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
2a047211
Unverified
Commit
2a047211
authored
Nov 19, 2017
by
Lucas Käldström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kubeadm: Fix a small bug in the self-hosting code
parent
d52d1602
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
selfhosting.go
cmd/kubeadm/app/phases/selfhosting/selfhosting.go
+3
-0
selfhosting_test.go
cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go
+9
-0
No files found.
cmd/kubeadm/app/phases/selfhosting/selfhosting.go
View file @
2a047211
...
@@ -141,6 +141,9 @@ func BuildDaemonSet(name string, podSpec *v1.PodSpec, mutators map[string][]PodS
...
@@ -141,6 +141,9 @@ func BuildDaemonSet(name string, podSpec *v1.PodSpec, mutators map[string][]PodS
Labels
:
BuildSelfhostedComponentLabels
(
name
),
Labels
:
BuildSelfhostedComponentLabels
(
name
),
},
},
Spec
:
apps
.
DaemonSetSpec
{
Spec
:
apps
.
DaemonSetSpec
{
Selector
:
&
metav1
.
LabelSelector
{
MatchLabels
:
BuildSelfhostedComponentLabels
(
name
),
},
Template
:
v1
.
PodTemplateSpec
{
Template
:
v1
.
PodTemplateSpec
{
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Labels
:
BuildSelfhostedComponentLabels
(
name
),
Labels
:
BuildSelfhostedComponentLabels
(
name
),
...
...
cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go
View file @
2a047211
...
@@ -113,6 +113,9 @@ metadata:
...
@@ -113,6 +113,9 @@ metadata:
name: self-hosted-kube-apiserver
name: self-hosted-kube-apiserver
namespace: kube-system
namespace: kube-system
spec:
spec:
selector:
matchLabels:
k8s-app: self-hosted-kube-apiserver
template:
template:
metadata:
metadata:
creationTimestamp: null
creationTimestamp: null
...
@@ -271,6 +274,9 @@ metadata:
...
@@ -271,6 +274,9 @@ metadata:
name: self-hosted-kube-controller-manager
name: self-hosted-kube-controller-manager
namespace: kube-system
namespace: kube-system
spec:
spec:
selector:
matchLabels:
k8s-app: self-hosted-kube-controller-manager
template:
template:
metadata:
metadata:
creationTimestamp: null
creationTimestamp: null
...
@@ -398,6 +404,9 @@ metadata:
...
@@ -398,6 +404,9 @@ metadata:
name: self-hosted-kube-scheduler
name: self-hosted-kube-scheduler
namespace: kube-system
namespace: kube-system
spec:
spec:
selector:
matchLabels:
k8s-app: self-hosted-kube-scheduler
template:
template:
metadata:
metadata:
creationTimestamp: null
creationTimestamp: null
...
...
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