Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1500934 - Dynamic broker ns for secrets #482

Merged
merged 1 commit into from Oct 11, 2017
Merged

Bug 1500934 - Dynamic broker ns for secrets #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkg/apb/secrets.go
View file
Open in desktop
Expand Up @@ -103,11 +103,11 @@ func InitializeSecretsCache(config []SecretsConfig, log *logging.Logger) {

// FilterSecrets - Filters all parameters masked by a secret out of the given
// specs
func FilterSecrets(inSpecs []*Spec) ([]*Spec, error) {
func FilterSecrets(inSpecs []*Spec, config ClusterConfig) ([]*Spec, error) {
for _, spec := range inSpecs {
secrets.log.Debugf("Filtering secrets from spec %v", spec.FQName)
for _, secret := range GetSecrets(spec) {
secretKeys, err := getSecretKeys(secret)
secretKeys, err := getSecretKeys(secret, config.Namespace)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -150,15 +150,15 @@ func paramInSecret(param ParameterDescriptor, secretKeys []string) bool {
return false
}

func getSecretKeys(secretName string) ([]string, error) {
func getSecretKeys(secretName, namespace string) ([]string, error) {
k8scli, err := clients.Kubernetes(secrets.log)
if err != nil {
return nil, err
}

secretData, err := k8scli.CoreV1().Secrets("ansible-service-broker").Get(secretName, meta_v1.GetOptions{})
secretData, err := k8scli.CoreV1().Secrets(namespace).Get(secretName, meta_v1.GetOptions{})
if err != nil {
secrets.log.Warningf("Unable to load secret '%s' from namespace 'ansible-service-broker'", secretName)
secrets.log.Warningf("Unable to load secret '%s' from namespace '%s'", secretName, namespace)
return []string{}, nil
}
secrets.log.Debugf("Found secret with name %v", secretName)
Expand Down
2 changes: 1 addition & 1 deletion pkg/broker/broker.go
View file
Open in desktop
Expand Up @@ -429,7 +429,7 @@ func (a AnsibleBroker) Catalog() (*CatalogResponse, error) {
}

a.log.Debugf("Filtering secret parameters out of specs...")
specs, err = apb.FilterSecrets(specs)
specs, err = apb.FilterSecrets(specs, a.clusterConfig)
if err != nil {
// TODO: Should we blow up or warn and continue?
a.log.Errorf("Something went real bad trying to load secrets %v", err)
Expand Down