Upgrade to aws-load-balancer-controller for NLB Services

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.23.0-alpha.9
+VERSION ?= 0.24.0-alpha.1
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
 # To re-generate a bundle for other specific channels without changing the standard setup, you can:

api/v1alpha1/backend_types.go

@@ -48,6 +48,7 @@ var (
 	backendDefaultListenerNLBLoadBalancer defaultNLBLoadBalancerSpec = defaultNLBLoadBalancerSpec{
 		ProxyProtocol:                 util.Pointer(true),
 		CrossZoneLoadBalancingEnabled: util.Pointer(true),
+		TerminationProtection:         util.Pointer(false),
 	}
 	backendDefaultListenerReplicas  int32                           = 2
 	backendDefaultListenerResources defaultResourceRequirementsSpec = defaultResourceRequirementsSpec{

api/v1alpha1/common_types.go

@@ -247,17 +247,25 @@ type NLBLoadBalancerSpec struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// +optional
 	EIPAllocations []string `json:"eipAllocations,omitempty"`
+	// Optionally specify the load balancer name
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// +optional
+	LoadBalancerName *string `json:"loadBalancerName,omitempty"`
+	// Termination protection setting
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// +optional
+	TerminationProtection *bool `json:"terminationProtection,omitempty"`
 }
 
 type defaultNLBLoadBalancerSpec struct {
-	CrossZoneLoadBalancingEnabled, ProxyProtocol *bool
-	EIPAllocations                               []string
+	CrossZoneLoadBalancingEnabled, ProxyProtocol, TerminationProtection *bool
 }
 
 // Default sets default values for any value not specifically set in the NLBLoadBalancerSpec struct
 func (spec *NLBLoadBalancerSpec) Default(def defaultNLBLoadBalancerSpec) {
 	spec.ProxyProtocol = boolOrDefault(spec.ProxyProtocol, def.ProxyProtocol)
 	spec.CrossZoneLoadBalancingEnabled = boolOrDefault(spec.CrossZoneLoadBalancingEnabled, def.CrossZoneLoadBalancingEnabled)
+	spec.TerminationProtection = boolOrDefault(spec.TerminationProtection, def.TerminationProtection)
 }
 
 // IsDeactivated true if the field is set with the deactivated value (empty struct)

api/v1alpha1/echoapi_types.go

@@ -68,6 +68,7 @@ var (
 	echoapiDefaultNLBLoadBalancer defaultNLBLoadBalancerSpec = defaultNLBLoadBalancerSpec{
 		ProxyProtocol:                 util.Pointer(true),
 		CrossZoneLoadBalancingEnabled: util.Pointer(true),
+		TerminationProtection:         util.Pointer(false),
 	}
 )
 

config/manager/kustomization.yaml

@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/3scale/saas-operator
-  newTag: v0.23.0-alpha.9
+  newTag: v0.24.0-alpha.1

config/manifests/bases/saas-operator.clusterserviceversion.yaml

@@ -1143,9 +1143,15 @@ spec:
       - description: The list of optional Elastic IPs allocations
         displayName: EIPAllocations
         path: listener.loadBalancer.eipAllocations
+      - description: Optionally specify the load balancer name
+        displayName: Load Balancer Name
+        path: listener.loadBalancer.loadBalancerName
       - description: Enables/disbles use of proxy protocol in the load balancer
         displayName: Proxy Protocol
         path: listener.loadBalancer.proxyProtocol
+      - description: Termination protection setting
+        displayName: Termination Protection
+        path: listener.loadBalancer.terminationProtection
       - description: Marin3r configures the Marin3r sidecars for the component
         displayName: Marin3r
         path: listener.marin3r
@@ -1720,9 +1726,15 @@ spec:
       - description: The list of optional Elastic IPs allocations
         displayName: EIPAllocations
         path: loadBalancer.eipAllocations
+      - description: Optionally specify the load balancer name
+        displayName: Load Balancer Name
+        path: loadBalancer.loadBalancerName
       - description: Enables/disbles use of proxy protocol in the load balancer
         displayName: Proxy Protocol
         path: loadBalancer.proxyProtocol
+      - description: Termination protection setting
+        displayName: Termination Protection
+        path: loadBalancer.terminationProtection
       - description: Marin3r configures the Marin3r sidecars for the component
         displayName: Marin3r
         path: marin3r

controllers/backend_controller.go

@@ -18,13 +18,17 @@ package controllers
 
 import (
 	"context"
+	"strings"
 
 	"github.com/3scale-ops/basereconciler/reconciler"
 	"github.com/3scale-ops/basereconciler/util"
 	saasv1alpha1 "github.com/3scale-ops/saas-operator/api/v1alpha1"
 	"github.com/3scale-ops/saas-operator/pkg/generators/backend"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 // BackendReconciler reconciles a Backend object
@@ -49,7 +53,7 @@ type BackendReconciler struct {
 // move the current state of the cluster closer to the desired state.
 func (r *BackendReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 
-	ctx, _ = r.Logger(ctx, "name", req.Name, "namespace", req.Namespace)
+	ctx, logger := r.Logger(ctx, "name", req.Name, "namespace", req.Namespace)
 	instance := &saasv1alpha1.Backend{}
 	result := r.ManageResourceLifecycle(ctx, req, instance,
 		reconciler.WithInMemoryInitializationFunc(util.ResourceDefaulter(instance)))
@@ -61,6 +65,38 @@ func (r *BackendReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	if err != nil {
 		return ctrl.Result{}, err
 	}
+
+	// Upgrade NLBs managed by nlb-helper-operator
+	svc := &corev1.Service{ObjectMeta: metav1.ObjectMeta{Name: gen.Listener.GetComponent(), Namespace: req.Namespace}}
+	if err := r.Client.Get(ctx, client.ObjectKeyFromObject(svc), svc); err == nil {
+		// 1. Update parent resource with NLB name for NLB adoption
+		// 2. Add termination protection
+		nlbName := strings.Split(strings.Split(svc.Status.LoadBalancer.Ingress[0].Hostname, ".")[0], "-")[0]
+		if instance.Spec.Listener.LoadBalancer.LoadBalancerName == nil ||
+			*instance.Spec.Listener.LoadBalancer.LoadBalancerName != nlbName {
+			patch := client.MergeFrom(instance.DeepCopy())
+			instance.Spec.Listener.LoadBalancer.LoadBalancerName = &nlbName
+			instance.Spec.Listener.LoadBalancer.TerminationProtection = util.Pointer(true)
+			if err := r.Client.Patch(ctx, instance, patch); err != nil {
+				return ctrl.Result{}, err
+			}
+			logger.Info("resource patched", "kind", "Backend", "key", req)
+		}
+
+		// 3. Abandon old Service resource
+		if svc.GetOwnerReferences() != nil || svc.GetAnnotations()["service.beta.kubernetes.io/aws-load-balancer-type"] != "external" {
+			svc.ObjectMeta.OwnerReferences = nil
+			svc.ObjectMeta.Annotations["service.beta.kubernetes.io/aws-load-balancer-type"] = "external"
+			if err := r.Client.Update(ctx, svc); err != nil {
+				return ctrl.Result{}, err
+			}
+			logger.Info("resource abandoned", "kind", "Service", "key", req)
+		}
+
+	} else if !errors.IsNotFound(err) {
+		return ctrl.Result{}, err
+	}
+
 	resources, err := gen.Resources()
 	if err != nil {
 		return ctrl.Result{}, err

controllers/backend_controller_suite_test.go

@@ -142,9 +142,9 @@ var _ = Describe("Backend controller", func() {
 				}).Assert(k8sClient, dep, timeout, poll))
 
 			svc := &corev1.Service{}
-			By("deploying the backend-listener service",
+			By("deploying the backend-listener-nlb service",
 				(&testutil.ExpectedResource{
-					Name: "backend-listener", Namespace: namespace,
+					Name: "backend-listener-nlb", Namespace: namespace,
 				}).Assert(k8sClient, svc, timeout, poll))
 
 			Expect(svc.Spec.Selector["deployment"]).To(Equal("backend-listener"))
@@ -290,8 +290,8 @@ var _ = Describe("Backend controller", func() {
 						return err
 					}
 
-					rvs["svc/backend-listener"] = testutil.GetResourceVersion(
-						k8sClient, &corev1.Service{}, "backend-listener", namespace, timeout, poll)
+					rvs["svc/backend-listener-nlb"] = testutil.GetResourceVersion(
+						k8sClient, &corev1.Service{}, "backend-listener-nlb", namespace, timeout, poll)
 					rvs["deployment/backend-listener"] = testutil.GetResourceVersion(
 						k8sClient, &appsv1.Deployment{}, "backend-listener", namespace, timeout, poll)
 					rvs["hpa/backend-worker"] = testutil.GetResourceVersion(
@@ -376,14 +376,15 @@ var _ = Describe("Backend controller", func() {
 					}).Assert(k8sClient, dep, timeout, poll))
 
 				svc := &corev1.Service{}
-				By("updating backend-listener service",
+				By("updating backend-listener-nlb service",
 					(&testutil.ExpectedResource{
-						Name: "backend-listener", Namespace: namespace,
-						LastVersion: rvs["svc/backend-listener"],
+						Name: "backend-listener-nlb", Namespace: namespace,
+						LastVersion: rvs["svc/backend-listener-nlb"],
 					}).Assert(k8sClient, svc, timeout, poll))
 
 				Expect(svc.Spec.Selector["deployment"]).To(Equal("backend-listener"))
-				Expect(svc.GetAnnotations()["service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled"]).To(Equal("false"))
+				Expect(svc.GetAnnotations()["service.beta.kubernetes.io/aws-load-balancer-attributes"]).
+					To(Equal("load_balancing.cross_zone.enabled=false,deletion_protection.enabled=false"))
 
 				hpa := &autoscalingv2.HorizontalPodAutoscaler{}
 				By("updating the backend-worker workload",
@@ -482,7 +483,7 @@ var _ = Describe("Backend controller", func() {
 					}
 
 					rvs["svc/backend-listener"] = testutil.GetResourceVersion(
-						k8sClient, &corev1.Service{}, "backend-listener", namespace, timeout, poll)
+						k8sClient, &corev1.Service{}, "backend-listener-nlb", namespace, timeout, poll)
 					rvs["deployment/backend-listener"] = testutil.GetResourceVersion(
 						k8sClient, &appsv1.Deployment{}, "backend-listener", namespace, timeout, poll)
 					rvs["deployment/backend-worker"] = testutil.GetResourceVersion(
@@ -541,9 +542,9 @@ var _ = Describe("Backend controller", func() {
 					}).Assert(k8sClient, dep, timeout, poll))
 
 				svc := &corev1.Service{}
-				By("keeps the backend-listener service deployment label selector",
+				By("keeps the backend-listener-nlb service deployment label selector",
 					(&testutil.ExpectedResource{
-						Name: "backend-listener", Namespace: namespace,
+						Name: "backend-listener-nlb", Namespace: namespace,
 					}).Assert(k8sClient, svc, timeout, poll))
 
 				Expect(svc.Spec.Selector["deployment"]).To(Equal("backend-listener"))
@@ -594,8 +595,8 @@ var _ = Describe("Backend controller", func() {
 
 						rvs["deployment/backend-listener-canary"] = testutil.GetResourceVersion(
 							k8sClient, &appsv1.Deployment{}, "backend-listener-canary", namespace, timeout, poll)
-						rvs["svc/backend-listener"] = testutil.GetResourceVersion(
-							k8sClient, &corev1.Service{}, "backend-listener", namespace, timeout, poll)
+						rvs["svc/backend-listener-nlb"] = testutil.GetResourceVersion(
+							k8sClient, &corev1.Service{}, "backend-listener-nlb", namespace, timeout, poll)
 						rvs["deployment/backend-worker-canary"] = testutil.GetResourceVersion(
 							k8sClient, &appsv1.Deployment{}, "backend-worker-canary", namespace, timeout, poll)
 
@@ -634,8 +635,8 @@ var _ = Describe("Backend controller", func() {
 					svc := &corev1.Service{}
 					By("removing the backend-listener service deployment label selector",
 						(&testutil.ExpectedResource{
-							Name: "backend-listener", Namespace: namespace,
-							LastVersion: rvs["svc/backend-listener"],
+							Name: "backend-listener-nlb", Namespace: namespace,
+							LastVersion: rvs["svc/backend-listener-nlb"],
 						}).Assert(k8sClient, svc, timeout, poll))
 
 					Expect(svc.Spec.Selector).ToNot(HaveKey("deployment"))