Point vsphere charts to latest upstream

packages/rancher-vsphere/rancher-vsphere-cpi/generated-changes/patch/Chart.yaml.patch

@@ -1,10 +0,0 @@
---- charts-original/Chart.yaml
-+++ charts/Chart.yaml
-@@ -3,6 +3,7 @@
-   catalog.cattle.io/display-name: vSphere CPI
-   catalog.cattle.io/namespace: kube-system
-   catalog.cattle.io/os: linux
-+  catalog.cattle.io/permits-os: linux,windows
-   catalog.cattle.io/rancher-version: '>= 2.6.0-0 <= 2.6.99-0'
-   catalog.cattle.io/release-name: vsphere-cpi
- apiVersion: v1

packages/rancher-vsphere/rancher-vsphere-cpi/generated-changes/patch/templates/daemonset.yaml.patch

@@ -1,14 +0,0 @@
---- charts-original/templates/daemonset.yaml
-+++ charts/templates/daemonset.yaml
-@@ -44,6 +44,11 @@
-                 operator: In
-                 values:
-                 - "true"
-+            - matchExpressions:
-+              - key: kubernetes.io/os
-+                operator: NotIn
-+                values:
-+                - "windows"
-       {{- end }}
-       {{- if .Values.cloudControllerManager.tolerations }}
-       tolerations:

packages/rancher-vsphere/rancher-vsphere-cpi/package.yaml

@@ -1,4 +1,4 @@
 url: https://github.com/rancher/vsphere-charts.git
 subdirectory: charts/rancher-vsphere-cpi
-commit: 27242a6495e33d34286d557459eb3cab785e26dd
+commit: 81da645ddf86370fc5d1e35dc4711a45b3cea929
-version: 100.1.1
+version: 100.2.0

packages/rancher-vsphere/rancher-vsphere-csi/generated-changes/patch/Chart.yaml.patch

@@ -1,10 +0,0 @@
---- charts-original/Chart.yaml
-+++ charts/Chart.yaml
-@@ -3,6 +3,7 @@
-   catalog.cattle.io/display-name: vSphere CSI
-   catalog.cattle.io/namespace: kube-system
-   catalog.cattle.io/os: linux
-+  catalog.cattle.io/permits-os: linux,windows
-   catalog.cattle.io/rancher-version: '>= 2.6.0-0 <= 2.6.99-0'
-   catalog.cattle.io/release-name: vsphere-csi
- apiVersion: v1

packages/rancher-vsphere/rancher-vsphere-csi/generated-changes/patch/templates/controller/deployment.yaml.patch

@@ -1,15 +0,0 @@
---- charts-original/templates/controller/deployment.yaml
-+++ charts/templates/controller/deployment.yaml
-@@ -38,6 +38,12 @@
-                 operator: In
-                 values:
-                 - "true"
-+            - matchExpressions:
-+              # Rancher node selector label
-+              - key: kubernetes.io/os
-+                operator: NotIn
-+                values:
-+                - "windows"
-       {{- end }}
-       {{- if .Values.csiController.tolerations }}
-       tolerations:

packages/rancher-vsphere/rancher-vsphere-csi/generated-changes/patch/templates/node/daemonset.yaml.patch

@@ -1,47 +0,0 @@
---- charts-original/templates/node/daemonset.yaml
-+++ charts/templates/node/daemonset.yaml
-@@ -8,6 +8,44 @@
-   selector:
-     matchLabels:
-       app: vsphere-csi-node
-+  {{- if .Values.csiNode.nodeSelector }}
-+  nodeSelector:
-+  {{- with .Values.csiNode.nodeSelector }}
-+    {{- toYaml . | nindent 6 }}
-+  {{- end }}
-+  {{- else }}
-+  affinity:
-+    nodeAffinity:
-+      requiredDuringSchedulingIgnoredDuringExecution:
-+        nodeSelectorTerms:
-+        - matchExpressions:
-+          # Rancher node selector label
-+          - key: kubernetes.io/os
-+            operator: NotIn
-+            values:
-+            - "windows"
-+  {{- end }}
-+  {{- if .Values.csiNode.tolerations }}
-+  tolerations:
-+  {{- with .Values.csiNode.tolerations }}
-+    {{- toYaml . | nindent 6 }}
-+  {{- end }}
-+  {{- else }}
-+  tolerations:
-+    - key: node-role.kubernetes.io/master
-+      operator: Exists
-+      effect: NoSchedule
-+    # Rancher specific change: These tolerations are added to account for RKE1 and RKE2 taints
-+    - key: node-role.kubernetes.io/controlplane
-+      effect: NoSchedule
-+      value: "true"
-+    - key: node-role.kubernetes.io/control-plane
-+      effect: NoSchedule
-+      value: "true"
-+    - key: node-role.kubernetes.io/etcd
-+      effect: NoSchedule
-+      value: "true"
-+  {{- end }}
-   updateStrategy:
-     type: "RollingUpdate"
-     rollingUpdate:

packages/rancher-vsphere/rancher-vsphere-csi/generated-changes/patch/values.yaml.patch

@@ -1,25 +0,0 @@
---- charts-original/values.yaml
-+++ charts/values.yaml
-@@ -41,6 +41,9 @@
-     csiProvisioner:
-       repository: rancher/mirrored-sig-storage-csi-provisioner
-       tag: v2.2.0
-+  ## Node labels for pod assignment
-+  ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
-+  ##
-   nodeSelector: {}
-   # Uncomment below toleration if you need an aggressive pod eviction in case when
-   # node becomes not-ready or unreachable. Default is 300 seconds if not specified.
-@@ -71,6 +74,12 @@
-   enabled: false
- 
- csiNode:
-+  ## Node labels for pod assignment
-+  ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
-+  ##
-+  nodeSelector: {}
-+  ## List of node taints to tolerate (requires Kubernetes >= 1.6)
-+  tolerations: []
-   prefixPath: ""
-   image:
-     repository: rancher/mirrored-cloud-provider-vsphere-csi-release-driver

packages/rancher-vsphere/rancher-vsphere-csi/package.yaml

@@ -1,4 +1,4 @@
 url: https://github.com/rancher/vsphere-charts.git
 subdirectory: charts/rancher-vsphere-csi
-commit: 27242a6495e33d34286d557459eb3cab785e26dd
+commit: 81da645ddf86370fc5d1e35dc4711a45b3cea929
-version: 100.1.1
+version: 100.2.0

release.yaml

@@ -53,9 +53,9 @@ rancher-pushprox:
 - 100.0.2
 rancher-vsphere-csi:
 - 2.3.1
-- 100.1.1+up2.3.0-rancher1
+- 100.2.0+up2.4.1-rancher1
 rancher-vsphere-cpi:
-- 100.1.1+up1.0.1
+- 100.2.0+up1.1.0
 rancher-webhook:
 - 0.1.300+up0.1.3
 - 1.0.4+up0.2.5-rc2