Merge branch 'main' into CLOUDP-188104/deployment-resource-tagging

mongodb · Aug 10, 2023 · 0ca9968 · 0ca9968
2 parents 05aa2d3 + 7b4825e
commit 0ca9968
Show file tree

Hide file tree

Showing 38 changed files with 3,979 additions and 277 deletions.
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -154,7 +154,8 @@ jobs:
             "custom-roles",
             "teams",
             "backup-config",
-            "data-federation"
+            "data-federation",
+            "deletion-protection"
           ]
     steps:
       - name: Get repo files from cache
@@ -229,6 +230,7 @@ jobs:
           AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           GCP_SA_CRED: ${{ secrets.GCP_SA_CRED_NEW_TEST }}
           DATADOG_KEY: ${{ secrets.DATADOG_KEY }}
+          PAGER_DUTY_SERVICE_KEY: ${{ secrets.PAGER_DUTY_SERVICE_KEY }}
         run: |
           helm version
           go version

diff --git a/Makefile b/Makefile
@@ -129,7 +129,7 @@ run: generate fmt vet manifests ## Run against the configured Kubernetes cluster
 	OPERATOR_POD_NAME=$(OPERATOR_POD_NAME) \
 	OPERATOR_NAMESPACE=$(OPERATOR_NAMESPACE) \
 	go run ./cmd/manager/main.go --atlas-domain=$(ATLAS_DOMAIN) \
-	--global-api-secret-name=$(ATLAS_KEY_SECRET_NAME)
+	--global-api-secret-name=$(ATLAS_KEY_SECRET_NAME) --log-level=debug
 
 .PHONY: install
 install: manifests kustomize ## Install CRDs from a cluster

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -54,8 +54,6 @@ import (
 )
 
 const (
-	objectDeletionProtectionFlag       = "object-deletion-protection"
-	subobjectDeletionProtectionFlag    = "subobject-deletion-protection"
 	objectDeletionProtectionDefault    = false
 	subobjectDeletionProtectionDefault = false
 
@@ -136,14 +134,16 @@ func main() {
 	}
 
 	if err = (&atlasdeployment.AtlasDeploymentReconciler{
-		Client:           mgr.GetClient(),
-		Log:              logger.Named("controllers").Named("AtlasDeployment").Sugar(),
-		Scheme:           mgr.GetScheme(),
-		AtlasDomain:      config.AtlasDomain,
-		GlobalAPISecret:  config.GlobalAPISecret,
-		ResourceWatcher:  watch.NewResourceWatcher(),
-		GlobalPredicates: globalPredicates,
-		EventRecorder:    mgr.GetEventRecorderFor("AtlasDeployment"),
+		Client:                      mgr.GetClient(),
+		Log:                         logger.Named("controllers").Named("AtlasDeployment").Sugar(),
+		Scheme:                      mgr.GetScheme(),
+		AtlasDomain:                 config.AtlasDomain,
+		GlobalAPISecret:             config.GlobalAPISecret,
+		ResourceWatcher:             watch.NewResourceWatcher(),
+		GlobalPredicates:            globalPredicates,
+		EventRecorder:               mgr.GetEventRecorderFor("AtlasDeployment"),
+		ObjectDeletionProtection:    config.ObjectDeletionProtection,
+		SubObjectDeletionProtection: config.SubObjectDeletionProtection,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "AtlasDeployment")
 		os.Exit(1)

diff --git a/go.mod b/go.mod
@@ -42,6 +42,7 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1 // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
+	github.com/benbjohnson/clock v1.3.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/google/s2a-go v0.1.4 // indirect

diff --git a/go.sum b/go.sum
@@ -96,6 +96,7 @@ github.com/aws/aws-sdk-go v1.44.318 h1:Yl66rpbQHFUbxe9JBKLcvOvRivhVgP6+zH0b9KzAR
 github.com/aws/aws-sdk-go v1.44.318/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
+github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

diff --git a/pkg/api/v1/atlasdeployment_types.go b/pkg/api/v1/atlasdeployment_types.go
@@ -229,6 +229,13 @@ func (s *ServerlessSpec) ServerlessToAtlas() (*mongodbatlas.Cluster, error) {
 	return result, err
 }
 
+// ToAtlas converts the ServerlessSpec to native Atlas client Cluster format.
+func (s *ServerlessSpec) ToAtlas() (*mongodbatlas.Cluster, error) {
+	result := &mongodbatlas.Cluster{}
+	err := compat.JSONCopy(result, s)
+	return result, err
+}
+
 // BiConnector specifies BI Connector for Atlas configuration on this deployment.
 type BiConnector struct {
 	Enabled        *bool  `json:"enabled,omitempty"`

diff --git a/pkg/api/v1/zz_generated.deepcopy.go b/pkg/api/v1/zz_generated.deepcopy.go
diff --git a/pkg/controller/atlas/api_error.go b/pkg/controller/atlas/api_error.go
@@ -17,6 +17,13 @@ const (
 	// Error indicates that the cluster doesn't exist
 	ClusterNotFound = "CLUSTER_NOT_FOUND"
 
+	// ServerlessClusterNotFound indicates that the serverless cluster doesn't exist
+	ServerlessInstanceNotFound = "SERVERLESS_INSTANCE_NOT_FOUND"
+
+	// ServerlessClusterFromClusterAPI indicates that we are trying to access
+	// a serverless instance from the cluster API, which is not allowed
+	ServerlessInstanceFromClusterAPI = "CANNOT_USE_SERVERLESS_INSTANCE_IN_CLUSTER_API"
+
 	// Resource not found
 	ResourceNotFound = "RESOURCE_NOT_FOUND"
 )