-
Notifications
You must be signed in to change notification settings - Fork 40.1k
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
Use pause manifest image #59056
Conversation
/retest Is there a minimum docker version needed for this to work properly? |
/retest |
@ixdy fat manifest pushed to docker via moby/moby#18785 in docker |
3e1ce17
to
58feb3e
Compare
There was a problem hiding this 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" |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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/
.
There was a problem hiding this comment.
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 :)
58feb3e
to
3b12849
Compare
e40ef26
to
7e6a516
Compare
@@ -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 |
There was a problem hiding this comment.
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?
kubernetes/cmd/kubelet/app/options/container_runtime.go
Lines 36 to 40 in 6590ea6
var ( | |
defaultPodSandboxImage = defaultPodSandboxImageName + | |
"-" + runtime.GOARCH + ":" + | |
defaultPodSandboxImageVersion | |
) |
There was a problem hiding this comment.
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.
test/integration/framework/util.go
Outdated
} | ||
|
||
// 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 { |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
/lgtm |
56f2b70
to
1a5d184
Compare
/lgtm |
/assign @vishh |
@vishh please help me getting this PR into this release! |
0c034c4
to
a3ab03b
Compare
/test pull-kubernetes-unit |
@vishh can you PTAL at this PR? |
@kubernetes/sig-node-pr-reviews can someone please help me reviewing this code? |
Could you please squash the commits? I will kindly ask @kubernetes/sig-node-pr-reviews for approve for you |
@resouer done.! Thanks |
/lgtm |
/approve |
[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 |
/test all [submit-queue is verifying that this PR is safe to merge] |
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here. |
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: