mirror of https://github.com/kubernetes/kops.git
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:
parent
e19fc773d6
commit
1d0c679577
|
|
@ -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: b00959d209cb73161173970727425d39b8b88ce7c9fbfc60970c20dbe5ce9a97
|
manifestHash: 6ac10f1bcbec5c020a04ddb78b3c190752a8917ec32e7fe4eee486884e0a33bc
|
||||||
name: node-termination-handler.aws
|
name: node-termination-handler.aws
|
||||||
prune:
|
prune:
|
||||||
kinds:
|
kinds:
|
||||||
|
|
|
||||||
|
|
@ -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:
|
||||||
|
|
@ -243,6 +244,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
|
||||||
|
|
@ -250,6 +252,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
|
||||||
|
|
@ -274,3 +277,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
|
||||||
|
|
|
||||||
|
|
@ -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 }}
|
||||||
|
|
@ -234,6 +235,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
|
||||||
|
|
@ -241,7 +243,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
|
||||||
|
|
@ -256,6 +258,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 }}
|
||||||
---
|
---
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue