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

kubeadm: Pull sidecar and dnsmasq-nanny images when using kube-dns #66499

Merged
merged 1 commit into from
Jul 24, 2018

Conversation

rosti
Copy link
Contributor

@rosti rosti commented Jul 23, 2018

What this PR does / why we need it:

It appears that sidecar and dnsmasq-nanny images are now required for
kube-dns deployment to work correctly. Thus the following default kube-dns
images are used now:

  • k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.10
  • k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.10
  • k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.10

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#1016

Special notes for your reviewer:

/cc @kubernetes/sig-cluster-lifecycle-pr-reviews
/area kubeadm
/assign @luxas
/assign @timothysc
/kind bug

Release note:

kubeadm: Pull sidecar and dnsmasq-nanny images when using kube-dns

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Jul 23, 2018
@k8s-ci-robot k8s-ci-robot added sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. area/kubeadm labels Jul 23, 2018
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 23, 2018
@k8s-ci-robot
Copy link
Contributor

@rosti: Reiterating the mentions to trigger a notification:
@kubernetes/sig-cluster-lifecycle-pr-reviews

In response to this:

What this PR does / why we need it:

It appears that sidecar and dnsmasq-nanny images are now required for
kube-dns deployment to work correctly. Thus the following default kube-dns
images are used now:

  • k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.10
  • k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.10
  • k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.10

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#1016

Special notes for your reviewer:

/cc @kubernetes/sig-cluster-lifecycle-pr-reviews
/area kubeadm
/assign @luxas
/assign @timothysc
/kind bug

Release note:

kubeadm: Pull sidecar and dnsmasq-nanny images when using kube-dns

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.

@neolit123
Copy link
Member

/cc @kubernetes/sig-cluster-lifecycle-pr-reviews
/ok-to-test

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 23, 2018
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
/approve
/hold
Please make sure this is working with appropriate unit tests. If we don't already have tests covering all of this, write them as part of this patch.

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 23, 2018
@timothysc
Copy link
Member

I'm missing something, why is this needed, and can you cross link the canonical reference from folks who manage these integrations.

/cc @MrHohn

Are you aware of this requirement, and where did it come from?

@k8s-ci-robot k8s-ci-robot requested a review from MrHohn July 24, 2018 02:22
@rosti
Copy link
Contributor Author

rosti commented Jul 24, 2018

I was a bit baffled by this too, but it is true. Tried it with a clean setup in a VM with Kubernetes 1.11.1 and it indeed fetched the sidecar and dnsmasq-nanny images and started them up:

# docker ps | grep dns
d1d618b961e7        k8s.gcr.io/k8s-dns-sidecar-amd64@sha256:4f1ab957f87b94a5ec1edc26fae50da2175461f00afecf68940c4aa079bd08a4         "/sidecar --v=2 --..."   39 minutes ago      Up 39 minutes                           k8s_sidecar_kube-dns-86c47599bd-865pw_kube-system_3cac7428-8f21-11e8-a06a-020043fe033b_0
4985e4dc39cb        k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64@sha256:bbb2a290a568125b3b996028958eb773f33b5b87a6b37bf38a28f8b62dddb3c8   "/dnsmasq-nanny -v..."   39 minutes ago      Up 39 minutes                           k8s_dnsmasq_kube-dns-86c47599bd-865pw_kube-system_3cac7428-8f21-11e8-a06a-020043fe033b_0
1cc37a3de744        55ffe31ac578                                                                                                     "/kube-dns --domai..."   39 minutes ago      Up 39 minutes                           k8s_kubedns_kube-dns-86c47599bd-865pw_kube-system_3cac7428-8f21-11e8-a06a-020043fe033b_0
91976d569cef        k8s.gcr.io/pause:3.1                                                                                             "/pause"                 39 minutes ago      Up 39 minutes                           k8s_POD_kube-dns-86c47599bd-865pw_kube-system_3cac7428-8f21-11e8-a06a-020043fe033b_0

It appears that sidecar and dnsmasq-nanny images are now required for
kube-dns deployment to work correctly. Thus the following default kube-dns
images are used now:

- k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.10
- k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.10
- k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.10

Signed-off-by: Rostislav M. Georgiev <[email protected]>
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 24, 2018
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
/approve
Thanks!

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: luxas, rosti

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

@luxas
Copy link
Member

luxas commented Jul 24, 2018

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 24, 2018
@MrHohn
Copy link
Member

MrHohn commented Jul 24, 2018

I was a bit baffled by this too, but it is true. Tried it with a clean setup in a VM with Kubernetes 1.11.1 and it indeed fetched the sidecar and dnsmasq-nanny images and started them up:

Humm sorry I'm missing some context here. From kube-dns point of view these two images are always required since long ago (1.5ish?). This feels like some sort of pre-loading mechanism in kubeadm, does it work on earlier k8s versions?

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 66291, 66471, 66499). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 2755000 into kubernetes:master Jul 24, 2018
@luxas
Copy link
Member

luxas commented Jul 25, 2018

@rosti we might wanna cherrypick this bugfix into v1.11

@neolit123
Copy link
Member

i will cherry pick it tomorrow.

k8s-github-robot pushed a commit that referenced this pull request Jul 30, 2018
…499-origin-release-1.11

Automatic merge from submit-queue.

Automated cherry pick of #66499: kubeadm: Pull sidecar and dnsmasq-nanny images when using

Cherry pick of #66499 on release-1.11.

#66499: kubeadm: Pull sidecar and dnsmasq-nanny images when using
@rosti rosti deleted the kubedns-images branch November 22, 2018 15:28
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. area/kubeadm cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Kubeadm has incorrect images list to bootstrap k8s 1.11 without internet
7 participants