github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

update version and manifest

Browse Source
This commit is contained in:
Sandeep Rajan 2018-02-22 10:40:24 -05:00
parent f1428e9eff
commit 993e5413ce
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,7 +309,7 @@ data:
health health
kubernetes {{ .DNSDomain }} in-addr.arpa ip6.arpa { kubernetes {{ .DNSDomain }} in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream {{ .UpstreamNameserver }} upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
}{{ .Federation }} }{{ .Federation }}
prometheus :9153 prometheus :9153

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

@ -23,13 +23,13 @@ import (
const ( const (
kubeDNSv190AndAboveVersion = "1.14.8" kubeDNSv190AndAboveVersion = "1.14.8"
coreDNSVersion = "1.0.4" coreDNSVersion = "1.0.6"
) )
// GetDNSVersion returns the right kube-dns version for a specific k8s version // GetDNSVersion returns the right kube-dns version for a specific k8s version
func GetDNSVersion(kubeVersion *version.Version, dns string) string { func GetDNSVersion(kubeVersion *version.Version, dns string) string {
// v1.9.0+ uses kube-dns 1.14.8 // v1.9.0+ uses kube-dns 1.14.8
// v1.9.0+ uses CoreDNS 1.0.4 if feature gate "CoreDNS" is enabled. // v1.9.0+ uses CoreDNS 1.0.6 if feature gate "CoreDNS" is enabled.
// In the future when the version is bumped at HEAD; add conditional logic to return the right versions // In the future when the 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