Replace nodeSelector with nodeAffinity master role

Label node-role.kubernetes.io/master has traditionally no value associated inherited from kubeadm deplyments but some platforms use "true" as value. Use node affinity instead of node selector ignoring the value of the label.
k8snetworkplumbingwg · Mar 16, 2021 · 96ac1ad · 96ac1ad
1 parent b028592
commit 96ac1ad
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/bindata/manifests/operator-webhook/server.yaml b/bindata/manifests/operator-webhook/server.yaml
@@ -24,7 +24,13 @@ spec:
       serviceAccountName: operator-webhook-sa
       nodeSelector:
         beta.kubernetes.io/os: linux
-        node-role.kubernetes.io/master:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: node-role.kubernetes.io/master
+                operator: Exists
       tolerations:
       - key: "node-role.kubernetes.io/master"
         operator: Exists

diff --git a/bindata/manifests/webhook/server.yaml b/bindata/manifests/webhook/server.yaml
@@ -27,7 +27,13 @@ spec:
       serviceAccountName: network-resources-injector-sa
       nodeSelector:
         beta.kubernetes.io/os: linux
-        node-role.kubernetes.io/master:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: node-role.kubernetes.io/master
+                operator: Exists
       tolerations:
       - key: "node-role.kubernetes.io/master"
         operator: Exists

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -12,8 +12,13 @@ spec:
       labels:
         name: sriov-network-operator
     spec:
-      nodeSelector:
-        node-role.kubernetes.io/master: ""
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: node-role.kubernetes.io/master
+                operator: Exists
       tolerations:
       - effect: NoSchedule
         key: node-role.kubernetes.io/master

diff --git a/manifests/4.7/sriov-network-operator.v4.7.0.clusterserviceversion.yaml b/manifests/4.7/sriov-network-operator.v4.7.0.clusterserviceversion.yaml
@@ -298,8 +298,13 @@ spec:
                 name: sriov-network-operator
             spec:
               serviceAccountName: sriov-network-operator
-              nodeSelector:
-                node-role.kubernetes.io/master: ""
+              affinity:
+                nodeAffinity:
+                  requiredDuringSchedulingIgnoredDuringExecution:
+                    nodeSelectorTerms:
+                    - matchExpressions:
+                      - key: node-role.kubernetes.io/master
+                        operator: Exists
               tolerations:
               - effect: NoSchedule
                 key: node-role.kubernetes.io/master