Merge branch 'release/v7.0.2-1' into main

Author: robertauer

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v7.0.2-1] - 2025-04-03
+### Changed
+- [#17] Update snapshot-controller to 7.0.2
+
 ## [v6.2.1-1] - 2025-04-01
 ### Changed
 - [#15] Update snapshot-controller to 6.2.1

Jenkinsfile

@@ -59,8 +59,11 @@ node('docker') {
                         // Sleep because it takes time for the controller to create the resource. Without it would end up
                         // in error "no matching resource found when run the wait command"
                         sleep(5)
-                        k3d.kubectl("wait --for=condition=ready pod -l app=snapshot-controller --timeout=300s")
+                        k3d.kubectl("wait --for=condition=ready pod -l app.kubernetes.io/name=snapshot-controller --timeout=300s")
                     }
+                } catch(Exception e) {
+                    k3d.collectAndArchiveLogs()
+                    throw e as java.lang.Throwable
                 } finally {
                     stage('Remove k3d cluster') {
                         k3d.deleteK3d()

Makefile

@@ -1,5 +1,5 @@
 ARTIFACT_ID=k8s-snapshot-controller
-VERSION=6.2.1-1
+VERSION=7.0.2-1
 MAKEFILES_VERSION=9.3.2
 REGISTRY_NAMESPACE?=k8s
 HELM_REPO_ENDPOINT=k3ces.local:30099

k8s/helm-crd/templates/groupsnapshot.storage.k8s.io_volumegroupsnapshotclasses.yaml

@@ -0,0 +1,84 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    {{- include "k8s-snapshot-controller-crd.labels" . | nindent 4 }}
+  annotations:
+    api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/814"
+    controller-gen.kubebuilder.io/version: v0.12.0
+  name: volumegroupsnapshotclasses.groupsnapshot.storage.k8s.io
+spec:
+  group: groupsnapshot.storage.k8s.io
+  names:
+    kind: VolumeGroupSnapshotClass
+    listKind: VolumeGroupSnapshotClassList
+    plural: volumegroupsnapshotclasses
+    shortNames:
+      - vgsclass
+      - vgsclasses
+    singular: volumegroupsnapshotclass
+  scope: Cluster
+  versions:
+    - additionalPrinterColumns:
+        - jsonPath: .driver
+          name: Driver
+          type: string
+        - description: Determines whether a VolumeGroupSnapshotContent created through
+            the VolumeGroupSnapshotClass should be deleted when its bound VolumeGroupSnapshot
+            is deleted.
+          jsonPath: .deletionPolicy
+          name: DeletionPolicy
+          type: string
+        - jsonPath: .metadata.creationTimestamp
+          name: Age
+          type: date
+      name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: VolumeGroupSnapshotClass specifies parameters that a underlying
+            storage system uses when creating a volume group snapshot. A specific VolumeGroupSnapshotClass
+            is used by specifying its name in a VolumeGroupSnapshot object. VolumeGroupSnapshotClasses
+            are non-namespaced.
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            deletionPolicy:
+              description: DeletionPolicy determines whether a VolumeGroupSnapshotContent
+                created through the VolumeGroupSnapshotClass should be deleted when
+                its bound VolumeGroupSnapshot is deleted. Supported values are "Retain"
+                and "Delete". "Retain" means that the VolumeGroupSnapshotContent and
+                its physical group snapshot on underlying storage system are kept. "Delete"
+                means that the VolumeGroupSnapshotContent and its physical group snapshot
+                on underlying storage system are deleted. Required.
+              enum:
+                - Delete
+                - Retain
+              type: string
+            driver:
+              description: Driver is the name of the storage driver expected to handle
+                this VolumeGroupSnapshotClass. Required.
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            parameters:
+              additionalProperties:
+                type: string
+              description: Parameters is a key-value map with storage driver specific
+                parameters for creating group snapshots. These values are opaque to
+                Kubernetes and are passed directly to the driver.
+              type: object
+          required:
+            - deletionPolicy
+            - driver
+          type: object
+      served: true
+      storage: true
+      subresources: {}