Simplyfy

controllers/bluegreen_controller.go

@@ -60,17 +60,15 @@ func (r *BlueGreenReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	}
 
 	// Create or Update BlueDeployment
-	for _, tgt := range []struct {
-		Phase v1.BlueOrGreen
-		Spec  *corev1.PodSpec
-	}{
-		{Phase: v1.Blue, Spec: bluegreen.Spec.BlueSpec},
-		{Phase: v1.Green, Spec: bluegreen.Spec.GreenSpec},
-	} {
-		if tgt.Spec == nil {
-			continue
+	if spec := bluegreen.Spec.BlueSpec; spec != nil {
+		if err := r.CreateOrUpdateDeployment(ctx, bluegreen, v1.Blue, *spec); err != nil {
+			return ctrl.Result{}, err
 		}
-		if err := r.CreateOrUpdateDeployment(ctx, bluegreen, tgt.Phase, *tgt.Spec); err != nil {
+	}
+
+	// Create or Update GreenDeployment
+	if spec := bluegreen.Spec.GreenSpec; spec != nil {
+		if err := r.CreateOrUpdateDeployment(ctx, bluegreen, v1.Green, *spec); err != nil {
 			return ctrl.Result{}, err
 		}
 	}

controllers/suite_test.go

@@ -18,7 +18,6 @@ package controllers
 
 import (
 	"path/filepath"
-	"testing"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -27,7 +26,6 @@ import (
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
@@ -42,6 +40,7 @@ var cfg *rest.Config
 var k8sClient client.Client
 var testEnv *envtest.Environment
 
+/*
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
 
@@ -49,6 +48,7 @@ func TestAPIs(t *testing.T) {
 		"Controller Suite",
 		[]Reporter{printer.NewlineReporter{}})
 }
+*/
 
 var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))