mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
Merge pull request #62676 from MrHohn/kube-dns-1.14.10
Automatic merge from submit-queue (batch tested with PRs 62676, 62612). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update kube-dns to Version 1.14.10 **What this PR does / why we need it**: kube-dns version bump for kubeadm will be on a speparate PR. **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 #NONE **Special notes for your reviewer**: /assign @rramkumar1 @bowei cc @grayluck **Release note**: ```release-note Update kube-dns to Version 1.14.10. Major changes: - Fix a bug in DNS resolution for externalName services and PTR records that need to query from upstream nameserver. ```
This commit is contained in:
commit
a73c80a783
@ -95,7 +95,7 @@ spec:
|
|||||||
optional: true
|
optional: true
|
||||||
containers:
|
containers:
|
||||||
- name: kubedns
|
- name: kubedns
|
||||||
image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.9
|
image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.10
|
||||||
resources:
|
resources:
|
||||||
# TODO: Set memory limits when we've profiled the container for large
|
# TODO: Set memory limits when we've profiled the container for large
|
||||||
# clusters, then set request = limit to keep this container in
|
# clusters, then set request = limit to keep this container in
|
||||||
@ -146,7 +146,7 @@ spec:
|
|||||||
- name: kube-dns-config
|
- name: kube-dns-config
|
||||||
mountPath: /kube-dns-config
|
mountPath: /kube-dns-config
|
||||||
- name: dnsmasq
|
- name: dnsmasq
|
||||||
image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.9
|
image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.10
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthcheck/dnsmasq
|
path: /healthcheck/dnsmasq
|
||||||
@ -185,7 +185,7 @@ spec:
|
|||||||
- name: kube-dns-config
|
- name: kube-dns-config
|
||||||
mountPath: /etc/k8s/dns/dnsmasq-nanny
|
mountPath: /etc/k8s/dns/dnsmasq-nanny
|
||||||
- name: sidecar
|
- name: sidecar
|
||||||
image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.9
|
image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.10
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /metrics
|
path: /metrics
|
||||||
|
@ -95,7 +95,7 @@ spec:
|
|||||||
optional: true
|
optional: true
|
||||||
containers:
|
containers:
|
||||||
- name: kubedns
|
- name: kubedns
|
||||||
image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.9
|
image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.10
|
||||||
resources:
|
resources:
|
||||||
# TODO: Set memory limits when we've profiled the container for large
|
# TODO: Set memory limits when we've profiled the container for large
|
||||||
# clusters, then set request = limit to keep this container in
|
# clusters, then set request = limit to keep this container in
|
||||||
@ -146,7 +146,7 @@ spec:
|
|||||||
- name: kube-dns-config
|
- name: kube-dns-config
|
||||||
mountPath: /kube-dns-config
|
mountPath: /kube-dns-config
|
||||||
- name: dnsmasq
|
- name: dnsmasq
|
||||||
image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.9
|
image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.10
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthcheck/dnsmasq
|
path: /healthcheck/dnsmasq
|
||||||
@ -185,7 +185,7 @@ spec:
|
|||||||
- name: kube-dns-config
|
- name: kube-dns-config
|
||||||
mountPath: /etc/k8s/dns/dnsmasq-nanny
|
mountPath: /etc/k8s/dns/dnsmasq-nanny
|
||||||
- name: sidecar
|
- name: sidecar
|
||||||
image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.9
|
image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.10
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /metrics
|
path: /metrics
|
||||||
|
@ -95,7 +95,7 @@ spec:
|
|||||||
optional: true
|
optional: true
|
||||||
containers:
|
containers:
|
||||||
- name: kubedns
|
- name: kubedns
|
||||||
image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.9
|
image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.10
|
||||||
resources:
|
resources:
|
||||||
# TODO: Set memory limits when we've profiled the container for large
|
# TODO: Set memory limits when we've profiled the container for large
|
||||||
# clusters, then set request = limit to keep this container in
|
# clusters, then set request = limit to keep this container in
|
||||||
@ -146,7 +146,7 @@ spec:
|
|||||||
- name: kube-dns-config
|
- name: kube-dns-config
|
||||||
mountPath: /kube-dns-config
|
mountPath: /kube-dns-config
|
||||||
- name: dnsmasq
|
- name: dnsmasq
|
||||||
image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.9
|
image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.10
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthcheck/dnsmasq
|
path: /healthcheck/dnsmasq
|
||||||
@ -185,7 +185,7 @@ spec:
|
|||||||
- name: kube-dns-config
|
- name: kube-dns-config
|
||||||
mountPath: /etc/k8s/dns/dnsmasq-nanny
|
mountPath: /etc/k8s/dns/dnsmasq-nanny
|
||||||
- name: sidecar
|
- name: sidecar
|
||||||
image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.9
|
image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.10
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /metrics
|
path: /metrics
|
||||||
|
Loading…
Reference in New Issue
Block a user