Merge pull request #12 from dfajmon/rebase-1.16.0

STOR-2006: Rebase to upstream v1.16.0 for OCP 4.18
openshift · Oct 8, 2024 · 1921c2a · 1921c2a
2 parents d5df0cf + f461041
commit 1921c2a
Show file tree

Hide file tree

Showing 155 changed files with 2,329 additions and 281 deletions.
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ include release-tools/build.make
 GIT_COMMIT := $(shell git rev-parse HEAD)
 REGISTRY ?= andyzhangx
 REGISTRY_NAME := $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
-IMAGE_VERSION ?= v1.15.0
+IMAGE_VERSION ?= v1.16.0
 VERSION ?= latest
 # Use a custom version for E2E tests if we are testing in CI
 ifdef CI
@@ -146,19 +146,19 @@ container: smb
 
 .PHONY: container-linux
 container-linux:
-	docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/$(ARCH)" \
+	docker buildx build --no-cache --pull --output=type=$(OUTPUT_TYPE) --platform="linux/$(ARCH)" \
 		--provenance=false --sbom=false \
 		-t $(IMAGE_TAG)-linux-$(ARCH) --build-arg ARCH=$(ARCH) -f ./cmd/smbplugin/Dockerfile .
 
 .PHONY: container-linux-armv7
 container-linux-armv7:
-	docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="linux/arm/v7" \
+	docker buildx build --no-cache --pull --output=type=$(OUTPUT_TYPE) --platform="linux/arm/v7" \
 		--provenance=false --sbom=false \
 		-t $(IMAGE_TAG)-linux-arm-v7 --build-arg ARCH=arm/v7 -f ./cmd/smbplugin/Dockerfile .
 
 .PHONY: container-windows
 container-windows:
-	docker buildx build --pull --output=type=$(OUTPUT_TYPE) --platform="windows/$(ARCH)" \
+	docker buildx build --no-cache --pull --output=type=$(OUTPUT_TYPE) --platform="windows/$(ARCH)" \
 		 -t $(IMAGE_TAG)-windows-$(OSVERSION)-$(ARCH) --build-arg OSVERSION=$(OSVERSION) \
 		--provenance=false --sbom=false \
 		 --build-arg ARCH=$(ARCH) -f ./cmd/smbplugin/Dockerfile.Windows .
@@ -194,6 +194,7 @@ push-manifest:
 		done; \
 	done
 	docker manifest push --purge $(IMAGE_TAG)
+	docker manifest inspect $(IMAGE_TAG)
 ifdef PUBLISH
 	docker manifest create $(IMAGE_TAG_LATEST) $(foreach osarch, $(ALL_OS_ARCH), $(IMAGE_TAG)-${osarch})
 	set -x; \
@@ -217,8 +218,8 @@ endif
 
 .PHONY: install-smb-provisioner
 install-smb-provisioner:
-	kubectl delete secret smbcreds --ignore-not-found
-	kubectl create secret generic smbcreds --from-literal username=USERNAME --from-literal password="PASSWORD" --from-literal mountOptions="dir_mode=0777,file_mode=0777,uid=0,gid=0,mfsymlinks"
+	kubectl delete secret smbcreds --ignore-not-found -n default
+	kubectl create secret generic smbcreds --from-literal username=USERNAME --from-literal password="PASSWORD" --from-literal mountOptions="dir_mode=0777,file_mode=0777,uid=0,gid=0,mfsymlinks" -n default
 ifdef TEST_WINDOWS
 	kubectl apply -f deploy/example/smb-provisioner/smb-server-lb.yaml
 else

diff --git a/README.md b/README.md
@@ -13,9 +13,9 @@ This driver allows Kubernetes to access [SMB](https://wiki.wireshark.org/SMB) se
 |Driver Version | supported k8s version | supported [Windows csi-proxy](https://github.com/kubernetes-csi/csi-proxy) version |
 |---------------|-----------------------|-------------------------------------|
 |master branch  | 1.21+                 | v0.2.2+                             |
+|v1.16.0        | 1.21+                 | v0.2.2+                             |
 |v1.15.0        | 1.21+                 | v0.2.2+                             |
 |v1.14.0        | 1.21+                 | v0.2.2+                             |
-|v1.13.0        | 1.21+                 | v0.2.2+                             |
 
 ### Driver parameters
 Please refer to `smb.csi.k8s.io` [driver parameters](./docs/driver-parameters.md)

diff --git a/charts/README.md b/charts/README.md
@@ -15,7 +15,7 @@
 
 ```console
 helm repo add csi-driver-smb https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts
-helm install csi-driver-smb csi-driver-smb/csi-driver-smb --namespace kube-system --version v1.15.0
+helm install csi-driver-smb csi-driver-smb/csi-driver-smb --namespace kube-system --version v1.16.0
 ```
 
 ### install driver with customized driver name, deployment name
@@ -52,7 +52,7 @@ The following table lists the configurable parameters of the latest SMB CSI Driv
 | `image.smb.repository`                                  | csi-driver-smb docker image                                                                                | `gcr.io/k8s-staging-sig-storage/smbplugin`              |
 | `image.smb.tag`                                         | csi-driver-smb docker image tag                                                                            | `canary`                                                |
 | `image.smb.pullPolicy`                                  | csi-driver-smb image pull policy                                                                           | `IfNotPresent`                                          |
-| `image.csiProvisioner.tag`                              | csi-provisioner docker image tag                                                                           | `v5.0.1`                                                |
+| `image.csiProvisioner.tag`                              | csi-provisioner docker image tag                                                                           | `v5.0.2`                                                |
 | `image.csiProvisioner.pullPolicy`                       | csi-provisioner image pull policy                                                                          | `IfNotPresent`                                          |
 | `image.livenessProbe.repository`                        | liveness-probe docker image                                                                                | `/livenessprobe`                                        |
 | `image.livenessProbe.tag`                               | liveness-probe docker image tag                                                                            | `v2.13.1`                                                |

diff --git a/charts/index.yaml b/charts/index.yaml
@@ -2,62 +2,71 @@ apiVersion: v1
 entries:
   csi-driver-smb:
   - apiVersion: v1
-    appVersion: v1.15.0
-    created: "2024-07-18T06:59:59.116464753Z"
+    appVersion: v1.16.0
+    created: "2024-09-01T13:38:18.751018927Z"
     description: SMB CSI Driver for Kubernetes
-    digest: fcadda7e1af1bcfbfd42da9f4a02f6baaa96b0b48bafe7241dc4c5a588d9e4b4
+    digest: 60c6a2c4663c639eb1be8f88b0edcfa7ea4450386bf41e02778fe512db8f3ba0
     name: csi-driver-smb
     urls:
-    - https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/latest/csi-driver-smb-v1.15.0.tgz
-    version: v1.15.0
+    - https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/latest/csi-driver-smb-v1.16.0.tgz
+    version: v1.16.0
+  - apiVersion: v1
+    appVersion: v1.16.0
+    created: "2024-09-01T13:38:18.76227771Z"
+    description: SMB CSI Driver for Kubernetes
+    digest: 60c6a2c4663c639eb1be8f88b0edcfa7ea4450386bf41e02778fe512db8f3ba0
+    name: csi-driver-smb
+    urls:
+    - https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.16.0/csi-driver-smb-v1.16.0.tgz
+    version: v1.16.0
   - apiVersion: v1
     appVersion: v1.15.0
-    created: "2024-07-18T06:59:59.126665562Z"
+    created: "2024-09-01T13:38:18.761689813Z"
     description: SMB CSI Driver for Kubernetes
-    digest: fcadda7e1af1bcfbfd42da9f4a02f6baaa96b0b48bafe7241dc4c5a588d9e4b4
+    digest: 1f006480427f88f781c3f7b3cf5e3d0429c68bb082a6a9337363ea5ef5a5cd0b
     name: csi-driver-smb
     urls:
     - https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.15.0/csi-driver-smb-v1.15.0.tgz
     version: v1.15.0
   - apiVersion: v1
     appVersion: v1.14.0
-    created: "2024-07-18T06:59:59.12600989Z"
+    created: "2024-09-01T13:38:18.760822176Z"
     description: SMB CSI Driver for Kubernetes
-    digest: 5d63c8c4824b43ad35f498854be6d24a06e3d7c19a50c57dc5c6de26d7f39850
+    digest: a84e22518f5e6cd1d3fcb06ef8c7616371c96400e8db6227bc84cd0474f6cce1
     name: csi-driver-smb
     urls:
     - https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.14.0/csi-driver-smb-v1.14.0.tgz
     version: v1.14.0
   - apiVersion: v1
     appVersion: v1.13.0
-    created: "2024-07-18T06:59:59.124750877Z"
+    created: "2024-09-01T13:38:18.758680643Z"
     description: SMB CSI Driver for Kubernetes
-    digest: 962ae1f26a13852e86256464e534228ae6118109aeb1e63abbee07ca18809cff
+    digest: 21ee866afbf5a59892c5588b00518e0f7853beac7643e8e558d440a260c6f142
     name: csi-driver-smb
     urls:
     - https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.13.0/csi-driver-smb-v1.13.0.tgz
     version: v1.13.0
   - apiVersion: v1
     appVersion: v1.12.0
-    created: "2024-07-18T06:59:59.12353098Z"
+    created: "2024-09-01T13:38:18.757527292Z"
     description: SMB CSI Driver for Kubernetes
-    digest: eb1f894fa5ad0c20da3b26a3ad4c20857914c8d76a098fd2185ff068d6118ddd
+    digest: fccc852a3e723b9d273ea21d1d59697a0a94b65665406de1fd7c461bd894d2a3
     name: csi-driver-smb
     urls:
     - https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.12.0/csi-driver-smb-v1.12.0.tgz
     version: v1.12.0
   - apiVersion: v1
     appVersion: v1.11.0
-    created: "2024-07-18T06:59:59.122589727Z"
+    created: "2024-09-01T13:38:18.756676418Z"
     description: SMB CSI Driver for Kubernetes
-    digest: ab3cab9509579264ed95e49a0ad077019a52a45b4e6cc436de5b1f70c03699ed
+    digest: 1c0f9b72801cbeb240d06dfe665a58e4b6ac0c25c5315ee5b9fe7972362796d0
     name: csi-driver-smb
     urls:
     - https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.11.0/csi-driver-smb-v1.11.0.tgz
     version: v1.11.0
   - apiVersion: v1
     appVersion: v1.10.0
-    created: "2024-07-18T06:59:59.121823174Z"
+    created: "2024-09-01T13:38:18.755908113Z"
     description: SMB CSI Driver for Kubernetes
     digest: 82e460e6fa80da9ca523a86c28e001e15595d27c3507864f2123dbadc64c7fec
     name: csi-driver-smb
@@ -66,7 +75,7 @@ entries:
     version: v1.10.0
   - apiVersion: v1
     appVersion: v1.9.0
-    created: "2024-07-18T06:59:59.135360154Z"
+    created: "2024-09-01T13:38:18.770960453Z"
     description: SMB CSI Driver for Kubernetes
     digest: 5c78c650b9755e508afecb3f6a554c549509023f7b0610b53853a41783d1c08f
     name: csi-driver-smb
@@ -75,7 +84,7 @@ entries:
     version: v1.9.0
   - apiVersion: v1
     appVersion: v1.8.0
-    created: "2024-07-18T06:59:59.133499239Z"
+    created: "2024-09-01T13:38:18.767677819Z"
     description: SMB CSI Driver for Kubernetes
     digest: d19d156c2143d753085bcbcb32506f8ebd7ebdee275e726f9c8d774a1f0b9f34
     name: csi-driver-smb
@@ -84,7 +93,7 @@ entries:
     version: v1.8.0
   - apiVersion: v1
     appVersion: v1.7.0
-    created: "2024-07-18T06:59:59.132497919Z"
+    created: "2024-09-01T13:38:18.766821155Z"
     description: SMB CSI Driver for Kubernetes
     digest: 65594a1ff09d912a33ee0674bba1fad1f7c717638a281fb68bcfa2c98c288453
     name: csi-driver-smb
@@ -93,7 +102,7 @@ entries:
     version: v1.7.0
   - apiVersion: v1
     appVersion: v1.6.0
-    created: "2024-07-18T06:59:59.131558208Z"
+    created: "2024-09-01T13:38:18.766033926Z"
     description: SMB CSI Driver for Kubernetes
     digest: 31dd4c8b0b0d4a61565631aa5b433b18b5375aeb24812bf4fa9958d5b7917485
     name: csi-driver-smb
@@ -102,7 +111,7 @@ entries:
     version: v1.6.0
   - apiVersion: v1
     appVersion: v1.5.0
-    created: "2024-07-18T06:59:59.130742188Z"
+    created: "2024-09-01T13:38:18.765235009Z"
     description: SMB CSI Driver for Kubernetes
     digest: b7dc9e9dc5d46df12a6d1a5643efe86439bff6c36867968f772e6899692083d6
     name: csi-driver-smb
@@ -111,7 +120,7 @@ entries:
     version: v1.5.0
   - apiVersion: v1
     appVersion: v1.4.0
-    created: "2024-07-18T06:59:59.130135834Z"
+    created: "2024-09-01T13:38:18.764618377Z"
     description: SMB CSI Driver for Kubernetes
     digest: 9b1a6166ab72c09d0eefb448ecc998639b9f6255afb00bfc0ae0a4fdad76f119
     name: csi-driver-smb
@@ -120,7 +129,7 @@ entries:
     version: v1.4.0
   - apiVersion: v1
     appVersion: v1.3.0
-    created: "2024-07-18T06:59:59.129292699Z"
+    created: "2024-09-01T13:38:18.763827043Z"
     description: SMB CSI Driver for Kubernetes
     digest: d2236d36f1cb24139ddf87ea87229369ed856efc42330e656330f6cfa7635858
     name: csi-driver-smb
@@ -129,7 +138,7 @@ entries:
     version: v1.3.0
   - apiVersion: v1
     appVersion: v1.2.0
-    created: "2024-07-18T06:59:59.12745517Z"
+    created: "2024-09-01T13:38:18.763063358Z"
     description: SMB CSI Driver for Kubernetes
     digest: 9d7099165db24d5412c95b298a59cca9b233ab8800d04efd34bb055812390915
     name: csi-driver-smb
@@ -138,7 +147,7 @@ entries:
     version: v1.2.0
   - apiVersion: v1
     appVersion: v1.1.0
-    created: "2024-07-18T06:59:59.120935991Z"
+    created: "2024-09-01T13:38:18.755025892Z"
     description: SMB CSI Driver for Kubernetes
     digest: 5b39613c9104db06815ee2d42fec8507c3bb2038264513449079a4eb5b6530a8
     name: csi-driver-smb
@@ -147,7 +156,7 @@ entries:
     version: v1.1.0
   - apiVersion: v1
     appVersion: v1.0.0
-    created: "2024-07-18T06:59:59.120064404Z"
+    created: "2024-09-01T13:38:18.754222539Z"
     description: SMB CSI Driver for Kubernetes
     digest: 3e4721dd007cc51750f7221be8f66ec7e287c83a8cdcfeb9a71c30f526b06dc4
     name: csi-driver-smb
@@ -156,7 +165,7 @@ entries:
     version: v1.0.0
   - apiVersion: v1
     appVersion: v0.6.0
-    created: "2024-07-18T06:59:59.119472272Z"
+    created: "2024-09-01T13:38:18.753656885Z"
     description: SMB CSI Driver for Kubernetes
     digest: 6fc9d05bc78ca98fb17071b7f5ad05b4c071f2403114d72feae99fb89ca1fc9f
     name: csi-driver-smb
@@ -165,7 +174,7 @@ entries:
     version: v0.6.0
   - apiVersion: v1
     appVersion: v0.5.0
-    created: "2024-07-18T06:59:59.118965554Z"
+    created: "2024-09-01T13:38:18.753161977Z"
     description: SMB CSI Driver for Kubernetes
     digest: 8264c6630806325613234c2d7951c188d073607e6f0f89d781ec32afed04157b
     name: csi-driver-smb
@@ -174,7 +183,7 @@ entries:
     version: v0.5.0
   - apiVersion: v1
     appVersion: v0.4.0
-    created: "2024-07-18T06:59:59.118405329Z"
+    created: "2024-09-01T13:38:18.752592007Z"
     description: SMB CSI Driver for Kubernetes
     digest: fb6d581ba5d4d1d78ca468f6daa4a24c47bb147b74d005d3c394521b4e534a3e
     name: csi-driver-smb
@@ -183,7 +192,7 @@ entries:
     version: v0.4.0
   - apiVersion: v1
     appVersion: v0.3.0
-    created: "2024-07-18T06:59:59.117892083Z"
+    created: "2024-09-01T13:38:18.752062233Z"
     description: SMB CSI Driver for Kubernetes
     digest: ee9e58db6d4a95491e2012c6607126bbff827b9c439e90e9a9798d2a73b0cb22
     name: csi-driver-smb
@@ -192,7 +201,7 @@ entries:
     version: v0.3.0
   - apiVersion: v1
     appVersion: v0.2.0
-    created: "2024-07-18T06:59:59.117254087Z"
+    created: "2024-09-01T13:38:18.751549685Z"
     description: SMB CSI Driver for Kubernetes
     digest: 8d8667106306d78dea9f63e5a3e8ee7ad2b60f86bd625f5968e37ca6a0cad317
     name: csi-driver-smb
@@ -201,11 +210,11 @@ entries:
     version: v0.2.0
   - apiVersion: v1
     appVersion: latest
-    created: "2024-07-18T06:59:59.134451894Z"
+    created: "2024-09-01T13:38:18.768465572Z"
     description: SMB CSI Driver for Kubernetes
     digest: 37a15bd85f6f9f2df20aed317d9baa3774128552488d02c2897d561e67777963
     name: csi-driver-smb
     urls:
     - https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.9.0/csi-driver-smb-v0.0.0.tgz
     version: v0.0.0
-generated: "2024-07-18T06:59:59.115664324Z"
+generated: "2024-09-01T13:38:18.750259778Z"
diff --git a/charts/latest/csi-driver-smb-v1.15.0.tgz b/charts/latest/csi-driver-smb-v1.15.0.tgz
diff --git a/charts/latest/csi-driver-smb-v1.16.0.tgz b/charts/latest/csi-driver-smb-v1.16.0.tgz
diff --git a/charts/latest/csi-driver-smb/Chart.yaml b/charts/latest/csi-driver-smb/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v1.15.0
+appVersion: v1.16.0
 description: SMB CSI Driver for Kubernetes
 name: csi-driver-smb
-version: v1.15.0
+version: v1.16.0
diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml
@@ -64,7 +64,7 @@ spec:
             - "--leader-election"
             - "--leader-election-namespace={{ .Release.Namespace }}"
             - "--extra-create-metadata=true"
-            - "--feature-gates=HonorPVReclaimPolicy=false"
+            - "--feature-gates=HonorPVReclaimPolicy=true"
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -130,18 +130,13 @@ spec:
               value: unix:///csi/csi.sock
           securityContext:
             privileged: true
-            readOnlyRootFilesystem: true
             capabilities:
               drop:
               - ALL
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
-            - mountPath: {{ .Values.controller.workingMountDir }}
-              name: tmp-dir
           resources: {{- toYaml .Values.controller.resources.smb | nindent 12 }}
       volumes:
         - name: socket-dir
           emptyDir: {}
-        - name: tmp-dir
-          emptyDir: {}
diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-node.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-node.yaml
@@ -134,7 +134,6 @@ spec:
                   apiVersion: v1
                   fieldPath: spec.nodeName
           securityContext:
-            readOnlyRootFilesystem: true
             privileged: true
             capabilities:
               drop:
@@ -148,7 +147,7 @@ spec:
 {{- if ne .Values.linux.krb5CacheDirectory "" }}
             - mountPath: {{ .Values.linux.kubelet }}/kerberos/
               mountPropagation: Bidirectional
-              name: krb5Cache-dir
+              name: krb5cache-dir
 {{- end }}
           resources: {{- toYaml .Values.linux.resources.smb | nindent 12 }}
       volumes:
@@ -168,6 +167,6 @@ spec:
         - hostPath:
             path: {{ .Values.linux.krb5CacheDirectory }}
             type: DirectoryOrCreate
-          name: krb5Cache-dir
+          name: krb5cache-dir
 {{- end }}
 {{- end -}}
diff --git a/charts/latest/csi-driver-smb/templates/rbac-csi-smb.yaml b/charts/latest/csi-driver-smb/templates/rbac-csi-smb.yaml
@@ -25,7 +25,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "create", "delete"]
+    verbs: ["get", "list", "watch", "create", "patch", "delete"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["get", "list", "watch", "update"]