MLE-17367 E2E Test for TLS (#45)

* update test to accept cli flags

* Added Named Cert E2E Test

* add ednode for TLS

* update the README according to review

* fixed test failure

* fix test failuire

* fix test failure

---------

Co-authored-by: Peng Zhou <[email protected]>

Author: pengzhouml

Makefile

@@ -123,6 +123,7 @@ test: manifests generate fmt vet envtest ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test -v $$(go list ./... | grep -v /e2e) -coverprofile cover.out
 
 # Utilize minikube or modify the e2e tests to load the image locally, enabling compatibility with other vendors.
+# To run specific e2e test with label, try 	go test -v ./test/e2e -count=1 -args --labels="type=tls-multi-node"
 .PHONY: e2e-test  # Run the e2e tests against a minikube k8s instance that is spun up.
 e2e-test: 
 	@echo "=====Setting hugepages value to 1280 for hugepages-e2e test"

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/go-logr/logr v1.4.2
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
+	github.com/tidwall/gjson v1.17.3
 	k8s.io/api v0.31.1
 	k8s.io/apiextensions-apiserver v0.31.0
 	k8s.io/apimachinery v0.31.1
@@ -55,6 +56,8 @@ require (
 	github.com/prometheus/common v0.55.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/vladimirvivien/gexe v0.3.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	go.uber.org/multierr v1.11.0 // indirect

go.sum

@@ -116,6 +116,12 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tidwall/gjson v1.17.3 h1:bwWLZU7icoKRG+C+0PNwIKC6FCJO/Q3p2pZvuP0jN94=
+github.com/tidwall/gjson v1.17.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/vladimirvivien/gexe v0.3.0 h1:4xwiOwGrDob5OMR6E92B9olDXYDglXdHhzR1ggYtWJM=
 github.com/vladimirvivien/gexe v0.3.0/go.mod h1:fp7cy60ON1xjhtEI/+bfSEIXX35qgmI+iRYlGOqbBFM=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=

test/README.md

@@ -0,0 +1,21 @@
+# Test MarkLogic Kubernetes Operator with e2e-framework
+
+## How to run the test
+
+```
+make e2e-setup-minikube
+make e2e-test
+make e2e-delete-minikube
+```
+
+Each test is assigned a “type” label, allowing you to run only the tests of a specified type.
+
+For example, to run only the test for TLS named cert test:
+```
+go test -v ./test/e2e -count=1 -args --labels="type=tls-named-cert"
+```
+
+To run only the TLS self signed cert test:
+```
+go test -v ./test/e2e -count=1 -args --labels="type=tls-self-signed"
+```

test/e2e/2_marklogic_cluster_test.go

@@ -24,8 +24,9 @@ import (
 var verifyHugePages = flag.Bool("verifyHugePages", false, "Test hugePages configuration")
 
 const (
-	groupName   = "node"
-	mlNamespace = "default"
+	groupName       = "node"
+	mlNamespace     = "default"
+	mlContainerName = "marklogic-server"
 )
 
 var (
@@ -59,7 +60,7 @@ var (
 )
 
 func TestMarklogicCluster(t *testing.T) {
-	feature := features.New("MarklogicCluster Resource")
+	feature := features.New("Marklogic Cluster Test")
 
 	// Assessment for MarklogicCluster creation
 	feature.Setup(func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
@@ -97,7 +98,7 @@ func TestMarklogicCluster(t *testing.T) {
 		client := c.Client()
 
 		podName := "node-0"
-		err := utils.WaitForPod(ctx, t, client, mlNamespace, podName, 90*time.Second)
+		err := utils.WaitForPod(ctx, t, client, mlNamespace, podName, 120*time.Second)
 		if err != nil {
 			t.Fatalf("Failed to wait for pod creation: %v", err)
 		}

test/e2e/3_ml_cluster_ednode_test.go

@@ -117,12 +117,12 @@ func TestMlClusterWithEdnode(t *testing.T) {
 		client := c.Client()
 
 		podName := "dnode-0"
-		err := utils.WaitForPod(ctx, t, client, mlClusterNs, podName, 90*time.Second)
+		err := utils.WaitForPod(ctx, t, client, mlClusterNs, podName, 120*time.Second)
 		if err != nil {
 			t.Fatalf("Failed to wait for pod creation: %v", err)
 		}
 		epodName := "enode-0"
-		err = utils.WaitForPod(ctx, t, client, mlClusterNs, epodName, 150*time.Second)
+		err = utils.WaitForPod(ctx, t, client, mlClusterNs, epodName, 180*time.Second)
 		if err != nil {
 			t.Fatalf("Failed to wait for pod creation: %v", err)
 		}