CLOUDP-132091: Add TLS and arbiters to operator upgrade test (#1103)

Author: mircea-cosbuc

.action_templates/jobs/tests.yaml

@@ -56,3 +56,5 @@ tests:
           distro: ubi
         - test-name: replica_set_mongod_port_change_with_arbiters
           distro: ubi
+        - test-name: replica_set_operator_upgrade
+          distro: ubi

.github/workflows/e2e-fork.yml

@@ -138,6 +138,8 @@ jobs:
           distro: ubi
         - test-name: replica_set_mongod_port_change_with_arbiters
           distro: ubi
+        - test-name: replica_set_operator_upgrade
+          distro: ubi
     steps:
     # template: .action_templates/steps/cancel-previous.yaml
     - name: Cancel Previous Runs

.github/workflows/e2e.yml

@@ -144,6 +144,8 @@ jobs:
           distro: ubi
         - test-name: replica_set_mongod_port_change_with_arbiters
           distro: ubi
+        - test-name: replica_set_operator_upgrade
+          distro: ubi
     steps:
     # template: .action_templates/steps/cancel-previous.yaml
     - name: Cancel Previous Runs

api/v1/mongodbcommunity_types.go

@@ -505,8 +505,9 @@ type TLS struct {
 
 // LocalObjectReference is a reference to another Kubernetes object by name.
 // TODO: Replace with a type from the K8s API. CoreV1 has an equivalent
-// 	"LocalObjectReference" type but it contains a TODO in its
-// 	description that we don't want in our CRD.
+//
+//	"LocalObjectReference" type but it contains a TODO in its
+//	description that we don't want in our CRD.
 type LocalObjectReference struct {
 	Name string `json:"name"`
 }

cmd/readiness/main.go

@@ -99,7 +99,7 @@ func hasDeadlockedSteps(health health.Status) bool {
 // there and find the last step which has "Started" non nil
 // (indeed this is not the perfect logic as sometimes the agent doesn't update the 'Started' as well - see
 // 'health-status-ok.json', but seems it works for finding deadlocks still
-//noinspection GoNilness
+// noinspection GoNilness
 func findCurrentStep(processStatuses map[string]health.MmsDirectorStatus) *health.StepStatus {
 	var currentPlan *health.PlanStatus
 	if len(processStatuses) == 0 {

test/e2e/replica_set_operator_upgrade/replica_set_operator_upgrade_test.go

@@ -21,13 +21,18 @@ func TestMain(m *testing.M) {
 }
 
 func TestReplicaSetOperatorUpgrade(t *testing.T) {
-	ctx := setup.SetupWithDefaultOperator(t)
+	resourceName := "mdb0"
+	testConfig := setup.LoadTestConfigFromEnv()
+	ctx := setup.SetupWithTestConfig(t, testConfig, true, true, resourceName)
 	defer ctx.Teardown()
 
-	mdb, user := e2eutil.NewTestMongoDB(ctx, "mdb0", "")
+	mdb, user := e2eutil.NewTestMongoDB(ctx, resourceName, testConfig.Namespace)
 	scramUser := mdb.GetScramUsers()[0]
+	mdb.Spec.Security.TLS = e2eutil.NewTestTLSConfig(false)
+	mdb.Spec.Arbiters = 1
+	mdb.Spec.Members = 2
 
-	_, err := setup.GeneratePasswordForUser(ctx, user, "")
+	_, err := setup.GeneratePasswordForUser(ctx, user, testConfig.Namespace)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -39,19 +44,22 @@ func TestReplicaSetOperatorUpgrade(t *testing.T) {
 
 	t.Run("Create MongoDB Resource", mongodbtests.CreateMongoDBResource(&mdb, ctx))
 	t.Run("Basic tests", mongodbtests.BasicFunctionality(&mdb, true))
-	t.Run("Keyfile authentication is configured", tester.HasKeyfileAuth(3))
-	t.Run("Test Basic Connectivity", tester.ConnectivitySucceeds())
-	t.Run("Test SRV Connectivity", tester.ConnectivitySucceeds(WithURI(mdb.MongoSRVURI("")), WithoutTls(), WithReplicaSet(mdb.Name)))
-	t.Run("Test Basic Connectivity with generated connection string secret",
-		tester.ConnectivitySucceeds(WithURI(mongodbtests.GetConnectionStringForUser(mdb, scramUser))))
-	t.Run("Test SRV Connectivity with generated connection string secret",
-		tester.ConnectivitySucceeds(WithURI(mongodbtests.GetSrvConnectionStringForUser(mdb, scramUser))))
-	t.Run("Ensure Authentication", tester.EnsureAuthenticationIsConfigured(3))
 	t.Run("AutomationConfig has the correct version", mongodbtests.AutomationConfigVersionHasTheExpectedVersion(&mdb, 1))
+	mongodbtests.SkipTestIfLocal(t, "Ensure MongoDB TLS Configuration", func(t *testing.T) {
+		t.Run("Has TLS Mode", tester.HasTlsMode("requireSSL", 60, WithTls(mdb)))
+		t.Run("Basic Connectivity Succeeds", tester.ConnectivitySucceeds(WithTls(mdb)))
+		t.Run("SRV Connectivity Succeeds", tester.ConnectivitySucceeds(WithURI(mdb.MongoSRVURI("")), WithTls(mdb)))
+		t.Run("Basic Connectivity With Generated Connection String Secret Succeeds",
+			tester.ConnectivitySucceeds(WithURI(mongodbtests.GetConnectionStringForUser(mdb, scramUser)), WithTls(mdb)))
+		t.Run("SRV Connectivity With Generated Connection String Secret Succeeds",
+			tester.ConnectivitySucceeds(WithURI(mongodbtests.GetSrvConnectionStringForUser(mdb, scramUser)), WithTls(mdb)))
+		t.Run("Connectivity Fails", tester.ConnectivityFails(WithoutTls()))
+		t.Run("Ensure authentication is configured", tester.EnsureAuthenticationIsConfigured(3, WithTls(mdb)))
+	})
 
 	// upgrade the operator to master
 	config := setup.LoadTestConfigFromEnv()
-	err = setup.DeployOperator(config, "mdb", false, false)
+	err = setup.DeployOperator(config, resourceName, true, false)
 	assert.NoError(t, err)
 
 	// Perform the basic tests
@@ -71,7 +79,7 @@ func TestReplicaSetOperatorUpgradeFrom0_7_2(t *testing.T) {
 	testConfig.ReadinessProbeImage = "quay.io/mongodb/mongodb-kubernetes-readinessprobe:1.0.6"
 	testConfig.AgentImage = "quay.io/mongodb/mongodb-agent:11.0.5.6963-1"
 
-	ctx := setup.SetupWithTestConfig(t, testConfig, true, resourceName)
+	ctx := setup.SetupWithTestConfig(t, testConfig, true, false, resourceName)
 	defer ctx.Teardown()
 
 	mdb, user := e2eutil.NewTestMongoDB(ctx, resourceName, "")

test/e2e/setup/setup.go

@@ -36,19 +36,6 @@ const (
 	Pem               tlsSecretType = "PEM"
 )
 
-func SetupWithDefaultOperator(t *testing.T) *e2eutil.Context {
-	ctx, err := e2eutil.NewContext(t, envvar.ReadBool(performCleanupEnv))
-
-	if err != nil {
-		t.Fatal(err)
-	}
-	config := LoadTestConfigFromEnv()
-	if err := DeployOperator(config, "mdb", false, true); err != nil {
-		t.Fatal(err)
-	}
-	return ctx
-}
-
 func Setup(t *testing.T) *e2eutil.Context {
 	ctx, err := e2eutil.NewContext(t, envvar.ReadBool(performCleanupEnv))
 
@@ -83,7 +70,7 @@ func SetupWithTLS(t *testing.T, resourceName string) (*e2eutil.Context, TestConf
 	return ctx, config
 }
 
-func SetupWithTestConfig(t *testing.T, testConfig TestConfig, withTLS bool, resourceName string) *e2eutil.Context {
+func SetupWithTestConfig(t *testing.T, testConfig TestConfig, withTLS, defaultOperator bool, resourceName string) *e2eutil.Context {
 	ctx, err := e2eutil.NewContext(t, envvar.ReadBool(performCleanupEnv))
 
 	if err != nil {
@@ -96,7 +83,7 @@ func SetupWithTestConfig(t *testing.T, testConfig TestConfig, withTLS bool, reso
 		}
 	}
 
-	if err := DeployOperator(testConfig, resourceName, withTLS, false); err != nil {
+	if err := DeployOperator(testConfig, resourceName, withTLS, defaultOperator); err != nil {
 		t.Fatal(err)
 	}