Skip to content

K
k3s
Commit acbfde39 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #53153 from bowei/update-kube-dns-1.14.5

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update kube dns 1.14.5 ```release-note Update kube-dns to 1.14.5 ```
parents ce4afa84 c122a7c5
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 57 deletions
cluster/addons/dns/kubedns-controller.yaml.base
View file @ acbfde39
...@@ -55,7 +55,7 @@ spec: ...@@ -55,7 +55,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - 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: 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
...@@ -106,7 +106,7 @@ spec: ...@@ -106,7 +106,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /kube-dns-config mountPath: /kube-dns-config
- name: dnsmasq - 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: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
...@@ -144,7 +144,7 @@ spec: ...@@ -144,7 +144,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: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4 image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
......
cluster/addons/dns/kubedns-controller.yaml.in
View file @ acbfde39
...@@ -55,7 +55,7 @@ spec: ...@@ -55,7 +55,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - 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: 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
...@@ -106,7 +106,7 @@ spec: ...@@ -106,7 +106,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /kube-dns-config mountPath: /kube-dns-config
- name: dnsmasq - 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: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
...@@ -144,7 +144,7 @@ spec: ...@@ -144,7 +144,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: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4 image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
......
cluster/addons/dns/kubedns-controller.yaml.sed
View file @ acbfde39
...@@ -55,7 +55,7 @@ spec: ...@@ -55,7 +55,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - 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: 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
...@@ -106,7 +106,7 @@ spec: ...@@ -106,7 +106,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /kube-dns-config mountPath: /kube-dns-config
- name: dnsmasq - 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: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
...@@ -144,7 +144,7 @@ spec: ...@@ -144,7 +144,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: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4 image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
......
cmd/kubeadm/app/cmd/upgrade/plan_test.go
View file @ acbfde39
...@@ -80,12 +80,12 @@ func TestPrintAvailableUpgrades(t *testing.T) { ...@@ -80,12 +80,12 @@ func TestPrintAvailableUpgrades(t *testing.T) {
"v1.7.1": 1, "v1.7.1": 1,
}, },
KubeadmVersion: "v1.7.2", KubeadmVersion: "v1.7.2",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.7.3", KubeVersion: "v1.7.3",
KubeadmVersion: "v1.7.3", KubeadmVersion: "v1.7.3",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
...@@ -100,7 +100,7 @@ API Server v1.7.1 v1.7.3 ...@@ -100,7 +100,7 @@ API Server v1.7.1 v1.7.3
Controller Manager v1.7.1 v1.7.3 Controller Manager v1.7.1 v1.7.3
Scheduler v1.7.1 v1.7.3 Scheduler v1.7.1 v1.7.3
Kube Proxy 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: You can now apply the upgrade by executing the following command:
...@@ -122,12 +122,12 @@ _____________________________________________________________________ ...@@ -122,12 +122,12 @@ _____________________________________________________________________
"v1.7.3": 1, "v1.7.3": 1,
}, },
KubeadmVersion: "v1.8.0", KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.8.0", KubeVersion: "v1.8.0",
KubeadmVersion: "v1.8.0", KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
...@@ -142,7 +142,7 @@ API Server v1.7.3 v1.8.0 ...@@ -142,7 +142,7 @@ API Server v1.7.3 v1.8.0
Controller Manager v1.7.3 v1.8.0 Controller Manager v1.7.3 v1.8.0
Scheduler v1.7.3 v1.8.0 Scheduler v1.7.3 v1.8.0
Kube Proxy 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: You can now apply the upgrade by executing the following command:
...@@ -162,12 +162,12 @@ _____________________________________________________________________ ...@@ -162,12 +162,12 @@ _____________________________________________________________________
"v1.7.3": 1, "v1.7.3": 1,
}, },
KubeadmVersion: "v1.8.1", KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.7.5", KubeVersion: "v1.7.5",
KubeadmVersion: "v1.8.1", KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
{ {
...@@ -178,12 +178,12 @@ _____________________________________________________________________ ...@@ -178,12 +178,12 @@ _____________________________________________________________________
"v1.7.3": 1, "v1.7.3": 1,
}, },
KubeadmVersion: "v1.8.1", KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.8.2", KubeVersion: "v1.8.2",
KubeadmVersion: "v1.8.2", KubeadmVersion: "v1.8.2",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
...@@ -198,7 +198,7 @@ API Server v1.7.3 v1.7.5 ...@@ -198,7 +198,7 @@ API Server v1.7.3 v1.7.5
Controller Manager v1.7.3 v1.7.5 Controller Manager v1.7.3 v1.7.5
Scheduler v1.7.3 v1.7.5 Scheduler v1.7.3 v1.7.5
Kube Proxy 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: You can now apply the upgrade by executing the following command:
...@@ -217,7 +217,7 @@ API Server v1.7.3 v1.8.2 ...@@ -217,7 +217,7 @@ API Server v1.7.3 v1.8.2
Controller Manager v1.7.3 v1.8.2 Controller Manager v1.7.3 v1.8.2
Scheduler v1.7.3 v1.8.2 Scheduler v1.7.3 v1.8.2
Kube Proxy 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: You can now apply the upgrade by executing the following command:
...@@ -239,12 +239,12 @@ _____________________________________________________________________ ...@@ -239,12 +239,12 @@ _____________________________________________________________________
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.8.0-beta.1", KubeVersion: "v1.8.0-beta.1",
KubeadmVersion: "v1.8.0-beta.1", KubeadmVersion: "v1.8.0-beta.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
...@@ -259,7 +259,7 @@ API Server v1.7.5 v1.8.0-beta.1 ...@@ -259,7 +259,7 @@ API Server v1.7.5 v1.8.0-beta.1
Controller Manager 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 Scheduler v1.7.5 v1.8.0-beta.1
Kube Proxy 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: You can now apply the upgrade by executing the following command:
...@@ -281,12 +281,12 @@ _____________________________________________________________________ ...@@ -281,12 +281,12 @@ _____________________________________________________________________
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: upgrade.ClusterState{ After: upgrade.ClusterState{
KubeVersion: "v1.8.0-rc.1", KubeVersion: "v1.8.0-rc.1",
KubeadmVersion: "v1.8.0-rc.1", KubeadmVersion: "v1.8.0-rc.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
...@@ -301,7 +301,7 @@ API Server v1.7.5 v1.8.0-rc.1 ...@@ -301,7 +301,7 @@ API Server v1.7.5 v1.8.0-rc.1
Controller Manager 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 Scheduler v1.7.5 v1.8.0-rc.1
Kube Proxy 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: You can now apply the upgrade by executing the following command:
......
cmd/kubeadm/app/phases/addons/dns/versions.go
View file @ acbfde39
...@@ -21,12 +21,12 @@ import ( ...@@ -21,12 +21,12 @@ import (
) )
const ( const (
kubeDNSv170AndAboveVersion = "1.14.4" kubeDNSv170AndAboveVersion = "1.14.5"
) )
// GetKubeDNSVersion returns the right kube-dns version for a specific k8s version // GetKubeDNSVersion returns the right kube-dns version for a specific k8s version
func GetKubeDNSVersion(kubeVersion *version.Version) string { 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 // 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 // Also, the version might be bumped for different k8s releases on the same branch
return kubeDNSv170AndAboveVersion return kubeDNSv170AndAboveVersion
......
cmd/kubeadm/app/phases/addons/dns/versions_test.go
View file @ acbfde39
...@@ -28,27 +28,27 @@ func TestGetKubeDNSVersion(t *testing.T) { ...@@ -28,27 +28,27 @@ func TestGetKubeDNSVersion(t *testing.T) {
}{ }{
{ {
k8sVersion: "v1.7.0", k8sVersion: "v1.7.0",
expected: "1.14.4", expected: "1.14.5",
}, },
{ {
k8sVersion: "v1.7.1", k8sVersion: "v1.7.1",
expected: "1.14.4", expected: "1.14.5",
}, },
{ {
k8sVersion: "v1.7.2", k8sVersion: "v1.7.2",
expected: "1.14.4", expected: "1.14.5",
}, },
{ {
k8sVersion: "v1.7.3", k8sVersion: "v1.7.3",
expected: "1.14.4", expected: "1.14.5",
}, },
{ {
k8sVersion: "v1.8.0-alpha.2", k8sVersion: "v1.8.0-alpha.2",
expected: "1.14.4", expected: "1.14.5",
}, },
{ {
k8sVersion: "v1.8.0", k8sVersion: "v1.8.0",
expected: "1.14.4", expected: "1.14.5",
}, },
} }
for _, rt := range tests { for _, rt := range tests {
......
cmd/kubeadm/app/phases/upgrade/compute_test.go
View file @ acbfde39
...@@ -98,12 +98,12 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -98,12 +98,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.1": 1, "v1.7.1": 1,
}, },
KubeadmVersion: "v1.7.2", KubeadmVersion: "v1.7.2",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.7.3", KubeVersion: "v1.7.3",
KubeadmVersion: "v1.7.3", KubeadmVersion: "v1.7.3",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
...@@ -128,12 +128,12 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -128,12 +128,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.3": 1, "v1.7.3": 1,
}, },
KubeadmVersion: "v1.8.0", KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0", KubeVersion: "v1.8.0",
KubeadmVersion: "v1.8.0", KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
...@@ -158,12 +158,12 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -158,12 +158,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.3": 1, "v1.7.3": 1,
}, },
KubeadmVersion: "v1.8.1", KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.7.5", KubeVersion: "v1.7.5",
KubeadmVersion: "v1.8.1", // Note: The kubeadm version mustn't be "downgraded" here KubeadmVersion: "v1.8.1", // Note: The kubeadm version mustn't be "downgraded" here
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
{ {
...@@ -174,12 +174,12 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -174,12 +174,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.3": 1, "v1.7.3": 1,
}, },
KubeadmVersion: "v1.8.1", KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.2", KubeVersion: "v1.8.2",
KubeadmVersion: "v1.8.2", KubeadmVersion: "v1.8.2",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
...@@ -219,12 +219,12 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -219,12 +219,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0-alpha.2", KubeVersion: "v1.8.0-alpha.2",
KubeadmVersion: "v1.8.0-alpha.2", KubeadmVersion: "v1.8.0-alpha.2",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
...@@ -250,12 +250,12 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -250,12 +250,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0-alpha.2", KubeVersion: "v1.8.0-alpha.2",
KubeadmVersion: "v1.8.0-alpha.2", KubeadmVersion: "v1.8.0-alpha.2",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
...@@ -282,12 +282,12 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -282,12 +282,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0-beta.1", KubeVersion: "v1.8.0-beta.1",
KubeadmVersion: "v1.8.0-beta.1", KubeadmVersion: "v1.8.0-beta.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
...@@ -314,12 +314,12 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -314,12 +314,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0-rc.1", KubeVersion: "v1.8.0-rc.1",
KubeadmVersion: "v1.8.0-rc.1", KubeadmVersion: "v1.8.0-rc.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
...@@ -346,12 +346,12 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -346,12 +346,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0-rc.1", KubeVersion: "v1.8.0-rc.1",
KubeadmVersion: "v1.8.0-rc.1", KubeadmVersion: "v1.8.0-rc.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
...@@ -378,12 +378,12 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -378,12 +378,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.8.0-rc.1", KubeVersion: "v1.8.0-rc.1",
KubeadmVersion: "v1.8.0-rc.1", KubeadmVersion: "v1.8.0-rc.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
{ {
...@@ -394,12 +394,12 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -394,12 +394,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1, "v1.7.5": 1,
}, },
KubeadmVersion: "v1.7.5", KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
After: ClusterState{ After: ClusterState{
KubeVersion: "v1.9.0-alpha.1", KubeVersion: "v1.9.0-alpha.1",
KubeadmVersion: "v1.9.0-alpha.1", KubeadmVersion: "v1.9.0-alpha.1",
DNSVersion: "1.14.4", DNSVersion: "1.14.5",
}, },
}, },
}, },
......
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