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

Use pause manifest image #59056

Merged
merged 1 commit into from
Apr 6, 2018
Merged

Conversation

mkumatag
Copy link
Member

@mkumatag mkumatag commented Jan 30, 2018

What this PR does / why we need it:
As pause manifest code is merged part of #57723, now its time to remove all architecture-dependent pause imagename.
Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 30, 2018
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jan 30, 2018
@ixdy
Copy link
Member

ixdy commented Jan 31, 2018

/retest

Is there a minimum docker version needed for this to work properly?

@mkumatag
Copy link
Member Author

/retest

@mkumatag
Copy link
Member Author

@ixdy fat manifest pushed to docker via moby/moby#18785 in docker 1.10.0 release, so minimum version we need is docker 1.10.0 release.

Copy link
Member

@luxas luxas left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -36,7 +36,7 @@ import (
)

const (
defaultSandboxImage = "gcr.io/google_containers/pause-amd64:3.1"
Copy link
Member

Choose a reason for hiding this comment

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

can this start use test/utils/image instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm little hesitant to use this one because it is completely outside of pkg/ package.

Copy link
Member

Choose a reason for hiding this comment

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

I agree with @mkumatag - I think we should avoid dependencies from pkg/ -> test/.

Copy link
Member

Choose a reason for hiding this comment

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

Fair enough - I'm fine with that :)

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 8, 2018
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 9, 2018
@mkumatag
Copy link
Member Author

mkumatag commented Feb 9, 2018

Resolved the conflict and pushed it back, @luxas @ixdy PTAL.

@mkumatag mkumatag force-pushed the pause_manifest branch 2 times, most recently from e40ef26 to 7e6a516 Compare February 9, 2018 04:53
@mkumatag mkumatag mentioned this pull request Feb 9, 2018
11 tasks
@@ -84,7 +84,7 @@ var (
NoSnatTestProxy = ImageConfig{e2eRegistry, "no-snat-test-proxy", "1.0", true}
NWayHTTP = ImageConfig{e2eRegistry, "n-way-http", "1.0", true}
// When these values are updated, also update cmd/kubelet/app/options/container_runtime.go
Copy link
Member

Choose a reason for hiding this comment

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

per this comment, I think you need to update cmd/kubelet/app/options/container_runtime.go?

var (
defaultPodSandboxImage = defaultPodSandboxImageName +
"-" + runtime.GOARCH + ":" +
defaultPodSandboxImageVersion
)

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed the review comment, PTAL latest commit.

}

// GetPauseImageName fetches the pause image name for the same architecture as the apiserver.
// GetPauseImageName returns the pause image name with proper version
func GetPauseImageName(c clientset.Interface) string {
Copy link
Member

Choose a reason for hiding this comment

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

minor not: his probably doesn't need to take c anymore.

Copy link
Member Author

Choose a reason for hiding this comment

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

after removing that c this function is dup of function from manifest.go file, so I consolidated all the functions into one and refactored the code a bit. PTAL at latest commits.

@ixdy
Copy link
Member

ixdy commented Feb 20, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 20, 2018
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 21, 2018
@ixdy
Copy link
Member

ixdy commented Feb 21, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 21, 2018
@ixdy
Copy link
Member

ixdy commented Feb 21, 2018

/assign @vishh

@mkumatag
Copy link
Member Author

@vishh please help me getting this PR into this release!

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 26, 2018
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 26, 2018
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 26, 2018
@mkumatag
Copy link
Member Author

/test pull-kubernetes-unit

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 1, 2018
@mkumatag
Copy link
Member Author

mkumatag commented Apr 2, 2018

@vishh can you PTAL at this PR?

@mkumatag
Copy link
Member Author

mkumatag commented Apr 6, 2018

@kubernetes/sig-node-pr-reviews can someone please help me reviewing this code?

@k8s-ci-robot k8s-ci-robot added the sig/node Categorizes an issue or PR as relevant to SIG Node. label Apr 6, 2018
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 6, 2018
@resouer
Copy link
Contributor

resouer commented Apr 6, 2018

Could you please squash the commits?

I will kindly ask @kubernetes/sig-node-pr-reviews for approve for you

@mkumatag
Copy link
Member Author

mkumatag commented Apr 6, 2018

@resouer done.! Thanks

@resouer
Copy link
Contributor

resouer commented Apr 6, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 6, 2018
@vishh
Copy link
Contributor

vishh commented Apr 6, 2018

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ixdy, mkumatag, resouer, vishh

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 6, 2018
@k8s-github-robot
Copy link

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

@k8s-github-robot
Copy link

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 489178d into kubernetes:master Apr 6, 2018
@mkumatag mkumatag deleted the pause_manifest branch April 7, 2018 04:12
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. 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.

7 participants