-
Notifications
You must be signed in to change notification settings - Fork 1.5k
*: Replace PullSecretPath with PullSecret #208
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
*: Replace PullSecretPath with PullSecret #208
Conversation
And include more detail about the failure in JSONFile, vs. the old boolean "this is invalid".
94b1b1f to
0b5a4d6
Compare
|
/assign @abhinavdahiya |
Instead of passing the pull secret around as a path, pass it around as a JSON string. This makes it easier to embed in Kubernetes, since we're punting the file-reading to callers at config-YAML-creation time. Store it as a string (like the SSH pubkey) instead of parsing it out into a more detailed structure, because we expect to consume it as an opaque string (just pass it to the registry without peaking inside). I've left some deprecated handling for folks who are still using pullSecretPath in their YAML. I'll file a follow-up pull request to drop it once we get the CI template in openshift/release updated to use pullSecret.
0b5a4d6 to
8a84eb2
Compare
Catching up with openshift/installer@8a84eb2e (*: Replace PullSecretPath with PullSecret, 2018-09-05, openshift/installer#208). The jq call ensures the secret JSON is on a single line, otherwise we'd need to be a bit more careful about injecting it into the YAML as a valid string literal. I've replaced the inputs.yaml copy with a sed invocation to avoid leaking the internal pull secret into the output artifacts. I'm not sure how sensitive it is though, maybe we don't mind leaking the secret?
yifan-gu
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abhinavdahiya, wking, yifan-gu 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 |
|
/hold cancel |
Instead of passing the pull secret around as a path, pass it around as a JSON string. This makes it easier to embed in Kubernetes, since we're punting the file-reading to callers at config-YAML-creation time.