Filter secret names for registry pod's sa - #2165
Merged
openshift-merge-robot merged 1 commit intoMay 19, 2021
Merged
openshift-merge-robot merged 1 commit into
openshift-merge-robot merged 1 commit into
Conversation
During the registry server sync the image pull secrets from the catalogsource's spec.secrets are passed unfiltered to the serviceaccount for the registry pod. Passing an empty string in the secrets list breaks serverside apply for the registry pod with the following error: failed to convert new object (/v1, Kind=Pod) to smd typed: .spec.imagePullSecrets: element 0: associative list with keys has an element that omits key field "name" (and doesn't have default value) This prevents the registry pod from being promoted via the SSA client when there is an update to the index image. To fix this, the image pull secrets list is filtered for empty strings before being set on the serviceaccount. Signed-off-by: Haseeb Tariq <hasbro17@gmail.com>
hasbro17
force-pushed
the
fix-ssa-error-from-empty-string
branch
from
May 19, 2021 00:11
24d9960 to
ee40fd9
Compare
Member
|
/lgtm Kudos on the description as well! Super helpful! |
Member
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: hasbro17, kevinrizza The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This file contains hidden or 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
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.
Description of the change:
During the registry server sync the image pull secrets from the catalogsource's spec.secrets are passed
unfiltered to the serviceaccount for the registry pod.
Passing an empty string in the secrets list breaks serverside apply for the registry pod which gets created without the
metadata.managedFieldswhen it has an empty element in theimagePullSecretslist:This prevents the registry pod from being promoted via the SSA client when
there is an update to the index image:
To fix this, the image pull secrets list is filtered for empty strings
before being set on the serviceaccount.
Motivation for the change:
Fix for: https://bugzilla.redhat.com/show_bug.cgi?id=1945548
Similar to kubernetes-sigs/structured-merge-diff#130
Reviewer Checklist
/doc