Support to bootstrap from a user-supplied security.json and minor refactorings to pass auth headers through a Context #356
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…actorings to pass auth headers through a Context
HoustonPutman
approved these changes
Oct 29, 2021
There was a problem hiding this comment.
Ok this looks good!
Was stumped a bit here but I think it looks good (and I think I understand it haha).
Only things left to do are:
- Changelog entry (in solr-operator Chart.yaml)
- Add the option to the solr helm chart & helm chart documentation.
| @@ -144,6 +173,34 @@ var _ = FDescribe("SolrCloud controller - Basic Auth", func() { | |||
| expectStatefulSetBasicAuthConfig(ctx, solrCloud, false) | |||
| }) | |||
| }) | |||
|
|
|||
| FContext("User Provided Credentials and security.json ConfigMap", func() { | |||
There was a problem hiding this comment.
Suggested change
| FContext("User Provided Credentials and security.json ConfigMap", func() { | |
| FContext("User Provided Credentials and security.json Secret", func() { |
There was a problem hiding this comment.
ugh, sorry @HoustonPutman ... moved a little too fast with that conversion! thanks for catching those I missed.
| security.SecurityJson = string(bootstrapSecret.Data[SecurityJsonFile]) | ||
| basicAuthSecret = authSecret | ||
| security.SecurityJsonSrc = &corev1.EnvVarSource{ |
| } | ||
| security.CredentialsSecret = basicAuthSecret | ||
|
|
||
| // is there a user-provided security.json in a ConfigMap? |
There was a problem hiding this comment.
Suggested change
| // is there a user-provided security.json in a ConfigMap? | |
| // is there a user-provided security.json in a Secret? |
| } | ||
| security.SecurityJson = securityJson | ||
| security.SecurityJsonSrc = &corev1.EnvVarSource{SecretKeyRef: sec.BootstrapSecurityJson} | ||
| } // else no user-provided configMap, no sweat for us |
There was a problem hiding this comment.
Suggested change
| } // else no user-provided configMap, no sweat for us | |
| } // else no user-provided secret, no sweat for us |
| @@ -431,3 +483,22 @@ func useSecureProbe(solrCloud *solr.SolrCloud, probe *corev1.Probe, mountPath st | |||
| probe.TimeoutSeconds = 5 | |||
| } | |||
| } | |||
|
|
|||
| // Called during reconcile to load the security.json from a user-supplied ConfigMap | |||
There was a problem hiding this comment.
Suggested change
| // Called during reconcile to load the security.json from a user-supplied ConfigMap | |
| // Called during reconcile to load the security.json from a user-supplied Secret |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #355
Includes the non-OIDC related security changes from #346