mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 12:18:16 +00:00 
			
		
		
		
	Merge pull request #129618 from gnufied/bump-csi-sidecars-132
Bump CSI sidecars to fix CI issues and such
This commit is contained in:
		@@ -182,11 +182,6 @@ var _ = utils.SIGDescribe("CSI Mock volume expansion", func() {
 | 
				
			|||||||
					framework.ExpectNoError(err, "While waiting for pvc to have fs resizing condition")
 | 
										framework.ExpectNoError(err, "While waiting for pvc to have fs resizing condition")
 | 
				
			||||||
					pvc = npvc
 | 
										pvc = npvc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
					inProgressConditions := pvc.Status.Conditions
 | 
					 | 
				
			||||||
					if len(inProgressConditions) > 0 {
 | 
					 | 
				
			||||||
						gomega.Expect(inProgressConditions[0].Type).To(gomega.Equal(v1.PersistentVolumeClaimFileSystemResizePending), "pvc must have fs resizing condition")
 | 
					 | 
				
			||||||
					}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
					ginkgo.By("Deleting the previously created pod")
 | 
										ginkgo.By("Deleting the previously created pod")
 | 
				
			||||||
					if test.simulatedCSIDriverError == expansionFailedMissingStagingPath {
 | 
										if test.simulatedCSIDriverError == expansionFailedMissingStagingPath {
 | 
				
			||||||
						e2epod.DeletePodOrFail(ctx, m.cs, pod.Namespace, pod.Name)
 | 
											e2epod.DeletePodOrFail(ctx, m.cs, pod.Namespace, pod.Name)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,7 +21,7 @@ spec:
 | 
				
			|||||||
      serviceAccountName: csi-gce-pd-controller-sa
 | 
					      serviceAccountName: csi-gce-pd-controller-sa
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
        - name: csi-snapshotter
 | 
					        - name: csi-snapshotter
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
 | 
					          image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - "--v=5"
 | 
					            - "--v=5"
 | 
				
			||||||
            - "--csi-address=/csi/csi.sock"
 | 
					            - "--csi-address=/csi/csi.sock"
 | 
				
			||||||
@@ -73,7 +73,7 @@ spec:
 | 
				
			|||||||
            - name: socket-dir
 | 
					            - name: socket-dir
 | 
				
			||||||
              mountPath: /csi
 | 
					              mountPath: /csi
 | 
				
			||||||
        - name: csi-attacher
 | 
					        - name: csi-attacher
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
 | 
					          image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - "--v=5"
 | 
					            - "--v=5"
 | 
				
			||||||
            - "--csi-address=/csi/csi.sock"
 | 
					            - "--csi-address=/csi/csi.sock"
 | 
				
			||||||
@@ -102,7 +102,7 @@ spec:
 | 
				
			|||||||
            - name: socket-dir
 | 
					            - name: socket-dir
 | 
				
			||||||
              mountPath: /csi
 | 
					              mountPath: /csi
 | 
				
			||||||
        - name: csi-resizer
 | 
					        - name: csi-resizer
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
 | 
					          image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - "--v=5"
 | 
					            - "--v=5"
 | 
				
			||||||
            - "--csi-address=/csi/csi.sock"
 | 
					            - "--csi-address=/csi/csi.sock"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -276,7 +276,7 @@ spec:
 | 
				
			|||||||
              mountPath: /csi
 | 
					              mountPath: /csi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        - name: node-driver-registrar
 | 
					        - name: node-driver-registrar
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
 | 
					          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - --v=5
 | 
					            - --v=5
 | 
				
			||||||
            - --csi-address=/csi/csi.sock
 | 
					            - --csi-address=/csi/csi.sock
 | 
				
			||||||
@@ -304,13 +304,13 @@ spec:
 | 
				
			|||||||
          volumeMounts:
 | 
					          volumeMounts:
 | 
				
			||||||
          - mountPath: /csi
 | 
					          - mountPath: /csi
 | 
				
			||||||
            name: socket-dir
 | 
					            name: socket-dir
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/livenessprobe:v2.14.0
 | 
					          image: registry.k8s.io/sig-storage/livenessprobe:v2.15.0
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
          - --csi-address=/csi/csi.sock
 | 
					          - --csi-address=/csi/csi.sock
 | 
				
			||||||
          - --health-port=9898
 | 
					          - --health-port=9898
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        - name: csi-attacher
 | 
					        - name: csi-attacher
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
 | 
					          image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - --v=5
 | 
					            - --v=5
 | 
				
			||||||
            - --csi-address=/csi/csi.sock
 | 
					            - --csi-address=/csi/csi.sock
 | 
				
			||||||
@@ -340,7 +340,7 @@ spec:
 | 
				
			|||||||
              name: socket-dir
 | 
					              name: socket-dir
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        - name: csi-resizer
 | 
					        - name: csi-resizer
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
 | 
					          image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - -v=5
 | 
					            - -v=5
 | 
				
			||||||
            - -csi-address=/csi/csi.sock
 | 
					            - -csi-address=/csi/csi.sock
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,7 +15,7 @@ spec:
 | 
				
			|||||||
      serviceAccountName: csi-mock
 | 
					      serviceAccountName: csi-mock
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
        - name: csi-attacher
 | 
					        - name: csi-attacher
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
 | 
					          image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - --v=5
 | 
					            - --v=5
 | 
				
			||||||
            - --csi-address=$(ADDRESS)
 | 
					            - --csi-address=$(ADDRESS)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,7 +15,7 @@ spec:
 | 
				
			|||||||
      serviceAccountName: csi-mock
 | 
					      serviceAccountName: csi-mock
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
        - name: csi-resizer
 | 
					        - name: csi-resizer
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
 | 
					          image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - "--v=5"
 | 
					            - "--v=5"
 | 
				
			||||||
            - "--csi-address=$(ADDRESS)"
 | 
					            - "--csi-address=$(ADDRESS)"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,7 +15,7 @@ spec:
 | 
				
			|||||||
      serviceAccountName: csi-mock
 | 
					      serviceAccountName: csi-mock
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
        - name: csi-snapshotter
 | 
					        - name: csi-snapshotter
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
 | 
					          image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - "--v=5"
 | 
					            - "--v=5"
 | 
				
			||||||
            - "--csi-address=$(ADDRESS)"
 | 
					            - "--csi-address=$(ADDRESS)"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,7 +34,7 @@ spec:
 | 
				
			|||||||
            - mountPath: /csi
 | 
					            - mountPath: /csi
 | 
				
			||||||
              name: socket-dir
 | 
					              name: socket-dir
 | 
				
			||||||
        - name: driver-registrar
 | 
					        - name: driver-registrar
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
 | 
					          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - --v=5
 | 
					            - --v=5
 | 
				
			||||||
            - --csi-address=/csi/csi.sock
 | 
					            - --csi-address=/csi/csi.sock
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -35,7 +35,7 @@ spec:
 | 
				
			|||||||
            - mountPath: /csi
 | 
					            - mountPath: /csi
 | 
				
			||||||
              name: socket-dir
 | 
					              name: socket-dir
 | 
				
			||||||
        - name: driver-registrar
 | 
					        - name: driver-registrar
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
 | 
					          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - --v=5
 | 
					            - --v=5
 | 
				
			||||||
            - --csi-address=/csi/csi.sock
 | 
					            - --csi-address=/csi/csi.sock
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user