diff --git a/build.env b/build.env index d84c7c45fc0..ce518995aad 100644 --- a/build.env +++ b/build.env @@ -37,7 +37,7 @@ GOLANGCI_VERSION=v2.5.0 # external snapshotter version # Refer: https://github.com/kubernetes-csi/external-snapshotter/releases -SNAPSHOT_VERSION=v8.2.0 +SNAPSHOT_VERSION=v8.4.0 # "go test" configuration # set to stdout or html to enable coverage reporting, disabled by default @@ -61,11 +61,11 @@ ROOK_VERSION=v1.16.4 ROOK_CEPH_CLUSTER_IMAGE=quay.io/ceph/ceph:v19.2.2 # CSI sidecar version -CSI_ATTACHER_VERSION=v4.8.0 -CSI_SNAPSHOTTER_VERSION=v8.2.0 -CSI_RESIZER_VERSION=v1.13.1 -CSI_PROVISIONER_VERSION=v5.1.0 -CSI_NODE_DRIVER_REGISTRAR_VERSION=v2.13.0 +CSI_ATTACHER_VERSION=v4.10.0 +CSI_SNAPSHOTTER_VERSION=v8.4.0 +CSI_RESIZER_VERSION=v2.0.0 +CSI_PROVISIONER_VERSION=v6.0.0 +CSI_NODE_DRIVER_REGISTRAR_VERSION=v2.15.0 # e2e settings # - enable CEPH_CSI_RUN_ALL_TESTS when running tests with if it has root diff --git a/charts/ceph-csi-cephfs/README.md b/charts/ceph-csi-cephfs/README.md index 4d18e388ce5..ee085840d4a 100644 --- a/charts/ceph-csi-cephfs/README.md +++ b/charts/ceph-csi-cephfs/README.md @@ -138,7 +138,7 @@ charts and their default values. | `nodeplugin.imagePullSecrets` | Specifies imagePullSecrets for containers | `[]` | | `nodeplugin.profiling.enabled` | Specifies whether profiling should be enabled | `false` | | `nodeplugin.registrar.image.repository` | Node-Registrar image repository URL | `registry.k8s.io/sig-storage/csi-node-driver-registrar` | -| `nodeplugin.registrar.image.tag` | Image tag | `v2.13.0` | +| `nodeplugin.registrar.image.tag` | Image tag | `v2.15.0` | | `nodeplugin.registrar.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `nodeplugin.plugin.image.repository` | Nodeplugin image repository URL | `quay.io/cephcsi/cephcsi` | | `nodeplugin.plugin.image.tag` | Image tag | `canary` | @@ -161,26 +161,26 @@ charts and their default values. | `provisioner.imagePullSecrets` | Specifies imagePullSecrets for containers | `[]` | | `provisioner.profiling.enabled` | Specifies whether profiling should be enabled | `false` | | `provisioner.provisioner.image.repository` | Specifies the csi-provisioner image repository URL | `registry.k8s.io/sig-storage/csi-provisioner` | -| `provisioner.provisioner.image.tag` | Specifies image tag | `v5.1.0` | +| `provisioner.provisioner.image.tag` | Specifies image tag | `v6.0.0` | | `provisioner.provisioner.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.provisioner.args.httpEndpointPort` | Specifies http server port for diagnostics, health checks and metrics | `""` | | `provisioner.provisioner.extraArgs` | Specifies extra arguments for the provisioner sidecar | `[]` | | `provisioner.attacher.name` | Specifies the name of csi-attacher sidecar | `attacher` | | `provisioner.attacher.enabled` | Specifies whether attacher sidecar is enabled | `true` | | `provisioner.attacher.image.repository` | Specifies the csi-attacher image repository URL | `registry.k8s.io/sig-storage/csi-attacher` | -| `provisioner.attacher.image.tag` | Specifies image tag | `v4.8.0` | +| `provisioner.attacher.image.tag` | Specifies image tag | `v4.10.0` | | `provisioner.attacher.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.attacher.args.httpEndpointPort` | Specifies http server port for diagnostics, health checks and metrics | `""` | | `provisioner.attacher.extraArgs` | Specifies extra arguments for the attacher sidecar | `[]` | | `provisioner.resizer.name` | Specifies the name of csi-resizer sidecar | `resizer` | | `provisioner.resizer.enabled` | Specifies whether resizer sidecar is enabled | `true` | | `provisioner.resizer.image.repository` | Specifies the csi-resizer image repository URL | `registry.k8s.io/sig-storage/csi-resizer` | -| `provisioner.resizer.image.tag` | Specifies image tag | `v1.13.1` | +| `provisioner.resizer.image.tag` | Specifies image tag | `v2.0.0` | | `provisioner.resizer.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.resizer.args.httpEndpointPort` | Specifies http server port for diagnostics, health checks and metrics | `""` | | `provisioner.resizer.extraArgs` | Specifies extra arguments for the resizer sidecar | `[]` | | `provisioner.snapshotter.image.repository` | Specifies the csi-snapshotter image repository URL | `registry.k8s.io/sig-storage/csi-snapshotter` | -| `provisioner.snapshotter.image.tag` | Specifies image tag | `v8.2.0` | +| `provisioner.snapshotter.image.tag` | Specifies image tag | `v8.4.0` | | `provisioner.snapshotter.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.snapshotter.args.enableVolumeGroupSnapshots` | enables the creation of volume group snapshots | `false` | | `provisioner.snapshotter.args.httpEndpointPort` | Specifies http server port for diagnostics, health checks and metrics | `""` | diff --git a/charts/ceph-csi-cephfs/templates/groupsnapshotclass.yaml b/charts/ceph-csi-cephfs/templates/groupsnapshotclass.yaml index 304f83e378e..212b0c0a045 100644 --- a/charts/ceph-csi-cephfs/templates/groupsnapshotclass.yaml +++ b/charts/ceph-csi-cephfs/templates/groupsnapshotclass.yaml @@ -1,5 +1,5 @@ {{- if .Values.volumeGroupSnapshotClass.create -}} -apiVersion: groupsnapshot.storage.k8s.io/v1beta1 +apiVersion: groupsnapshot.storage.k8s.io/v1beta2 kind: VolumeGroupSnapshotClass metadata: name: {{ .Values.volumeGroupSnapshotClass.name }} diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml index cd17b60ee40..0ef6f48b999 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml @@ -153,6 +153,7 @@ spec: - "--v={{ .Values.logLevel }}" - "--csi-address=/csi/{{ .Values.pluginSocketFile }}" - "--kubelet-registration-path={{ .Values.kubeletDir }}/plugins/{{ .Values.driverName }}/{{ .Values.pluginSocketFile }}" + - "--automaxprocs=true" env: - name: KUBE_NODE_NAME valueFrom: diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml index 861fcdaedc4..497b5d1da35 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -151,6 +151,7 @@ spec: - "--retry-interval-start=500ms" - "--extra-create-metadata=true" - "--feature-gates=HonorPVReclaimPolicy=true" + - "--automaxprocs=true" - "--prevent-volume-mode-conversion=true" {{- if and .Values.provisioner.provisioner.args .Values.provisioner.provisioner.args.httpEndpointPort }} - "--http-endpoint=$(POD_IP):{{ .Values.provisioner.provisioner.args.httpEndpointPort }}" @@ -185,6 +186,7 @@ spec: - "--timeout={{ .Values.provisioner.timeout }}" - "--leader-election=true" - "--extra-create-metadata=true" + - "--automaxprocs=true" - "--feature-gates=CSIVolumeGroupSnapshot={{.Values.provisioner.snapshotter.args.enableVolumeGroupSnapshots }}" {{- if and .Values.provisioner.snapshotter.args .Values.provisioner.snapshotter.args.httpEndpointPort }} - "--http-endpoint=$(POD_IP):{{ .Values.provisioner.snapshotter.args.httpEndpointPort }}" @@ -256,6 +258,7 @@ spec: - "--retry-interval-start=500ms" - "--handle-volume-inuse-error=false" - "--feature-gates=RecoverVolumeExpansionFailure=true" + - "--automaxprocs=true" {{- if and .Values.provisioner.resizer.args .Values.provisioner.resizer.args.httpEndpointPort }} - "--http-endpoint=$(POD_IP):{{ .Values.provisioner.resizer.args.httpEndpointPort }}" {{- end }} diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index 7226353d512..06e8d64a47c 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -131,7 +131,7 @@ nodeplugin: registrar: image: repository: registry.k8s.io/sig-storage/csi-node-driver-registrar - tag: v2.13.0 + tag: v2.15.0 pullPolicy: IfNotPresent resources: {} @@ -232,7 +232,7 @@ provisioner: provisioner: image: repository: registry.k8s.io/sig-storage/csi-provisioner - tag: v5.1.0 + tag: v6.0.0 pullPolicy: IfNotPresent resources: {} args: @@ -255,7 +255,7 @@ provisioner: enabled: true image: repository: registry.k8s.io/sig-storage/csi-attacher - tag: v4.8.0 + tag: v4.10.0 pullPolicy: IfNotPresent resources: {} args: @@ -272,7 +272,7 @@ provisioner: enabled: true image: repository: registry.k8s.io/sig-storage/csi-resizer - tag: v1.13.1 + tag: v2.0.0 pullPolicy: IfNotPresent resources: {} args: @@ -287,7 +287,7 @@ provisioner: snapshotter: image: repository: registry.k8s.io/sig-storage/csi-snapshotter - tag: v8.2.0 + tag: v8.4.0 pullPolicy: IfNotPresent resources: {} args: diff --git a/charts/ceph-csi-rbd/README.md b/charts/ceph-csi-rbd/README.md index b4e8eedbee9..f11c9ae5aa7 100644 --- a/charts/ceph-csi-rbd/README.md +++ b/charts/ceph-csi-rbd/README.md @@ -111,7 +111,7 @@ charts and their default values. | `nodeplugin.imagePullSecrets` | Specifies imagePullSecrets for containers | `[]` | | `nodeplugin.profiling.enabled` | Specifies whether profiling should be enabled | `false` | | `nodeplugin.registrar.image.repository` | Node Registrar image repository URL | `registry.k8s.io/sig-storage/csi-node-driver-registrar` | -| `nodeplugin.registrar.image.tag` | Image tag | `v2.13.0` | +| `nodeplugin.registrar.image.tag` | Image tag | `v2.15.0` | | `nodeplugin.registrar.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `nodeplugin.plugin.image.repository` | Nodeplugin image repository URL | `quay.io/cephcsi/cephcsi` | | `nodeplugin.plugin.image.tag` | Image tag | `canary` | @@ -138,7 +138,7 @@ charts and their default values. | `provisioner.imagePullSecrets` | Specifies imagePullSecrets for containers | `[]` | | `provisioner.profiling.enabled` | Specifies whether profiling should be enabled | `false` | | `provisioner.provisioner.image.repository` | Specifies the csi-provisioner image repository URL | `registry.k8s.io/sig-storage/csi-provisioner` | -| `provisioner.provisioner.image.tag` | Specifies image tag | `v5.1.0` | +| `provisioner.provisioner.image.tag` | Specifies image tag | `v6.0.0` | | `provisioner.provisioner.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.provisioner.args.httpEndpointPort` | Specifies http server port for diagnostics, health checks and metrics | `""` | | `provisioner.provisioner.extraArgs` | Specifies extra arguments for the provisioner sidecar | `[]` | @@ -148,19 +148,19 @@ charts and their default values. | `provisioner.attacher.name` | Specifies the name of csi-attacher sidecar | `attacher` | | `provisioner.attacher.enabled` | Specifies whether attacher sidecar is enabled | `true` | | `provisioner.attacher.image.repository` | Specifies the csi-attacher image repository URL | `registry.k8s.io/sig-storage/csi-attacher` | -| `provisioner.attacher.image.tag` | Specifies image tag | `v4.5.` | +| `provisioner.attacher.image.tag` | Specifies image tag | `v4.10.0` | | `provisioner.attacher.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.attacher.args.httpEndpointPort` | Specifies http server port for diagnostics, health checks and metrics | `""` | | `provisioner.attacher.extraArgs` | Specifies extra arguments for the attacher sidecar | `[]` | | `provisioner.resizer.name` | Specifies the name of csi-resizer sidecar | `resizer` | | `provisioner.resizer.enabled` | Specifies whether resizer sidecar is enabled | `true` | | `provisioner.resizer.image.repository` | Specifies the csi-resizer image repository URL | `registry.k8s.io/sig-storage/csi-resizer` | -| `provisioner.resizer.image.tag` | Specifies image tag | `v1.13.1` | +| `provisioner.resizer.image.tag` | Specifies image tag | `v2.0.0` | | `provisioner.resizer.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.resizer.args.httpEndpointPort` | Specifies http server port for diagnostics, health checks and metrics | `""` | | `provisioner.resizer.extraArgs` | Specifies extra arguments for the resizer sidecar | `[]` | | `provisioner.snapshotter.image.repository` | Specifies the csi-snapshotter image repository URL | `registry.k8s.io/sig-storage/csi-snapshotter` | -| `provisioner.snapshotter.image.tag` | Specifies image tag | `v8.2.0` | +| `provisioner.snapshotter.image.tag` | Specifies image tag | `v8.4.0` | | `provisioner.snapshotter.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.snapshotter.args.enableVolumeGroupSnapshots` | enables the creation of volume group snapshots | `false` | | `provisioner.snapshotter.args.httpEndpointPort` | Specifies http server port for diagnostics, health checks and metrics | `""` | diff --git a/charts/ceph-csi-rbd/templates/groupsnapshotclass.yaml b/charts/ceph-csi-rbd/templates/groupsnapshotclass.yaml index 95f269057fc..fe0ef1e297a 100644 --- a/charts/ceph-csi-rbd/templates/groupsnapshotclass.yaml +++ b/charts/ceph-csi-rbd/templates/groupsnapshotclass.yaml @@ -1,5 +1,5 @@ {{- if .Values.volumeGroupSnapshotClass.create -}} -apiVersion: groupsnapshot.storage.k8s.io/v1beta1 +apiVersion: groupsnapshot.storage.k8s.io/v1beta2 kind: VolumeGroupSnapshotClass metadata: name: {{ .Values.volumeGroupSnapshotClass.name }} diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml index 731c0f6a242..97eaccc776f 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml @@ -158,6 +158,7 @@ spec: - "--v={{ .Values.logLevel }}" - "--csi-address=/csi/{{ .Values.pluginSocketFile }}" - "--kubelet-registration-path={{ .Values.kubeletDir }}/plugins/{{ .Values.driverName }}/{{ .Values.pluginSocketFile }}" + - "--automaxprocs=true" env: - name: KUBE_NODE_NAME valueFrom: diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml index 34116b14756..b8008f9c9d6 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml @@ -164,6 +164,7 @@ spec: - "--default-fstype={{ .Values.provisioner.defaultFSType }}" - "--extra-create-metadata=true" - "--feature-gates=HonorPVReclaimPolicy=true" + - "--automaxprocs=true" - "--prevent-volume-mode-conversion=true" - "--immediate-topology=false" {{- if and .Values.provisioner.provisioner.args .Values.provisioner.provisioner.args.httpEndpointPort }} @@ -202,6 +203,7 @@ spec: - "--retry-interval-start=500ms" - "--handle-volume-inuse-error=false" - "--feature-gates=RecoverVolumeExpansionFailure=true" + - "--automaxprocs=true" {{- if and .Values.provisioner.resizer.args .Values.provisioner.resizer.args.httpEndpointPort }} - "--http-endpoint=$(POD_IP):{{ .Values.provisioner.resizer.args.httpEndpointPort }}" {{- end }} @@ -236,6 +238,7 @@ spec: - "--timeout={{ .Values.provisioner.timeout }}" - "--leader-election=true" - "--extra-create-metadata=true" + - "--automaxprocs=true" - "--feature-gates=CSIVolumeGroupSnapshot={{.Values.provisioner.snapshotter.args.enableVolumeGroupSnapshots }}" {{- if and .Values.provisioner.snapshotter.args .Values.provisioner.snapshotter.args.httpEndpointPort }} - "--http-endpoint=$(POD_IP):{{ .Values.provisioner.snapshotter.args.httpEndpointPort }}" @@ -266,6 +269,7 @@ spec: image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}" imagePullPolicy: {{ .Values.provisioner.attacher.image.pullPolicy }} args: + - "--automaxprocs=true" - "--v={{ .Values.sidecarLogLevel }}" - "--csi-address=$(ADDRESS)" - "--leader-election=true" diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index daaf9d6b89b..2c926d55dd0 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -142,7 +142,7 @@ nodeplugin: registrar: image: repository: registry.k8s.io/sig-storage/csi-node-driver-registrar - tag: v2.13.0 + tag: v2.15.0 pullPolicy: IfNotPresent resources: {} @@ -256,7 +256,7 @@ provisioner: provisioner: image: repository: registry.k8s.io/sig-storage/csi-provisioner - tag: v5.1.0 + tag: v6.0.0 pullPolicy: IfNotPresent resources: {} args: @@ -276,7 +276,7 @@ provisioner: enabled: true image: repository: registry.k8s.io/sig-storage/csi-attacher - tag: v4.8.0 + tag: v4.10.0 pullPolicy: IfNotPresent resources: {} args: @@ -293,7 +293,7 @@ provisioner: enabled: true image: repository: registry.k8s.io/sig-storage/csi-resizer - tag: v1.13.1 + tag: v2.0.0 pullPolicy: IfNotPresent resources: {} args: @@ -308,7 +308,7 @@ provisioner: snapshotter: image: repository: registry.k8s.io/sig-storage/csi-snapshotter - tag: v8.2.0 + tag: v8.4.0 pullPolicy: IfNotPresent resources: {} args: diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index e329ee95bbb..f9523b06c6d 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -93,7 +93,7 @@ spec: - name: ceph-csi-encryption-kms-config mountPath: /etc/ceph-csi-encryption-kms-config/ - name: csi-provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v6.0.0 args: - "--csi-address=$(ADDRESS)" - "--v=1" @@ -120,7 +120,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.10.0 args: - "--v=1" - "--csi-address=$(ADDRESS)" @@ -143,7 +143,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1 + image: registry.k8s.io/sig-storage/csi-resizer:v2.0.0 args: - "--csi-address=$(ADDRESS)" - "--v=1" @@ -169,7 +169,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.4.0 args: - "--csi-address=$(ADDRESS)" - "--v=1" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index 87edfa005b9..5df161f6481 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -107,7 +107,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.15.0 args: - "--v=1" - "--csi-address=/csi/csi.sock" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml index f4f26a4ea9d..2337db29bb3 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -73,7 +73,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: csi-provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v6.0.0 args: - "--csi-address=$(ADDRESS)" - "--v=1" @@ -99,7 +99,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1 + image: registry.k8s.io/sig-storage/csi-resizer:v2.0.0 args: - "--csi-address=$(ADDRESS)" - "--v=1" @@ -125,7 +125,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.4.0 args: - "--csi-address=$(ADDRESS)" - "--v=1" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index 129516faa0b..8efe0acf479 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin.yaml @@ -80,7 +80,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.15.0 args: - "--v=1" - "--csi-address=/csi/csi.sock" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index 416dc43513f..b4c84d7e4cc 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -105,7 +105,7 @@ spec: mountPath: /run/secrets/tokens readOnly: true - name: csi-provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v6.0.0 args: - "--csi-address=$(ADDRESS)" - "--v=1" @@ -135,7 +135,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.4.0 args: - "--csi-address=$(ADDRESS)" - "--v=1" @@ -160,7 +160,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.10.0 args: - "--v=1" - "--csi-address=$(ADDRESS)" @@ -184,7 +184,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1 + image: registry.k8s.io/sig-storage/csi-resizer:v2.0.0 args: - "--csi-address=$(ADDRESS)" - "--v=1" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 407eef3eac0..7c52b56b2a4 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -117,7 +117,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.15.0 args: - "--v=1" - "--csi-address=/csi/csi.sock" diff --git a/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/doc.go b/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/doc.go similarity index 92% rename from e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/doc.go rename to e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/doc.go index c70a3f53199..70532460570 100644 --- a/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/doc.go +++ b/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2024 The Kubernetes Authors. +Copyright 2025 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,4 +17,4 @@ limitations under the License. // Code generated by client-gen. DO NOT EDIT. // This package has the automatically generated typed clients. -package v1beta1 +package v1beta2 diff --git a/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/generated_expansion.go b/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/generated_expansion.go similarity index 93% rename from e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/generated_expansion.go rename to e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/generated_expansion.go index 10f62712e43..ed8318ed6cb 100644 --- a/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/generated_expansion.go +++ b/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/generated_expansion.go @@ -1,5 +1,5 @@ /* -Copyright 2024 The Kubernetes Authors. +Copyright 2025 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ limitations under the License. // Code generated by client-gen. DO NOT EDIT. -package v1beta1 +package v1beta2 type VolumeGroupSnapshotExpansion interface{} diff --git a/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/volumegroupsnapshot.go b/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/volumegroupsnapshot.go similarity index 79% rename from e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/volumegroupsnapshot.go rename to e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/volumegroupsnapshot.go index 8687a330f81..a9b7a8f64bd 100644 --- a/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/volumegroupsnapshot.go +++ b/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/volumegroupsnapshot.go @@ -1,5 +1,5 @@ /* -Copyright 2024 The Kubernetes Authors. +Copyright 2025 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ limitations under the License. // Code generated by client-gen. DO NOT EDIT. -package v1beta1 +package v1beta2 import ( "context" "time" - v1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta1" + v1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" scheme "github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -38,15 +38,15 @@ type VolumeGroupSnapshotsGetter interface { // VolumeGroupSnapshotInterface has methods to work with VolumeGroupSnapshot resources. type VolumeGroupSnapshotInterface interface { - Create(ctx context.Context, volumeGroupSnapshot *v1beta1.VolumeGroupSnapshot, opts v1.CreateOptions) (*v1beta1.VolumeGroupSnapshot, error) - Update(ctx context.Context, volumeGroupSnapshot *v1beta1.VolumeGroupSnapshot, opts v1.UpdateOptions) (*v1beta1.VolumeGroupSnapshot, error) - UpdateStatus(ctx context.Context, volumeGroupSnapshot *v1beta1.VolumeGroupSnapshot, opts v1.UpdateOptions) (*v1beta1.VolumeGroupSnapshot, error) + Create(ctx context.Context, volumeGroupSnapshot *v1beta2.VolumeGroupSnapshot, opts v1.CreateOptions) (*v1beta2.VolumeGroupSnapshot, error) + Update(ctx context.Context, volumeGroupSnapshot *v1beta2.VolumeGroupSnapshot, opts v1.UpdateOptions) (*v1beta2.VolumeGroupSnapshot, error) + UpdateStatus(ctx context.Context, volumeGroupSnapshot *v1beta2.VolumeGroupSnapshot, opts v1.UpdateOptions) (*v1beta2.VolumeGroupSnapshot, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1beta1.VolumeGroupSnapshot, error) - List(ctx context.Context, opts v1.ListOptions) (*v1beta1.VolumeGroupSnapshotList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*v1beta2.VolumeGroupSnapshot, error) + List(ctx context.Context, opts v1.ListOptions) (*v1beta2.VolumeGroupSnapshotList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.VolumeGroupSnapshot, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta2.VolumeGroupSnapshot, err error) VolumeGroupSnapshotExpansion } @@ -57,7 +57,7 @@ type volumeGroupSnapshots struct { } // newVolumeGroupSnapshots returns a VolumeGroupSnapshots -func newVolumeGroupSnapshots(c *GroupsnapshotV1beta1Client, namespace string) *volumeGroupSnapshots { +func newVolumeGroupSnapshots(c *GroupsnapshotV1beta2Client, namespace string) *volumeGroupSnapshots { return &volumeGroupSnapshots{ client: c.RESTClient(), ns: namespace, @@ -65,8 +65,8 @@ func newVolumeGroupSnapshots(c *GroupsnapshotV1beta1Client, namespace string) *v } // Get takes name of the volumeGroupSnapshot, and returns the corresponding volumeGroupSnapshot object, and an error if there is any. -func (c *volumeGroupSnapshots) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.VolumeGroupSnapshot, err error) { - result = &v1beta1.VolumeGroupSnapshot{} +func (c *volumeGroupSnapshots) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta2.VolumeGroupSnapshot, err error) { + result = &v1beta2.VolumeGroupSnapshot{} err = c.client.Get(). Namespace(c.ns). Resource("volumegroupsnapshots"). @@ -78,12 +78,12 @@ func (c *volumeGroupSnapshots) Get(ctx context.Context, name string, options v1. } // List takes label and field selectors, and returns the list of VolumeGroupSnapshots that match those selectors. -func (c *volumeGroupSnapshots) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.VolumeGroupSnapshotList, err error) { +func (c *volumeGroupSnapshots) List(ctx context.Context, opts v1.ListOptions) (result *v1beta2.VolumeGroupSnapshotList, err error) { var timeout time.Duration if opts.TimeoutSeconds != nil { timeout = time.Duration(*opts.TimeoutSeconds) * time.Second } - result = &v1beta1.VolumeGroupSnapshotList{} + result = &v1beta2.VolumeGroupSnapshotList{} err = c.client.Get(). Namespace(c.ns). Resource("volumegroupsnapshots"). @@ -110,8 +110,8 @@ func (c *volumeGroupSnapshots) Watch(ctx context.Context, opts v1.ListOptions) ( } // Create takes the representation of a volumeGroupSnapshot and creates it. Returns the server's representation of the volumeGroupSnapshot, and an error, if there is any. -func (c *volumeGroupSnapshots) Create(ctx context.Context, volumeGroupSnapshot *v1beta1.VolumeGroupSnapshot, opts v1.CreateOptions) (result *v1beta1.VolumeGroupSnapshot, err error) { - result = &v1beta1.VolumeGroupSnapshot{} +func (c *volumeGroupSnapshots) Create(ctx context.Context, volumeGroupSnapshot *v1beta2.VolumeGroupSnapshot, opts v1.CreateOptions) (result *v1beta2.VolumeGroupSnapshot, err error) { + result = &v1beta2.VolumeGroupSnapshot{} err = c.client.Post(). Namespace(c.ns). Resource("volumegroupsnapshots"). @@ -123,8 +123,8 @@ func (c *volumeGroupSnapshots) Create(ctx context.Context, volumeGroupSnapshot * } // Update takes the representation of a volumeGroupSnapshot and updates it. Returns the server's representation of the volumeGroupSnapshot, and an error, if there is any. -func (c *volumeGroupSnapshots) Update(ctx context.Context, volumeGroupSnapshot *v1beta1.VolumeGroupSnapshot, opts v1.UpdateOptions) (result *v1beta1.VolumeGroupSnapshot, err error) { - result = &v1beta1.VolumeGroupSnapshot{} +func (c *volumeGroupSnapshots) Update(ctx context.Context, volumeGroupSnapshot *v1beta2.VolumeGroupSnapshot, opts v1.UpdateOptions) (result *v1beta2.VolumeGroupSnapshot, err error) { + result = &v1beta2.VolumeGroupSnapshot{} err = c.client.Put(). Namespace(c.ns). Resource("volumegroupsnapshots"). @@ -138,8 +138,8 @@ func (c *volumeGroupSnapshots) Update(ctx context.Context, volumeGroupSnapshot * // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *volumeGroupSnapshots) UpdateStatus(ctx context.Context, volumeGroupSnapshot *v1beta1.VolumeGroupSnapshot, opts v1.UpdateOptions) (result *v1beta1.VolumeGroupSnapshot, err error) { - result = &v1beta1.VolumeGroupSnapshot{} +func (c *volumeGroupSnapshots) UpdateStatus(ctx context.Context, volumeGroupSnapshot *v1beta2.VolumeGroupSnapshot, opts v1.UpdateOptions) (result *v1beta2.VolumeGroupSnapshot, err error) { + result = &v1beta2.VolumeGroupSnapshot{} err = c.client.Put(). Namespace(c.ns). Resource("volumegroupsnapshots"). @@ -180,8 +180,8 @@ func (c *volumeGroupSnapshots) DeleteCollection(ctx context.Context, opts v1.Del } // Patch applies the patch and returns the patched volumeGroupSnapshot. -func (c *volumeGroupSnapshots) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.VolumeGroupSnapshot, err error) { - result = &v1beta1.VolumeGroupSnapshot{} +func (c *volumeGroupSnapshots) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta2.VolumeGroupSnapshot, err error) { + result = &v1beta2.VolumeGroupSnapshot{} err = c.client.Patch(pt). Namespace(c.ns). Resource("volumegroupsnapshots"). diff --git a/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/volumegroupsnapshot_client.go b/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/volumegroupsnapshot_client.go similarity index 68% rename from e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/volumegroupsnapshot_client.go rename to e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/volumegroupsnapshot_client.go index 49ecc7cf5e0..500229c0f42 100644 --- a/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/volumegroupsnapshot_client.go +++ b/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/volumegroupsnapshot_client.go @@ -1,5 +1,5 @@ /* -Copyright 2024 The Kubernetes Authors. +Copyright 2025 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,44 +16,44 @@ limitations under the License. // Code generated by client-gen. DO NOT EDIT. -package v1beta1 +package v1beta2 import ( "net/http" - v1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta1" + v1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" "github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) -type GroupsnapshotV1beta1Interface interface { +type GroupsnapshotV1beta2Interface interface { RESTClient() rest.Interface VolumeGroupSnapshotsGetter VolumeGroupSnapshotClassesGetter VolumeGroupSnapshotContentsGetter } -// GroupsnapshotV1beta1Client is used to interact with features provided by the groupsnapshot.storage.k8s.io group. -type GroupsnapshotV1beta1Client struct { +// GroupsnapshotV1beta2Client is used to interact with features provided by the groupsnapshot.storage.k8s.io group. +type GroupsnapshotV1beta2Client struct { restClient rest.Interface } -func (c *GroupsnapshotV1beta1Client) VolumeGroupSnapshots(namespace string) VolumeGroupSnapshotInterface { +func (c *GroupsnapshotV1beta2Client) VolumeGroupSnapshots(namespace string) VolumeGroupSnapshotInterface { return newVolumeGroupSnapshots(c, namespace) } -func (c *GroupsnapshotV1beta1Client) VolumeGroupSnapshotClasses() VolumeGroupSnapshotClassInterface { +func (c *GroupsnapshotV1beta2Client) VolumeGroupSnapshotClasses() VolumeGroupSnapshotClassInterface { return newVolumeGroupSnapshotClasses(c) } -func (c *GroupsnapshotV1beta1Client) VolumeGroupSnapshotContents() VolumeGroupSnapshotContentInterface { +func (c *GroupsnapshotV1beta2Client) VolumeGroupSnapshotContents() VolumeGroupSnapshotContentInterface { return newVolumeGroupSnapshotContents(c) } -// NewForConfig creates a new GroupsnapshotV1beta1Client for the given config. +// NewForConfig creates a new GroupsnapshotV1beta2Client for the given config. // NewForConfig is equivalent to NewForConfigAndClient(c, httpClient), // where httpClient was generated with rest.HTTPClientFor(c). -func NewForConfig(c *rest.Config) (*GroupsnapshotV1beta1Client, error) { +func NewForConfig(c *rest.Config) (*GroupsnapshotV1beta2Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -65,9 +65,9 @@ func NewForConfig(c *rest.Config) (*GroupsnapshotV1beta1Client, error) { return NewForConfigAndClient(&config, httpClient) } -// NewForConfigAndClient creates a new GroupsnapshotV1beta1Client for the given config and http client. +// NewForConfigAndClient creates a new GroupsnapshotV1beta2Client for the given config and http client. // Note the http client provided takes precedence over the configured transport values. -func NewForConfigAndClient(c *rest.Config, h *http.Client) (*GroupsnapshotV1beta1Client, error) { +func NewForConfigAndClient(c *rest.Config, h *http.Client) (*GroupsnapshotV1beta2Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -76,12 +76,12 @@ func NewForConfigAndClient(c *rest.Config, h *http.Client) (*GroupsnapshotV1beta if err != nil { return nil, err } - return &GroupsnapshotV1beta1Client{client}, nil + return &GroupsnapshotV1beta2Client{client}, nil } -// NewForConfigOrDie creates a new GroupsnapshotV1beta1Client for the given config and +// NewForConfigOrDie creates a new GroupsnapshotV1beta2Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *rest.Config) *GroupsnapshotV1beta1Client { +func NewForConfigOrDie(c *rest.Config) *GroupsnapshotV1beta2Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -89,13 +89,13 @@ func NewForConfigOrDie(c *rest.Config) *GroupsnapshotV1beta1Client { return client } -// New creates a new GroupsnapshotV1beta1Client for the given RESTClient. -func New(c rest.Interface) *GroupsnapshotV1beta1Client { - return &GroupsnapshotV1beta1Client{c} +// New creates a new GroupsnapshotV1beta2Client for the given RESTClient. +func New(c rest.Interface) *GroupsnapshotV1beta2Client { + return &GroupsnapshotV1beta2Client{c} } func setConfigDefaults(config *rest.Config) error { - gv := v1beta1.SchemeGroupVersion + gv := v1beta2.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() @@ -109,7 +109,7 @@ func setConfigDefaults(config *rest.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *GroupsnapshotV1beta1Client) RESTClient() rest.Interface { +func (c *GroupsnapshotV1beta2Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/volumegroupsnapshotclass.go b/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/volumegroupsnapshotclass.go similarity index 81% rename from e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/volumegroupsnapshotclass.go rename to e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/volumegroupsnapshotclass.go index 642cedd705e..e03c85cfb9e 100644 --- a/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/volumegroupsnapshotclass.go +++ b/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/volumegroupsnapshotclass.go @@ -1,5 +1,5 @@ /* -Copyright 2024 The Kubernetes Authors. +Copyright 2025 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ limitations under the License. // Code generated by client-gen. DO NOT EDIT. -package v1beta1 +package v1beta2 import ( "context" "time" - v1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta1" + v1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" scheme "github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -38,14 +38,14 @@ type VolumeGroupSnapshotClassesGetter interface { // VolumeGroupSnapshotClassInterface has methods to work with VolumeGroupSnapshotClass resources. type VolumeGroupSnapshotClassInterface interface { - Create(ctx context.Context, volumeGroupSnapshotClass *v1beta1.VolumeGroupSnapshotClass, opts v1.CreateOptions) (*v1beta1.VolumeGroupSnapshotClass, error) - Update(ctx context.Context, volumeGroupSnapshotClass *v1beta1.VolumeGroupSnapshotClass, opts v1.UpdateOptions) (*v1beta1.VolumeGroupSnapshotClass, error) + Create(ctx context.Context, volumeGroupSnapshotClass *v1beta2.VolumeGroupSnapshotClass, opts v1.CreateOptions) (*v1beta2.VolumeGroupSnapshotClass, error) + Update(ctx context.Context, volumeGroupSnapshotClass *v1beta2.VolumeGroupSnapshotClass, opts v1.UpdateOptions) (*v1beta2.VolumeGroupSnapshotClass, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1beta1.VolumeGroupSnapshotClass, error) - List(ctx context.Context, opts v1.ListOptions) (*v1beta1.VolumeGroupSnapshotClassList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*v1beta2.VolumeGroupSnapshotClass, error) + List(ctx context.Context, opts v1.ListOptions) (*v1beta2.VolumeGroupSnapshotClassList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.VolumeGroupSnapshotClass, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta2.VolumeGroupSnapshotClass, err error) VolumeGroupSnapshotClassExpansion } @@ -55,15 +55,15 @@ type volumeGroupSnapshotClasses struct { } // newVolumeGroupSnapshotClasses returns a VolumeGroupSnapshotClasses -func newVolumeGroupSnapshotClasses(c *GroupsnapshotV1beta1Client) *volumeGroupSnapshotClasses { +func newVolumeGroupSnapshotClasses(c *GroupsnapshotV1beta2Client) *volumeGroupSnapshotClasses { return &volumeGroupSnapshotClasses{ client: c.RESTClient(), } } // Get takes name of the volumeGroupSnapshotClass, and returns the corresponding volumeGroupSnapshotClass object, and an error if there is any. -func (c *volumeGroupSnapshotClasses) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.VolumeGroupSnapshotClass, err error) { - result = &v1beta1.VolumeGroupSnapshotClass{} +func (c *volumeGroupSnapshotClasses) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta2.VolumeGroupSnapshotClass, err error) { + result = &v1beta2.VolumeGroupSnapshotClass{} err = c.client.Get(). Resource("volumegroupsnapshotclasses"). Name(name). @@ -74,12 +74,12 @@ func (c *volumeGroupSnapshotClasses) Get(ctx context.Context, name string, optio } // List takes label and field selectors, and returns the list of VolumeGroupSnapshotClasses that match those selectors. -func (c *volumeGroupSnapshotClasses) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.VolumeGroupSnapshotClassList, err error) { +func (c *volumeGroupSnapshotClasses) List(ctx context.Context, opts v1.ListOptions) (result *v1beta2.VolumeGroupSnapshotClassList, err error) { var timeout time.Duration if opts.TimeoutSeconds != nil { timeout = time.Duration(*opts.TimeoutSeconds) * time.Second } - result = &v1beta1.VolumeGroupSnapshotClassList{} + result = &v1beta2.VolumeGroupSnapshotClassList{} err = c.client.Get(). Resource("volumegroupsnapshotclasses"). VersionedParams(&opts, scheme.ParameterCodec). @@ -104,8 +104,8 @@ func (c *volumeGroupSnapshotClasses) Watch(ctx context.Context, opts v1.ListOpti } // Create takes the representation of a volumeGroupSnapshotClass and creates it. Returns the server's representation of the volumeGroupSnapshotClass, and an error, if there is any. -func (c *volumeGroupSnapshotClasses) Create(ctx context.Context, volumeGroupSnapshotClass *v1beta1.VolumeGroupSnapshotClass, opts v1.CreateOptions) (result *v1beta1.VolumeGroupSnapshotClass, err error) { - result = &v1beta1.VolumeGroupSnapshotClass{} +func (c *volumeGroupSnapshotClasses) Create(ctx context.Context, volumeGroupSnapshotClass *v1beta2.VolumeGroupSnapshotClass, opts v1.CreateOptions) (result *v1beta2.VolumeGroupSnapshotClass, err error) { + result = &v1beta2.VolumeGroupSnapshotClass{} err = c.client.Post(). Resource("volumegroupsnapshotclasses"). VersionedParams(&opts, scheme.ParameterCodec). @@ -116,8 +116,8 @@ func (c *volumeGroupSnapshotClasses) Create(ctx context.Context, volumeGroupSnap } // Update takes the representation of a volumeGroupSnapshotClass and updates it. Returns the server's representation of the volumeGroupSnapshotClass, and an error, if there is any. -func (c *volumeGroupSnapshotClasses) Update(ctx context.Context, volumeGroupSnapshotClass *v1beta1.VolumeGroupSnapshotClass, opts v1.UpdateOptions) (result *v1beta1.VolumeGroupSnapshotClass, err error) { - result = &v1beta1.VolumeGroupSnapshotClass{} +func (c *volumeGroupSnapshotClasses) Update(ctx context.Context, volumeGroupSnapshotClass *v1beta2.VolumeGroupSnapshotClass, opts v1.UpdateOptions) (result *v1beta2.VolumeGroupSnapshotClass, err error) { + result = &v1beta2.VolumeGroupSnapshotClass{} err = c.client.Put(). Resource("volumegroupsnapshotclasses"). Name(volumeGroupSnapshotClass.Name). @@ -154,8 +154,8 @@ func (c *volumeGroupSnapshotClasses) DeleteCollection(ctx context.Context, opts } // Patch applies the patch and returns the patched volumeGroupSnapshotClass. -func (c *volumeGroupSnapshotClasses) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.VolumeGroupSnapshotClass, err error) { - result = &v1beta1.VolumeGroupSnapshotClass{} +func (c *volumeGroupSnapshotClasses) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta2.VolumeGroupSnapshotClass, err error) { + result = &v1beta2.VolumeGroupSnapshotClass{} err = c.client.Patch(pt). Resource("volumegroupsnapshotclasses"). Name(name). diff --git a/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/volumegroupsnapshotcontent.go b/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/volumegroupsnapshotcontent.go similarity index 79% rename from e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/volumegroupsnapshotcontent.go rename to e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/volumegroupsnapshotcontent.go index eafada58954..3168991fc5e 100644 --- a/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1/volumegroupsnapshotcontent.go +++ b/e2e/vendor/github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2/volumegroupsnapshotcontent.go @@ -1,5 +1,5 @@ /* -Copyright 2024 The Kubernetes Authors. +Copyright 2025 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ limitations under the License. // Code generated by client-gen. DO NOT EDIT. -package v1beta1 +package v1beta2 import ( "context" "time" - v1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta1" + v1beta2 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" scheme "github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -38,15 +38,15 @@ type VolumeGroupSnapshotContentsGetter interface { // VolumeGroupSnapshotContentInterface has methods to work with VolumeGroupSnapshotContent resources. type VolumeGroupSnapshotContentInterface interface { - Create(ctx context.Context, volumeGroupSnapshotContent *v1beta1.VolumeGroupSnapshotContent, opts v1.CreateOptions) (*v1beta1.VolumeGroupSnapshotContent, error) - Update(ctx context.Context, volumeGroupSnapshotContent *v1beta1.VolumeGroupSnapshotContent, opts v1.UpdateOptions) (*v1beta1.VolumeGroupSnapshotContent, error) - UpdateStatus(ctx context.Context, volumeGroupSnapshotContent *v1beta1.VolumeGroupSnapshotContent, opts v1.UpdateOptions) (*v1beta1.VolumeGroupSnapshotContent, error) + Create(ctx context.Context, volumeGroupSnapshotContent *v1beta2.VolumeGroupSnapshotContent, opts v1.CreateOptions) (*v1beta2.VolumeGroupSnapshotContent, error) + Update(ctx context.Context, volumeGroupSnapshotContent *v1beta2.VolumeGroupSnapshotContent, opts v1.UpdateOptions) (*v1beta2.VolumeGroupSnapshotContent, error) + UpdateStatus(ctx context.Context, volumeGroupSnapshotContent *v1beta2.VolumeGroupSnapshotContent, opts v1.UpdateOptions) (*v1beta2.VolumeGroupSnapshotContent, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1beta1.VolumeGroupSnapshotContent, error) - List(ctx context.Context, opts v1.ListOptions) (*v1beta1.VolumeGroupSnapshotContentList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*v1beta2.VolumeGroupSnapshotContent, error) + List(ctx context.Context, opts v1.ListOptions) (*v1beta2.VolumeGroupSnapshotContentList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.VolumeGroupSnapshotContent, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta2.VolumeGroupSnapshotContent, err error) VolumeGroupSnapshotContentExpansion } @@ -56,15 +56,15 @@ type volumeGroupSnapshotContents struct { } // newVolumeGroupSnapshotContents returns a VolumeGroupSnapshotContents -func newVolumeGroupSnapshotContents(c *GroupsnapshotV1beta1Client) *volumeGroupSnapshotContents { +func newVolumeGroupSnapshotContents(c *GroupsnapshotV1beta2Client) *volumeGroupSnapshotContents { return &volumeGroupSnapshotContents{ client: c.RESTClient(), } } // Get takes name of the volumeGroupSnapshotContent, and returns the corresponding volumeGroupSnapshotContent object, and an error if there is any. -func (c *volumeGroupSnapshotContents) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.VolumeGroupSnapshotContent, err error) { - result = &v1beta1.VolumeGroupSnapshotContent{} +func (c *volumeGroupSnapshotContents) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta2.VolumeGroupSnapshotContent, err error) { + result = &v1beta2.VolumeGroupSnapshotContent{} err = c.client.Get(). Resource("volumegroupsnapshotcontents"). Name(name). @@ -75,12 +75,12 @@ func (c *volumeGroupSnapshotContents) Get(ctx context.Context, name string, opti } // List takes label and field selectors, and returns the list of VolumeGroupSnapshotContents that match those selectors. -func (c *volumeGroupSnapshotContents) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.VolumeGroupSnapshotContentList, err error) { +func (c *volumeGroupSnapshotContents) List(ctx context.Context, opts v1.ListOptions) (result *v1beta2.VolumeGroupSnapshotContentList, err error) { var timeout time.Duration if opts.TimeoutSeconds != nil { timeout = time.Duration(*opts.TimeoutSeconds) * time.Second } - result = &v1beta1.VolumeGroupSnapshotContentList{} + result = &v1beta2.VolumeGroupSnapshotContentList{} err = c.client.Get(). Resource("volumegroupsnapshotcontents"). VersionedParams(&opts, scheme.ParameterCodec). @@ -105,8 +105,8 @@ func (c *volumeGroupSnapshotContents) Watch(ctx context.Context, opts v1.ListOpt } // Create takes the representation of a volumeGroupSnapshotContent and creates it. Returns the server's representation of the volumeGroupSnapshotContent, and an error, if there is any. -func (c *volumeGroupSnapshotContents) Create(ctx context.Context, volumeGroupSnapshotContent *v1beta1.VolumeGroupSnapshotContent, opts v1.CreateOptions) (result *v1beta1.VolumeGroupSnapshotContent, err error) { - result = &v1beta1.VolumeGroupSnapshotContent{} +func (c *volumeGroupSnapshotContents) Create(ctx context.Context, volumeGroupSnapshotContent *v1beta2.VolumeGroupSnapshotContent, opts v1.CreateOptions) (result *v1beta2.VolumeGroupSnapshotContent, err error) { + result = &v1beta2.VolumeGroupSnapshotContent{} err = c.client.Post(). Resource("volumegroupsnapshotcontents"). VersionedParams(&opts, scheme.ParameterCodec). @@ -117,8 +117,8 @@ func (c *volumeGroupSnapshotContents) Create(ctx context.Context, volumeGroupSna } // Update takes the representation of a volumeGroupSnapshotContent and updates it. Returns the server's representation of the volumeGroupSnapshotContent, and an error, if there is any. -func (c *volumeGroupSnapshotContents) Update(ctx context.Context, volumeGroupSnapshotContent *v1beta1.VolumeGroupSnapshotContent, opts v1.UpdateOptions) (result *v1beta1.VolumeGroupSnapshotContent, err error) { - result = &v1beta1.VolumeGroupSnapshotContent{} +func (c *volumeGroupSnapshotContents) Update(ctx context.Context, volumeGroupSnapshotContent *v1beta2.VolumeGroupSnapshotContent, opts v1.UpdateOptions) (result *v1beta2.VolumeGroupSnapshotContent, err error) { + result = &v1beta2.VolumeGroupSnapshotContent{} err = c.client.Put(). Resource("volumegroupsnapshotcontents"). Name(volumeGroupSnapshotContent.Name). @@ -131,8 +131,8 @@ func (c *volumeGroupSnapshotContents) Update(ctx context.Context, volumeGroupSna // UpdateStatus was generated because the type contains a Status member. // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *volumeGroupSnapshotContents) UpdateStatus(ctx context.Context, volumeGroupSnapshotContent *v1beta1.VolumeGroupSnapshotContent, opts v1.UpdateOptions) (result *v1beta1.VolumeGroupSnapshotContent, err error) { - result = &v1beta1.VolumeGroupSnapshotContent{} +func (c *volumeGroupSnapshotContents) UpdateStatus(ctx context.Context, volumeGroupSnapshotContent *v1beta2.VolumeGroupSnapshotContent, opts v1.UpdateOptions) (result *v1beta2.VolumeGroupSnapshotContent, err error) { + result = &v1beta2.VolumeGroupSnapshotContent{} err = c.client.Put(). Resource("volumegroupsnapshotcontents"). Name(volumeGroupSnapshotContent.Name). @@ -170,8 +170,8 @@ func (c *volumeGroupSnapshotContents) DeleteCollection(ctx context.Context, opts } // Patch applies the patch and returns the patched volumeGroupSnapshotContent. -func (c *volumeGroupSnapshotContents) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.VolumeGroupSnapshotContent, err error) { - result = &v1beta1.VolumeGroupSnapshotContent{} +func (c *volumeGroupSnapshotContents) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta2.VolumeGroupSnapshotContent, err error) { + result = &v1beta2.VolumeGroupSnapshotContent{} err = c.client.Patch(pt). Resource("volumegroupsnapshotcontents"). Name(name). diff --git a/e2e/vendor/modules.txt b/e2e/vendor/modules.txt index f657acb2629..84ed4e81b7d 100644 --- a/e2e/vendor/modules.txt +++ b/e2e/vendor/modules.txt @@ -157,7 +157,7 @@ github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapsho github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2 github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1 github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/scheme -github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1 +github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2 github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumesnapshot/v1 # github.com/kylelemons/godebug v1.1.0 ## explicit; go 1.11 diff --git a/e2e/volumegroupsnapshot.go b/e2e/volumegroupsnapshot.go index afcbe35350b..04038764ab3 100644 --- a/e2e/volumegroupsnapshot.go +++ b/e2e/volumegroupsnapshot.go @@ -21,7 +21,7 @@ import ( "crypto/sha256" "fmt" - groupsnapapi "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta1" + groupsnapapi "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/test/e2e/framework" ) @@ -88,17 +88,17 @@ func (c *cephFSVolumeGroupSnapshot) ValidateResourcesForCreate(vgs *groupsnapapi return fmt.Errorf("failed to get VolumeGroupSnapshotContent: %w", err) } - sourcePVCCount := len(vgsc.Status.VolumeSnapshotHandlePairList) + sourcePVCCount := len(vgsc.Status.VolumeSnapshotInfoList) // we are creating clones for each source PVC - clonePVCCount := len(vgsc.Status.VolumeSnapshotHandlePairList) + clonePVCCount := len(vgsc.Status.VolumeSnapshotInfoList) totalPVCCount := sourcePVCCount + clonePVCCount validateSubvolumeCount(c.framework, totalPVCCount, fileSystemName, subvolumegroup) // we are creating 1 snapshot for each source PVC, validate the snapshot count - for _, snapshot := range vgsc.Status.VolumeSnapshotHandlePairList { + for _, snapshot := range vgsc.Status.VolumeSnapshotInfoList { volumeHandle := snapshot.VolumeHandle volumeSnapshotName := fmt.Sprintf("snapshot-%x", sha256.Sum256([]byte( - string(vgsc.UID)+volumeHandle))) + string(vgs.UID)+volumeHandle))) volumeSnapshot, err := c.snapClient.VolumeSnapshots(vgs.Namespace).Get(ctx, volumeSnapshotName, metav1.GetOptions{}) if err != nil { return fmt.Errorf("failed to get VolumeSnapshot: %w", err) @@ -192,8 +192,8 @@ func (rvgs *rbdVolumeGroupSnapshot) ValidateResourcesForCreate(vgs *groupsnapapi return fmt.Errorf("failed to get VolumeGroupSnapshotContent: %w", err) } - sourcePVCCount := len(vgsc.Status.VolumeSnapshotHandlePairList) - clonePVCCount := len(vgsc.Status.VolumeSnapshotHandlePairList) + sourcePVCCount := len(vgsc.Status.VolumeSnapshotInfoList) + clonePVCCount := len(vgsc.Status.VolumeSnapshotInfoList) totalPVCCount := sourcePVCCount + clonePVCCount validateOmapCount(rvgs.framework, totalPVCCount, rbdType, defaultRBDPool, volumesType) diff --git a/e2e/volumegroupsnapshot_base.go b/e2e/volumegroupsnapshot_base.go index 8740d0c1e46..55ec95e3d83 100644 --- a/e2e/volumegroupsnapshot_base.go +++ b/e2e/volumegroupsnapshot_base.go @@ -22,9 +22,9 @@ import ( "fmt" "time" - groupsnapapi "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta1" + groupsnapapi "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1beta2" snapapi "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1" - groupsnapclient "github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta1" + groupsnapclient "github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumegroupsnapshot/v1beta2" snapclient "github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned/typed/volumesnapshot/v1" v1 "k8s.io/api/core/v1" apierrs "k8s.io/apimachinery/pkg/api/errors" @@ -77,7 +77,7 @@ type VolumeGroupSnapshotter interface { type volumeGroupSnapshotterBase struct { timeout int framework *framework.Framework - groupclient *groupsnapclient.GroupsnapshotV1beta1Client + groupclient *groupsnapclient.GroupsnapshotV1beta2Client snapClient *snapclient.SnapshotV1Client storageClassName string blockPVC bool @@ -180,11 +180,11 @@ func (v *volumeGroupSnapshotterBase) CreatePVCClones( } namespace := vgs.Namespace ctx := context.TODO() - pvcs := make([]*v1.PersistentVolumeClaim, len(groupSnapshotContent.Status.VolumeSnapshotHandlePairList)) - for i, snapshot := range groupSnapshotContent.Status.VolumeSnapshotHandlePairList { + pvcs := make([]*v1.PersistentVolumeClaim, len(groupSnapshotContent.Status.VolumeSnapshotInfoList)) + for i, snapshot := range groupSnapshotContent.Status.VolumeSnapshotInfoList { volumeHandle := snapshot.VolumeHandle volumeSnapshotName := fmt.Sprintf("snapshot-%x", sha256.Sum256([]byte( - string(groupSnapshotContent.UID)+volumeHandle))) + string(vgs.UID)+volumeHandle))) volumeSnapshot, err := v.snapClient.VolumeSnapshots(namespace).Get(ctx, volumeSnapshotName, metav1.GetOptions{}) if err != nil { return nil, fmt.Errorf("failed to get VolumeSnapshot: %w", err) diff --git a/examples/cephfs/groupsnapshot.yaml b/examples/cephfs/groupsnapshot.yaml index e2d25f85711..634dd9677e9 100644 --- a/examples/cephfs/groupsnapshot.yaml +++ b/examples/cephfs/groupsnapshot.yaml @@ -1,5 +1,5 @@ --- -apiVersion: groupsnapshot.storage.k8s.io/v1beta1 +apiVersion: groupsnapshot.storage.k8s.io/v1beta2 kind: VolumeGroupSnapshot metadata: name: new-groupsnapshot-demo-1 diff --git a/examples/cephfs/groupsnapshotclass.yaml b/examples/cephfs/groupsnapshotclass.yaml index 88958e73d89..3cd95f65f6b 100644 --- a/examples/cephfs/groupsnapshotclass.yaml +++ b/examples/cephfs/groupsnapshotclass.yaml @@ -1,5 +1,5 @@ --- -apiVersion: groupsnapshot.storage.k8s.io/v1beta1 +apiVersion: groupsnapshot.storage.k8s.io/v1beta2 kind: VolumeGroupSnapshotClass metadata: name: csi-cephfsplugin-groupsnapclass diff --git a/examples/rbd/groupsnapshot.yaml b/examples/rbd/groupsnapshot.yaml index 7d957761ac9..8e483c27779 100644 --- a/examples/rbd/groupsnapshot.yaml +++ b/examples/rbd/groupsnapshot.yaml @@ -1,5 +1,5 @@ --- -apiVersion: groupsnapshot.storage.k8s.io/v1beta1 +apiVersion: groupsnapshot.storage.k8s.io/v1beta2 kind: VolumeGroupSnapshot metadata: name: rbd-groupsnapshot diff --git a/examples/rbd/groupsnapshotclass.yaml b/examples/rbd/groupsnapshotclass.yaml index d54d1c1b3c7..4e68653e0c7 100644 --- a/examples/rbd/groupsnapshotclass.yaml +++ b/examples/rbd/groupsnapshotclass.yaml @@ -1,5 +1,5 @@ --- -apiVersion: groupsnapshot.storage.k8s.io/v1beta1 +apiVersion: groupsnapshot.storage.k8s.io/v1beta2 kind: VolumeGroupSnapshotClass metadata: name: csi-rbdplugin-groupsnapclass diff --git a/scripts/k8s-storage/driver-cephfs.yaml b/scripts/k8s-storage/driver-cephfs.yaml index 5a93d80a4ca..9aa4b931f52 100644 --- a/scripts/k8s-storage/driver-cephfs.yaml +++ b/scripts/k8s-storage/driver-cephfs.yaml @@ -1,5 +1,8 @@ --- ShortName: cephcsi-cephfs-test +Timeouts: + ClaimProvision: 10m + StorageClass: FromExistingClassName: k8s-storage-e2e-cephfs # FromFile: sc-cephfs.yaml diff --git a/scripts/k8s-storage/driver-rbd.yaml b/scripts/k8s-storage/driver-rbd.yaml index 3b74027eb67..5eb5a0ae5ee 100644 --- a/scripts/k8s-storage/driver-rbd.yaml +++ b/scripts/k8s-storage/driver-rbd.yaml @@ -1,5 +1,8 @@ --- ShortName: cephcsi-rbd-test +Timeouts: + ClaimProvision: 10m + StorageClass: FromExistingClassName: k8s-storage-e2e-rbd # FromFile: sc-rbd.yaml