Skip to content

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

Merge pull request #78030 from rajansandeep/bump1.5.0

Bump CoreDNS version to 1.5.0 and update manifest
parents 961ea6bd 0b284194
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
cluster/addons/dns/coredns/coredns.yaml.base
View file @ 648cb98a
...@@ -64,9 +64,9 @@ data: ...@@ -64,9 +64,9 @@ data:
.:53 { .:53 {
errors errors
health health
ready
kubernetes __PILLAR__DNS__DOMAIN__ in-addr.arpa ip6.arpa { kubernetes __PILLAR__DNS__DOMAIN__ in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
ttl 30 ttl 30
} }
...@@ -116,7 +116,7 @@ spec: ...@@ -116,7 +116,7 @@ spec:
beta.kubernetes.io/os: linux beta.kubernetes.io/os: linux
containers: containers:
- name: coredns - name: coredns
image: k8s.gcr.io/coredns:1.3.1 image: k8s.gcr.io/coredns:1.5.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
limits: limits:
...@@ -150,8 +150,8 @@ spec: ...@@ -150,8 +150,8 @@ spec:
failureThreshold: 5 failureThreshold: 5
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /health path: /ready
port: 8080 port: 8181
scheme: HTTP scheme: HTTP
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
......
cluster/addons/dns/coredns/coredns.yaml.in
View file @ 648cb98a
...@@ -64,9 +64,9 @@ data: ...@@ -64,9 +64,9 @@ data:
.:53 { .:53 {
errors errors
health health
ready
kubernetes {{ pillar['dns_domain'] }} in-addr.arpa ip6.arpa { kubernetes {{ pillar['dns_domain'] }} in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
ttl 30 ttl 30
} }
...@@ -116,7 +116,7 @@ spec: ...@@ -116,7 +116,7 @@ spec:
beta.kubernetes.io/os: linux beta.kubernetes.io/os: linux
containers: containers:
- name: coredns - name: coredns
image: k8s.gcr.io/coredns:1.3.1 image: k8s.gcr.io/coredns:1.5.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
limits: limits:
...@@ -150,8 +150,8 @@ spec: ...@@ -150,8 +150,8 @@ spec:
failureThreshold: 5 failureThreshold: 5
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /health path: /ready
port: 8080 port: 8181
scheme: HTTP scheme: HTTP
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
......
cluster/addons/dns/coredns/coredns.yaml.sed
View file @ 648cb98a
...@@ -64,9 +64,9 @@ data: ...@@ -64,9 +64,9 @@ data:
.:53 { .:53 {
errors errors
health health
ready
kubernetes $DNS_DOMAIN in-addr.arpa ip6.arpa { kubernetes $DNS_DOMAIN in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
ttl 30 ttl 30
} }
...@@ -116,7 +116,7 @@ spec: ...@@ -116,7 +116,7 @@ spec:
beta.kubernetes.io/os: linux beta.kubernetes.io/os: linux
containers: containers:
- name: coredns - name: coredns
image: k8s.gcr.io/coredns:1.3.1 image: k8s.gcr.io/coredns:1.5.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
limits: limits:
...@@ -150,8 +150,8 @@ spec: ...@@ -150,8 +150,8 @@ spec:
failureThreshold: 5 failureThreshold: 5
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /health path: /ready
port: 8080 port: 8181
scheme: HTTP scheme: HTTP
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
......
cmd/kubeadm/app/constants/constants.go
View file @ 648cb98a
...@@ -328,7 +328,7 @@ const ( ...@@ -328,7 +328,7 @@ const (
KubeDNSVersion = "1.14.13" KubeDNSVersion = "1.14.13"
// CoreDNSVersion is the version of CoreDNS to be deployed if it is used // CoreDNSVersion is the version of CoreDNS to be deployed if it is used
CoreDNSVersion = "1.3.1" CoreDNSVersion = "1.5.0"
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct // ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
ClusterConfigurationKind = "ClusterConfiguration" ClusterConfigurationKind = "ClusterConfiguration"
......
cmd/kubeadm/app/phases/addons/dns/manifests.go
View file @ 648cb98a
...@@ -281,8 +281,8 @@ spec: ...@@ -281,8 +281,8 @@ spec:
failureThreshold: 5 failureThreshold: 5
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /health path: /ready
port: 8080 port: 8181
scheme: HTTP scheme: HTTP
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
...@@ -314,9 +314,9 @@ data: ...@@ -314,9 +314,9 @@ data:
.:53 { .:53 {
errors errors
health health
ready
kubernetes {{ .DNSDomain }} in-addr.arpa ip6.arpa { kubernetes {{ .DNSDomain }} in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
ttl 30 ttl 30
}{{ .Federation }} }{{ .Federation }}
......
cmd/kubeadm/app/phases/upgrade/compute_test.go
View file @ 648cb98a
...@@ -186,7 +186,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -186,7 +186,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(), KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(), KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion), EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion),
}, },
}, },
...@@ -225,7 +225,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -225,7 +225,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(), KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(), KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion), EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion),
}, },
}, },
...@@ -264,7 +264,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -264,7 +264,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.String(), KubeVersion: constants.CurrentKubernetesVersion.String(),
KubeadmVersion: constants.CurrentKubernetesVersion.String(), KubeadmVersion: constants.CurrentKubernetesVersion.String(),
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion), EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
}, },
}, },
...@@ -303,7 +303,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -303,7 +303,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(5).String(), KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(5).String(),
KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(5).String(), // Note: The kubeadm version mustn't be "downgraded" here KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(5).String(), // Note: The kubeadm version mustn't be "downgraded" here
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion), EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion),
}, },
}, },
...@@ -323,7 +323,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -323,7 +323,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(), KubeVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
KubeadmVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(), KubeadmVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion), EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
}, },
}, },
...@@ -382,7 +382,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -382,7 +382,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(), KubeVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
KubeadmVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(), KubeadmVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion), EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
}, },
}, },
...@@ -422,7 +422,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -422,7 +422,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(), KubeVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
KubeadmVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(), KubeadmVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion), EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
}, },
}, },
...@@ -463,7 +463,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -463,7 +463,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.13.0-beta.1", KubeVersion: "v1.13.0-beta.1",
KubeadmVersion: "v1.13.0-beta.1", KubeadmVersion: "v1.13.0-beta.1",
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: "3.2.24", EtcdVersion: "3.2.24",
}, },
}, },
...@@ -504,7 +504,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -504,7 +504,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.13.0-rc.1", KubeVersion: "v1.13.0-rc.1",
KubeadmVersion: "v1.13.0-rc.1", KubeadmVersion: "v1.13.0-rc.1",
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: "3.2.24", EtcdVersion: "3.2.24",
}, },
}, },
...@@ -545,7 +545,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -545,7 +545,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.13.6-rc.1", KubeVersion: "v1.13.6-rc.1",
KubeadmVersion: "v1.13.6-rc.1", KubeadmVersion: "v1.13.6-rc.1",
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: "3.2.24", EtcdVersion: "3.2.24",
}, },
}, },
...@@ -586,7 +586,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -586,7 +586,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.13.0-rc.1", KubeVersion: "v1.13.0-rc.1",
KubeadmVersion: "v1.13.0-rc.1", KubeadmVersion: "v1.13.0-rc.1",
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: "3.2.24", EtcdVersion: "3.2.24",
}, },
}, },
...@@ -606,7 +606,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -606,7 +606,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.12.0-alpha.2", KubeVersion: "v1.12.0-alpha.2",
KubeadmVersion: "v1.12.0-alpha.2", KubeadmVersion: "v1.12.0-alpha.2",
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: "3.2.24", EtcdVersion: "3.2.24",
}, },
}, },
...@@ -659,7 +659,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -659,7 +659,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(), KubeVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
KubeadmVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(), KubeadmVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion), EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
}, },
}, },
...@@ -696,7 +696,7 @@ func TestGetAvailableUpgrades(t *testing.T) { ...@@ -696,7 +696,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.String(), KubeVersion: constants.CurrentKubernetesVersion.String(),
KubeadmVersion: constants.CurrentKubernetesVersion.String(), KubeadmVersion: constants.CurrentKubernetesVersion.String(),
DNSType: kubeadmapi.CoreDNS, DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1", DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion), 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