From d74a0d47d6c72c6d1045613be8e8e0d243ae1a4b Mon Sep 17 00:00:00 2001 From: Praveen M Date: Mon, 9 Mar 2026 14:59:50 +0530 Subject: [PATCH 1/2] Update SnapshotMetadataService CRD API version from v1alpha1 to v1beta1 Align e2e tests with upstream external-snapshot-metadata change (kubernetes-csi/external-snapshot-metadata#215) which promotes the SnapshotMetadataService API to v1beta1. Signed-off-by: Praveen M --- test/e2e/feature/feature.go | 2 +- test/e2e/storage/utils/snapshot-metadata.go | 2 +- .../cbt.storage.k8s.io_snapshotmetadataservices.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/feature/feature.go b/test/e2e/feature/feature.go index 6d4b3f41b4a..c389280c14b 100644 --- a/test/e2e/feature/feature.go +++ b/test/e2e/feature/feature.go @@ -409,7 +409,7 @@ var ( // Tests marked with this feature require: // - A CSI driver that supports the snapshot metadata service (e.g., CSI hostpath driver with --enable-snapshot-metadata) // - The external-snapshot-metadata sidecar deployed alongside the CSI driver - // - The SnapshotMetadataService CRD (cbt.storage.k8s.io/v1alpha1) installed + // - The SnapshotMetadataService CRD (cbt.storage.k8s.io/v1beta1) installed // - A storage driver that implements the CapSnapshotMetadata capability SnapshotMetadata = framework.WithFeature(framework.ValidFeatures.Add("SnapshotMetadata")) diff --git a/test/e2e/storage/utils/snapshot-metadata.go b/test/e2e/storage/utils/snapshot-metadata.go index 83698af3d6c..a272044e7ec 100644 --- a/test/e2e/storage/utils/snapshot-metadata.go +++ b/test/e2e/storage/utils/snapshot-metadata.go @@ -51,7 +51,7 @@ const ( // SnapshotMetadataService API constants SnapshotMetadataServiceGroup = "cbt.storage.k8s.io" - SnapshotMetadataServiceVersion = "v1alpha1" + SnapshotMetadataServiceVersion = "v1beta1" SnapshotMetadataServiceAPIVersion = SnapshotMetadataServiceGroup + "/" + SnapshotMetadataServiceVersion SnapshotMetadataServiceKind = "SnapshotMetadataService" SnapshotMetadataServiceResource = "snapshotmetadataservices" diff --git a/test/e2e/testing-manifests/storage-csi/external-snapshot-metadata/cbt.storage.k8s.io_snapshotmetadataservices.yaml b/test/e2e/testing-manifests/storage-csi/external-snapshot-metadata/cbt.storage.k8s.io_snapshotmetadataservices.yaml index 31178d7a84b..de75d40132c 100644 --- a/test/e2e/testing-manifests/storage-csi/external-snapshot-metadata/cbt.storage.k8s.io_snapshotmetadataservices.yaml +++ b/test/e2e/testing-manifests/storage-csi/external-snapshot-metadata/cbt.storage.k8s.io_snapshotmetadataservices.yaml @@ -17,7 +17,7 @@ spec: singular: snapshotmetadataservice scope: Cluster versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: |- From 81380fd39905fcb997313727d9de5298ef88111e Mon Sep 17 00:00:00 2001 From: Praveen M Date: Mon, 9 Mar 2026 15:12:07 +0530 Subject: [PATCH 2/2] Fix SnapshotMetadata feature label to match test-infra filter Change the feature label from "SnapshotMetadata" to "snapshotmetadata" so it matches the [Feature:snapshotmetadata] filter used in test-infra, which was causing the e2e tests to be skipped. --- test/e2e/feature/feature.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/feature/feature.go b/test/e2e/feature/feature.go index c389280c14b..0a84c05ec39 100644 --- a/test/e2e/feature/feature.go +++ b/test/e2e/feature/feature.go @@ -411,7 +411,7 @@ var ( // - The external-snapshot-metadata sidecar deployed alongside the CSI driver // - The SnapshotMetadataService CRD (cbt.storage.k8s.io/v1beta1) installed // - A storage driver that implements the CapSnapshotMetadata capability - SnapshotMetadata = framework.WithFeature(framework.ValidFeatures.Add("SnapshotMetadata")) + SnapshotMetadata = framework.WithFeature(framework.ValidFeatures.Add("snapshotmetadata")) // TODO: document the feature (owning SIG, when to use this feature for a test) StackdriverAcceleratorMonitoring = framework.WithFeature(framework.ValidFeatures.Add("StackdriverAcceleratorMonitoring"))