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
f41f1887
Commit
f41f1887
authored
Nov 29, 2017
by
stewart-yu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix minor err in kubeadm
parent
2c9ffc0e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
features_test.go
cmd/kubeadm/app/features/features_test.go
+6
-6
dns.go
cmd/kubeadm/app/phases/addons/dns/dns.go
+1
-1
No files found.
cmd/kubeadm/app/features/features_test.go
View file @
f41f1887
...
@@ -168,16 +168,16 @@ func TestResolveFeatureGateDependencies(t *testing.T) {
...
@@ -168,16 +168,16 @@ func TestResolveFeatureGateDependencies(t *testing.T) {
expectedFeatures
:
map
[
string
]
bool
{},
expectedFeatures
:
map
[
string
]
bool
{},
},
},
{
// others flags
{
// others flags
inputFeatures
:
map
[
string
]
bool
{
"SupportIPVSProxyMode"
:
true
},
inputFeatures
:
map
[
string
]
bool
{
CoreDNS
:
true
},
expectedFeatures
:
map
[
string
]
bool
{
"SupportIPVSProxyMode"
:
true
},
expectedFeatures
:
map
[
string
]
bool
{
CoreDNS
:
true
},
},
},
{
// just StoreCertsInSecrets flags
{
// just StoreCertsInSecrets flags
inputFeatures
:
map
[
string
]
bool
{
"StoreCertsInSecrets"
:
true
},
inputFeatures
:
map
[
string
]
bool
{
StoreCertsInSecrets
:
true
},
expectedFeatures
:
map
[
string
]
bool
{
"StoreCertsInSecrets"
:
true
,
"SelfHosting"
:
true
},
expectedFeatures
:
map
[
string
]
bool
{
StoreCertsInSecrets
:
true
,
SelfHosting
:
true
},
},
},
{
// just HighAvailability flags
{
// just HighAvailability flags
inputFeatures
:
map
[
string
]
bool
{
"HighAvailability"
:
true
},
inputFeatures
:
map
[
string
]
bool
{
HighAvailability
:
true
},
expectedFeatures
:
map
[
string
]
bool
{
"HighAvailability"
:
true
,
"StoreCertsInSecrets"
:
true
,
"SelfHosting"
:
true
},
expectedFeatures
:
map
[
string
]
bool
{
HighAvailability
:
true
,
StoreCertsInSecrets
:
true
,
SelfHosting
:
true
},
},
},
}
}
...
...
cmd/kubeadm/app/phases/addons/dns/dns.go
View file @
f41f1887
...
@@ -200,7 +200,7 @@ func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, clien
...
@@ -200,7 +200,7 @@ func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, clien
coreDNSServiceAccount
:=
&
v1
.
ServiceAccount
{}
coreDNSServiceAccount
:=
&
v1
.
ServiceAccount
{}
if
err
:=
kuberuntime
.
DecodeInto
(
legacyscheme
.
Codecs
.
UniversalDecoder
(),
[]
byte
(
CoreDNSServiceAccount
),
coreDNSServiceAccount
);
err
!=
nil
{
if
err
:=
kuberuntime
.
DecodeInto
(
legacyscheme
.
Codecs
.
UniversalDecoder
(),
[]
byte
(
CoreDNSServiceAccount
),
coreDNSServiceAccount
);
err
!=
nil
{
return
fmt
.
Errorf
(
"unable to decode CoreDNS
configmap
%v"
,
err
)
return
fmt
.
Errorf
(
"unable to decode CoreDNS
serviceaccount
%v"
,
err
)
}
}
// Create the ConfigMap for CoreDNS or update it in case it already exists
// Create the ConfigMap for CoreDNS or update it in case it already exists
...
...
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