fix: add labels of component when generating secret of tls (#7448)

apecloud · Jun 12, 2024 · e77f2aa · e77f2aa
1 parent 9f729eb
commit e77f2aa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/controllers/apps/transformer_component_tls_test.go b/controllers/apps/transformer_component_tls_test.go
@@ -200,6 +200,17 @@ var _ = Describe("TLS self-signed cert function", func() {
 				clusterObj.Spec.ComponentSpecs[0].Issuer = nil
 				Expect(k8sClient.Patch(ctx, clusterObj, patch)).Should(Succeed())
 				Eventually(hasTLSSettings).Should(BeFalse())
+
+				By("delete a cluster cleanly when tls enabled")
+				Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(clusterObj), clusterObj)).Should(Succeed())
+				patch = client.MergeFrom(clusterObj.DeepCopy())
+				clusterObj.Spec.ComponentSpecs[0].TLS = true
+				clusterObj.Spec.ComponentSpecs[0].Issuer = &appsv1alpha1.Issuer{Name: appsv1alpha1.IssuerKubeBlocks}
+				Expect(k8sClient.Patch(ctx, clusterObj, patch)).Should(Succeed())
+				Eventually(hasTLSSettings).Should(BeTrue())
+
+				testapps.DeleteObject(&testCtx, clusterKey, &appsv1alpha1.Cluster{})
+				Eventually(testapps.CheckObjExists(&testCtx, clusterKey, &appsv1alpha1.Cluster{}, false)).Should(Succeed())
 			})
 		})
 	})

diff --git a/pkg/controller/plan/tls_utils.go b/pkg/controller/plan/tls_utils.go
@@ -44,8 +44,9 @@ import (
 func ComposeTLSSecret(namespace, clusterName, componentName string) (*v1.Secret, error) {
 	name := GenerateTLSSecretName(clusterName, componentName)
 	secret := builder.NewSecretBuilder(namespace, name).
+		AddLabels(constant.AppManagedByLabelKey, constant.AppName).
 		AddLabels(constant.AppInstanceLabelKey, clusterName).
-		AddLabels(constant.KBManagedByKey, constant.AppName).
+		AddLabels(constant.KBAppComponentLabelKey, componentName).
 		SetStringData(map[string]string{}).
 		GetObject()
 

diff --git a/pkg/controller/plan/tls_utils_test.go b/pkg/controller/plan/tls_utils_test.go
@@ -50,7 +50,8 @@ var _ = Describe("TLSUtilsTest", func() {
 			Expect(secret.Name).Should(Equal(fmt.Sprintf("%s-%s-tls-certs", clusterName, componentName)))
 			Expect(secret.Labels).ShouldNot(BeNil())
 			Expect(secret.Labels[constant.AppInstanceLabelKey]).Should(Equal(clusterName))
-			Expect(secret.Labels[constant.KBManagedByKey]).Should(Equal(constant.AppName))
+			Expect(secret.Labels[constant.AppManagedByLabelKey]).Should(Equal(constant.AppName))
+			Expect(secret.Labels[constant.KBAppComponentLabelKey]).Should(Equal(componentName))
 			Expect(secret.StringData).ShouldNot(BeNil())
 			Expect(secret.StringData[constant.CAName]).ShouldNot(BeZero())
 			Expect(secret.StringData[constant.CertName]).ShouldNot(BeZero())