From 3b05cdfca7fc3b9b9594bbd08174c170f5c6cec8 Mon Sep 17 00:00:00 2001 From: Flavius Lacatusu Date: Fri, 25 Jun 2021 11:04:56 +0200 Subject: [PATCH] fix: Fix image puller reconcile infinite loop when checluster image puller deployment name and configmap name are empty Signed-off-by: Flavius Lacatusu --- pkg/deploy/kubernetes_image_puller.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/deploy/kubernetes_image_puller.go b/pkg/deploy/kubernetes_image_puller.go index aeeea38f5..251697d2a 100644 --- a/pkg/deploy/kubernetes_image_puller.go +++ b/pkg/deploy/kubernetes_image_puller.go @@ -141,6 +141,13 @@ func ReconcileImagePuller(ctx *DeployContext) (reconcile.Result, error) { return reconcile.Result{}, err } + if ctx.CheCluster.Spec.ImagePuller.Spec.DeploymentName == "" { + ctx.CheCluster.Spec.ImagePuller.Spec.DeploymentName = imagePuller.Spec.DeploymentName + } + if ctx.CheCluster.Spec.ImagePuller.Spec.ConfigMapName == "" { + ctx.CheCluster.Spec.ImagePuller.Spec.ConfigMapName = imagePuller.Spec.ConfigMapName + } + // If ImagePuller specs are different, update the KubernetesImagePuller CR if imagePuller.Spec != ctx.CheCluster.Spec.ImagePuller.Spec { imagePuller.Spec = ctx.CheCluster.Spec.ImagePuller.Spec