mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #41657 from bowei/update-dns
Automatic merge from submit-queue (batch tested with PRs 41349, 41532, 41256, 41587, 41657) Update dns ```release-note NONE ```
This commit is contained in:
commit
44aa1679c9
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -93,7 +93,7 @@ spec:
|
||||
name: kube-proxy
|
||||
`
|
||||
|
||||
KubeDNSVersion = "1.12.1"
|
||||
KubeDNSVersion = "1.13.0"
|
||||
|
||||
KubeDNSDeployment = `
|
||||
|
||||
@ -198,7 +198,6 @@ spec:
|
||||
failureThreshold: 5
|
||||
args:
|
||||
- --cache-size=1000
|
||||
- --no-resolv
|
||||
- --server=/{{ .DNSDomain }}/127.0.0.1#10053
|
||||
- --server=/in-addr.arpa/127.0.0.1#10053
|
||||
- --server=/ip6.arpa/127.0.0.1#10053
|
||||
|
Loading…
Reference in New Issue
Block a user