mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	Merge pull request #110826 from humblec/test-failure
Fix the test failure on volume snapshot
This commit is contained in:
		@@ -35,13 +35,16 @@ rules:
 | 
				
			|||||||
    verbs: ["get", "list", "watch"]
 | 
					    verbs: ["get", "list", "watch"]
 | 
				
			||||||
  - apiGroups: ["snapshot.storage.k8s.io"]
 | 
					  - apiGroups: ["snapshot.storage.k8s.io"]
 | 
				
			||||||
    resources: ["volumesnapshotcontents"]
 | 
					    resources: ["volumesnapshotcontents"]
 | 
				
			||||||
    verbs: ["create", "get", "list", "watch", "update", "delete"]
 | 
					    verbs: ["create", "get", "list", "watch", "update", "delete", "patch"]
 | 
				
			||||||
  - apiGroups: ["snapshot.storage.k8s.io"]
 | 
					  - apiGroups: ["snapshot.storage.k8s.io"]
 | 
				
			||||||
    resources: ["volumesnapshots"]
 | 
					    resources: ["volumesnapshots"]
 | 
				
			||||||
    verbs: ["get", "list", "watch", "update"]
 | 
					    verbs: ["get", "list", "watch", "update", "patch"]
 | 
				
			||||||
  - apiGroups: ["snapshot.storage.k8s.io"]
 | 
					  - apiGroups: ["snapshot.storage.k8s.io"]
 | 
				
			||||||
    resources: ["volumesnapshots/status"]
 | 
					    resources: ["volumesnapshots/status"]
 | 
				
			||||||
    verbs: ["update"]
 | 
					    verbs: ["update", "patch"]
 | 
				
			||||||
 | 
					  - apiGroups: ["snapshot.storage.k8s.io"]
 | 
				
			||||||
 | 
					    resources: ["volumesnapshotcontents/status"]
 | 
				
			||||||
 | 
					    verbs: ["patch"]
 | 
				
			||||||
  - apiGroups: ["apiextensions.k8s.io"]
 | 
					  - apiGroups: ["apiextensions.k8s.io"]
 | 
				
			||||||
    resources: ["customresourcedefinitions"]
 | 
					    resources: ["customresourcedefinitions"]
 | 
				
			||||||
    verbs: ["create", "list", "watch", "delete", "get", "update"]
 | 
					    verbs: ["create", "list", "watch", "delete", "get", "update"]
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,7 +22,7 @@ spec:
 | 
				
			|||||||
      serviceAccount: volume-snapshot-controller
 | 
					      serviceAccount: volume-snapshot-controller
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
        - name: volume-snapshot-controller
 | 
					        - name: volume-snapshot-controller
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/snapshot-controller:v4.2.1
 | 
					          image: registry.k8s.io/sig-storage/snapshot-controller:v6.0.1
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - "--v=5"
 | 
					            - "--v=5"
 | 
				
			||||||
            - "--metrics-path=/metrics"
 | 
					            - "--metrics-path=/metrics"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,7 +39,7 @@ spec:
 | 
				
			|||||||
            - name: socket-dir
 | 
					            - name: socket-dir
 | 
				
			||||||
              mountPath: /csi
 | 
					              mountPath: /csi
 | 
				
			||||||
        - name: csi-provisioner
 | 
					        - name: csi-provisioner
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-provisioner:v3.1.0
 | 
					          image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - "--v=5"
 | 
					            - "--v=5"
 | 
				
			||||||
            - "--csi-address=/csi/csi.sock"
 | 
					            - "--csi-address=/csi/csi.sock"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -323,7 +323,7 @@ spec:
 | 
				
			|||||||
            name: socket-dir
 | 
					            name: socket-dir
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        - name: csi-provisioner
 | 
					        - name: csi-provisioner
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-provisioner:v3.1.0
 | 
					          image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - -v=5
 | 
					            - -v=5
 | 
				
			||||||
            - --csi-address=/csi/csi.sock
 | 
					            - --csi-address=/csi/csi.sock
 | 
				
			||||||
@@ -352,7 +352,7 @@ spec:
 | 
				
			|||||||
              name: socket-dir
 | 
					              name: socket-dir
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        - name: csi-snapshotter
 | 
					        - name: csi-snapshotter
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-snapshotter:v5.0.1
 | 
					          image: registry.k8s.io/sig-storage/csi-snapshotter:v6.0.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-snapshotter
 | 
					        - name: csi-snapshotter
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-snapshotter:v4.2.1
 | 
					          image: registry.k8s.io/sig-storage/csi-snapshotter:v6.0.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-provisioner
 | 
					        - name: csi-provisioner
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-provisioner:v3.0.0
 | 
					          image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - "--csi-address=$(ADDRESS)"
 | 
					            - "--csi-address=$(ADDRESS)"
 | 
				
			||||||
            # Topology support is needed for the pod rescheduling test
 | 
					            # Topology support is needed for the pod rescheduling test
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,7 +15,7 @@ spec:
 | 
				
			|||||||
      serviceAccountName: csi-mock
 | 
					      serviceAccountName: csi-mock
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
        - name: csi-provisioner
 | 
					        - name: csi-provisioner
 | 
				
			||||||
          image: registry.k8s.io/sig-storage/csi-provisioner:v3.0.0
 | 
					          image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
 | 
				
			||||||
          args:
 | 
					          args:
 | 
				
			||||||
            - "--csi-address=$(ADDRESS)"
 | 
					            - "--csi-address=$(ADDRESS)"
 | 
				
			||||||
            # Topology support is needed for the pod rescheduling test
 | 
					            # Topology support is needed for the pod rescheduling test
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user