Add Deployment and ConfigMap upgrade path

controllers/limitador_controller.go

@@ -21,18 +21,21 @@ import (
 	"encoding/json"
 	"fmt"
 	"reflect"
+	"strings"
 
 	"github.com/go-logr/logr"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
 	limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
+	"github.com/kuadrant/limitador-operator/pkg/helpers"
 	"github.com/kuadrant/limitador-operator/pkg/limitador"
 	"github.com/kuadrant/limitador-operator/pkg/reconcilers"
 )
@@ -199,6 +202,28 @@ func (r *LimitadorReconciler) reconcileDeployment(ctx context.Context, limitador
 		return err
 	}
 
+	// Check if the new deployment is ready
+	newDeployment := &appsv1.Deployment{}
+	if err := r.Client().Get(ctx, client.ObjectKeyFromObject(deployment), newDeployment); err != nil {
+		return err
+	}
+
+	availableCondition := helpers.FindDeploymentStatusCondition(newDeployment.Status.Conditions, "Available")
+
+	if availableCondition != nil && availableCondition.Status == v1.ConditionTrue {
+		// Delete the old deployment
+		oldDeployment := &appsv1.Deployment{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      limitadorObj.Name,
+				Namespace: limitadorObj.Namespace,
+			},
+		}
+
+		if err := r.Client().Delete(ctx, oldDeployment); err != nil && !errors.IsNotFound(err) {
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -266,6 +291,17 @@ func (r *LimitadorReconciler) reconcileLimitsConfigMap(ctx context.Context, limi
 		return err
 	}
 
+	oldConfigMap := &v1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      strings.TrimPrefix(limitador.LimitsConfigMapName(limitadorObj), "limitador-"),
+			Namespace: limitadorObj.Namespace,
+		},
+	}
+
+	if err := r.Client().Delete(ctx, oldConfigMap); err != nil && !errors.IsNotFound(err) {
+		return err
+	}
+
 	return nil
 }