Merge pull request #2532 from andyzhangx/add-extra-create-metadata-sn…

…apshot feat: add extra-create-metadata=true on snapshot sidecar
kubernetes-sigs · Sep 21, 2024 · ec99ab6 · ec99ab6
2 parents 44acb93 + 0044ec7
commit ec99ab6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/charts/latest/azuredisk-csi-driver-v0.0.0.tgz b/charts/latest/azuredisk-csi-driver-v0.0.0.tgz
diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -129,6 +129,7 @@ spec:
             - "--leader-election-namespace={{ .Release.Namespace }}"
             - "-v=2"
             - "--timeout=1200s"
+            - "--extra-create-metadata=true"
           env:
             - name: ADDRESS
               value: /csi/csi.sock

diff --git a/deploy/csi-azuredisk-controller.yaml b/deploy/csi-azuredisk-controller.yaml
@@ -98,6 +98,7 @@ spec:
             - "--leader-election-namespace=kube-system"
             - "--v=2"
             - "--timeout=1200s"
+            - "--extra-create-metadata=true"
           env:
             - name: ADDRESS
               value: /csi/csi.sock

diff --git a/pkg/azureconstants/azure_constants.go b/pkg/azureconstants/azure_constants.go
@@ -56,6 +56,9 @@ const (
 	PvcNamespaceTag                   = "kubernetes.io-created-for-pvc-namespace"
 	PvcNameTag                        = "kubernetes.io-created-for-pvc-name"
 	PvNameKey                         = "csi.storage.k8s.io/pv/name"
+	VolumeSnapshotNameKey             = "csi.storage.k8s.io/volumesnapshot/name"
+	VolumeSnapshotNamespaceKey        = "csi.storage.k8s.io/volumesnapshot/namespace"
+	VolumeSnapshotContentNameKey      = "csi.storage.k8s.io/volumesnapshotcontent/name"
 	PvNameTag                         = "kubernetes.io-created-for-pv-name"
 	RateLimited                       = "rate limited"
 	RequestedSizeGib                  = "requestedsizegib"

diff --git a/pkg/azuredisk/controllerserver.go b/pkg/azuredisk/controllerserver.go
@@ -1012,6 +1012,12 @@ func (d *Driver) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshotRequ
 			dataAccessAuthMode = v
 		case consts.TagValueDelimiterField:
 			tagValueDelimiter = v
+		case consts.VolumeSnapshotNameKey:
+			// ignore the key
+		case consts.VolumeSnapshotNamespaceKey:
+			// ignore the key
+		case consts.VolumeSnapshotContentNameKey:
+			// ignore the key
 		default:
 			return nil, status.Errorf(codes.Internal, "AzureDisk - invalid option %s in VolumeSnapshotClass", k)
 		}