Merge pull request #4 from Mirantis/fix-ingress-reconcile

Fix an issue where ingress was being reconcilled when it is not specified in the specs

.github/workflows/build.yaml

@@ -0,0 +1,24 @@
+name: Build Docker Image
+
+on:
+  pull_request:
+    types: [ opened, synchronize, reopened ]
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/[email protected]
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build docker image
+        working-directory: .
+        run: make docker-build

.github/workflows/release.yml

@@ -1,11 +1,8 @@
-name: Build Boundless Operator Docker Image
+name: Build and Push Docker Image
 
 on:
   push:
     branches: [ "main" ]
-  pull_request:
-    types: [opened, reopened]
-    branches: [ "main" ]
 
 jobs:
   build-and-push:

api/v1alpha1/blueprint_types.go

@@ -18,12 +18,12 @@ type BlueprintSpec struct {
 
 // Component defines the core and addons components that should be installed
 type Component struct {
-	Core   Core        `json:"core,omitempty"`
+	Core   *Core       `json:"core,omitempty"`
 	Addons []AddonSpec `json:"addons,omitempty"`
 }
 
 type Core struct {
-	Ingress IngressSpec `json:"ingress,omitempty"`
+	Ingress *IngressSpec `json:"ingress,omitempty"`
 }
 
 // BlueprintStatus defines the observed state of Blueprint

controllers/blueprint_controller.go

@@ -59,11 +59,13 @@ func (r *BlueprintReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		}
 	}
 
-	logger.Info("Reconciling ingress")
-	err = r.createOrUpdateIngress(ctx, logger, ingressResource(&instance.Spec.Components.Core.Ingress))
-	if err != nil {
-		logger.Error(err, "Failed to reconcile ingress", "Name", instance.Spec.Components.Core.Ingress)
-		return ctrl.Result{Requeue: true}, err
+	if instance.Spec.Components.Core != nil && instance.Spec.Components.Core.Ingress != nil {
+		logger.Info("Reconciling ingress")
+		err = r.createOrUpdateIngress(ctx, logger, ingressResource(instance.Spec.Components.Core.Ingress))
+		if err != nil {
+			logger.Error(err, "Failed to reconcile ingress", "Name", instance.Spec.Components.Core.Ingress)
+			return ctrl.Result{Requeue: true}, err
+		}
 	}
 
 	for _, addon := range instance.Spec.Components.Addons {
@@ -101,7 +103,7 @@ func (r *BlueprintReconciler) createOrUpdateAddon(ctx context.Context, logger lo
 		return nil
 	}
 
-	logger.Info("Creating add-on", "Name", existing.Name)
+	logger.Info("Creating add-on", "Name", obj.GetName())
 	err = r.Create(ctx, obj)
 	if err != nil {
 		return fmt.Errorf("failed to create add-on %s: %w", obj.GetName(), err)
@@ -128,7 +130,7 @@ func (r *BlueprintReconciler) createOrUpdateIngress(ctx context.Context, logger
 		return nil
 	}
 
-	logger.Info("Creating ingress", "Name", existing.Name)
+	logger.Info("Creating ingress", "Name", obj.GetName())
 	err = r.Create(ctx, obj)
 	if err != nil {
 		return fmt.Errorf("failed to create ingress %s: %w", obj.GetName(), err)