fixup integrations

Author: josvazg

internal/controller/atlas/provider.go

@@ -162,9 +162,18 @@ func (p *ProductionProvider) SdkClientSet(ctx context.Context, creds *Credential
 		return nil, err
 	}
 
+	clientv20241113002, err := adminv20250312002.NewClient(
+		adminv20250312002.UseBaseURL(p.domain),
+		adminv20250312002.UseHTTPClient(httpClient),
+		adminv20250312002.UseUserAgent(operatorUserAgent()))
+	if err != nil {
+		return nil, err
+	}
+
 	return &ClientSet{
 		SdkClient20231115008: clientv20231115008,
 		SdkClient20241113001: clientv20241113001,
+		SdkClient20250312002: clientv20241113002,
 	}, nil
 }
 

internal/controller/atlasthirdpartyintegrations/handler.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"fmt"
 
+	"go.uber.org/zap"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -45,11 +46,22 @@ type reconcileRequest struct {
 	Service   thirdpartyintegration.ThirdPartyIntegrationService
 }
 
-func NewAtlasThirdPartyIntegrationsReconciler() *ctrlstate.Reconciler[akov2next.AtlasThirdPartyIntegration] {
-	return ctrlstate.NewStateReconciler(&AtlasThirdPartyIntegrationHandler{})
+func NewAtlasThirdPartyIntegrationsReconciler(
+	atlasProvider atlas.Provider,
+	logger *zap.Logger,
+	globalSecretRef client.ObjectKey,
+) *ctrlstate.Reconciler[akov2next.AtlasThirdPartyIntegration] {
+	return ctrlstate.NewStateReconciler(&AtlasThirdPartyIntegrationHandler{
+		AtlasReconciler: reconciler.AtlasReconciler{
+			AtlasProvider:   atlasProvider,
+			Log:             logger.Named("controllers").Named("AtlasThirdPartyIntegration").Sugar(),
+			GlobalSecretRef: globalSecretRef,
+		},
+	})
 }
 
 func (h *AtlasThirdPartyIntegrationHandler) SetupWithManager(mgr ctrl.Manager, rec reconcile.Reconciler) error {
+	// TODO indexers wiring
 	h.Client = mgr.GetClient()
 	obj := &akov2next.AtlasThirdPartyIntegration{}
 	return internalbuilder.NewDefaultSetupWithManager(mgr, rec, obj)
@@ -118,26 +130,28 @@ func (h *AtlasThirdPartyIntegrationHandler) populateIntegration(ctx context.Cont
 
 func fetchIntegrationSecrets(ctx context.Context, kubeClient client.Client, integration *akov2next.AtlasThirdPartyIntegration) (map[string][]byte, error) {
 	ks := secret.NewKubernetesSecretProvider(kubeClient)
+	secretName := ""
 	switch integration.Spec.Type {
 	case "DATADOG":
-		return ks.Fetch(ctx, integration.Spec.Datadog.APIKeySecret.Name)
+		secretName = integration.Spec.Datadog.APIKeySecret.Name
 	case "MICROSOFT_TEAMS":
-		return ks.Fetch(ctx, integration.Spec.MicrosoftTeams.URLSecret.Name)
+		secretName = integration.Spec.MicrosoftTeams.URLSecret.Name
 	case "NEW_RELIC":
-		return ks.Fetch(ctx, integration.Spec.NewRelic.CredentialsSecret.Name)
+		secretName = integration.Spec.NewRelic.CredentialsSecret.Name
 	case "OPS_GENIE":
-		return ks.Fetch(ctx, integration.Spec.OpsGenie.APIKeySecret.Name)
+		secretName = integration.Spec.OpsGenie.APIKeySecret.Name
 	case "PAGER_DUTY":
-		return ks.Fetch(ctx, integration.Spec.PagerDuty.ServiceKeySecret.Name)
+		secretName = integration.Spec.PagerDuty.ServiceKeySecret.Name
 	case "PROMETHEUS":
-		return ks.Fetch(ctx, integration.Spec.Prometheus.PrometheusCredentialsSecret.Name)
+		secretName = integration.Spec.Prometheus.PrometheusCredentialsSecret.Name
 	case "SLACK":
-		return ks.Fetch(ctx, integration.Spec.Slack.APITokenSecret.Name)
+		secretName = integration.Spec.Slack.APITokenSecret.Name
 	case "VICTOR_OPS":
-		return ks.Fetch(ctx, integration.Spec.VictorOps.APIKeySecret.Name)
+		secretName = integration.Spec.VictorOps.APIKeySecret.Name
 	case "WEBHOOK":
-		return ks.Fetch(ctx, integration.Spec.Webhook.URLSecret.Name)
+		secretName = integration.Spec.Webhook.URLSecret.Name
 	default:
 		return nil, fmt.Errorf("%w %v", thirdpartyintegration.ErrUnsupportedIntegrationType, integration.Spec.Type)
 	}
+	return ks.Fetch(ctx, secretName, integration.Namespace)
 }

internal/next-crds/atlas.nextapi.mongodb.com_atlasthirdpartyintegrations.yaml

@@ -409,8 +409,11 @@ spec:
                 description: ID of the third party integration resource in Atlas
                 type: string
               observedGeneration:
-                description: ObservedGeneration tracks the generation the status value
-                  was derived from
+                description: |-
+                  ObservedGeneration indicates the generation of the resource specification
+                  that the Atlas Operator is aware of.
+                  The Atlas Operator updates this field to the 'metadata.generation' as
+                  soon as it starts reconciliation of the resource.
                 format: int64
                 type: integer
             required:

internal/nextapi/v1/status/atlasthirdpartyintegration.go

@@ -14,6 +14,8 @@
 
 package status
 
+// +k8s:deepcopy-gen=true
+
 // AtlasThirdPartyIntegrationStatus holds the status of an integration
 type AtlasThirdPartyIntegrationStatus struct {
 	UnifiedStatus `json:",inline"`

internal/nextapi/v1/status/unifiedstatus.go

@@ -1,14 +1,33 @@
+// Copyright 2025 MongoDB.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package status
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// UnifiedStatus
+// +k8s:deepcopy-gen=true
+
+// UnifiedStatus is shared by CRDs with Unified State Machine support
 type UnifiedStatus struct {
 	// Conditions holding the status details
 	Conditions []metav1.Condition `json:"conditions"`
 
-	// ObservedGeneration tracks the generation the status value was derived from
+	// ObservedGeneration indicates the generation of the resource specification
+	// that the Atlas Operator is aware of.
+	// The Atlas Operator updates this field to the 'metadata.generation' as
+	// soon as it starts reconciliation of the resource.
 	ObservedGeneration int64 `json:"observedGeneration"`
 }

internal/nextapi/v1/status/zz_generated.deepcopy.go

@@ -38,7 +38,7 @@ func NewFromSpec(crd *akov2next.AtlasThirdPartyIntegration, secrets map[string][
 	switch tpi.Type {
 	case "DATADOG":
 		tpi.DatadogSecrets = &DatadogSecrets{
-			APIKey: string(secrets["apikey"]),
+			APIKey: string(secrets["apiKey"]),
 		}
 	case "MICROSOFT_TEAMS":
 		tpi.MicrosoftTeamsSecrets = &MicrosoftTeamsSecrets{
@@ -53,7 +53,7 @@ func NewFromSpec(crd *akov2next.AtlasThirdPartyIntegration, secrets map[string][
 		}
 	case "OPS_GENIE":
 		tpi.OpsGenieSecrets = &OpsGenieSecrets{
-			APIKey: string(secrets["apikey"]),
+			APIKey: string(secrets["apiKey"]),
 		}
 	case "PAGER_DUTY":
 		tpi.PagerDutySecrets = &PagerDutySecrets{
@@ -70,7 +70,7 @@ func NewFromSpec(crd *akov2next.AtlasThirdPartyIntegration, secrets map[string][
 		}
 	case "VICTOR_OPS":
 		tpi.VictorOpsSecrets = &VictorOpsSecrets{
-			APIKey: string(secrets["apikey"]),
+			APIKey: string(secrets["apiKey"]),
 		}
 	case "WEBHOOK":
 		tpi.WebhookSecrets = &WebhookSecrets{

internal/translation/thirdpartyintegration/conversion.go

@@ -25,7 +25,7 @@ import (
 type Secret map[string][]byte
 
 type SecretProvider interface {
-	Fetch(ctx context.Context, name string) (Secret, error)
+	Fetch(ctx context.Context, name, namespace string) (Secret, error)
 }
 
 type kubernetesSecrets struct {
@@ -36,9 +36,9 @@ func NewKubernetesSecretProvider(c client.Client) SecretProvider {
 	return &kubernetesSecrets{client: c}
 }
 
-func (ks *kubernetesSecrets) Fetch(ctx context.Context, secretName string) (Secret, error) {
+func (ks *kubernetesSecrets) Fetch(ctx context.Context, secretName, namespace string) (Secret, error) {
 	secret := v1.Secret{}
-	err := ks.client.Get(ctx, client.ObjectKey{Name: secretName}, &secret)
+	err := ks.client.Get(ctx, client.ObjectKey{Name: secretName, Namespace: namespace}, &secret)
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch secret %q: %w", secretName, err)
 	}

pkg/secret/secret.go

@@ -46,7 +46,7 @@ func TestKubernetesSecretProvider(t *testing.T) {
 		WithObjects(&testSecret).Build()
 	ctx := context.TODO()
 
-	fetched, err := secret.NewKubernetesSecretProvider(fakeClient).Fetch(ctx, testSecret.Name)
+	fetched, err := secret.NewKubernetesSecretProvider(fakeClient).Fetch(ctx, testSecret.Name, testSecret.Namespace)
 	require.NoError(t, err)
 	assert.Equal(t, want, fetched)
 }