From 6ce84147c15ebfdb1e5678a5a455ba7fbb32d5da Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Tue, 15 Feb 2022 11:19:20 +0100
Subject: [PATCH] change CRD creation strategy

---
 pkg/controller/util.go | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkg/controller/util.go b/pkg/controller/util.go
index 5d8c48b7f..bca8082f6 100644
--- a/pkg/controller/util.go
+++ b/pkg/controller/util.go
@@ -54,22 +54,27 @@ func (c *Controller) clusterWorkerID(clusterName spec.NamespacedName) uint32 {
 }
 
 func (c *Controller) createOperatorCRD(desiredCrd *apiextv1.CustomResourceDefinition) error {
-	if crd, err := c.KubeClient.CustomResourceDefinitions().Create(context.TODO(), desiredCrd, metav1.CreateOptions{}); err != nil {
-		if k8sutil.ResourceAlreadyExists(err) {
-			c.logger.Infof("customResourceDefinition %q is already registered and will only be updated", crd.Name)
-			// copy annotations and labels from existing CRD since we do not define them
-			desiredCrd.Annotations = crd.Annotations
-			desiredCrd.Labels = crd.Labels
-			patch, err := json.Marshal(desiredCrd)
-			if err != nil {
-				return fmt.Errorf("could not marshal new customResourceDefintion %q: %v", desiredCrd.Name, err)
-			}
-			if _, err := c.KubeClient.CustomResourceDefinitions().Patch(
-				context.TODO(), crd.Name, types.MergePatchType, patch, metav1.PatchOptions{}); err != nil {
-				return fmt.Errorf("could not update customResourceDefinition %q: %v", crd.Name, err)
-			}
-		} else {
-			c.logger.Errorf("could not create customResourceDefinition %q: %v", desiredCrd.Name, err)
+	crd, err := c.KubeClient.CustomResourceDefinitions().Get(context.TODO(), desiredCrd.Name, metav1.GetOptions{})
+	if k8sutil.ResourceNotFound(err) {
+		if _, err := c.KubeClient.CustomResourceDefinitions().Create(context.TODO(), desiredCrd, metav1.CreateOptions{}); err != nil {
+			return fmt.Errorf("could not create customResourceDefinition %q: %v", desiredCrd.Name, err)
+		}
+	}
+	if err != nil {
+		c.logger.Errorf("could not get customResourceDefinition %q: %v", desiredCrd.Name, err)
+	}
+	if crd != nil {
+		c.logger.Infof("customResourceDefinition %q is already registered and will only be updated", crd.Name)
+		// copy annotations and labels from existing CRD since we do not define them
+		desiredCrd.Annotations = crd.Annotations
+		desiredCrd.Labels = crd.Labels
+		patch, err := json.Marshal(desiredCrd)
+		if err != nil {
+			return fmt.Errorf("could not marshal new customResourceDefintion %q: %v", desiredCrd.Name, err)
+		}
+		if _, err := c.KubeClient.CustomResourceDefinitions().Patch(
+			context.TODO(), crd.Name, types.MergePatchType, patch, metav1.PatchOptions{}); err != nil {
+			return fmt.Errorf("could not update customResourceDefinition %q: %v", crd.Name, err)
 		}
 	} else {
 		c.logger.Infof("customResourceDefinition %q has been registered", crd.Name)