kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14863 from justinsb/context_to_get_or_create_secret 

Add context to GetOrCreateSecret
This commit is contained in:
Kubernetes Prow Robot 2022-12-23 08:39:26 -08:00 committed by GitHub
parent f5b72742b4 a69dc902c4
commit ffe47df7df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kops/create_secret_ciliumpassword.go
View File

@ -125,7 +125,7 @@ func RunCreateSecretCiliumEncryptionConfig(ctx context.Context, f commandutils.F
} }
if !options.Force { if !options.Force {
_, created, err := secretStore.GetOrCreateSecret("ciliumpassword", secret) _, created, err := secretStore.GetOrCreateSecret(ctx, "ciliumpassword", secret)
if err != nil { if err != nil {
return fmt.Errorf("error adding Cilium IPSec secret: %v", err) return fmt.Errorf("error adding Cilium IPSec secret: %v", err)
} }

2
cmd/kops/create_secret_dockerconfig.go
View File

@ -130,7 +130,7 @@ func RunCreateSecretDockerConfig(ctx context.Context, f commandutils.Factory, ou
} }
if !options.Force { if !options.Force {
_, created, err := secretStore.GetOrCreateSecret("dockerconfig", secret) _, created, err := secretStore.GetOrCreateSecret(ctx, "dockerconfig", secret)
if err != nil { if err != nil {
return fmt.Errorf("adding dockerconfig secret: %v", err) return fmt.Errorf("adding dockerconfig secret: %v", err)
} }

2
cmd/kops/create_secret_encryptionconfig.go
View File

@ -123,7 +123,7 @@ func RunCreateSecretEncryptionConfig(ctx context.Context, f commandutils.Factory
} }
if !options.Force { if !options.Force {
_, created, err := secretStore.GetOrCreateSecret("encryptionconfig", secret) _, created, err := secretStore.GetOrCreateSecret(ctx, "encryptionconfig", secret)
if err != nil { if err != nil {
return fmt.Errorf("adding encryptionconfig secret: %v", err) return fmt.Errorf("adding encryptionconfig secret: %v", err)
} }

2
cmd/kops/create_secret_weavepassword.go
View File

@ -127,7 +127,7 @@ func RunCreateSecretWeavePassword(ctx context.Context, f commandutils.Factory, o
} }
if !options.Force { if !options.Force {
_, created, err := secretStore.GetOrCreateSecret("weavepassword", secret) _, created, err := secretStore.GetOrCreateSecret(ctx, "weavepassword", secret)
if err != nil { if err != nil {
return fmt.Errorf("adding weavepassword secret: %v", err) return fmt.Errorf("adding weavepassword secret: %v", err)
} }

2
pkg/configserver/secretstore.go
View File

@ -65,7 +65,7 @@ func (s *configserverSecretStore) FindSecret(id string) (*fi.Secret, error) {
} }
// GetOrCreateSecret implements fi.SecretStore // GetOrCreateSecret implements fi.SecretStore
func (s *configserverSecretStore) GetOrCreateSecret(id string, secret *fi.Secret) (current *fi.Secret, created bool, err error) { func (s *configserverSecretStore) GetOrCreateSecret(ctx context.Context, id string, secret *fi.Secret) (current *fi.Secret, created bool, err error) {
return nil, false, fmt.Errorf("GetOrCreateSecret not supported by configserverSecretStore") return nil, false, fmt.Errorf("GetOrCreateSecret not supported by configserverSecretStore")
} }

4
upup/pkg/fi/fitasks/secret.go
View File

@ -75,6 +75,8 @@ func (s *Secret) CheckChanges(a, e, changes *Secret) error {
} }
func (_ *Secret) Render(c *fi.CloudupContext, a, e, changes *Secret) error { func (_ *Secret) Render(c *fi.CloudupContext, a, e, changes *Secret) error {
ctx := c.Context()
name := fi.ValueOf(e.Name) name := fi.ValueOf(e.Name)
if name == "" { if name == "" {
return fi.RequiredField("Name") return fi.RequiredField("Name")
@ -87,7 +89,7 @@ func (_ *Secret) Render(c *fi.CloudupContext, a, e, changes *Secret) error {
return fmt.Errorf("error creating secret %q: %v", name, err) return fmt.Errorf("error creating secret %q: %v", name, err)
} }
_, _, err = secrets.GetOrCreateSecret(name, secret) _, _, err = secrets.GetOrCreateSecret(ctx, name, secret)
if err != nil { if err != nil {
return fmt.Errorf("error creating secret %q: %v", name, err) return fmt.Errorf("error creating secret %q: %v", name, err)
} }

2
upup/pkg/fi/secrets.go
View File

@ -34,7 +34,7 @@ type SecretStore interface {
// FindSecret finds a secret, if exists. Returns nil,nil if not found // FindSecret finds a secret, if exists. Returns nil,nil if not found
FindSecret(id string) (*Secret, error) FindSecret(id string) (*Secret, error)
// GetOrCreateSecret creates a secret // GetOrCreateSecret creates a secret
GetOrCreateSecret(id string, secret *Secret) (current *Secret, created bool, err error) GetOrCreateSecret(ctx context.Context, id string, secret *Secret) (current *Secret, created bool, err error)
// ReplaceSecret will forcefully update an existing secret if it exists // ReplaceSecret will forcefully update an existing secret if it exists
ReplaceSecret(id string, secret *Secret) (current *Secret, err error) ReplaceSecret(id string, secret *Secret) (current *Secret, err error)
// ListSecrets lists the ids of all known secrets // ListSecrets lists the ids of all known secrets

4
upup/pkg/fi/secrets/clientset_secretstore.go
View File

@ -171,9 +171,7 @@ func (c *ClientsetSecretStore) DeleteSecret(name string) error {
} }
// GetOrCreateSecret implements fi.SecretStore::GetOrCreateSecret // GetOrCreateSecret implements fi.SecretStore::GetOrCreateSecret
func (c *ClientsetSecretStore) GetOrCreateSecret(name string, secret *fi.Secret) (*fi.Secret, bool, error) { func (c *ClientsetSecretStore) GetOrCreateSecret(ctx context.Context, name string, secret *fi.Secret) (*fi.Secret, bool, error) {
ctx := context.TODO()
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {
s, err := c.FindSecret(name) s, err := c.FindSecret(name)
if err != nil { if err != nil {

4
upup/pkg/fi/secrets/vfs_secretstore.go
View File

@ -139,9 +139,7 @@ func (c *VFSSecretStore) Secret(id string) (*fi.Secret, error) {
return s, nil return s, nil
} }
func (c *VFSSecretStore) GetOrCreateSecret(id string, secret *fi.Secret) (*fi.Secret, bool, error) { func (c *VFSSecretStore) GetOrCreateSecret(ctx context.Context, id string, secret *fi.Secret) (*fi.Secret, bool, error) {
ctx := context.TODO()
p := c.buildSecretPath(id) p := c.buildSecretPath(id)
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {