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
8c8cdfe7
Commit
8c8cdfe7
authored
Dec 18, 2017
by
xiangpengzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update CoreDNS version and Corefile.
parent
cdbfff07
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
12 deletions
+18
-12
coredns.yaml.base
cluster/addons/dns/coredns.yaml.base
+5
-3
coredns.yaml.in
cluster/addons/dns/coredns.yaml.in
+5
-3
coredns.yaml.sed
cluster/addons/dns/coredns.yaml.sed
+5
-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.
cluster/addons/dns/coredns.yaml.base
View file @
8c8cdfe7
...
...
@@ -57,9 +57,11 @@ data:
Corefile: |
.:53 {
errors
log
stdout
log
health
kubernetes __PILLAR__DNS__DOMAIN__ __PILLAR__CLUSTER_CIDR__
kubernetes __PILLAR__DNS__DOMAIN__ __PILLAR__CLUSTER_CIDR__ {
pods insecure
}
prometheus
proxy . /etc/resolv.conf
cache 30
...
...
@@ -93,7 +95,7 @@ spec:
operator: "Exists"
containers:
- name: coredns
image: coredns/coredns:
0.9.10
image: coredns/coredns:
1.0.1
imagePullPolicy: IfNotPresent
resources:
limits:
...
...
cluster/addons/dns/coredns.yaml.in
View file @
8c8cdfe7
...
...
@@ -57,9 +57,11 @@ data:
Corefile: |
.:53 {
errors
log
stdout
log
health
kubernetes {{ pillar['dns_domain'] }} {{ pillar['service_cluster_ip_range'] }}
kubernetes {{ pillar['dns_domain'] }} {{ pillar['service_cluster_ip_range'] }} {
pods insecure
}
prometheus
proxy . /etc/resolv.conf
cache 30
...
...
@@ -93,7 +95,7 @@ spec:
operator: "Exists"
containers:
- name: coredns
image: coredns/coredns:
0.9.10
image: coredns/coredns:
1.0.1
imagePullPolicy: IfNotPresent
resources:
limits:
...
...
cluster/addons/dns/coredns.yaml.sed
View file @
8c8cdfe7
...
...
@@ -57,9 +57,11 @@ data:
Corefile: |
.:53 {
errors
log
stdout
log
health
kubernetes $DNS_DOMAIN $SERVICE_CLUSTER_IP_RANGE
kubernetes $DNS_DOMAIN $SERVICE_CLUSTER_IP_RANGE {
pods insecure
}
prometheus
prox
y
.
/et
c
/resolv.conf
c
ache 30
...
...
@@ -93,7 +95,7 @@ spec:
operator: "Exists"
containers:
- name: coredns
image: coredns/coredns:
0
.
9
.
10
image: coredns/coredns:
1
.
0
.
1
i
magePullPolicy: IfNotPresent
re
s
o
urces:
limits:
...
...
cmd/kubeadm/app/phases/addons/dns/manifests.go
View file @
8c8cdfe7
...
...
@@ -293,7 +293,7 @@ data:
Corefile: |
.:53 {
errors
log
stdout
log
health
kubernetes {{ .DNSDomain }} {{ .ServiceCIDR }} {
pods insecure
...
...
cmd/kubeadm/app/phases/addons/dns/versions.go
View file @
8c8cdfe7
...
...
@@ -27,14 +27,14 @@ const (
kubeDNSProbeSRV
=
"SRV"
kubeDNSProbeA
=
"A"
coreDNSVersion
=
"1.0.
0
"
coreDNSVersion
=
"1.0.
1
"
)
// GetDNSVersion returns the right kube-dns version for a specific k8s version
func
GetDNSVersion
(
kubeVersion
*
version
.
Version
,
dns
string
)
string
{
// v1.8.0+ uses kube-dns 1.14.5
// v1.9.0+ uses kube-dns 1.14.7
// v1.9.0+ uses CoreDNS 1.0.
0
// v1.9.0+ uses CoreDNS 1.0.
1
// 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
...
...
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