github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-02 01:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48044 from bowei/kube-dns-1.14.4

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 48074, 47971, 48044, 47514, 47647)

Update kube-dns to 1.14.4

- Fixes broken arm dnsmasq image
- Fixes kube-dns log spam issue

https://github.com/kubernetes/dns/issues/111

```release-note
none
```
This commit is contained in:
Kubernetes Submit Queue
2017-06-26 11:40:56 -07:00
committed by GitHub
parent 36ae4ae4e3 85025ef7dc
commit 8cbe10497e
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/addons/dns/kubedns-controller.yaml.base
View File

@@ -55,7 +55,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.3 image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4
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
@@ -106,7 +106,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /kube-dns-config mountPath: /kube-dns-config
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.3 image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@@ -144,7 +144,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: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.3 image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics

6
cluster/addons/dns/kubedns-controller.yaml.in
View File

@@ -55,7 +55,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.3 image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4
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
@@ -106,7 +106,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /kube-dns-config mountPath: /kube-dns-config
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.3 image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@@ -144,7 +144,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: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.3 image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics

6
cluster/addons/dns/kubedns-controller.yaml.sed
View File

@@ -55,7 +55,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.3 image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4
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
@@ -106,7 +106,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /kube-dns-config mountPath: /kube-dns-config
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.3 image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@@ -144,7 +144,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: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.3 image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics

2
cmd/kubeadm/app/phases/addons/manifests.go
View File

@@ -96,7 +96,7 @@ spec:
path: /run/xtables.lock path: /run/xtables.lock
` `
KubeDNSVersion = "1.14.3" KubeDNSVersion = "1.14.4"
KubeDNSDeployment = ` KubeDNSDeployment = `