removed duplicate file and fix unit tests

vertica · Feb 5, 2025 · f5dc049 · f5dc049
1 parent b0d5610
commit f5dc049
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 144 deletions.
diff --git a/api/v1/verticadb_webhook.go b/api/v1/verticadb_webhook.go
@@ -671,7 +671,7 @@ func (v *VerticaDB) hasDuplicateScName(allErrs field.ErrorList) field.ErrorList
 }
 
 func (v *VerticaDB) hasValidClientServerTLSMode(allErrs field.ErrorList) field.ErrorList {
-	var tlsModes []string = []string{"prefer", "require", "verify_ca", "verify_full"}
+	tlsModes := []string{"enable", "disable", "try_verify", "verify_ca", "verify_full"}
 	if v.Spec.ClientServerTLSMode != "" {
 		TLSMode := strings.ToLower(v.Spec.ClientServerTLSMode)
 		validMode := false

diff --git a/pkg/controllers/vdb/nmaservercertgen_reconciler.go b/pkg/controllers/vdb/nmaservercertgen_reconciler.go
diff --git a/pkg/controllers/vdb/nmaservercertgen_reconciler_test.go b/pkg/controllers/vdb/nmaservercertgen_reconciler_test.go
@@ -40,7 +40,7 @@ var _ = Describe("httpservercertgen_reconcile", func() {
 		test.CreateVDB(ctx, k8sClient, vdb)
 		defer test.DeleteVDB(ctx, k8sClient, vdb)
 
-		r := MakeNMACertGenReconciler(vdbRec, logger, vdb)
+		r := MakeTLSServerCertGenReconciler(vdbRec, logger, vdb)
 		Expect(r.Reconcile(ctx, &ctrl.Request{})).Should(Equal(ctrl.Result{}))
 		Expect(vdb.Spec.NMATLSSecret).ShouldNot(Equal(""))
 	})
@@ -53,7 +53,7 @@ var _ = Describe("httpservercertgen_reconcile", func() {
 		test.CreateVDB(ctx, k8sClient, vdb)
 		defer test.DeleteVDB(ctx, k8sClient, vdb)
 
-		r := MakeNMACertGenReconciler(vdbRec, logger, vdb)
+		r := MakeTLSServerCertGenReconciler(vdbRec, logger, vdb)
 		Expect(r.Reconcile(ctx, &ctrl.Request{})).Should(Equal(ctrl.Result{}))
 		Expect(vdb.Spec.NMATLSSecret).Should(Equal(DummySecretName))
 	})
@@ -65,7 +65,7 @@ var _ = Describe("httpservercertgen_reconcile", func() {
 		test.CreateVDB(ctx, k8sClient, vdb)
 		defer test.DeleteVDB(ctx, k8sClient, vdb)
 
-		r := MakeNMACertGenReconciler(vdbRec, logger, vdb)
+		r := MakeTLSServerCertGenReconciler(vdbRec, logger, vdb)
 		Expect(r.Reconcile(ctx, &ctrl.Request{})).Should(Equal(ctrl.Result{}))
 		Expect(vdb.Spec.NMATLSSecret).ShouldNot(Equal(""))
 		nm := types.NamespacedName{Namespace: vdb.Namespace, Name: vdb.Spec.NMATLSSecret}
@@ -89,7 +89,7 @@ var _ = Describe("httpservercertgen_reconcile", func() {
 		err := k8sClient.Get(ctx, nm, secret)
 		Expect(errors.IsNotFound(err)).Should(BeTrue())
 
-		r := MakeNMACertGenReconciler(vdbRec, logger, vdb)
+		r := MakeTLSServerCertGenReconciler(vdbRec, logger, vdb)
 		Expect(r.Reconcile(ctx, &ctrl.Request{})).Should(Equal(ctrl.Result{}))
 		Expect(vdb.Spec.NMATLSSecret).Should(Equal(TLSSecretName))
 		Expect(k8sClient.Get(ctx, nm, secret)).Should(Succeed())

diff --git a/pkg/controllers/vdb/tlsservercertgen_reconciler.go b/pkg/controllers/vdb/tlsservercertgen_reconciler.go
@@ -109,7 +109,7 @@ func (h *TLSServerCertGenReconciler) reconcileOneSecret(secretFieldName, secretN
 	if err != nil {
 		return ctrl.Result{}, err
 	}
-	h.Log.Info("created certificate and secret for %s", secret.Name)
+	h.Log.Info("created certificate and secret for " + secret.Name)
 	return ctrl.Result{}, h.setSecretNameInVDB(ctx, secretFieldName, secret.ObjectMeta.Name)
 }