CLOUDP-94119: Do not mark the CR as failed on secret absence, it could be deleted at later stage after when scram is set (#622)

Author: irajdeep

api/v1/mongodbcommunity_types.go

@@ -558,10 +558,6 @@ func (m MongoDBCommunity) NamespacedName() types.NamespacedName {
 	return types.NamespacedName{Name: m.Name, Namespace: m.Namespace}
 }
 
-func (m MongoDBCommunity) GetAgentScramCredentialsNamespacedName() types.NamespacedName {
-	return types.NamespacedName{Name: fmt.Sprintf("%s-agent-scram-credentials", m.Name), Namespace: m.Namespace}
-}
-
 func (m MongoDBCommunity) DesiredReplicas() int {
 	return m.Spec.Members
 }

controllers/mongodb_users.go

@@ -16,7 +16,15 @@ func (r ReplicaSetReconciler) ensureUserResources(mdb mdbv1.MongoDBCommunity) er
 		secretNamespacedName := types.NamespacedName{Name: user.PasswordSecretName, Namespace: mdb.Namespace}
 		if _, err := secret.ReadKey(r.client, user.PasswordSecretKey, secretNamespacedName); err != nil {
 			if apiErrors.IsNotFound(err) {
-				return fmt.Errorf(`user password secret "%s" not found: %s`, secretNamespacedName, err)
+				// check for SCRAM secret as well
+
+				scramSecretName := types.NamespacedName{Name: user.ScramCredentialsSecretName, Namespace: mdb.Namespace}
+				_, err = r.client.GetSecret(scramSecretName)
+				if apiErrors.IsNotFound(err) {
+					return fmt.Errorf(`user password secret: %s and scram secret: %s not found`, secretNamespacedName, scramSecretName)
+				}
+				r.log.Errorf(`user password secret "%s" not found: %s`, secretNamespacedName, err)
+				continue
 			}
 			return err
 		}