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: 46236: Support sandbox images from private registries #15880

Merged
merged 1 commit into from
Aug 24, 2017

Conversation

sjenning
Copy link
Contributor

@sjenning sjenning commented Aug 21, 2017

kubernetes/kubernetes#46236

xref https://bugzilla.redhat.com/show_bug.cgi?id=1481251

This is a regression vs origin 1.5. When using the dockershim+CRI, the new default in kube 1.6, the client no longer uses .docker/config.json for pull credentials for infra pods.

This upstream commit went into kube 1.7 but was not cherry-picked to kube 1.6.

This PR is the pick for origin 1.6 and should try to go into 1.6.1

Reviewer note:
Upstream refactored dockertools to libdocker so the patch doesn't match exactly.

@sdodson @michaelgugino @derekwaynecarr @eparis

@openshift-merge-robot openshift-merge-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 21, 2017
@stevekuznetsov
Copy link
Contributor

/unassign @bparees @stevekuznetsov
/assign @derekwaynecarr

@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 Aug 22, 2017
@openshift-merge-robot
Copy link
Contributor

[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-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 22, 2017
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@sjenning
Copy link
Contributor Author

/retest

@sjenning
Copy link
Contributor Author

extended_conformance_gce failed to provision cluster
/retest

@sjenning
Copy link
Contributor Author

I'm not seeing how these errors could be caused by my change. Yet I don't see them happening in other PRs. One more time for good measure.
/retest

@sjenning
Copy link
Contributor Author

I'm left to conclude this change is breaking some e2e tests. Need to look into it.

@sjenning
Copy link
Contributor Author

Nope, other 3.6.x PRs are failing the same tests. Flake #15941

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 24, 2017

@sjenning: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_conformance_gce 6fb49e5 link /test extended_conformance_gce

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue

@openshift-merge-robot openshift-merge-robot merged commit 8865a3a into openshift:release-3.6 Aug 24, 2017
Copy link
Contributor

@michaelgugino michaelgugino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following up, having some trouble getting this to work in our container images.

@@ -340,15 +343,44 @@ func getSecurityOptSeparator(v *semver.Version) rune {

// ensureSandboxImageExists pulls the sandbox image when it's not present.
func ensureSandboxImageExists(client dockertools.DockerInterface, image string) error {
dockerCfgSearchPath := []string{"/.docker", filepath.Join(os.Getenv("HOME"), ".docker")}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be "./.docker" ?

Or is looking in the top of the file system in /.docker intentional here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't really notice that before. Might ask on the upstream PR why this is.

What trouble are you having with the containerized node? I figured it would Just Work (tm) since /var/lib/origin is bind mounted from the host into the containerized node.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants