scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 03:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #41657 from bowei/update-dns

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41349, 41532, 41256, 41587, 41657)

Update dns

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-02-22 08:12:48 -08:00
committed by GitHub
parent fe34705f8a f8b7464097
commit 44aa1679c9
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ spec:
optional: true
containers:
- name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.12.1
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.13.0
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
@@ -104,7 +104,7 @@ spec:
- name: kube-dns-config
mountPath: /kube-dns-config
- name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.12.1
image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.13.0
livenessProbe:
httpGet:
path: /healthcheck/dnsmasq
@@ -133,7 +133,7 @@ spec:
cpu: 150m
memory: 10Mi
- name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.12.1
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.13.0
livenessProbe:
httpGet:
path: /metrics

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

@@ -52,7 +52,7 @@ spec:
optional: true
containers:
- name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.12.1
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.13.0
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
@@ -104,7 +104,7 @@ spec:
- name: kube-dns-config
mountPath: /kube-dns-config
- name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.12.1
image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.13.0
livenessProbe:
httpGet:
path: /healthcheck/dnsmasq
@@ -133,7 +133,7 @@ spec:
cpu: 150m
memory: 10Mi
- name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.12.1
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.13.0
livenessProbe:
httpGet:
path: /metrics

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

@@ -52,7 +52,7 @@ spec:
optional: true
containers:
- name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.12.1
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.13.0
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
@@ -103,7 +103,7 @@ spec:
- name: kube-dns-config
mountPath: /kube-dns-config
- name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.12.1
image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.13.0
livenessProbe:
httpGet:
path: /healthcheck/dnsmasq
@@ -132,7 +132,7 @@ spec:
cpu: 150m
memory: 10Mi
- name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.12.1
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.13.0
livenessProbe:
httpGet:
path: /metrics