Do not reconcile APM Server if association is not fully configured (e…

…lastic#2224)

* Do not reconcile APM Server if association is not ready

pkg/controller/apmserver/apmserver_controller.go

@@ -213,6 +213,10 @@ func (r *ReconcileApmServer) Reconcile(request reconcile.Request) (reconcile.Res
 		return reconcile.Result{}, err
 	}
 
+	if !association.IsConfiguredIfSet(&as, r.recorder) {
+		return reconcile.Result{}, nil
+	}
+
 	return r.doReconcile(request, &as)
 }
 

pkg/controller/common/association/association.go

@@ -5,11 +5,12 @@
 package association
 
 import (
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/types"
-
 	commonv1 "github.com/elastic/cloud-on-k8s/pkg/apis/common/v1"
+	"github.com/elastic/cloud-on-k8s/pkg/controller/common/events"
 	"github.com/elastic/cloud-on-k8s/pkg/utils/k8s"
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
 )
 
 // ElasticsearchAuthSettings returns the user and the password to be used by an associated object to authenticate
@@ -30,3 +31,19 @@ func ElasticsearchAuthSettings(
 	}
 	return assocConf.AuthSecretKey, string(secret.Data[assocConf.AuthSecretKey]), nil
 }
+
+// IsConfiguredIfSet checks if an association is set in the spec and if it has been configured by an association controller.
+// This is used to prevent the deployment of an associated resource while the association is not yet fully configured.
+func IsConfiguredIfSet(associated commonv1.Associated, r record.EventRecorder) bool {
+	esRef := associated.ElasticsearchRef()
+	if (&esRef).IsDefined() && !associated.AssociationConf().IsConfigured() {
+		r.Event(associated, v1.EventTypeWarning, events.EventAssociationError, "Elasticsearch backend is not configured")
+		log.Info("Elasticsearch association not established: skipping associated resource deployment reconciliation",
+			"kind", associated.GetObjectKind().GroupVersionKind().Kind,
+			"namespace", associated.GetNamespace(),
+			"name", associated.GetName(),
+		)
+		return false
+	}
+	return true
+}

pkg/controller/kibana/driver.go

@@ -10,11 +10,11 @@ import (
 
 	kbv1 "github.com/elastic/cloud-on-k8s/pkg/apis/kibana/v1"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/common"
+	"github.com/elastic/cloud-on-k8s/pkg/controller/common/association"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/common/certificates/http"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/common/deployment"
 	driver2 "github.com/elastic/cloud-on-k8s/pkg/controller/common/driver"
-	"github.com/elastic/cloud-on-k8s/pkg/controller/common/events"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/common/keystore"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/common/operator"
 	"github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler"
@@ -233,9 +233,7 @@ func (d *driver) Reconcile(
 	params operator.Parameters,
 ) *reconciler.Results {
 	results := reconciler.Results{}
-	if kb.RequiresAssociation() && !kb.AssociationConf().IsConfigured() {
-		d.recorder.Event(kb, corev1.EventTypeWarning, events.EventAssociationError, "Elasticsearch backend is not configured")
-		log.Info("Elasticsearch association not established: skipping Kibana deployment reconciliation", "namespace", kb.Namespace, "kibana_name", kb.Name)
+	if !association.IsConfiguredIfSet(kb, d.recorder) {
 		return &results
 	}