Enable Ingress to Gslb Owner Reference

* Enables proper Ingress -> Gslb CR ownership in case of
annotation based management approach
with pre-existing Ingress as in

https://www.k8gb.io/docs/ingress_annotations.html

* Resolves #361

* Covered by Terratest

Signed-off-by: Yury Tsarev <yury.tsarev@absa.africa>

Makefile

@@ -434,8 +434,8 @@ endef
 
 define docker-test-build-push
 	docker build . -t k8gb:$(COMMIT_HASH)
-	docker tag k8gb:$(COMMIT_HASH) $(REPO):v$(COMMIT_HASH)
-	docker push $(REPO):v$(COMMIT_HASH)
+	docker tag k8gb:$(COMMIT_HASH) $(REPO):$(COMMIT_HASH)
+	docker push $(REPO):$(COMMIT_HASH)
 	sed -i "s/$(VERSION)/$(COMMIT_HASH)/g" chart/k8gb/Chart.yaml
 endef
 

chart/k8gb/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: k8gb
 description: A Helm chart for Kubernetes Global Balancer
 type: application
-version: v0.7.7
-appVersion: v0.7.7
+version: v0.7.8
+appVersion: v0.7.8
 
 dependencies:
   - name: coredns

controllers/gslb_controller.go

@@ -36,6 +36,7 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
@@ -248,12 +249,21 @@ func (r *GslbReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			}
 		}
 
+		err = controllerutil.SetControllerReference(ingressToReuse, gslb, r.Scheme)
+		if err != nil {
+			log.Err(err).
+				Str("Ingress", ingressToReuse.Name).
+				Str("Gslb", gslb.Name).
+				Msg("Cannot set the Ingress as the owner of the Gslb")
+		}
+
 		log.Info().Msgf("Creating new Gslb(%s) out of Ingress annotation", gslb.Name)
 		err = c.Create(context.Background(), gslb)
 		if err != nil {
 			log.Err(err).Msg("Glsb creation failed")
 		}
 	}
+
 	ingressMapFn := handler.ToRequestsFunc(
 		func(a handler.MapObject) []reconcile.Request {
 			for annotationKey, annotationValue := range a.Meta.GetAnnotations() {

terratest/test/helpers.go

@@ -167,3 +167,21 @@ func assertDNSEndpointLabel(t *testing.T, options *k8s.KubectlOptions, label str
 	t.Helper()
 	k8s.RunKubectl(t, options, "get", "dnsendpoint", "-l", label)
 }
+
+func assertGslbDeleted(t *testing.T, options *k8s.KubectlOptions, gslbName string) {
+	t.Helper()
+	deletionExpected := []string{fmt.Sprintf("Error from server (NotFound): gslbs.k8gb.absa.oss \"%s\" not found", gslbName)}
+	deletionActual, err := DoWithRetryWaitingForValueE(
+		t,
+		"Waiting for Gslb CR to be deleted...",
+		300,
+		1*time.Second,
+		func() ([]string, error) {
+			out, err := k8s.RunKubectlAndGetOutputE(t, options, "get", "gslb", gslbName)
+			return []string{out}, err
+		},
+		deletionExpected)
+	require.NoError(t, err)
+
+	assert.Equal(t, deletionExpected, deletionActual)
+}

terratest/test/k8gb_ingress_annotation_failover_test.go

@@ -54,8 +54,6 @@ func TestK8gbIngressAnnotationFailover(t *testing.T) {
 
 	defer k8s.DeleteNamespace(t, options, namespaceName)
 
-	defer k8s.KubectlDelete(t, options, kubeResourcePath)
-
 	k8s.KubectlApply(t, options, kubeResourcePath)
 
 	ingress := k8s.GetIngress(t, options, "test-gslb-annotation-failover")
@@ -69,4 +67,9 @@ func TestK8gbIngressAnnotationFailover(t *testing.T) {
 		err := k8s.RunKubectlE(t, options, "get", "gslb", "broken-test-gslb-annotation-failover")
 		require.Error(t, err)
 	})
+
+	t.Run("Gslb is getting deleted together with the annotated Ingress", func(t *testing.T) {
+		k8s.KubectlDelete(t, options, kubeResourcePath)
+		assertGslbDeleted(t, options, ingress.Name)
+	})
 }

terratest/test/k8gb_ingress_annotation_rr_test.go

@@ -52,12 +52,15 @@ func TestK8gbIngressAnnotationRR(t *testing.T) {
 
 	defer k8s.DeleteNamespace(t, options, namespaceName)
 
-	defer k8s.KubectlDelete(t, options, kubeResourcePath)
-
 	k8s.KubectlApply(t, options, kubeResourcePath)
 
 	ingress := k8s.GetIngress(t, options, "test-gslb-annotation")
 	require.Equal(t, ingress.Name, "test-gslb-annotation")
 	assertGslbStatus(t, options, "test-gslb-annotation", "notfound.cloud.example.com:NotFound roundrobin.cloud.example.com:NotFound unhealthy.cloud.example.com:NotFound")
 	assertGslbSpec(t, options, "test-gslb-annotation", ".spec.strategy.type", "roundRobin")
+
+	t.Run("Gslb is getting deleted together with the annotated Ingress", func(t *testing.T) {
+		k8s.KubectlDelete(t, options, kubeResourcePath)
+		assertGslbDeleted(t, options, ingress.Name)
+	})
 }