Create a k8schain directly from pull secrets #1049
Merged
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
The k8schain package creates a new keychain by resolving Kubernets
secrets from service accounts and other image pull secrets specified by
name. The k8s client gets the full secret content for these named
resources.
Sometimes it's desirable to pull the content of a secret from a cache,
or to watch a resource for changes in a controller. In this situation
it would be helpful to create a k8schain directly from resolved secrets,
without making calls to the k8s api server.
This change refactors the existing k8schain.New() method to separate the
resolution of secrets from the creation of the keychain. This is only a
refactoring of existing behavior to shortcut the k8s api lookups. There
is no change in existing behavior for the keychain.
Added:
k8schain.NewFromPullSecrets(context.Context, []corev1.Secret) (authn.Keychain, error)
Signed-off-by: Scott Andrews <andrewssc@vmware.com>
| }) | ||
|
|
||
| // Extend the default keyring with the pull secrets. | ||
| kr, err := credentialprovidersecrets.MakeDockerKeyring(pullSecrets, keyring) |
There was a problem hiding this comment.
You're okay with the default keyring here being the magical NewDockerKeyring() thing?
I'm starting to lean away from that (#1042) because it's caused problems (knative/serving#10259).
There was a problem hiding this comment.
My goal for this PR was to not change the current behavior. I agree with the spirit of #1042
Codecov Report
@@ Coverage Diff @@
## main #1049 +/- ##
==========================================
+ Coverage 75.47% 75.50% +0.02%
==========================================
Files 107 107
Lines 5092 5094 +2
==========================================
+ Hits 3843 3846 +3
+ Misses 704 703 -1
Partials 545 545
Continue to review full report at Codecov.
|
|
Ah sorry, can you fix the fmt error? |
|
@jonjohnsonjr done |
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.
The k8schain package creates a new keychain by resolving Kubernets
secrets from service accounts and other image pull secrets specified by
name. The k8s client gets the full secret content for these named
resources.
Sometimes it's desirable to pull the content of a secret from a cache,
or to watch a resource for changes in a controller. In this situation
it would be helpful to create a k8schain directly from resolved secrets,
without making calls to the k8s api server.
This change refactors the existing k8schain.New() method to separate the
resolution of secrets from the creation of the keychain. This is only a
refactoring of existing behavior to shortcut the k8s api lookups. There
is no change in existing behavior for the keychain.
Added:
Signed-off-by: Scott Andrews andrewssc@vmware.com