kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add label to prevent kops-controller from running on old nodes

This commit is contained in:
John Gardiner Myers 2020-09-27 21:44:50 -07:00
parent 257f85962e
commit 11bebf0b4b
12 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
protokube/pkg/protokube/labeler.go
View File

@ -40,7 +40,8 @@ func bootstrapMasterNodeLabels(ctx context.Context, kubeContext *KubernetesConte
}
labels := map[string]string{
"node-role.kubernetes.io/master": "",
"node-role.kubernetes.io/master": "",
"kops.k8s.io/kops-controller-pki": "",
}
shouldPatch := false

1
upup/models/bindata.go
View File

@ -2751,6 +2751,7 @@ spec:
operator: Exists
nodeSelector:
node-role.kubernetes.io/master: ""
kops.k8s.io/kops-controller-pki: ""
dnsPolicy: Default # Don't use cluster DNS (we are likely running before kube-dns)
hostNetwork: true
serviceAccount: kops-controller

1
upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
View File

@ -41,6 +41,7 @@ spec:
operator: Exists
nodeSelector:
node-role.kubernetes.io/master: ""
kops.k8s.io/kops-controller-pki: ""
dnsPolicy: Default # Don't use cluster DNS (we are likely running before kube-dns)
hostNetwork: true
serviceAccount: kops-controller

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
View File

@ -7,7 +7,7 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95
manifestHash: 00457a1b369f839820f5fc094c5610e2065da388
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml
View File

@ -7,7 +7,7 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 3c73d81e8c87bf4f409323ca904d22ee9c375284
manifestHash: db684c93db61d505f87af71577409945bc290fc1
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io

1
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
View File

@ -52,6 +52,7 @@ spec:
dnsPolicy: Default
hostNetwork: true
nodeSelector:
kops.k8s.io/kops-controller-pki: ""
node-role.kubernetes.io/master: ""
priorityClassName: system-node-critical
serviceAccount: kops-controller

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View File

@ -7,7 +7,7 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95
manifestHash: 00457a1b369f839820f5fc094c5610e2065da388
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io

1
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/kops-controller.addons.k8s.io-k8s-1.16.yaml
View File

@ -52,6 +52,7 @@ spec:
dnsPolicy: Default
hostNetwork: true
nodeSelector:
kops.k8s.io/kops-controller-pki: ""
node-role.kubernetes.io/master: ""
priorityClassName: system-node-critical
serviceAccount: kops-controller

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml
View File

@ -7,7 +7,7 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95
manifestHash: 00457a1b369f839820f5fc094c5610e2065da388
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io

1
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml
View File

@ -52,6 +52,7 @@ spec:
dnsPolicy: Default
hostNetwork: true
nodeSelector:
kops.k8s.io/kops-controller-pki: ""
node-role.kubernetes.io/master: ""
priorityClassName: system-node-critical
serviceAccount: kops-controller

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
View File

@ -7,7 +7,7 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 3c73d81e8c87bf4f409323ca904d22ee9c375284
manifestHash: db684c93db61d505f87af71577409945bc290fc1
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
View File

@ -7,7 +7,7 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95
manifestHash: 00457a1b369f839820f5fc094c5610e2065da388
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io