Merge pull request #90234 from jsafrane/remove-prestop-hook

Sync csi-hostpath manifests

test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-attacher.yaml

@@ -40,7 +40,7 @@ spec:
       serviceAccountName: csi-attacher
       containers:
         - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:v2.1.0
+          image: quay.io/k8scsi/csi-attacher:v2.2.0
           args:
             - --v=5
             - --csi-address=/csi/csi.sock

test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-driverinfo.yaml

@@ -3,8 +3,10 @@ kind: CSIDriver
 metadata:
   name: hostpath.csi.k8s.io
 spec:
-  # Supports both modes, but needs pod info for that to determine the actual mode.
+  # Supports persistent and ephemeral inline volumes.
-  podInfoOnMount: true
   volumeLifecycleModes:
   - Persistent
   - Ephemeral
+  # To determine at runtime which mode a volume uses, pod info and its
+  # "csi.storage.k8s.io/ephemeral" entry are needed.
+  podInfoOnMount: true

test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-plugin.yaml

@@ -36,11 +36,7 @@ spec:
     spec:
       containers:
         - name: node-driver-registrar
-          image: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0
+          image: quay.io/k8scsi/csi-node-driver-registrar:v1.3.0
-          lifecycle:
-            preStop:
-              exec:
-                command: ["/bin/sh", "-c", "rm -rf /registration/csi-hostpath /registration/csi-hostpath-reg.sock"]
           args:
             - --v=5
             - --csi-address=/csi/csi.sock
@@ -71,6 +67,8 @@ spec:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"
+            # The only difference to github.com/kubernetes-csi/csi-driver-host-path/deploy
+            # - we have a tests that checks node limits.
             - "--maxvolumespernode=10"
           env:
             - name: CSI_ENDPOINT
@@ -107,7 +105,6 @@ spec:
               name: csi-data-dir
             - mountPath: /dev
               name: dev-dir
-
         - name: liveness-probe
           volumeMounts:
           - mountPath: /csi
@@ -115,7 +112,6 @@ spec:
           image: quay.io/k8scsi/livenessprobe:v1.1.0
           args:
           - --csi-address=/csi/csi.sock
-          - --connection-timeout=3s
           - --health-port=9898
 
       volumes:

test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-provisioner.yaml

@@ -40,11 +40,11 @@ spec:
       serviceAccountName: csi-provisioner
       containers:
         - name: csi-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v1.5.0
+          image: quay.io/k8scsi/csi-provisioner:v1.6.0
           args:
             - -v=5
             - --csi-address=/csi/csi.sock
-            - --connection-timeout=15s
+            - --feature-gates=Topology=true
           securityContext:
             # This is necessary only for systems with SELinux, where
             # non-privileged sidecar containers cannot access unix domain socket

test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-resizer.yaml

@@ -27,16 +27,23 @@ spec:
       labels:
         app: csi-hostpath-resizer
     spec:
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - csi-hostpathplugin
+            topologyKey: kubernetes.io/hostname
       serviceAccountName: csi-resizer
       containers:
         - name: csi-resizer
-          image: quay.io/k8scsi/csi-resizer:v0.4.0
+          image: quay.io/k8scsi/csi-resizer:v0.5.0
           args:
-            - "--v=5"
+            - -v=5
-            - "--csi-address=$(ADDRESS)"
+            - -csi-address=/csi/csi.sock
-          env:
-            - name: ADDRESS
-              value: /csi/csi.sock
           securityContext:
             # This is necessary only for systems with SELinux, where
             # non-privileged sidecar containers cannot access unix domain socket

test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-snapshotter.yaml

@@ -1,52 +1,59 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: csi-snapshotter
+  name: csi-hostpath-snapshotter
   labels:
-    app: csi-snapshotter
+    app: csi-hostpath-snapshotter
 spec:
   selector:
-    app: csi-snapshotter
+    app: csi-hostpath-snapshotter
   ports:
-  - name: dummy
+    - name: dummy
-    port: 12345
+      port: 12345
 
 ---
 kind: StatefulSet
 apiVersion: apps/v1
 metadata:
-  name: csi-snapshotter
+  name: csi-hostpath-snapshotter
 spec:
-  serviceName: "csi-snapshotter"
+  serviceName: "csi-hostpath-snapshotter"
   replicas: 1
   selector:
     matchLabels:
-      app: csi-snapshotter
+      app: csi-hostpath-snapshotter
   template:
     metadata:
       labels:
-        app: csi-snapshotter
+        app: csi-hostpath-snapshotter
     spec:
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - csi-hostpathplugin
+            topologyKey: kubernetes.io/hostname
       serviceAccount: csi-snapshotter
       containers:
-      - name: csi-snapshotter
+        - name: csi-snapshotter
-        image: quay.io/k8scsi/csi-snapshotter:v2.0.0
+          image: quay.io/k8scsi/csi-snapshotter:v2.1.0
-        args:
+          args:
-        - "--v=5"
+            - -v=5
-        - "--csi-address=$(ADDRESS)"
+            - --csi-address=/csi/csi.sock
-        env:
+          securityContext:
-        - name: ADDRESS
+            # This is necessary only for systems with SELinux, where
-          value: /csi/csi.sock
+            # non-privileged sidecar containers cannot access unix domain socket
-        securityContext:
+            # created by privileged CSI driver container.
-          # This is necessary only for systems with SELinux, where
+            privileged: true
-          # non-privileged sidecar containers cannot access unix domain socket
+          volumeMounts:
-          # created by privileged CSI driver container.
+            - mountPath: /csi
-          privileged: true
+              name: socket-dir
-        volumeMounts:
-        - name: socket-dir
-          mountPath: /csi
       volumes:
-      - hostPath:
+        - hostPath:
-          path: /var/lib/kubelet/plugins/csi-hostpath
+            path: /var/lib/kubelet/plugins/csi-hostpath
-          type: DirectoryOrCreate
+            type: DirectoryOrCreate
-        name: socket-dir
+          name: socket-dir