fix(tidb): unexpectedly use secret for sem config (#6573)

Author: liubog2008

pkg/controllers/tidb/tasks/pod.go

@@ -200,8 +200,10 @@ func newPod(cluster *v1alpha1.Cluster, tidb *v1alpha1.TiDB, g features.Gates) *c
 		vols = append(vols, corev1.Volume{
 			Name: v1alpha1.VolumeNameSEM,
 			VolumeSource: corev1.VolumeSource{
-				Secret: &corev1.SecretVolumeSource{
-					SecretName: coreutil.SEMConfigMapName(tidb),
+				ConfigMap: &corev1.ConfigMapVolumeSource{
+					LocalObjectReference: corev1.LocalObjectReference{
+						Name: coreutil.SEMConfigMapName(tidb),
+					},
 				},
 			},
 		})

tests/e2e/data/cluster.go

@@ -25,6 +25,7 @@ import (
 
 const (
 	BootstrapSQLName = "bootstrap-sql"
+	SEMConfigName    = "sem-config"
 )
 
 func NewCluster(namespace string, patches ...ClusterPatch) *v1alpha1.Cluster {

tests/e2e/data/tidb.go

@@ -213,3 +213,70 @@ graceful-wait-before-shutdown = 20
 		}
 	})
 }
+
+func WithSEMConfig() GroupPatch[*v1alpha1.TiDBGroup] {
+	return GroupPatchFunc[*v1alpha1.TiDBGroup](func(obj *v1alpha1.TiDBGroup) {
+		if obj.Spec.Template.Spec.Security == nil {
+			obj.Spec.Template.Spec.Security = &v1alpha1.TiDBSecurity{}
+		}
+		sec := obj.Spec.Template.Spec.Security
+		if sec.SEM == nil {
+			sec.SEM = &v1alpha1.SEM{}
+		}
+		sec.SEM.Config.Name = SEMConfigName
+	})
+}
+
+// SEMConfig returns a simple sem config for test
+func SEMConfig() string {
+	return `
+{
+    "verison": "1",
+    "tidb_version": "8.0",
+    "restricted_databases": [
+        "metrics_schema"
+    ],
+    "restricted_tables" : [
+        {
+            "schema": "mysql",
+            "name": "expr_pushdown_blacklist"
+        },
+        {
+            "schema": "mysql",
+            "name": "gc_delete_range"
+        },
+        {
+            "schema": "mysql",
+            "name": "gc_delete_range_done"
+        },
+        {
+            "schema": "mysql",
+            "name": "opt_rule_blacklist"
+        },
+        {
+            "schema": "mysql",
+            "name": "tidb"
+        },
+        {
+            "schema": "mysql",
+            "name": "global_variables"
+        },
+    ],
+    "restricted_variables" : [
+        {
+            "name": "hostname",
+            "restriction-type": "replace",
+            "readonly": true,
+            "value": "localhost"
+        },
+    ],
+    "restricted_status" : [
+       {
+           "name": "tidb_gc_leader_desc",
+           "restriction-type": "hidden"
+       }
+    ],
+    "restricted_static_privileges_col" : ["File_priv","Shutdown_priv"]
+}
+`
+}

tests/e2e/framework/framework.go

@@ -230,6 +230,26 @@ func (f *Framework) SetupBootstrapSQL(sql string) {
 	})
 }
 
+func (f *Framework) SetupSEMConfig(cfg string) {
+	ginkgo.BeforeEach(func(ctx context.Context) {
+		cm := &corev1.ConfigMap{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      data.SEMConfigName,
+				Namespace: f.Namespace.Name,
+			},
+			Data: map[string]string{
+				v1alpha1.FileNameSEMConfig: cfg,
+			},
+		}
+		ginkgo.By("Creating a sem configmap")
+		f.Must(f.Client.Create(ctx, cm))
+		ginkgo.DeferCleanup(func(ctx context.Context) {
+			ginkgo.By("Delete the sem configmap")
+			f.Must(f.Client.Delete(ctx, cm))
+		})
+	})
+}
+
 func (*Framework) Must(err error) {
 	gomega.ExpectWithOffset(1, err).To(gomega.Succeed())
 }

tests/e2e/label/well_known.go

@@ -53,6 +53,14 @@ var (
 	FeatureHotReload    = ginkgo.Label("f:HotReload")
 	FeaturePDMS         = ginkgo.Label("f:PDMS")
 
+	// Config
+	ConfigSEM          = ginkgo.Label("cfg:SEM")
+	ConfigTLS          = ginkgo.Label("cfg:TLS")
+	ConfigAuthToken    = ginkgo.Label("cfg:AuthToken")
+	ConfigBootstrapSQL = ginkgo.Label("cfg:BootstrapSQL")
+	ConfigHotReload    = ginkgo.Label("cfg:HotReload")
+	ConfigPDMS         = ginkgo.Label("cfg:PDMS")
+
 	// Mode
 	ModeDisaggregatedTiFlash = ginkgo.Label("m:DisaggregatedTiFlash")
 

tests/e2e/tidb/tidb.go

@@ -104,6 +104,21 @@ GRANT ALL PRIVILEGES ON *.* TO '%s'@'%s';`, sub, iss, email, sub, "%")
 		})
 	})
 
+	ginkgo.Context("SEMConfig", label.P1, label.ConfigSEM, func() {
+		f.SetupSEMConfig(data.SEMConfig())
+		f.SetupCluster()
+
+		ginkgo.It("should create the TiDB cluster with sem config", func(ctx context.Context) {
+			pdg := f.MustCreatePD(ctx)
+			kvg := f.MustCreateTiKV(ctx)
+			dbg := f.MustCreateTiDB(ctx, data.WithSEMConfig())
+
+			f.WaitForPDGroupReady(ctx, pdg)
+			f.WaitForTiKVGroupReady(ctx, kvg)
+			f.WaitForTiDBGroupReady(ctx, dbg)
+		})
+	})
+
 	ginkgo.Context("Scale and Update", label.P0, func() {
 		ginkgo.It("support scale TiDB from 1 to 4", label.Scale, func(ctx context.Context) {
 			pdg := f.MustCreatePD(ctx)