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.

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

allow using both infrastructure_roles_options #1090

Merged
merged 13 commits into from
Aug 10, 2020
Merged

Conversation

FxKu
Copy link
Member

@FxKu FxKu commented Aug 7, 2020

Current master only allows to set one of the two infrastructure roles options. If infrastructure_roles_secrets is set, infrastructure_roles_secret_name is ignored. However, as the new option doesn't allow "templating", so configmap users might still want to use old option but also being able to reference another secret with the new flexibility of choosing the keys.

This PR also fixes a small "bug": When using the new configmap option one had to specify a rolekey. But it could be that this info isn't available. CRD validation also doesn't enforce it.

pkg/cluster/sync.go Outdated Show resolved Hide resolved
pkg/controller/util.go Outdated Show resolved Hide resolved
default:
c.logger.Warningf("Role description is not known: %s", properties)
}
}
} else {

if roleDef.SecretName != emptyName &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's probably better to have "validate" method.

@erthalion
Copy link
Contributor

👍

1 similar comment
@FxKu
Copy link
Member Author

FxKu commented Aug 10, 2020

👍

@FxKu FxKu merged commit 43163cf into master Aug 10, 2020
@FxKu FxKu added this to the 1.6 milestone Aug 10, 2020
@FxKu FxKu added the zalando label Aug 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants