(dev-v2.6-archive) Merge pull request #1450 from cbron/external-webhook-100

Bump External webhook to the 100 scheme

(partially cherry picked from commit b981dc636d)

packages/rancher-external-ip-webhook/package.yaml

@@ -1,2 +1,2 @@
 url: https://github.com/rancher/externalip-webhook/releases/download/v1.0.0/rancher-externalip-webhook-1.0.0.tgz
-version: 1.0.0
+version: 100.0.0

packages/rancher-vsphere-csi/charts/templates/vsphere-csi-controller-deployment.yaml

@@ -15,30 +15,15 @@ spec:
         app: vsphere-csi-controller
         role: vsphere-csi
     spec:
-      {{- if .Values.csiController.nodeSelector }}
+      serviceAccountName: vsphere-csi-controller
       nodeSelector:
+      {{- if .Values.csiController.nodeSelector }}
       {{- with .Values.csiController.nodeSelector }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- else }}
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-              # RKE node selector label
-              - key: node-role.kubernetes.io/controlplane
-                operator: In
-                values:
-                - "true"
-            - matchExpressions:
-              # RKE2 node selector label
-              - key: node-role.kubernetes.io/control-plane
-                operator: In
-                values:
-                - "true"
+        node-role.kubernetes.io/controlplane: "true"
       {{- end }}
-      serviceAccountName: vsphere-csi-controller
       tolerations:
         # Rancher specific change: These tolerations are intentionally different from upstream to avoid lessening the scope to only NoSchedule with a specific key
         # - key: node-role.kubernetes.io/master