feat: add feature flag for inline volume support

kubernetes-csi · Jan 13, 2025 · 0e4e10c · 0e4e10c
1 parent 8105a9d
commit 0e4e10c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 2 deletions.
diff --git a/charts/latest/csi-driver-smb-v0.0.0.tgz b/charts/latest/csi-driver-smb-v0.0.0.tgz
diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-driver.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-driver.yaml
@@ -8,4 +8,6 @@ spec:
   podInfoOnMount: true
   volumeLifecycleModes:
     - Persistent
+    {{- if .Values.feature.enableInlineVolume }}
     - Ephemeral
+    {{- end }}
diff --git a/charts/latest/csi-driver-smb/templates/rbac-csi-smb.yaml b/charts/latest/csi-driver-smb/templates/rbac-csi-smb.yaml
@@ -98,6 +98,7 @@ roleRef:
   name: {{ .Values.rbac.name }}-external-resizer-role
   apiGroup: rbac.authorization.k8s.io
 ---
+{{- if .Values.feature.enableInlineVolume }}
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -107,7 +108,6 @@ rules:
   - apiGroups: [""]
     resources: ["secrets"]
     verbs: ["get"]
-
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
@@ -122,4 +122,5 @@ roleRef:
   kind: ClusterRole
   name: csi-{{ .Values.rbac.name }}-node-secret-role
   apiGroup: rbac.authorization.k8s.io
+{{- end }}
 {{ end }}
diff --git a/charts/latest/csi-driver-smb/values.yaml b/charts/latest/csi-driver-smb/values.yaml
@@ -39,6 +39,7 @@ driver:
 
 feature:
   enableGetVolumeStats: true
+  enableInlineVolume: true
 
 controller:
   name: csi-smb-controller

diff --git a/test/e2e/dynamic_provisioning_test.go b/test/e2e/dynamic_provisioning_test.go
@@ -535,6 +535,12 @@ var _ = ginkgo.Describe("Dynamic Provisioning", func() {
 	})
 
 	ginkgo.It("should create an CSI inline volume", func(ctx ginkgo.SpecContext) {
+		secretName := "smbcreds"
+		ginkgo.By(fmt.Sprintf("creating secret %s in namespace %s", secretName, ns.Name))
+		tsecret := testsuites.CopyTestSecret(ctx, cs, "default", ns, defaultSmbSecretName)
+		tsecret.Create(ctx)
+		defer tsecret.Cleanup(ctx)
+
 		pods := []testsuites.PodDetails{
 			{
 				Cmd: convertToPowershellCommandIfNecessary("echo 'hello world' > /mnt/test-1/data && grep 'hello world' /mnt/test-1/data"),

diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
@@ -50,6 +50,7 @@ const (
 	defaultSmbSource             = "//smb-server.default.svc.cluster.local/share"
 	defaultSmbSecretName         = "smbcreds"
 	defaultSmbSecretNamespace    = "default"
+	accountNameForTest           = "YW5keXNzZGZpbGUK"
 )
 
 var (
@@ -173,7 +174,7 @@ var _ = ginkgo.BeforeSuite(func() {
 	}
 
 	if isWindowsHostProcessDeployment {
-		decodedBytes, err := base64.StdEncoding.DecodeString("YW5keXNzZGZpbGUK")
+		decodedBytes, err := base64.StdEncoding.DecodeString(accountNameForTest)
 		if err != nil {
 			log.Printf("Error decoding base64 string: %v\n", err)
 			return

diff --git a/test/e2e/testsuites/testsuites.go b/test/e2e/testsuites/testsuites.go
@@ -717,6 +717,17 @@ func NewTestSecret(c clientset.Interface, ns *v1.Namespace, name string, data ma
 	}
 }
 
+func CopyTestSecret(ctx context.Context, c clientset.Interface, sourceNamespace string, targetNamespace *v1.Namespace, secretName string) *TestSecret {
+	secret, err := c.CoreV1().Secrets(sourceNamespace).Get(ctx, secretName, metav1.GetOptions{})
+	framework.ExpectNoError(err)
+
+	return &TestSecret{
+		client:    c,
+		namespace: targetNamespace,
+		secret:    secret,
+	}
+}
+
 func (t *TestSecret) Create(ctx context.Context) {
 	var err error
 	t.secret, err = t.client.CoreV1().Secrets(t.namespace.Name).Create(ctx, t.secret, metav1.CreateOptions{})