github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #68900 from MrHohn/kube-dns-1.14.13 

Bump kube-dns to 1.14.13
pull/8/head
k8s-ci-robot 2018-09-20 20:35:46 -07:00 committed by GitHub
parent fb50b3cb32 576d6e5c92
commit d39102d92e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/addons/dns/kube-dns/kube-dns.yaml.base
View File

@ -96,7 +96,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: k8s.gcr.io/k8s-dns-kube-dns:1.14.12 image: k8s.gcr.io/k8s-dns-kube-dns:1.14.13
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:
- 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:1.14.12 image: k8s.gcr.io/k8s-dns-dnsmasq-nanny:1.14.13
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@ -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:1.14.12 image: k8s.gcr.io/k8s-dns-sidecar:1.14.13
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics

6
cluster/addons/dns/kube-dns/kube-dns.yaml.in
View File

@ -96,7 +96,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: k8s.gcr.io/k8s-dns-kube-dns:1.14.12 image: k8s.gcr.io/k8s-dns-kube-dns:1.14.13
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:
- 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:1.14.12 image: k8s.gcr.io/k8s-dns-dnsmasq-nanny:1.14.13
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@ -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:1.14.12 image: k8s.gcr.io/k8s-dns-sidecar:1.14.13
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics

6
cluster/addons/dns/kube-dns/kube-dns.yaml.sed
View File

@ -96,7 +96,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: k8s.gcr.io/k8s-dns-kube-dns:1.14.12 image: k8s.gcr.io/k8s-dns-kube-dns:1.14.13
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:
- 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:1.14.12 image: k8s.gcr.io/k8s-dns-dnsmasq-nanny:1.14.13
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@ -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:1.14.12 image: k8s.gcr.io/k8s-dns-sidecar:1.14.13
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics

16
cmd/kubeadm/app/cmd/upgrade/plan_test.go
View File

@ -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.12", DNSVersion: "1.14.13",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -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.12 Kube DNS 1.14.5 1.14.13
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 @@ _____________________________________________________________________
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.12", DNSVersion: "1.14.13",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -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.12 Kube DNS 1.14.5 1.14.13
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 @@ _____________________________________________________________________
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.12", DNSVersion: "1.14.13",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -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.12 Kube DNS 1.14.5 1.14.13
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 @@ _____________________________________________________________________
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.12", DNSVersion: "1.14.13",
EtcdVersion: "3.1.12", EtcdVersion: "3.1.12",
}, },
}, },
@ -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.12 Kube DNS 1.14.5 1.14.13
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:

2
cmd/kubeadm/app/constants/constants.go
View File

@ -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.12" KubeDNSVersion = "1.14.13"
// 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"

2
cmd/kubeadm/app/phases/upgrade/compute_test.go
View File

@ -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.12", DNSVersion: "1.14.13",
EtcdVersion: "3.2.24", EtcdVersion: "3.2.24",
}, },
}, },