diff --git a/gcp-compute-persistent-disk-csi-driver/csi-gce-pd-controller-patch.yaml b/gcp-compute-persistent-disk-csi-driver/csi-gce-pd-controller-patch.yaml index 04eba987..ba3d6266 100644 --- a/gcp-compute-persistent-disk-csi-driver/csi-gce-pd-controller-patch.yaml +++ b/gcp-compute-persistent-disk-csi-driver/csi-gce-pd-controller-patch.yaml @@ -19,9 +19,6 @@ spec: role: master containers: - name: gce-pd-driver - # Latest available pushed image is v1.11.1 - # https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/issues/1397 - image: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.11.1 # Delete the expected gcp credentials secret and mount env: - $patch: delete @@ -30,6 +27,7 @@ spec: - $patch: delete name: cloud-sa-volume mountPath: "/etc/cloud-sa" + # Keeps upstream manifests and adds CrossNamespaceVolumeDataSource=true feature gate - name: csi-provisioner args: - --v=2 diff --git a/gcp-compute-persistent-disk-csi-driver/csi-gce-pd-node-patch.yaml b/gcp-compute-persistent-disk-csi-driver/csi-gce-pd-node-patch.yaml deleted file mode 100644 index 8cb11ac2..00000000 --- a/gcp-compute-persistent-disk-csi-driver/csi-gce-pd-node-patch.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: csi-gce-pd-node -spec: - template: - spec: - containers: - - name: gce-pd-driver - # Latest available pushed image is v1.11.1 - # https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/issues/1397 - image: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.11.1 diff --git a/gcp-compute-persistent-disk-csi-driver/kustomization.yaml b/gcp-compute-persistent-disk-csi-driver/kustomization.yaml index 24ccc44f..50456239 100644 --- a/gcp-compute-persistent-disk-csi-driver/kustomization.yaml +++ b/gcp-compute-persistent-disk-csi-driver/kustomization.yaml @@ -9,14 +9,10 @@ namespace: kube-system # Use a commit ref instead of tag, as images do not follow tags in the repo # manifests. resources: - # Using latest manifests version in time of this change, but will have to - # patch the image locally under csi-gce-pd-controller-patch.yaml to the - # latest version - - github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/deploy/kubernetes/overlays/stable-master?ref=18a713415b80584164803f26e904cc85c6274b45 + - github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/deploy/kubernetes/overlays/stable-master?ref=fda486201567e7fc99e12659708595195f426b50 patches: - path: csi-gce-pd-controller-patch.yaml - - path: csi-gce-pd-node-patch.yaml - target: group: rbac.authorization.k8s.io version: v1