Unverified Commit 18ca81f0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #62032 from rramkumar1/automated-cherry-pick-of-#61908-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #61908: Update kube-dns to Version 1.14.9. Major changes: - Fix for Cherry pick of #61908 on release-1.10. #61908: Update kube-dns to Version 1.14.9. Major changes: - Fix for
parents 094504a3 1e18b1c3
...@@ -95,7 +95,7 @@ spec: ...@@ -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.8 image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.9
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: ...@@ -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.8 image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.9
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
...@@ -185,7 +185,7 @@ spec: ...@@ -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.8 image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.9
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
......
...@@ -95,7 +95,7 @@ spec: ...@@ -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.8 image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.9
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: ...@@ -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.8 image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.9
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
...@@ -185,7 +185,7 @@ spec: ...@@ -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.8 image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.9
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
......
...@@ -95,7 +95,7 @@ spec: ...@@ -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.8 image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.9
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: ...@@ -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.8 image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.9
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
...@@ -185,7 +185,7 @@ spec: ...@@ -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.8 image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.9
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment