Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update kube dns #53085

Merged
merged 2 commits into from Sep 27, 2017
Merged

Update kube dns #53085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a8cc32
Update kube-dns to version 1.14.5
bowei Sep 26, 2017
00df734
Update kubeadm to 1.14.5
bowei Sep 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions cluster/addons/dns/kubedns-controller.yaml.base
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ spec:
optional: true
containers:
- name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
Expand Down Expand Up @@ -106,7 +106,7 @@ spec:
- name: kube-dns-config
mountPath: /kube-dns-config
- name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
livenessProbe:
httpGet:
path: /healthcheck/dnsmasq
Expand Down Expand Up @@ -144,7 +144,7 @@ spec:
- name: kube-dns-config
mountPath: /etc/k8s/dns/dnsmasq-nanny
- name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
livenessProbe:
httpGet:
path: /metrics
Expand Down
6 changes: 3 additions & 3 deletions cluster/addons/dns/kubedns-controller.yaml.in
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ spec:
optional: true
containers:
- name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
Expand Down Expand Up @@ -106,7 +106,7 @@ spec:
- name: kube-dns-config
mountPath: /kube-dns-config
- name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
livenessProbe:
httpGet:
path: /healthcheck/dnsmasq
Expand Down Expand Up @@ -144,7 +144,7 @@ spec:
- name: kube-dns-config
mountPath: /etc/k8s/dns/dnsmasq-nanny
- name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
livenessProbe:
httpGet:
path: /metrics
Expand Down
6 changes: 3 additions & 3 deletions cluster/addons/dns/kubedns-controller.yaml.sed
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ spec:
optional: true
containers:
- name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
Expand Down Expand Up @@ -106,7 +106,7 @@ spec:
- name: kube-dns-config
mountPath: /kube-dns-config
- name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
livenessProbe:
httpGet:
path: /healthcheck/dnsmasq
Expand Down Expand Up @@ -144,7 +144,7 @@ spec:
- name: kube-dns-config
mountPath: /etc/k8s/dns/dnsmasq-nanny
- name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
livenessProbe:
httpGet:
path: /metrics
Expand Down
36 changes: 18 additions & 18 deletions cmd/kubeadm/app/cmd/upgrade/plan_test.go
View file
Open in desktop
Expand Up @@ -80,12 +80,12 @@ func TestPrintAvailableUpgrades(t *testing.T) {
"v1.7.1": 1,
},
KubeadmVersion: "v1.7.2",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: upgrade.ClusterState{
KubeVersion: "v1.7.3",
KubeadmVersion: "v1.7.3",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
Expand All @@ -100,7 +100,7 @@ API Server v1.7.1 v1.7.3
Controller Manager v1.7.1 v1.7.3
Scheduler v1.7.1 v1.7.3
Kube Proxy v1.7.1 v1.7.3
Kube DNS 1.14.4 1.14.4
Kube DNS 1.14.5 1.14.5

You can now apply the upgrade by executing the following command:

Expand All @@ -122,12 +122,12 @@ _____________________________________________________________________
"v1.7.3": 1,
},
KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: upgrade.ClusterState{
KubeVersion: "v1.8.0",
KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
Expand All @@ -142,7 +142,7 @@ API Server v1.7.3 v1.8.0
Controller Manager v1.7.3 v1.8.0
Scheduler v1.7.3 v1.8.0
Kube Proxy v1.7.3 v1.8.0
Kube DNS 1.14.4 1.14.4
Kube DNS 1.14.5 1.14.5

You can now apply the upgrade by executing the following command:

Expand All @@ -162,12 +162,12 @@ _____________________________________________________________________
"v1.7.3": 1,
},
KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: upgrade.ClusterState{
KubeVersion: "v1.7.5",
KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
{
Expand All @@ -178,12 +178,12 @@ _____________________________________________________________________
"v1.7.3": 1,
},
KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: upgrade.ClusterState{
KubeVersion: "v1.8.2",
KubeadmVersion: "v1.8.2",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
Expand All @@ -198,7 +198,7 @@ API Server v1.7.3 v1.7.5
Controller Manager v1.7.3 v1.7.5
Scheduler v1.7.3 v1.7.5
Kube Proxy v1.7.3 v1.7.5
Kube DNS 1.14.4 1.14.4
Kube DNS 1.14.5 1.14.5

You can now apply the upgrade by executing the following command:

Expand All @@ -217,7 +217,7 @@ API Server v1.7.3 v1.8.2
Controller Manager v1.7.3 v1.8.2
Scheduler v1.7.3 v1.8.2
Kube Proxy v1.7.3 v1.8.2
Kube DNS 1.14.4 1.14.4
Kube DNS 1.14.5 1.14.5

You can now apply the upgrade by executing the following command:

Expand All @@ -239,12 +239,12 @@ _____________________________________________________________________
"v1.7.5": 1,
},
KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: upgrade.ClusterState{
KubeVersion: "v1.8.0-beta.1",
KubeadmVersion: "v1.8.0-beta.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
Expand All @@ -259,7 +259,7 @@ API Server v1.7.5 v1.8.0-beta.1
Controller Manager v1.7.5 v1.8.0-beta.1
Scheduler v1.7.5 v1.8.0-beta.1
Kube Proxy v1.7.5 v1.8.0-beta.1
Kube DNS 1.14.4 1.14.4
Kube DNS 1.14.5 1.14.5

You can now apply the upgrade by executing the following command:

Expand All @@ -281,12 +281,12 @@ _____________________________________________________________________
"v1.7.5": 1,
},
KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: upgrade.ClusterState{
KubeVersion: "v1.8.0-rc.1",
KubeadmVersion: "v1.8.0-rc.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
Expand All @@ -301,7 +301,7 @@ API Server v1.7.5 v1.8.0-rc.1
Controller Manager v1.7.5 v1.8.0-rc.1
Scheduler v1.7.5 v1.8.0-rc.1
Kube Proxy v1.7.5 v1.8.0-rc.1
Kube DNS 1.14.4 1.14.4
Kube DNS 1.14.5 1.14.5

You can now apply the upgrade by executing the following command:

Expand Down
4 changes: 2 additions & 2 deletions cmd/kubeadm/app/phases/addons/dns/versions.go
View file
Open in desktop
Expand Up @@ -21,12 +21,12 @@ import (
)

const (
kubeDNSv170AndAboveVersion = "1.14.4"
kubeDNSv170AndAboveVersion = "1.14.5"
)

// GetKubeDNSVersion returns the right kube-dns version for a specific k8s version
func GetKubeDNSVersion(kubeVersion *version.Version) string {
// v1.7.0+ uses 1.14.4, just return that here
// v1.7.0+ uses 1.14.5, just return that here
// In the future when the kube-dns version is bumped at HEAD; add conditional logic to return the right versions
// Also, the version might be bumped for different k8s releases on the same branch
return kubeDNSv170AndAboveVersion
Expand Down
12 changes: 6 additions & 6 deletions cmd/kubeadm/app/phases/addons/dns/versions_test.go
View file
Open in desktop
Expand Up @@ -28,27 +28,27 @@ func TestGetKubeDNSVersion(t *testing.T) {
}{
{
k8sVersion: "v1.7.0",
expected: "1.14.4",
expected: "1.14.5",
},
{
k8sVersion: "v1.7.1",
expected: "1.14.4",
expected: "1.14.5",
},
{
k8sVersion: "v1.7.2",
expected: "1.14.4",
expected: "1.14.5",
},
{
k8sVersion: "v1.7.3",
expected: "1.14.4",
expected: "1.14.5",
},
{
k8sVersion: "v1.8.0-alpha.2",
expected: "1.14.4",
expected: "1.14.5",
},
{
k8sVersion: "v1.8.0",
expected: "1.14.4",
expected: "1.14.5",
},
}
for _, rt := range tests {
Expand Down