1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2025-03-30 19:54:46 +00:00

chore: update tolerations and affinities to control-plane

This updates the tolerations and affinities to also respect the
term „control-plane“ which will eventually replace „master“
This commit is contained in:
Morre 2021-05-29 19:43:13 +02:00
parent bd97f9e803
commit d11edaa056
No known key found for this signature in database
GPG key ID: BFED22AA844DE3A8
4 changed files with 31 additions and 1 deletions

View file

@ -12,4 +12,4 @@ keywords:
- feature-detection - feature-detection
- node-labels - node-labels
type: application type: application
version: 0.1.2 version: 0.2.0

View file

@ -58,6 +58,10 @@ master:
operator: "Equal" operator: "Equal"
value: "" value: ""
effect: "NoSchedule" effect: "NoSchedule"
- key: "node-role.kubernetes.io/control-plane"
operator: "Equal"
value: ""
effect: "NoSchedule"
annotations: {} annotations: {}
@ -70,6 +74,12 @@ master:
- key: "node-role.kubernetes.io/master" - key: "node-role.kubernetes.io/master"
operator: In operator: In
values: [""] values: [""]
- weight: 1
preference:
matchExpressions:
- key: "node-role.kubernetes.io/control-plane"
operator: In
values: [""]
worker: worker:
configmapName: nfd-worker-conf configmapName: nfd-worker-conf

View file

@ -70,11 +70,21 @@ spec:
- key: "node-role.kubernetes.io/master" - key: "node-role.kubernetes.io/master"
operator: In operator: In
values: [""] values: [""]
- weight: 1
preference:
matchExpressions:
- key: "node-role.kubernetes.io/control-plane"
operator: In
values: [""]
tolerations: tolerations:
- key: "node-role.kubernetes.io/master" - key: "node-role.kubernetes.io/master"
operator: "Equal" operator: "Equal"
value: "" value: ""
effect: "NoSchedule" effect: "NoSchedule"
- key: "node-role.kubernetes.io/control-plane"
operator: "Equal"
value: ""
effect: "NoSchedule"
containers: containers:
- env: - env:
- name: NODE_NAME - name: NODE_NAME

View file

@ -67,11 +67,21 @@ spec:
- key: "node-role.kubernetes.io/master" - key: "node-role.kubernetes.io/master"
operator: In operator: In
values: [""] values: [""]
- weight: 1
preference:
matchExpressions:
- key: "node-role.kubernetes.io/control-plane"
operator: In
values: [""]
tolerations: tolerations:
- key: "node-role.kubernetes.io/master" - key: "node-role.kubernetes.io/master"
operator: "Equal" operator: "Equal"
value: "" value: ""
effect: "NoSchedule" effect: "NoSchedule"
- key: "node-role.kubernetes.io/control-plane"
operator: "Equal"
value: ""
effect: "NoSchedule"
containers: containers:
- name: nfd-master - name: nfd-master
image: gcr.io/k8s-staging-nfd/node-feature-discovery:master image: gcr.io/k8s-staging-nfd/node-feature-discovery:master