CLOUDP-85517: no connection secrets in db user status (#184)

Author: Anton

config/crd/bases/atlas.mongodb.com_atlasdatabaseusers.yaml

@@ -185,13 +185,6 @@ spec:
                   - type
                   type: object
                 type: array
-              connectionSecrets:
-                additionalProperties:
-                  type: string
-                description: ConnectionSecrets defines all the Secrets for the current
-                  database user that were created by the Atlas Operator and which
-                  provide the Atlas clusters connectivity information
-                type: object
               name:
                 description: UserName is the current name of database user.
                 type: string

pkg/api/v1/status/atlasdatabaseuser.go

@@ -5,12 +5,6 @@ package status
 // AtlasDatabaseUserStatusOption is the option that is applied to Atlas Project Status
 type AtlasDatabaseUserStatusOption func(s *AtlasDatabaseUserStatus)
 
-func AtlasDatabaseUserSecretsOption(clusters2Secrets map[string]string) AtlasDatabaseUserStatusOption {
-	return func(s *AtlasDatabaseUserStatus) {
-		s.ConnectionSecrets = clusters2Secrets
-	}
-}
-
 func AtlasDatabaseUserPasswordVersion(passwordVersion string) AtlasDatabaseUserStatusOption {
 	return func(s *AtlasDatabaseUserStatus) {
 		s.PasswordVersion = passwordVersion
@@ -26,10 +20,6 @@ func AtlasDatabaseUserNameOption(name string) AtlasDatabaseUserStatusOption {
 type AtlasDatabaseUserStatus struct {
 	Common `json:",inline"`
 
-	// ConnectionSecrets defines all the Secrets for the current database user that were created by the Atlas Operator
-	// and which provide the Atlas clusters connectivity information
-	ConnectionSecrets map[string]string `json:"connectionSecrets,omitempty"`
-
 	// PasswordVersion is the 'ResourceVersion' of the password Secret that the Atlas Operator is aware of
 	PasswordVersion string `json:"passwordVersion,omitempty"`
 

pkg/controller/atlasdatabaseuser/connectionsecrets.go

@@ -7,7 +7,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1"
-	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status"
 	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret"
 	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow"
 	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/stringutil"
@@ -20,7 +19,6 @@ func createOrUpdateConnectionSecrets(ctx *workflow.Context, k8sClient client.Cli
 		return workflow.Terminate(workflow.DatabaseUserConnectionSecretsNotCreated, err.Error())
 	}
 
-	secretNames := make(map[string]string)
 	requeue := false
 	for _, cluster := range clusters {
 		scopes := dbUser.GetScopes(mdbv1.ClusterScopeType)
@@ -56,14 +54,12 @@ func createOrUpdateConnectionSecrets(ctx *workflow.Context, k8sClient client.Cli
 			return workflow.Terminate(workflow.DatabaseUserConnectionSecretsNotCreated, err.Error())
 		}
 		ctx.Log.Debugw("Ensured connection Secret up-to-date", "secretname", secretName)
-		secretNames[cluster.Name] = secretName
 	}
 
 	if err := cleanupStaleSecrets(ctx, k8sClient, project.ID(), dbUser); err != nil {
 		return workflow.Terminate(workflow.DatabaseUserStaleConnectionSecrets, err.Error())
 	}
 
-	ctx.EnsureStatusOption(status.AtlasDatabaseUserSecretsOption(secretNames))
 	if requeue {
 		return workflow.InProgress(workflow.DatabaseUserConnectionSecretsNotCreated, "Waiting for clusters to get created/updated")
 	}

test/int/dbuser_test.go

@@ -185,12 +185,6 @@ var _ = Describe("AtlasDatabaseUser", func() {
 					validateSecret(k8sClient, *createdProject, *createdClusterGCP, *createdDBUser)
 					validateSecret(k8sClient, *createdProject, *createdClusterAWS, *createdDBUser)
 					checkNumberOfConnectionSecrets(k8sClient, *createdProject, 2)
-
-					expectedSecretsInStatus := map[string]string{
-						"test-cluster-aws": connSecretname("-test-cluster-aws-test-db-user"),
-						"test-cluster-gcp": connSecretname("-test-cluster-gcp-test-db-user"),
-					}
-					Expect(createdDBUser.Status.ConnectionSecrets).To(Equal(expectedSecretsInStatus))
 				})
 				By("Checking connectivity to Clusters", func() {
 					// The user created lacks read/write roles
@@ -218,12 +212,6 @@ var _ = Describe("AtlasDatabaseUser", func() {
 					validateSecret(k8sClient, *createdProject, *createdClusterGCP, *createdDBUser)
 					validateSecret(k8sClient, *createdProject, *createdClusterAWS, *createdDBUser)
 					checkNumberOfConnectionSecrets(k8sClient, *createdProject, 2)
-
-					expectedSecretsInStatus := map[string]string{
-						"test-cluster-aws": connSecretname("-test-cluster-aws-test-db-user"),
-						"test-cluster-gcp": connSecretname("-test-cluster-gcp-test-db-user"),
-					}
-					Expect(createdDBUser.Status.ConnectionSecrets).To(Equal(expectedSecretsInStatus))
 				})
 
 				By("Checking write permissions for Clusters", func() {
@@ -271,8 +259,6 @@ var _ = Describe("AtlasDatabaseUser", func() {
 					validateSecret(k8sClient, *createdProject, *createdClusterAWS, *createdDBUser)
 					validateSecret(k8sClient, *createdProject, *createdClusterGCP, *secondDBUser)
 					checkNumberOfConnectionSecrets(k8sClient, *createdProject, 3)
-					expectedSecretsInStatus := map[string]string{"test-cluster-gcp": connSecretname("-test-cluster-gcp-second-db-user")}
-					Expect(secondDBUser.Status.ConnectionSecrets).To(Equal(expectedSecretsInStatus))
 				})
 
 				By("Checking write permissions for Clusters", func() {
@@ -323,7 +309,6 @@ var _ = Describe("AtlasDatabaseUser", func() {
 
 				checkUserInAtlas(*createdDBUser)
 				checkNumberOfConnectionSecrets(k8sClient, *createdProject, 0)
-				Expect(createdDBUser.Status.ConnectionSecrets).To(BeEmpty())
 			})
 			By("Creating cluster", func() {
 				createdClusterAWS = mdbv1.DefaultAWSCluster(namespace.Name, createdProject.Name)
@@ -346,8 +331,6 @@ var _ = Describe("AtlasDatabaseUser", func() {
 				By("Checking connection Secrets", func() {
 					validateSecret(k8sClient, *createdProject, *createdClusterAWS, *createdDBUser)
 					checkNumberOfConnectionSecrets(k8sClient, *createdProject, 1)
-					expectedSecretsInStatus := map[string]string{"test-cluster-aws": connSecretname("-test-cluster-aws-test-db-user")}
-					Expect(createdDBUser.Status.ConnectionSecrets).To(Equal(expectedSecretsInStatus))
 				})
 			})
 		})