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.

Sign up for GitHub

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

Jump to bottom

kubeadm: pause image should be arch agnostic, as it is a manifest list #65920

Merged
merged 1 commit into from
Jul 7, 2018
Merged

kubeadm: pause image should be arch agnostic, as it is a manifest list #65920

merged 1 commit into from
Jul 7, 2018

Conversation

dims
Copy link
Member

@dims dims commented Jul 6, 2018 •
edited by luxas
Loading

Signed-off-by: Davanum Srinivas davanum@gmail.com

What this PR does / why we need it:

pause image is backed by a manifest list. so we should not use the arch image when reporting using say kubeadm config image list

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 kubernetes/kubeadm#962

Special notes for your reviewer:

Release note:

kubeadm: Fix pause image to not use architecture, as it is a manifest list

@dims
pause image should be arch agnostic
a6f86c6 
Change-Id: I4997ace30077335767bca402a8b98202c91b950b
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels Jul 6, 2018
@k8s-ci-robot k8s-ci-robot requested review from dixudx and timothysc July 6, 2018 19:21
@dims
Copy link
Member Author

dims commented Jul 6, 2018

/assign @luxas

@neolit123
Copy link
Member

@dims could you please add kubeadm: in the release note.

@chuckha
Copy link
Contributor

chuckha commented Jul 6, 2018

/lgtm

thanks for the fast patch!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 6, 2018
luxas
luxas approved these changes Jul 6, 2018
View reviewed changes
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

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chuckha, dims, luxas

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 Jul 6, 2018
@luxas luxas changed the title pause image should be arch agnostic kubeadm: pause image should be arch agnostic, as it is a manifest list Jul 6, 2018
@luxas
Copy link
Member

luxas commented Jul 6, 2018

Thanks a lot @dims 😄!! Can you cherrypick it to v1.11 as well 😉?

@dims dims mentioned this pull request Jul 6, 2018
Merged
@dims
Copy link
Member Author

dims commented Jul 6, 2018

@luxas Done!

@luxas luxas mentioned this pull request Jul 6, 2018
Closed
9 tasks
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 65946, 65904, 65913, 65906, 65920). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit d51bfcd into kubernetes:master Jul 7, 2018
k8s-github-robot pushed a commit that referenced this pull request Jul 9, 2018
Merge pull request #65923 from dims/automated-cherry-pick-of-#65920-u…
cd9b53a 
…pstream-release-1.11

Automatic merge from submit-queue.

Automated cherry pick of #65920: pause image should be arch agnostic

Cherry pick of #65920 on release-1.11.

#65920: pause image should be arch agnostic
@dims dims mentioned this pull request Jul 10, 2018
Closed
@nikhita nikhita mentioned this pull request Jul 12, 2018
Closed
@bart0sh bart0sh mentioned this pull request Jul 27, 2018
Closed
@giner giner mentioned this pull request Aug 10, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@luxas luxas luxas approved these changes

@dixudx dixudx Awaiting requested review from dixudx

@timothysc timothysc Awaiting requested review from timothysc

Assignees

@chuckha chuckha

@luxas luxas

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm 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 Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

kubeadm tries to pull k8s.gcr.io/pause-amd64:3.1 instead of k8s.gcr.io/pause:3.1
6 participants
@dims @neolit123 @chuckha @k8s-ci-robot @luxas @k8s-github-robot