fix integrations status

Signed-off-by: jose.vazquez <[email protected]>

Author: josvazg

internal/cmd/nextako/main.go

@@ -108,6 +108,7 @@ func setupControllerRuntimeLogger() error {
 }
 
 func startAKO(akoPath string) (*exec.Cmd, error) {
+	//nolint:gosec
 	cmd := exec.Command(akoPath, os.Args[1:]...)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr

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

@@ -8,13 +8,24 @@ metadata:
 spec:
   group: atlas.nextapi.mongodb.com
   names:
+    categories:
+    - atlas
     kind: AtlasThirdPartyIntegration
     listKind: AtlasThirdPartyIntegrationList
     plural: atlasthirdpartyintegrations
+    shortNames:
+    - atpi
     singular: atlasthirdpartyintegration
   scope: Namespaced
   versions:
-  - name: v1
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=="Ready")].status
+      name: Ready
+      type: string
+    - jsonPath: .status.id
+      name: Id
+      type: string
+    name: v1
     schema:
       openAPIV3Schema:
         description: AtlasThirdPartyIntegration is the Schema for the atlas 3rd party
@@ -352,28 +363,56 @@ spec:
                 description: Conditions is the list of statuses showing the current
                   state of the Atlas Custom Resource
                 items:
-                  description: Condition describes the state of an Atlas Custom Resource
-                    at a certain point.
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
                   properties:
                     lastTransitionTime:
-                      description: Last time the condition transitioned from one status
-                        to another.
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
                       format: date-time
                       type: string
                     message:
-                      description: A human readable message indicating details about
-                        the transition.
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
                       type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
                     reason:
-                      description: The reason for the condition's last transition.
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
                       type: string
                     status:
-                      description: Status of the condition, one of True, False, Unknown.
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
                       type: string
                     type:
-                      description: Type of Atlas Custom Resource condition.
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string
                   required:
+                  - lastTransitionTime
+                  - message
+                  - reason
                   - status
                   - type
                   type: object

internal/nextapi/v1/atlasthirdpartyintegration_types.go

@@ -20,16 +20,21 @@ import (
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api"
 	akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/nextapi/v1/status"
+	ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
 )
 
 func init() {
 	SchemeBuilder.Register(&AtlasThirdPartyIntegration{}, &AtlasThirdPartyIntegrationList{})
 }
 
+// AtlasThirdPartyIntegration is the Schema for the atlas 3rd party inegrations API.
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:object:root=true
+// +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].status`
+// +kubebuilder:printcolumn:name="Id",type=string,JSONPath=`.status.id`
 // +kubebuilder:subresource:status
-
-// AtlasThirdPartyIntegration is the Schema for the atlas 3rd party inegrations API.
+// +groupName:=atlas.mongodb.com
+// +kubebuilder:resource:categories=atlas,shortName=atpi
 type AtlasThirdPartyIntegration struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -38,19 +43,27 @@ type AtlasThirdPartyIntegration struct {
 	Status status.AtlasThirdPartyIntegrationStatus `json:"status,omitempty"`
 }
 
-func (in *AtlasThirdPartyIntegration) GetStatus() api.Status {
-	return in.Status
-}
+// func (tpi *AtlasThirdPartyIntegration) GetStatus() api.Status {
+// 	return tpi.Status
+// }
+
+// func (tpi *AtlasThirdPartyIntegration) UpdateStatus(conditions []metav1.Condition, _ ...api.Option) {
+// 	tpi.Status.Conditions = conditions
+// 	tpi.Status.ObservedGeneration = tpi.ObjectMeta.Generation
+// }
 
-func (b *AtlasThirdPartyIntegration) UpdateStatus(conditions []api.Condition, _ ...api.Option) {
-	b.Status.Conditions = conditions
-	b.Status.ObservedGeneration = b.ObjectMeta.Generation
+func (tpi *AtlasThirdPartyIntegration) Credentials() *api.LocalObjectReference {
+	return tpi.Spec.ConnectionSecret
 }
 
-func (np *AtlasThirdPartyIntegration) Credentials() *api.LocalObjectReference {
-	return np.Spec.ConnectionSecret
+func (tpi *AtlasThirdPartyIntegration) GetStatusObject() ctrlstate.StatusObject {
+	return &tpi.Status
 }
 
+// func (tpi *AtlasThirdPartyIntegration) GetConditions() []metav1.Condition {
+// 	return tpi.Status.GetConditions()
+// }
+
 // +k8s:deepcopy-gen=true
 
 // AtlasThirdPartyIntegrationSpec contains the expected configuration for an integration

internal/nextapi/v1/atlasthirdpartyintegration_types_test.go

@@ -204,7 +204,7 @@ func TestIntegrationCELChecks(t *testing.T) {
 			unstructuredObject, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&tc.obj)
 			require.NoError(t, err)
 
-			crdPath := "../../next-crds/nextapi.mongodb.com_atlasthirdpartyintegrations.yaml"
+			crdPath := "../../next-crds/atlas.nextapi.mongodb.com_atlasthirdpartyintegrations.yaml"
 			validator, err := cel.VersionValidatorFromFile(t, crdPath, "v1")
 			assert.NoError(t, err)
 			errs := validator(unstructuredObject, nil)

internal/nextapi/v1/status/atlasthirdpartyintegration.go

@@ -14,13 +14,12 @@
 
 package status
 
-import (
-	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api"
-)
+// +kubebuilder:object:generate=true
 
 // AtlasThirdPartyIntegrationStatus holds the status of an integration
 type AtlasThirdPartyIntegrationStatus struct {
-	api.Common `json:",inline"`
+	// UnifiedStatus holds state common to all CRDs supporting the Unified State Machine
+	UnifiedStatus `json:",inline"`
 
 	// ID of the third party integration resource in Atlas
 	ID string `json:"id"`

internal/nextapi/v1/status/unifiedstate.go

@@ -0,0 +1,21 @@
+package status
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +kubebuilder:object:generate=true
+
+// UnifiedStatus is shared by all CRDs supporting unified state machine
+type UnifiedStatus struct {
+	// Conditions is the list of statuses showing the current state of the Atlas Custom Resource
+	Conditions []metav1.Condition `json:"conditions"`
+
+	// 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,omitempty"`
+}
+
+func (us *UnifiedStatus) GetConditions() []metav1.Condition {
+	return us.Conditions
+}

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

@@ -89,7 +89,7 @@ func (r *Reconciler[T]) SetupWithManager(mgr ctrl.Manager) error {
 
 func (r *Reconciler[T]) Reconcile(ctx context.Context, req ctrl.Request) (reconcile.Result, error) {
 	logger := log.FromContext(ctx).WithName("state")
-	logger.Info("reconcile started", "req", req)
+	logger.Info("reconcile requested", "req", req)
 
 	t := new(T)
 	obj := any(t).(client.Object)
@@ -153,7 +153,7 @@ func (r *Reconciler[T]) Reconcile(ctx context.Context, req ctrl.Request) (reconc
 	meta.SetStatusCondition(&newStatusConditions, ready)
 
 	if err := patchStatus(ctx, r.cluster.GetClient(), obj, newStatus); err != nil {
-		return ctrl.Result{}, fmt.Errorf("failed to patch status: %w", err)
+		return ctrl.Result{}, fmt.Errorf("failed to reconcile status: %w", err)
 	}
 
 	return result.Result, reconcileErr

pkg/controller/state/reconciler.go

@@ -503,6 +503,10 @@ func (do *dummyObject) GetConditions() []metav1.Condition {
 	return do.conditions
 }
 
+func (do *dummyObject) GetStatusObject() StatusObject {
+	return do
+}
+
 func (do *dummyObject) DeepCopy() *dummyObject {
 	if do == nil {
 		return nil

pkg/controller/state/reconciler_test.go

@@ -26,16 +26,19 @@ import (
 )
 
 type StatusObject interface {
-	client.Object
 	GetConditions() []metav1.Condition
 }
 
+type StatusHolder interface {
+	GetStatusObject() StatusObject
+}
+
 func newStatusObject(obj client.Object) (StatusObject, error) {
-	statusObj, ok := obj.(StatusObject)
+	holder, ok := obj.(StatusHolder)
 	if ok {
-		return statusObj, nil
+		return holder.GetStatusObject(), nil
 	}
-	return nil, errors.New("object must implement StatusObject")
+	return nil, errors.New("object must implement StatusObjeStatusHolder")
 }
 
 func patchStatus(ctx context.Context, c client.Client, obj client.Object, status any) error {