github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Updates kube-dns in kubeadm to 1.14.7

Browse Source
This commit is contained in:
Daneyon Hansen 2017-10-26 09:13:30 -07:00
parent 1f53329c67
commit c65520b421
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/phases/addons/dns/versions.go
View File

@ -22,7 +22,7 @@ import (
const ( const (
kubeDNSv180AndAboveVersion = "1.14.5" kubeDNSv180AndAboveVersion = "1.14.5"
kubeDNSv190AndAboveVersion = "1.14.6" kubeDNSv190AndAboveVersion = "1.14.7"
kubeDNSProbeSRV = "SRV" kubeDNSProbeSRV = "SRV"
kubeDNSProbeA = "A" kubeDNSProbeA = "A"
@ -31,7 +31,7 @@ const (
// 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.8.0+ uses 1.14.5 // v1.8.0+ uses 1.14.5
// v1.9.0+ uses 1.14.6 // v1.9.0+ uses 1.14.7
// 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
if kubeVersion.Major() == 1 && kubeVersion.Minor() >= 9 { if kubeVersion.Major() == 1 && kubeVersion.Minor() >= 9 {

2
cmd/kubeadm/app/phases/addons/dns/versions_test.go
View File

@ -52,7 +52,7 @@ func TestGetKubeDNSVersion(t *testing.T) {
}, },
{ {
k8sVersion: "v1.9.0", k8sVersion: "v1.9.0",
expected: "1.14.6", expected: "1.14.7",
}, },
} }
for _, rt := range tests { for _, rt := range tests {

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

@ -399,7 +399,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
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.6", DNSVersion: "1.14.7",
}, },
}, },
}, },