Skip to content

K
k3s
Unverified Commit 16aeec24 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #78545 from neolit123/kubeadm-revert-coredns-1.3.1

kubeadm: revert CoreDNS to 1.3.1
parents 99f2e78c a49bc480
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 18 deletions
cmd/kubeadm/app/constants/constants.go
View file @ 16aeec24
......@@ -331,7 +331,7 @@ const (
KubeDNSVersion = "1.14.13"
// CoreDNSVersion is the version of CoreDNS to be deployed if it is used
CoreDNSVersion = "1.5.0"
CoreDNSVersion = "1.3.1"
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
ClusterConfigurationKind = "ClusterConfiguration"
......
cmd/kubeadm/app/phases/addons/dns/manifests.go
View file @ 16aeec24
......@@ -281,8 +281,8 @@ spec:
failureThreshold: 5
readinessProbe:
httpGet:
path: /ready
port: 8181
path: /health
port: 8080
scheme: HTTP
securityContext:
allowPrivilegeEscalation: false
......@@ -314,7 +314,6 @@ data:
.:53 {
errors
health
ready
kubernetes {{ .DNSDomain }} in-addr.arpa ip6.arpa {
pods insecure
fallthrough in-addr.arpa ip6.arpa
......
cmd/kubeadm/app/phases/upgrade/compute_test.go
View file @ 16aeec24
......@@ -186,7 +186,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion),
},
},
......@@ -225,7 +225,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion),
},
},
......@@ -264,7 +264,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.String(),
KubeadmVersion: constants.CurrentKubernetesVersion.String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
},
},
......@@ -303,7 +303,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(5).String(),
KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(5).String(), // Note: The kubeadm version mustn't be "downgraded" here
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion),
},
},
......@@ -323,7 +323,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
KubeadmVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
},
},
......@@ -382,7 +382,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
KubeadmVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
},
},
......@@ -422,7 +422,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
KubeadmVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
},
},
......@@ -463,7 +463,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.13.0-beta.1",
KubeadmVersion: "v1.13.0-beta.1",
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: "3.2.24",
},
},
......@@ -504,7 +504,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.13.0-rc.1",
KubeadmVersion: "v1.13.0-rc.1",
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: "3.2.24",
},
},
......@@ -545,7 +545,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.13.6-rc.1",
KubeadmVersion: "v1.13.6-rc.1",
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: "3.2.24",
},
},
......@@ -586,7 +586,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.13.0-rc.1",
KubeadmVersion: "v1.13.0-rc.1",
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: "3.2.24",
},
},
......@@ -606,7 +606,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.12.0-alpha.2",
KubeadmVersion: "v1.12.0-alpha.2",
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: "3.2.24",
},
},
......@@ -659,7 +659,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
KubeadmVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
},
},
......@@ -696,7 +696,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.String(),
KubeadmVersion: constants.CurrentKubernetesVersion.String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.5.0",
DNSVersion: "1.3.1",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
},
},
......
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