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
fce42e0b
Commit
fce42e0b
authored
Jun 05, 2018
by
Sandeep Rajan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
coredns to use gcr.io repo
parent
fa20f87f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
dns.go
cmd/kubeadm/app/phases/addons/dns/dns.go
+4
-3
dns_test.go
cmd/kubeadm/app/phases/addons/dns/dns_test.go
+4
-3
manifests.go
cmd/kubeadm/app/phases/addons/dns/manifests.go
+1
-1
No files found.
cmd/kubeadm/app/phases/addons/dns/dns.go
View file @
fce42e0b
...
...
@@ -161,9 +161,10 @@ func createKubeDNSAddon(deploymentBytes, serviceBytes []byte, client clientset.I
func
coreDNSAddon
(
cfg
*
kubeadmapi
.
MasterConfiguration
,
client
clientset
.
Interface
,
k8sVersion
*
version
.
Version
)
error
{
// Get the YAML manifest conditionally based on the k8s version
dnsDeploymentBytes
:=
GetCoreDNSManifest
(
k8sVersion
)
coreDNSDeploymentBytes
,
err
:=
kubeadmutil
.
ParseTemplate
(
dnsDeploymentBytes
,
struct
{
MasterTaintKey
,
Version
string
}{
MasterTaintKey
:
kubeadmconstants
.
LabelNodeRoleMaster
,
Version
:
GetDNSVersion
(
k8sVersion
,
kubeadmconstants
.
CoreDNS
),
coreDNSDeploymentBytes
,
err
:=
kubeadmutil
.
ParseTemplate
(
dnsDeploymentBytes
,
struct
{
ImageRepository
,
MasterTaintKey
,
Version
string
}{
ImageRepository
:
cfg
.
ImageRepository
,
MasterTaintKey
:
kubeadmconstants
.
LabelNodeRoleMaster
,
Version
:
GetDNSVersion
(
k8sVersion
,
kubeadmconstants
.
CoreDNS
),
})
if
err
!=
nil
{
return
fmt
.
Errorf
(
"error when parsing CoreDNS deployment template: %v"
,
err
)
...
...
cmd/kubeadm/app/phases/addons/dns/dns_test.go
View file @
fce42e0b
...
...
@@ -115,9 +115,10 @@ func TestCompileManifests(t *testing.T) {
},
{
manifest
:
CoreDNSDeployment
,
data
:
struct
{
MasterTaintKey
,
Version
string
}{
MasterTaintKey
:
"foo"
,
Version
:
"foo"
,
data
:
struct
{
ImageRepository
,
MasterTaintKey
,
Version
string
}{
ImageRepository
:
"foo"
,
MasterTaintKey
:
"foo"
,
Version
:
"foo"
,
},
expected
:
true
,
},
...
...
cmd/kubeadm/app/phases/addons/dns/manifests.go
View file @
fce42e0b
...
...
@@ -247,7 +247,7 @@ spec:
effect: NoSchedule
containers:
- name: coredns
image:
coredns
/coredns:{{ .Version }}
image:
{{ .ImageRepository }}
/coredns:{{ .Version }}
imagePullPolicy: IfNotPresent
resources:
limits:
...
...
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