Skip to content

K
k3s
Unverified Commit 191949da authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub
Browse files
Options

Merge pull request #68430 from prameshj/update-dns

Update kube-dns container images.
parents 40098179 216dc8ad
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
cluster/addons/dns/kube-dns/kube-dns.yaml.base
View file @ 191949da
...@@ -96,7 +96,7 @@ spec: ...@@ -96,7 +96,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.10 image: k8s.gcr.io/k8s-dns-kube-dns:1.14.12
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
...@@ -147,7 +147,7 @@ spec: ...@@ -147,7 +147,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.10 image: k8s.gcr.io/k8s-dns-dnsmasq-nanny:1.14.12
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
...@@ -187,7 +187,7 @@ spec: ...@@ -187,7 +187,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.10 image: k8s.gcr.io/k8s-dns-sidecar:1.14.12
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
......
cluster/addons/dns/kube-dns/kube-dns.yaml.in
View file @ 191949da
...@@ -96,7 +96,7 @@ spec: ...@@ -96,7 +96,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.10 image: k8s.gcr.io/k8s-dns-kube-dns:1.14.12
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
...@@ -147,7 +147,7 @@ spec: ...@@ -147,7 +147,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.10 image: k8s.gcr.io/k8s-dns-dnsmasq-nanny:1.14.12
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
...@@ -187,7 +187,7 @@ spec: ...@@ -187,7 +187,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.10 image: k8s.gcr.io/k8s-dns-sidecar:1.14.12
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
......
cluster/addons/dns/kube-dns/kube-dns.yaml.sed
View file @ 191949da
...@@ -96,7 +96,7 @@ spec: ...@@ -96,7 +96,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.10 image: k8s.gcr.io/k8s-dns-kube-dns:1.14.12
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
...@@ -147,7 +147,7 @@ spec: ...@@ -147,7 +147,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.10 image: k8s.gcr.io/k8s-dns-dnsmasq-nanny:1.14.12
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
...@@ -187,7 +187,7 @@ spec: ...@@ -187,7 +187,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.10 image: k8s.gcr.io/k8s-dns-sidecar:1.14.12
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
......
cmd/kubeadm/app/cmd/upgrade/plan_test.go
View file @ 191949da
...@@ -147,7 +147,7 @@ _____________________________________________________________________ ...@@ -147,7 +147,7 @@ _____________________________________________________________________
KubeVersion: "v1.9.0", KubeVersion: "v1.9.0",
KubeadmVersion: "v1.9.0", KubeadmVersion: "v1.9.0",
DNSType: "kube-dns", DNSType: "kube-dns",
DNSVersion: "1.14.10", DNSVersion: "1.14.12",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
...@@ -163,7 +163,7 @@ API Server v1.8.3 v1.9.0 ...@@ -163,7 +163,7 @@ API Server v1.8.3 v1.9.0
Controller Manager v1.8.3 v1.9.0 Controller Manager v1.8.3 v1.9.0
Scheduler v1.8.3 v1.9.0 Scheduler v1.8.3 v1.9.0
Kube Proxy v1.8.3 v1.9.0 Kube Proxy v1.8.3 v1.9.0
Kube DNS 1.14.5 1.14.10 Kube DNS 1.14.5 1.14.12
Etcd 3.0.17 3.1.12 Etcd 3.0.17 3.1.12
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
...@@ -213,7 +213,7 @@ _____________________________________________________________________ ...@@ -213,7 +213,7 @@ _____________________________________________________________________
KubeVersion: "v1.9.0", KubeVersion: "v1.9.0",
KubeadmVersion: "v1.9.0", KubeadmVersion: "v1.9.0",
DNSType: "kube-dns", DNSType: "kube-dns",
DNSVersion: "1.14.10", DNSVersion: "1.14.12",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
...@@ -249,7 +249,7 @@ API Server v1.8.3 v1.9.0 ...@@ -249,7 +249,7 @@ API Server v1.8.3 v1.9.0
Controller Manager v1.8.3 v1.9.0 Controller Manager v1.8.3 v1.9.0
Scheduler v1.8.3 v1.9.0 Scheduler v1.8.3 v1.9.0
Kube Proxy v1.8.3 v1.9.0 Kube Proxy v1.8.3 v1.9.0
Kube DNS 1.14.5 1.14.10 Kube DNS 1.14.5 1.14.12
Etcd 3.0.17 3.1.12 Etcd 3.0.17 3.1.12
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
...@@ -281,7 +281,7 @@ _____________________________________________________________________ ...@@ -281,7 +281,7 @@ _____________________________________________________________________
KubeVersion: "v1.9.0-beta.1", KubeVersion: "v1.9.0-beta.1",
KubeadmVersion: "v1.9.0-beta.1", KubeadmVersion: "v1.9.0-beta.1",
DNSType: "kube-dns", DNSType: "kube-dns",
DNSVersion: "1.14.10", DNSVersion: "1.14.12",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
...@@ -297,7 +297,7 @@ API Server v1.8.5 v1.9.0-beta.1 ...@@ -297,7 +297,7 @@ API Server v1.8.5 v1.9.0-beta.1
Controller Manager v1.8.5 v1.9.0-beta.1 Controller Manager v1.8.5 v1.9.0-beta.1
Scheduler v1.8.5 v1.9.0-beta.1 Scheduler v1.8.5 v1.9.0-beta.1
Kube Proxy v1.8.5 v1.9.0-beta.1 Kube Proxy v1.8.5 v1.9.0-beta.1
Kube DNS 1.14.5 1.14.10 Kube DNS 1.14.5 1.14.12
Etcd 3.0.17 3.1.12 Etcd 3.0.17 3.1.12
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
...@@ -329,7 +329,7 @@ _____________________________________________________________________ ...@@ -329,7 +329,7 @@ _____________________________________________________________________
KubeVersion: "v1.9.0-rc.1", KubeVersion: "v1.9.0-rc.1",
KubeadmVersion: "v1.9.0-rc.1", KubeadmVersion: "v1.9.0-rc.1",
DNSType: "kube-dns", DNSType: "kube-dns",
DNSVersion: "1.14.10", DNSVersion: "1.14.12",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
...@@ -345,7 +345,7 @@ API Server v1.8.5 v1.9.0-rc.1 ...@@ -345,7 +345,7 @@ API Server v1.8.5 v1.9.0-rc.1
Controller Manager v1.8.5 v1.9.0-rc.1 Controller Manager v1.8.5 v1.9.0-rc.1
Scheduler v1.8.5 v1.9.0-rc.1 Scheduler v1.8.5 v1.9.0-rc.1
Kube Proxy v1.8.5 v1.9.0-rc.1 Kube Proxy v1.8.5 v1.9.0-rc.1
Kube DNS 1.14.5 1.14.10 Kube DNS 1.14.5 1.14.12
Etcd 3.0.17 3.1.12 Etcd 3.0.17 3.1.12
You can now apply the upgrade by executing the following command: You can now apply the upgrade by executing the following command:
......
cmd/kubeadm/app/constants/constants.go
View file @ 191949da
...@@ -299,7 +299,7 @@ const ( ...@@ -299,7 +299,7 @@ const (
LeaseEndpointReconcilerType = "lease" LeaseEndpointReconcilerType = "lease"
// KubeDNSVersion is the version of kube-dns to be deployed if it is used // KubeDNSVersion is the version of kube-dns to be deployed if it is used
KubeDNSVersion = "1.14.10" KubeDNSVersion = "1.14.12"
// CoreDNSVersion is the version of CoreDNS to be deployed if it is used // CoreDNSVersion is the version of CoreDNS to be deployed if it is used
CoreDNSVersion = "1.2.2" CoreDNSVersion = "1.2.2"
......
cmd/kubeadm/app/phases/upgrade/compute_test.go
View file @ 191949da
...@@ -715,7 +715,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -715,7 +715,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.12.0", KubeVersion: "v1.12.0",
KubeadmVersion: "v1.12.0", KubeadmVersion: "v1.12.0",
DNSType: "kube-dns", DNSType: "kube-dns",
DNSVersion: "1.14.10", DNSVersion: "1.14.12",
EtcdVersion: "3.2.24", EtcdVersion: "3.2.24",
}, },
}, },
......
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