Merge pull request #13076 from olemarkus/automated-cherry-pick-of-#13067-origin-release-1.23

Automated cherry pick of #13067: Bump external-snapshotted to v5.0.0

tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content

@@ -140,7 +140,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.20
     manifest: snapshot-controller.addons.k8s.io/k8s-1.20.yaml
-    manifestHash: c1625843c5dbf647500867b4af18a62c6ded8516800d051f21a75589a3fa5c27
+    manifestHash: a9781145d51aa191d5bd29bf31c535d17e50157e209ee0765ac20d6a7145eaf5
     name: snapshot-controller.addons.k8s.io
     needsPKI: true
     selector:

tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-snapshot-controller.addons.k8s.io-k8s-1.20_content

@@ -16,6 +16,9 @@ spec:
     kind: VolumeSnapshotClass
     listKind: VolumeSnapshotClassList
     plural: volumesnapshotclasses
+    shortNames:
+    - vsclass
+    - vsclasses
     singular: volumesnapshotclass
   scope: Cluster
   versions:
@@ -167,6 +170,9 @@ spec:
     kind: VolumeSnapshotContent
     listKind: VolumeSnapshotContentList
     plural: volumesnapshotcontents
+    shortNames:
+    - vsc
+    - vscs
     singular: volumesnapshotcontent
   scope: Cluster
   versions:
@@ -199,6 +205,11 @@ spec:
       jsonPath: .spec.volumeSnapshotRef.name
       name: VolumeSnapshot
       type: string
+    - description: Namespace of the VolumeSnapshot object to which this VolumeSnapshotContent
+        object is bound.
+      jsonPath: .spec.volumeSnapshotRef.namespace
+      name: VolumeSnapshotNamespace
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
@@ -419,6 +430,11 @@ spec:
       jsonPath: .spec.volumeSnapshotRef.name
       name: VolumeSnapshot
       type: string
+    - description: Namespace of the VolumeSnapshot object to which this VolumeSnapshotContent
+        object is bound.
+      jsonPath: .spec.volumeSnapshotRef.namespace
+      name: VolumeSnapshotNamespace
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
@@ -635,6 +651,8 @@ spec:
     kind: VolumeSnapshot
     listKind: VolumeSnapshotList
     plural: volumesnapshots
+    shortNames:
+    - vs
     singular: volumesnapshot
   scope: Namespaced
   versions:
@@ -1018,6 +1036,31 @@ metadata:
 
 ---
 
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  creationTimestamp: null
+  labels:
+    addon.kops.k8s.io/name: snapshot-controller.addons.k8s.io
+    app.kubernetes.io/managed-by: kops
+    k8s-addon: snapshot-controller.addons.k8s.io
+  name: snapshot-controller-leaderelection
+  namespace: kube-system
+rules:
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - get
+  - watch
+  - list
+  - delete
+  - update
+  - create
+
+---
+
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -1027,7 +1070,6 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: snapshot-controller.addons.k8s.io
   name: snapshot-controller-runner
-  namespace: kube-system
 rules:
 - apiGroups:
   - ""
@@ -1083,6 +1125,13 @@ rules:
   - watch
   - update
   - delete
+  - patch
+- apiGroups:
+  - snapshot.storage.k8s.io
+  resources:
+  - volumesnapshotcontents/status
+  verbs:
+  - patch
 - apiGroups:
   - snapshot.storage.k8s.io
   resources:
@@ -1092,57 +1141,14 @@ rules:
   - list
   - watch
   - update
+  - patch
 - apiGroups:
   - snapshot.storage.k8s.io
   resources:
   - volumesnapshots/status
   verbs:
   - update
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: snapshot-controller.addons.k8s.io
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: snapshot-controller.addons.k8s.io
-  name: snapshot-controller-role
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: snapshot-controller-runner
-subjects:
-- kind: ServiceAccount
-  name: snapshot-controller
-  namespace: kube-system
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: snapshot-controller.addons.k8s.io
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: snapshot-controller.addons.k8s.io
-  name: snapshot-controller-leaderelection
-  namespace: kube-system
-rules:
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - get
-  - watch
-  - list
-  - delete
-  - update
-  - create
+  - patch
 
 ---
 
@@ -1161,6 +1167,25 @@ roleRef:
   kind: Role
   name: snapshot-controller-leaderelection
 subjects:
+- kind: ServiceAccount
+  name: snapshot-controller
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  creationTimestamp: null
+  labels:
+    addon.kops.k8s.io/name: snapshot-controller.addons.k8s.io
+    app.kubernetes.io/managed-by: kops
+    k8s-addon: snapshot-controller.addons.k8s.io
+  name: snapshot-controller-role
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: snapshot-controller-runner
+subjects:
 - kind: ServiceAccount
   name: snapshot-controller
   namespace: kube-system
@@ -1197,15 +1222,23 @@ spec:
       - args:
         - --v=5
         - --leader-election=true
-        image: k8s.gcr.io/sig-storage/snapshot-controller:v4.2.1
+        image: gcr.io/k8s-staging-sig-storage/snapshot-controller:v5.0.0
         imagePullPolicy: IfNotPresent
         name: snapshot-controller
-      nodeSelector:
-        kubernetes.io/os: linux
-        node-role.kubernetes.io/master: ""
       serviceAccount: snapshot-controller
-      tolerations:
-      - operator: Exists
+      topologySpreadConstraints:
+      - labelSelector:
+          matchLabels:
+            app: snapshot-controller
+        maxSkew: 1
+        topologyKey: topology.kubernetes.io/zone
+        whenUnsatisfiable: ScheduleAnyway
+      - labelSelector:
+          matchLabels:
+            app: snapshot-controller
+        maxSkew: 1
+        topologyKey: kubernetes.io/hostname
+        whenUnsatisfiable: DoNotSchedule
 
 ---
 
@@ -1234,7 +1267,7 @@ spec:
       - args:
         - --tls-cert-file=/etc/snapshot-validation-webhook/certs/tls.crt
         - --tls-private-key-file=/etc/snapshot-validation-webhook/certs/tls.key
-        image: k8s.gcr.io/sig-storage/snapshot-validation-webhook:v4.2.1
+        image: k8s.gcr.io/sig-storage/snapshot-validation-webhook:v5.0.0
         imagePullPolicy: IfNotPresent
         name: snapshot-validation
         ports:

tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content

@@ -140,7 +140,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.20
     manifest: snapshot-controller.addons.k8s.io/k8s-1.20.yaml
-    manifestHash: c1625843c5dbf647500867b4af18a62c6ded8516800d051f21a75589a3fa5c27
+    manifestHash: a9781145d51aa191d5bd29bf31c535d17e50157e209ee0765ac20d6a7145eaf5
     name: snapshot-controller.addons.k8s.io
     needsPKI: true
     selector:

tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-snapshot-controller.addons.k8s.io-k8s-1.20_content

@@ -16,6 +16,9 @@ spec:
     kind: VolumeSnapshotClass
     listKind: VolumeSnapshotClassList
     plural: volumesnapshotclasses
+    shortNames:
+    - vsclass
+    - vsclasses
     singular: volumesnapshotclass
   scope: Cluster
   versions:
@@ -167,6 +170,9 @@ spec:
     kind: VolumeSnapshotContent
     listKind: VolumeSnapshotContentList
     plural: volumesnapshotcontents
+    shortNames:
+    - vsc
+    - vscs
     singular: volumesnapshotcontent
   scope: Cluster
   versions:
@@ -199,6 +205,11 @@ spec:
       jsonPath: .spec.volumeSnapshotRef.name
       name: VolumeSnapshot
       type: string
+    - description: Namespace of the VolumeSnapshot object to which this VolumeSnapshotContent
+        object is bound.
+      jsonPath: .spec.volumeSnapshotRef.namespace
+      name: VolumeSnapshotNamespace
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
@@ -419,6 +430,11 @@ spec:
       jsonPath: .spec.volumeSnapshotRef.name
       name: VolumeSnapshot
       type: string
+    - description: Namespace of the VolumeSnapshot object to which this VolumeSnapshotContent
+        object is bound.
+      jsonPath: .spec.volumeSnapshotRef.namespace
+      name: VolumeSnapshotNamespace
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
@@ -635,6 +651,8 @@ spec:
     kind: VolumeSnapshot
     listKind: VolumeSnapshotList
     plural: volumesnapshots
+    shortNames:
+    - vs
     singular: volumesnapshot
   scope: Namespaced
   versions:
@@ -1018,6 +1036,31 @@ metadata:
 
 ---
 
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  creationTimestamp: null
+  labels:
+    addon.kops.k8s.io/name: snapshot-controller.addons.k8s.io
+    app.kubernetes.io/managed-by: kops
+    k8s-addon: snapshot-controller.addons.k8s.io
+  name: snapshot-controller-leaderelection
+  namespace: kube-system
+rules:
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - get
+  - watch
+  - list
+  - delete
+  - update
+  - create
+
+---
+
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -1027,7 +1070,6 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: snapshot-controller.addons.k8s.io
   name: snapshot-controller-runner
-  namespace: kube-system
 rules:
 - apiGroups:
   - ""
@@ -1083,6 +1125,13 @@ rules:
   - watch
   - update
   - delete
+  - patch
+- apiGroups:
+  - snapshot.storage.k8s.io
+  resources:
+  - volumesnapshotcontents/status
+  verbs:
+  - patch
 - apiGroups:
   - snapshot.storage.k8s.io
   resources:
@@ -1092,57 +1141,14 @@ rules:
   - list
   - watch
   - update
+  - patch
 - apiGroups:
   - snapshot.storage.k8s.io
   resources:
   - volumesnapshots/status
   verbs:
   - update
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: snapshot-controller.addons.k8s.io
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: snapshot-controller.addons.k8s.io
-  name: snapshot-controller-role
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: snapshot-controller-runner
-subjects:
-- kind: ServiceAccount
-  name: snapshot-controller
-  namespace: kube-system
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: snapshot-controller.addons.k8s.io
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: snapshot-controller.addons.k8s.io
-  name: snapshot-controller-leaderelection
-  namespace: kube-system
-rules:
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - get
-  - watch
-  - list
-  - delete
-  - update
-  - create
+  - patch
 
 ---
 
@@ -1161,6 +1167,25 @@ roleRef:
   kind: Role
   name: snapshot-controller-leaderelection
 subjects:
+- kind: ServiceAccount
+  name: snapshot-controller
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  creationTimestamp: null
+  labels:
+    addon.kops.k8s.io/name: snapshot-controller.addons.k8s.io
+    app.kubernetes.io/managed-by: kops
+    k8s-addon: snapshot-controller.addons.k8s.io
+  name: snapshot-controller-role
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: snapshot-controller-runner
+subjects:
 - kind: ServiceAccount
   name: snapshot-controller
   namespace: kube-system
@@ -1197,15 +1222,23 @@ spec:
       - args:
         - --v=5
         - --leader-election=true
-        image: k8s.gcr.io/sig-storage/snapshot-controller:v4.2.1
+        image: gcr.io/k8s-staging-sig-storage/snapshot-controller:v5.0.0
         imagePullPolicy: IfNotPresent
         name: snapshot-controller
-      nodeSelector:
-        kubernetes.io/os: linux
-        node-role.kubernetes.io/master: ""
       serviceAccount: snapshot-controller
-      tolerations:
-      - operator: Exists
+      topologySpreadConstraints:
+      - labelSelector:
+          matchLabels:
+            app: snapshot-controller
+        maxSkew: 1
+        topologyKey: topology.kubernetes.io/zone
+        whenUnsatisfiable: ScheduleAnyway
+      - labelSelector:
+          matchLabels:
+            app: snapshot-controller
+        maxSkew: 1
+        topologyKey: kubernetes.io/hostname
+        whenUnsatisfiable: DoNotSchedule
 
 ---
 
@@ -1234,7 +1267,7 @@ spec:
       - args:
         - --tls-cert-file=/etc/snapshot-validation-webhook/certs/tls.crt
         - --tls-private-key-file=/etc/snapshot-validation-webhook/certs/tls.key
-        image: k8s.gcr.io/sig-storage/snapshot-validation-webhook:v4.2.1
+        image: k8s.gcr.io/sig-storage/snapshot-validation-webhook:v5.0.0
         imagePullPolicy: IfNotPresent
         name: snapshot-validation
         ports:

tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content

@@ -133,7 +133,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.20
     manifest: snapshot-controller.addons.k8s.io/k8s-1.20.yaml
-    manifestHash: c1625843c5dbf647500867b4af18a62c6ded8516800d051f21a75589a3fa5c27
+    manifestHash: a9781145d51aa191d5bd29bf31c535d17e50157e209ee0765ac20d6a7145eaf5
     name: snapshot-controller.addons.k8s.io
     needsPKI: true
     selector:

tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-snapshot-controller.addons.k8s.io-k8s-1.20_content

@@ -16,6 +16,9 @@ spec:
     kind: VolumeSnapshotClass
     listKind: VolumeSnapshotClassList
     plural: volumesnapshotclasses
+    shortNames:
+    - vsclass
+    - vsclasses
     singular: volumesnapshotclass
   scope: Cluster
   versions:
@@ -167,6 +170,9 @@ spec:
     kind: VolumeSnapshotContent
     listKind: VolumeSnapshotContentList
     plural: volumesnapshotcontents
+    shortNames:
+    - vsc
+    - vscs
     singular: volumesnapshotcontent
   scope: Cluster
   versions:
@@ -199,6 +205,11 @@ spec:
       jsonPath: .spec.volumeSnapshotRef.name
       name: VolumeSnapshot
       type: string
+    - description: Namespace of the VolumeSnapshot object to which this VolumeSnapshotContent
+        object is bound.
+      jsonPath: .spec.volumeSnapshotRef.namespace
+      name: VolumeSnapshotNamespace
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
@@ -419,6 +430,11 @@ spec:
       jsonPath: .spec.volumeSnapshotRef.name
       name: VolumeSnapshot
       type: string
+    - description: Namespace of the VolumeSnapshot object to which this VolumeSnapshotContent
+        object is bound.
+      jsonPath: .spec.volumeSnapshotRef.namespace
+      name: VolumeSnapshotNamespace
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
@@ -635,6 +651,8 @@ spec:
     kind: VolumeSnapshot
     listKind: VolumeSnapshotList
     plural: volumesnapshots
+    shortNames:
+    - vs
     singular: volumesnapshot
   scope: Namespaced
   versions:
@@ -1018,6 +1036,31 @@ metadata:
 
 ---
 
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  creationTimestamp: null
+  labels:
+    addon.kops.k8s.io/name: snapshot-controller.addons.k8s.io
+    app.kubernetes.io/managed-by: kops
+    k8s-addon: snapshot-controller.addons.k8s.io
+  name: snapshot-controller-leaderelection
+  namespace: kube-system
+rules:
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - get
+  - watch
+  - list
+  - delete
+  - update
+  - create
+
+---
+
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -1027,7 +1070,6 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: snapshot-controller.addons.k8s.io
   name: snapshot-controller-runner
-  namespace: kube-system
 rules:
 - apiGroups:
   - ""
@@ -1083,6 +1125,13 @@ rules:
   - watch
   - update
   - delete
+  - patch
+- apiGroups:
+  - snapshot.storage.k8s.io
+  resources:
+  - volumesnapshotcontents/status
+  verbs:
+  - patch
 - apiGroups:
   - snapshot.storage.k8s.io
   resources:
@@ -1092,57 +1141,14 @@ rules:
   - list
   - watch
   - update
+  - patch
 - apiGroups:
   - snapshot.storage.k8s.io
   resources:
   - volumesnapshots/status
   verbs:
   - update
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: snapshot-controller.addons.k8s.io
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: snapshot-controller.addons.k8s.io
-  name: snapshot-controller-role
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: snapshot-controller-runner
-subjects:
-- kind: ServiceAccount
-  name: snapshot-controller
-  namespace: kube-system
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  creationTimestamp: null
-  labels:
-    addon.kops.k8s.io/name: snapshot-controller.addons.k8s.io
-    app.kubernetes.io/managed-by: kops
-    k8s-addon: snapshot-controller.addons.k8s.io
-  name: snapshot-controller-leaderelection
-  namespace: kube-system
-rules:
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - get
-  - watch
-  - list
-  - delete
-  - update
-  - create
+  - patch
 
 ---
 
@@ -1161,6 +1167,25 @@ roleRef:
   kind: Role
   name: snapshot-controller-leaderelection
 subjects:
+- kind: ServiceAccount
+  name: snapshot-controller
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  creationTimestamp: null
+  labels:
+    addon.kops.k8s.io/name: snapshot-controller.addons.k8s.io
+    app.kubernetes.io/managed-by: kops
+    k8s-addon: snapshot-controller.addons.k8s.io
+  name: snapshot-controller-role
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: snapshot-controller-runner
+subjects:
 - kind: ServiceAccount
   name: snapshot-controller
   namespace: kube-system
@@ -1197,15 +1222,23 @@ spec:
       - args:
         - --v=5
         - --leader-election=true
-        image: k8s.gcr.io/sig-storage/snapshot-controller:v4.2.1
+        image: gcr.io/k8s-staging-sig-storage/snapshot-controller:v5.0.0
         imagePullPolicy: IfNotPresent
         name: snapshot-controller
-      nodeSelector:
-        kubernetes.io/os: linux
-        node-role.kubernetes.io/master: ""
       serviceAccount: snapshot-controller
-      tolerations:
-      - operator: Exists
+      topologySpreadConstraints:
+      - labelSelector:
+          matchLabels:
+            app: snapshot-controller
+        maxSkew: 1
+        topologyKey: topology.kubernetes.io/zone
+        whenUnsatisfiable: ScheduleAnyway
+      - labelSelector:
+          matchLabels:
+            app: snapshot-controller
+        maxSkew: 1
+        topologyKey: kubernetes.io/hostname
+        whenUnsatisfiable: DoNotSchedule
 
 ---
 
@@ -1234,7 +1267,7 @@ spec:
       - args:
         - --tls-cert-file=/etc/snapshot-validation-webhook/certs/tls.crt
         - --tls-private-key-file=/etc/snapshot-validation-webhook/certs/tls.key
-        image: k8s.gcr.io/sig-storage/snapshot-validation-webhook:v4.2.1
+        image: k8s.gcr.io/sig-storage/snapshot-validation-webhook:v5.0.0
         imagePullPolicy: IfNotPresent
         name: snapshot-validation
         ports: