Enable environment variables for Kubernetes credential providers #2934
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
webern
approved these changes
Mar 23, 2023
| @@ -11,8 +11,15 @@ providers: | |||
| {{/each}} | |||
| defaultCacheDuration: "{{default "12h" this.cache-duration}}" | |||
| apiVersion: credentialprovider.kubelet.k8s.io/v1alpha1 | |||
| {{#if (eq @key "ecr-credential-provider")}} | |||
| {{#if (or (eq @key "ecr-credential-provider") this.env-variables)}} | |||
| #[serde(rename_all = "kebab-case")] | ||
| pub struct CredentialProvider { | ||
| enabled: bool, | ||
| image_patterns: Vec<SingleLineString>, | ||
| cache_duration: Option<KubernetesDurationValue>, | ||
| env_variables: Option<EnvVarMap>, |
There was a problem hiding this comment.
Probably doesn't matter here, but these will be randomly ordered when iterated for the config file.
There was a problem hiding this comment.
Yep, it shouldn't matter what order these come in as in the final rendering of the template. They all just end up being environment variables in the credential process.
I briefly considered using a BTreeMap, but it ultimately doesn't matter.
bcressey
reviewed
Apr 4, 2023
This adds the capability to provide environment variables that can be passed through to the Kubernetes credential provider configuration. Signed-off-by: Sean McGinnis <stmcg@amazon.com>
stmcginnis
force-pushed
the
cred-prov-env
branch
from
4bb3562
to
2fcb890
Compare
bcressey
approved these changes
Apr 9, 2023
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.
Issue number:
Closes #2602
Description of changes:
This adds the capability to provide environment variables that can be passed through to the Kubernetes credential provider configuration.
This makes it possible to provide user data settings like:
and have that show up in the credential provider configuration file as:
Testing done:
Deployed node and verified launched successfully.
Ran:
Checked
kubeletstatus and cat'd `/etc/kubernetes/kubelet/credential-provider-config.yaml to make sure it reflected normal (pre-this change) configuration.Ran:
Checked
kubeletstatus and cat'd/etc/kubernetes/kubelet/credential-provider-config.yaml to see that it now contained the expectedenv:` entries.On new clean nodes, tried specifying all settings at once, and only current settings with adding environment variables later to make sure there was proper handling for template generation in all cases.
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.