github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: Fix a small bug in the self-hosting code

Browse Source
This commit is contained in:
Lucas Käldström 2017-11-19 14:45:16 +02:00
parent d52d160239
commit 2a047211f4
No known key found for this signature in database
GPG Key ID: 3FA3783D77751514
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/phases/selfhosting/selfhosting.go
View File

@ -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),

9
cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go
View File

@ -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:
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:
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