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
Member

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

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Jul 23, 2018

@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

This comment has been minimized.

Copy link
Member

neolit123 commented Jul 23, 2018

@luxas

luxas approved these changes Jul 23, 2018

Copy link
Member

luxas left a comment

/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.

@timothysc

This comment has been minimized.

Copy link
Member

timothysc commented Jul 24, 2018

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 Jul 24, 2018

@rosti

This comment has been minimized.

Copy link
Member 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
kubeadm: Pull sidecar and dnsmasq-nanny images when using kube-dns
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 <rostislavg@vmware.com>

@rosti rosti force-pushed the rosti:kubedns-images branch from 2c5d2ca to fb7ba52 Jul 24, 2018

@k8s-ci-robot k8s-ci-robot added size/M and removed lgtm size/S labels Jul 24, 2018

@luxas

luxas approved these changes Jul 24, 2018

Copy link
Member

luxas left a comment

/lgtm
/approve
Thanks!

@k8s-ci-robot k8s-ci-robot added the lgtm label Jul 24, 2018

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Jul 24, 2018

[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

This comment has been minimized.

Copy link
Member

luxas commented Jul 24, 2018

/hold cancel

@MrHohn

This comment has been minimized.

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

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Jul 24, 2018

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

18 checks passed

Submit Queue Queued to run github e2e tests a second time.
Details
cla/linuxfoundation rosti authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-e2e-kops-aws Job succeeded.
Details
pull-kubernetes-e2e-kubeadm-gce Skipped
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped
pull-kubernetes-local-e2e-containerized Skipped
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
@luxas

This comment has been minimized.

Copy link
Member

luxas commented Jul 25, 2018

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

@neolit123

This comment has been minimized.

Copy link
Member

neolit123 commented Jul 25, 2018

i will cherry pick it tomorrow.

@luxas luxas referenced this pull request Jul 25, 2018

Closed

Cherrypick tracking issue for v1.11 #958

8 of 9 tasks complete

k8s-github-robot pushed a commit that referenced this pull request Jul 30, 2018

Kubernetes Submit Queue
Merge pull request #66679 from neolit123/automated-cherry-pick-of-#66…
…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 rosti:kubedns-images branch Nov 22, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.