Skip to content
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

Openshift apiserver: Make the global pullsecret accessible #606

Merged
merged 1 commit into from
Oct 28, 2021

Conversation

alvaroaleman
Copy link
Contributor

The openshift-apiserver doesn't access the global pullsecret from the
api but reads it from /var/lib/kubelet/config.json. Without this change,
imagestream imports that rely on the global pull secret don't work.

This fixes the "[sig-builds][Feature:Builds] imagechangetriggers
imagechangetriggers should trigger builds of all types" conformance
test.

Ref https://issues.redhat.com/browse/HOSTEDCP-257

The openshift-apiserver doesn't access the global pullsecret from the
api but reads it from /var/lib/kubelet/config.json. Without this change,
imagestream imports that rely on the global pull secret don't work.

This fixes the "[sig-builds][Feature:Builds] imagechangetriggers
imagechangetriggers should trigger builds of all types" conformance
test.

Ref https://issues.redhat.com/browse/HOSTEDCP-257
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 27, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 27, 2021
@csrwng
Copy link
Contributor

csrwng commented Oct 27, 2021

nice!
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 27, 2021
@alvaroaleman
Copy link
Contributor Author

/cherrypick release-4.8

@openshift-cherrypick-robot

@alvaroaleman: once the present PR merges, I will cherry-pick it on top of release-4.8 in a new PR and assign it to you.

In response to this:

/cherrypick release-4.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@alvaroaleman
Copy link
Contributor Author

/retest

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 346fdc2 into openshift:main Oct 28, 2021
@openshift-cherrypick-robot

@alvaroaleman: #606 failed to apply on top of branch "release-4.8":

Applying: Openshift apiserver: Make the global pullsecret accessible
Using index info to reconstruct a base tree...
M	control-plane-operator/controllers/hostedcontrolplane/oapi/deployment.go
Falling back to patching base and 3-way merge...
Auto-merging control-plane-operator/controllers/hostedcontrolplane/oapi/deployment.go
CONFLICT (content): Merge conflict in control-plane-operator/controllers/hostedcontrolplane/oapi/deployment.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Openshift apiserver: Make the global pullsecret accessible
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-4.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants