rancher/dynamiclistener
1
0
Fork 0
forked from github/dynamiclistener
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request from ibuildthecloud/master

Browse Source 
Fix error masking issue
This commit is contained in:
Darren Shepherd 2020-07-27 22:48:58 -07:00 committed by GitHub
commit bafb051656
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions

14
storage/kubernetes/ca.go
View File

@ -25,21 +25,18 @@ func getSecret(secrets v1controller.SecretClient, namespace, name string) (*v1.S
return s, err
}
if err := createAndStore(secrets, namespace, name); err != nil {
return nil, err
}
return secrets.Get(namespace, name, metav1.GetOptions{})
return createAndStore(secrets, namespace, name)
}
func createAndStore(secrets v1controller.SecretClient, namespace string, name string) error {
func createAndStore(secrets v1controller.SecretClient, namespace string, name string) (*v1.Secret, error) {
ca, cert, err := factory.GenCA()
if err != nil {
return err
return nil, err
}
certPem, keyPem, err := factory.Marshal(ca, cert)
if err != nil {
return err
return nil, err
}
secret := &v1.Secret{
@ -54,6 +51,5 @@ func createAndStore(secrets v1controller.SecretClient, namespace string, name st
Type: v1.SecretTypeTLS,
}
secrets.Create(secret)
return nil
return secrets.Create(secret)
}