Merge pull request #519 from Rakshith-R/worktree-audience-flag

Add --audience flag to snapshot-metadata sidecar container

Author: Madhu-1

docs/features/rbd-snapshot-metadata.md

@@ -124,7 +124,7 @@ Users need to perform the following manual setup:
 
    > **Note:**
    > - `address`: Should point to the service created in step 2, replace `<service-name>`, `<driver-namespace>`, and `<service-port>` with your actual values from step 2
-   > - `audience`: Recommended to use the CSI driver name for consistency
+   > - `audience`: Must be set to your RBD driver name (e.g., `rbd.csi.ceph.com`) as configured in the Driver CR name (step 5)
    > - `caCert`: Base64-encoded CA certificate bundle
 
 ## Ceph-CSI Operator Responsibilities

internal/controller/driver_controller.go

@@ -975,6 +975,7 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error {
 											utils.CsiAddressContainerArg,
 											utils.SnapshotMetadataTlsCertArg,
 											utils.SnapshotMetadataTlsKeyArg,
+											utils.SnapshotMetadataAudienceArg(r.driver.Name),
 										},
 									),
 									Ports: []corev1.ContainerPort{

internal/utils/csi.go

@@ -409,6 +409,10 @@ var SnapshotMetadataGrpcServicePortArg = fmt.Sprintf("--port=%d", SnapshotMetada
 var SnapshotMetadataTlsCertArg = "--tls-cert=/tmp/certificates/tls.crt"
 var SnapshotMetadataTlsKeyArg = "--tls-key=/tmp/certificates/tls.key"
 
+func SnapshotMetadataAudienceArg(driverName string) string {
+	return fmt.Sprintf("--audience=%s", driverName)
+}
+
 func LogVerbosityContainerArg(level int) string {
 	return fmt.Sprintf("--v=%d", Clamp(level, 0, 5))
 }

internal/utils/csi_test.go

@@ -0,0 +1,49 @@
+/*
+Copyright 2026.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package utils
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSnapshotMetadataAudienceArg(t *testing.T) {
+	tests := []struct {
+		name       string
+		driverName string
+		expected   string
+	}{
+		{
+			name:       "rbd driver",
+			driverName: "rbd.csi.ceph.com",
+			expected:   "--audience=rbd.csi.ceph.com",
+		},
+		{
+			name:       "prefixed rbd driver",
+			driverName: "myprefix.rbd.csi.ceph.com",
+			expected:   "--audience=myprefix.rbd.csi.ceph.com",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := SnapshotMetadataAudienceArg(tt.driverName)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}