diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-21 13:15:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-21 13:15:28 +0200 |
| commit | ffa73c58a52b470d9708a8ae38536fa0dc443d8b (patch) | |
| tree | 5f946382c70e75a60595966442c2ce48924816b8 /pkg/domain | |
| parent | fea325327106aebc08fd6b11bc77c434e614c3e9 (diff) | |
| parent | 9bb51e8e96f98ab74d416a9af9bd708c7c503bdf (diff) | |
| download | podman-ffa73c58a52b470d9708a8ae38536fa0dc443d8b.tar.gz podman-ffa73c58a52b470d9708a8ae38536fa0dc443d8b.tar.bz2 podman-ffa73c58a52b470d9708a8ae38536fa0dc443d8b.zip | |
Merge pull request #15842 from ashley-cui/seclabels
Add labels to secrets
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/secrets.go | 4 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/secrets.go | 5 | ||||
| -rw-r--r-- | pkg/domain/infra/tunnel/secrets.go | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/pkg/domain/entities/secrets.go b/pkg/domain/entities/secrets.go index d8af937a7..5686b90e9 100644 --- a/pkg/domain/entities/secrets.go +++ b/pkg/domain/entities/secrets.go @@ -13,6 +13,7 @@ type SecretCreateReport struct { type SecretCreateOptions struct { Driver string DriverOpts map[string]string + Labels map[string]string } type SecretListRequest struct { @@ -55,6 +56,7 @@ type SecretVersion struct { type SecretSpec struct { Name string Driver SecretDriverSpec + Labels map[string]string } type SecretDriverSpec struct { @@ -70,6 +72,8 @@ type SecretCreateRequest struct { Data string // Driver represents a driver (default "file") Driver SecretDriverSpec + // Labels are labels on the secret + Labels map[string]string } // Secret create response diff --git a/pkg/domain/infra/abi/secrets.go b/pkg/domain/infra/abi/secrets.go index 47159d65a..2a377288b 100644 --- a/pkg/domain/infra/abi/secrets.go +++ b/pkg/domain/infra/abi/secrets.go @@ -45,6 +45,7 @@ func (ic *ContainerEngine) SecretCreate(ctx context.Context, name string, reader storeOpts := secrets.StoreOptions{ DriverOpts: options.DriverOpts, + Labels: options.Labels, } secretID, err := manager.Store(name, data, options.Driver, storeOpts) @@ -74,6 +75,9 @@ func (ic *ContainerEngine) SecretInspect(ctx context.Context, nameOrIDs []string return nil, nil, fmt.Errorf("inspecting secret %s: %w", nameOrID, err) } } + if secret.Labels == nil { + secret.Labels = make(map[string]string) + } report := &entities.SecretInfoReport{ ID: secret.ID, CreatedAt: secret.CreatedAt, @@ -84,6 +88,7 @@ func (ic *ContainerEngine) SecretInspect(ctx context.Context, nameOrIDs []string Name: secret.Driver, Options: secret.DriverOptions, }, + Labels: secret.Labels, }, } reports = append(reports, report) diff --git a/pkg/domain/infra/tunnel/secrets.go b/pkg/domain/infra/tunnel/secrets.go index d26718b12..aa48cb764 100644 --- a/pkg/domain/infra/tunnel/secrets.go +++ b/pkg/domain/infra/tunnel/secrets.go @@ -14,7 +14,8 @@ func (ic *ContainerEngine) SecretCreate(ctx context.Context, name string, reader opts := new(secrets.CreateOptions). WithDriver(options.Driver). WithDriverOpts(options.DriverOpts). - WithName(name) + WithName(name). + WithLabels(options.Labels) created, err := secrets.Create(ic.ClientCtx, reader, opts) if err != nil { return nil, err |