*: Replace PullSecretPath with PullSecret#208
Merged
openshift-merge-robot merged 2 commits intoopenshift:masterfrom Sep 6, 2018
Merged
*: Replace PullSecretPath with PullSecret#208openshift-merge-robot merged 2 commits intoopenshift:masterfrom
openshift-merge-robot merged 2 commits intoopenshift:masterfrom
Conversation
And include more detail about the failure in JSONFile, vs. the old boolean "this is invalid".
openshift-ci-robot
added
the
size/M
openshift-ci-robot
added
the
approved
wking
force-pushed
the
drop-pull-secret-path
branch
from
94b1b1f to
0b5a4d6
Compare
Member
Author
|
/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.
wking
force-pushed
the
drop-pull-secret-path
branch
from
0b5a4d6 to
8a84eb2
Compare
openshift-ci-robot
added
size/L
wking
added a commit
to wking/openshift-release
that referenced
this pull request
Sep 5, 2018
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?
Contributor
openshift-ci-robot
added
do-not-merge/hold
Contributor
|
[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 |
Member
Author
|
/hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
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
5 participants
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.
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.