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

UPSTREAM: 58955: pkg: kubelet: do not assume anything about images names #18340

Merged
merged 1 commit into from
Jan 31, 2018

Conversation

sjenning
Copy link
Contributor

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 29, 2018
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Jan 29, 2018
@runcom
Copy link
Member

runcom commented Jan 29, 2018

LGTM

@derekwaynecarr
Copy link
Member

need a 3.8 pick since 3.8 masters run 3.8 nodes.

@sjenning
Copy link
Contributor Author

sjenning commented Jan 29, 2018

@derekwaynecarr I also verified the positive case in which the image does exist in the configured, non-docker, registry and the container pulls from the configured registry and runs successfully.

@sjenning
Copy link
Contributor Author

my old friend, flake #17556
/retest

@derekwaynecarr
Copy link
Member

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 30, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, sjenning

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 30, 2018
@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue (batch tested with PRs 18225, 18351, 18331, 18340, 18326).

@openshift-merge-robot openshift-merge-robot merged commit d91de34 into openshift:master Jan 31, 2018
openshift-merge-robot added a commit that referenced this pull request Jan 31, 2018
Automatic merge from submit-queue.

[3.8] UPSTREAM: 58955: pkg: kubelet: do not assume anything about images names

3.8 backport; see master PR #18340 for details.

@liggitt @derekwaynecarr @frobware @mrunalp @runcom
openshift-merge-robot added a commit that referenced this pull request Feb 15, 2018
Automatic merge from submit-queue (batch tested with PRs 18624, 18605).

Revert "Admission plugin: openshift.io/ImageQualify"

This reverts commit 8bc3e07.  #18020

Render unneeded by upstream kubernetes/kubernetes#58955 and Origin pick #18340

Will live on forever in git history if we find a use case for it later.
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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants