mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #54639 from danehans/dns_update
Automatic merge from submit-queue (batch tested with PRs 54331, 54655, 54320, 54639, 54288). 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>. Updates kube-dns in kubeadm to 1.14.7 **What this PR does / why we need it**: Adds support for the latest kube-dns image (1.14.7) introduced by https://github.com/kubernetes/kubernetes/pull/54443 **Special notes for your reviewer**: Required for IPv6 support. /area ipv6 /sig network **Release note**: ```NONE ```
This commit is contained in:
commit
d5d512c8a9
@ -22,7 +22,7 @@ import (
|
||||
|
||||
const (
|
||||
kubeDNSv180AndAboveVersion = "1.14.5"
|
||||
kubeDNSv190AndAboveVersion = "1.14.6"
|
||||
kubeDNSv190AndAboveVersion = "1.14.7"
|
||||
|
||||
kubeDNSProbeSRV = "SRV"
|
||||
kubeDNSProbeA = "A"
|
||||
@ -31,7 +31,7 @@ const (
|
||||
// GetKubeDNSVersion returns the right kube-dns version for a specific k8s version
|
||||
func GetKubeDNSVersion(kubeVersion *version.Version) string {
|
||||
// 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
|
||||
// Also, the version might be bumped for different k8s releases on the same branch
|
||||
if kubeVersion.Major() == 1 && kubeVersion.Minor() >= 9 {
|
||||
|
@ -52,7 +52,7 @@ func TestGetKubeDNSVersion(t *testing.T) {
|
||||
},
|
||||
{
|
||||
k8sVersion: "v1.9.0",
|
||||
expected: "1.14.6",
|
||||
expected: "1.14.7",
|
||||
},
|
||||
}
|
||||
for _, rt := range tests {
|
||||
|
@ -399,7 +399,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
||||
After: ClusterState{
|
||||
KubeVersion: "v1.9.0-alpha.1",
|
||||
KubeadmVersion: "v1.9.0-alpha.1",
|
||||
DNSVersion: "1.14.6",
|
||||
DNSVersion: "1.14.7",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user