Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
993e5413
Commit
993e5413
authored
Feb 22, 2018
by
Sandeep Rajan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update version and manifest
parent
f1428e9e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
manifests.go
cmd/kubeadm/app/phases/addons/dns/manifests.go
+1
-1
versions.go
cmd/kubeadm/app/phases/addons/dns/versions.go
+2
-2
No files found.
cmd/kubeadm/app/phases/addons/dns/manifests.go
View file @
993e5413
...
@@ -309,7 +309,7 @@ data:
...
@@ -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
...
...
cmd/kubeadm/app/phases/addons/dns/versions.go
View file @
993e5413
...
@@ -23,13 +23,13 @@ import (
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment