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

Merge pull request #56015 from luxas/kubeadm_fix_selfhosting_bug

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

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

**What this PR does / why we need it**:

`apps/v1beta2` requires that `DaemonSet.spec.selector.matchLabels` equals `DaemonSet.spec.template.metadata.labels`. Without this change, the API server rejects the DaemonSet in the validation stage.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
@kubernetes/sig-cluster-lifecycle-pr-reviews @xiangpengzhao
This commit is contained in:
Kubernetes Submit Queue 2017-11-19 06:32:26 -08:00 committed by GitHub
commit 0291bd35fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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