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

Fix wrong label selector in NTH manifest

This commit is contained in:
DingGGu 2022-04-09 17:16:55 +09:00
parent 24965f43b2
commit 844931af53
No known key found for this signature in database
GPG Key ID: D5DA1D6BE86A6BD3
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content
View File

@ -47,7 +47,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.11 - id: k8s-1.11
manifest: node-termination-handler.aws/k8s-1.11.yaml manifest: node-termination-handler.aws/k8s-1.11.yaml
manifestHash: a6e9da6b83dd1d28906e8eb35da56f1fd05b79a0ad96ceeacb85ce1f92782e95 manifestHash: cf741c78a61335c7f8129bb8ecdf11e8936309e59f15885a8117c8c893eb2d9a
name: node-termination-handler.aws name: node-termination-handler.aws
prune: prune:
kinds: kinds:
@ -73,6 +73,8 @@ spec:
- group: policy - group: policy
kind: PodDisruptionBudget kind: PodDisruptionBudget
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
namespaces:
- kube-system
- group: rbac.authorization.k8s.io - group: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops

4
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content
View File

@ -232,8 +232,8 @@ spec:
topologySpreadConstraints: topologySpreadConstraints:
- labelSelector: - labelSelector:
matchLabels: matchLabels:
io.cilium/app: operator app.kubernetes.io/instance: aws-node-termination-handler
name: cilium-operator app.kubernetes.io/name: aws-node-termination-handler
maxSkew: 1 maxSkew: 1
topologyKey: topology.kubernetes.io/zone topologyKey: topology.kubernetes.io/zone
whenUnsatisfiable: ScheduleAnyway whenUnsatisfiable: ScheduleAnyway

4
upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template
View File

@ -221,8 +221,8 @@ spec:
whenUnsatisfiable: ScheduleAnyway whenUnsatisfiable: ScheduleAnyway
labelSelector: labelSelector:
matchLabels: matchLabels:
io.cilium/app: operator app.kubernetes.io/name: aws-node-termination-handler
name: cilium-operator app.kubernetes.io/instance: aws-node-termination-handler
- maxSkew: 1 - maxSkew: 1
topologyKey: "kubernetes.io/hostname" topologyKey: "kubernetes.io/hostname"
whenUnsatisfiable: DoNotSchedule whenUnsatisfiable: DoNotSchedule