Add deployment-specific selectors to nth pdb

If not, when migrating from imds-mode to sqs-mode, the selectors will match the daemonset pods, which doesn't work with pdb
This commit is contained in:
Ole Markus With 2022-08-11 07:20:23 +02:00
parent 18cba87e91
commit cae87bb208
3 changed files with 10 additions and 3 deletions

View File

@ -41,7 +41,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: fdea063ac413e3ebaf12c2523f47aefdebaa52dfe53179a090cf0f6ac9927b31 manifestHash: da86a57a95265f04686e7d5be0a9b987f376ebc513f0b3c0937c269b4c13ccc3
name: node-termination-handler.aws name: node-termination-handler.aws
prune: prune:
kinds: kinds:

View File

@ -130,6 +130,7 @@ spec:
app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/name: aws-node-termination-handler
k8s-app: aws-node-termination-handler k8s-app: aws-node-termination-handler
kops.k8s.io/managed-by: kops kops.k8s.io/managed-by: kops
kops.k8s.io/nth-mode: sqs
kubernetes.io/os: linux kubernetes.io/os: linux
spec: spec:
affinity: affinity:
@ -246,6 +247,7 @@ spec:
matchLabels: matchLabels:
app.kubernetes.io/instance: aws-node-termination-handler app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/name: aws-node-termination-handler
kops.k8s.io/nth-mode: sqs
maxSkew: 1 maxSkew: 1
topologyKey: topology.kubernetes.io/zone topologyKey: topology.kubernetes.io/zone
whenUnsatisfiable: ScheduleAnyway whenUnsatisfiable: ScheduleAnyway
@ -253,6 +255,7 @@ spec:
matchLabels: matchLabels:
app.kubernetes.io/instance: aws-node-termination-handler app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/name: aws-node-termination-handler
kops.k8s.io/nth-mode: sqs
maxSkew: 1 maxSkew: 1
topologyKey: kubernetes.io/hostname topologyKey: kubernetes.io/hostname
whenUnsatisfiable: DoNotSchedule whenUnsatisfiable: DoNotSchedule
@ -277,3 +280,4 @@ spec:
matchLabels: matchLabels:
app.kubernetes.io/instance: aws-node-termination-handler app.kubernetes.io/instance: aws-node-termination-handler
app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/name: aws-node-termination-handler
kops.k8s.io/nth-mode: sqs

View File

@ -102,7 +102,7 @@ metadata:
k8s-app: aws-node-termination-handler k8s-app: aws-node-termination-handler
app.kubernetes.io/version: "{{ .Version }}" app.kubernetes.io/version: "{{ .Version }}"
spec: spec:
replicas: 1 replicas: {{ ControlPlaneControllerReplicas true }}
selector: selector:
matchLabels: matchLabels:
app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/name: aws-node-termination-handler
@ -115,6 +115,7 @@ spec:
app.kubernetes.io/instance: aws-node-termination-handler app.kubernetes.io/instance: aws-node-termination-handler
k8s-app: aws-node-termination-handler k8s-app: aws-node-termination-handler
kubernetes.io/os: linux kubernetes.io/os: linux
kops.k8s.io/nth-mode: sqs
spec: spec:
nodeSelector: null nodeSelector: null
{{ if not UseServiceAccountExternalPermissions }} {{ if not UseServiceAccountExternalPermissions }}
@ -237,6 +238,7 @@ spec:
matchLabels: matchLabels:
app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/instance: aws-node-termination-handler app.kubernetes.io/instance: aws-node-termination-handler
kops.k8s.io/nth-mode: sqs
- maxSkew: 1 - maxSkew: 1
topologyKey: "kubernetes.io/hostname" topologyKey: "kubernetes.io/hostname"
whenUnsatisfiable: DoNotSchedule whenUnsatisfiable: DoNotSchedule
@ -244,7 +246,7 @@ spec:
matchLabels: matchLabels:
app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/instance: aws-node-termination-handler app.kubernetes.io/instance: aws-node-termination-handler
kops.k8s.io/nth-mode: sqs
--- ---
apiVersion: policy/v1beta1 apiVersion: policy/v1beta1
kind: PodDisruptionBudget kind: PodDisruptionBudget
@ -259,6 +261,7 @@ spec:
matchLabels: matchLabels:
app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/name: aws-node-termination-handler
app.kubernetes.io/instance: aws-node-termination-handler app.kubernetes.io/instance: aws-node-termination-handler
kops.k8s.io/nth-mode: sqs
maxUnavailable: 1 maxUnavailable: 1
{{ else }} {{ else }}
--- ---