feat: upgrade to Go 1.20

.github/workflows/build-images-base.yaml

@@ -100,10 +100,10 @@ jobs:
     name: Build Bundle
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.19.x
+      - name: Set up Go 1.20.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.20.x
         id: go
       - name: Check out code
         uses: actions/checkout@v3
@@ -147,10 +147,10 @@ jobs:
     needs: [build, build-bundle]
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.19.x
+      - name: Set up Go 1.20.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.20.x
         id: go
       - name: Check out code
         uses: actions/checkout@v3

.github/workflows/code-style.yaml

@@ -40,10 +40,10 @@ jobs:
             importpath: golang.org/x/tools/cmd/goimports@latest
 
     steps:
-      - name: Set up Go 1.19.x
+      - name: Set up Go 1.20.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.20.x
         id: go
 
       - name: Check out code
@@ -90,10 +90,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Set up Go 1.19.x
+      - name: Set up Go 1.20.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.20.x
         id: go
 
       - name: Check out code

.github/workflows/test.yaml

@@ -18,7 +18,7 @@ jobs:
     name: Unit Tests
     strategy:
       matrix:
-        go-version: [ 1.19.x ]
+        go-version: [ 1.20.x ]
         platform: [ ubuntu-latest ]
     runs-on: ${{ matrix.platform }}
     defaults:
@@ -53,10 +53,10 @@ jobs:
       run:
         shell: bash
     steps:
-      - name: Set up Go 1.19.x
+      - name: Set up Go 1.20.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.20.x
         id: go
       - name: Check out code
         uses: actions/checkout@v3
@@ -94,10 +94,10 @@ jobs:
     name: Verify manifests
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.19.x
+      - name: Set up Go 1.20.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.20.x
         id: go
       - name: Check out code
         uses: actions/checkout@v3
@@ -109,10 +109,10 @@ jobs:
     name: Verify bundle
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.19.x
+      - name: Set up Go 1.20.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.20.x
         id: go
       - name: Check out code
         uses: actions/checkout@v3
@@ -124,10 +124,10 @@ jobs:
     name: Verify fmt
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.19.x
+      - name: Set up Go 1.20.x
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.20.x
         id: go
       - name: Check out code
         uses: actions/checkout@v3
@@ -139,7 +139,7 @@ jobs:
     name: Test Scripts
     strategy:
       matrix:
-        go-version: [ 1.19.x ]
+        go-version: [ 1.20.x ]
         platform: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.platform }}
     defaults:

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19 as builder
+FROM golang:1.20 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -451,7 +451,7 @@ run-lint: $(GOLANGCI-LINT) ## Run lint tests
 	$(GOLANGCI-LINT) run
 
 $(GOLANGCI-LINT):
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_PATH)/bin v1.50.1
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_PATH)/bin v1.54.2
 
 .PHONY: golangci-lint
 golangci-lint: $(GOLANGCI-LINT) ## Download golangci-lint locally if necessary.

controllers/authpolicy_controller.go

@@ -172,7 +172,7 @@ func (r *AuthPolicyReconciler) deleteResources(ctx context.Context, ap *api.Auth
 
 	// remove direct back ref
 	if targetNetworkObject != nil {
-		if err := r.deleteNetworkResourceDirectBackReference(ctx, ap, targetNetworkObject); err != nil {
+		if err := r.deleteNetworkResourceDirectBackReference(ctx, targetNetworkObject); err != nil {
 			return err
 		}
 	}
@@ -186,8 +186,8 @@ func (r *AuthPolicyReconciler) reconcileNetworkResourceDirectBackReference(ctx c
 	return r.ReconcileTargetBackReference(ctx, client.ObjectKeyFromObject(ap), targetNetworkObject, common.AuthPolicyBackRefAnnotation)
 }
 
-func (r *AuthPolicyReconciler) deleteNetworkResourceDirectBackReference(ctx context.Context, ap *api.AuthPolicy, targetNetworkObject client.Object) error {
-	return r.DeleteTargetBackReference(ctx, client.ObjectKeyFromObject(ap), targetNetworkObject, common.AuthPolicyBackRefAnnotation)
+func (r *AuthPolicyReconciler) deleteNetworkResourceDirectBackReference(ctx context.Context, targetNetworkObject client.Object) error {
+	return r.DeleteTargetBackReference(ctx, targetNetworkObject, common.AuthPolicyBackRefAnnotation)
 }
 
 // SetupWithManager sets up the controller with the Manager.

controllers/authpolicy_istio_authorization_policy.go

@@ -63,15 +63,15 @@ func (r *AuthPolicyReconciler) deleteIstioAuthorizationPolicies(ctx context.Cont
 	}
 
 	for _, gw := range gwDiffObj.GatewaysWithInvalidPolicyRef {
-		listOptions := &client.ListOptions{LabelSelector: labels.SelectorFromSet(labels.Set(istioAuthorizationPolicyLabels(client.ObjectKeyFromObject(gw.Gateway), client.ObjectKeyFromObject(ap))))}
+		listOptions := &client.ListOptions{LabelSelector: labels.SelectorFromSet(istioAuthorizationPolicyLabels(client.ObjectKeyFromObject(gw.Gateway), client.ObjectKeyFromObject(ap)))}
 		iapList := &istio.AuthorizationPolicyList{}
 		if err := r.Client().List(ctx, iapList, listOptions); err != nil {
 			return err
 		}
 
 		for _, iap := range iapList.Items {
 			// it's OK to just go ahead and delete because we only create one IAP per target network object,
-			// and a network object can be target by no more than one AuthPolicy
+			// and a network object can be targeted by no more than one AuthPolicy
 			if err := r.DeleteResource(ctx, iap); err != nil && !apierrors.IsNotFound(err) {
 				logger.Error(err, "failed to delete IstioAuthorizationPolicy")
 				return err

controllers/authpolicy_status.go

@@ -9,7 +9,7 @@ import (
 	kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
 	"github.com/kuadrant/kuadrant-operator/pkg/common"
 	"k8s.io/apimachinery/pkg/api/errors"
-	meta "k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"

controllers/helper_test.go

@@ -17,7 +17,7 @@ import (
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	meta "k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"

controllers/kuadrant_controller.go

@@ -135,11 +135,7 @@ func (r *KuadrantReconciler) Reconcile(eventCtx context.Context, req ctrl.Reques
 		logger.V(1).Error(gwErr, "Reconciling cluster gateways failed")
 	}
 
-	specResult, specErr := r.reconcileSpec(ctx, kObj)
-	if specErr == nil && specResult.Requeue {
-		logger.V(1).Info("Reconciling spec not finished. Requeueing.")
-		return specResult, nil
-	}
+	specErr := r.reconcileSpec(ctx, kObj)
 
 	statusResult, statusErr := r.reconcileStatus(ctx, kObj, specErr)
 
@@ -356,20 +352,16 @@ func (r *KuadrantReconciler) registerServiceMeshMember(ctx context.Context, kObj
 	return r.ReconcileResource(ctx, &maistrav1.ServiceMeshMember{}, member, reconcilers.CreateOnlyMutator)
 }
 
-func (r *KuadrantReconciler) reconcileSpec(ctx context.Context, kObj *kuadrantv1beta1.Kuadrant) (ctrl.Result, error) {
+func (r *KuadrantReconciler) reconcileSpec(ctx context.Context, kObj *kuadrantv1beta1.Kuadrant) error {
 	if err := r.registerExternalAuthorizer(ctx, kObj); err != nil {
-		return ctrl.Result{}, err
+		return err
 	}
 
 	if err := r.reconcileLimitador(ctx, kObj); err != nil {
-		return ctrl.Result{}, err
-	}
-
-	if err := r.reconcileAuthorino(ctx, kObj); err != nil {
-		return ctrl.Result{}, err
+		return err
 	}
 
-	return ctrl.Result{}, nil
+	return r.reconcileAuthorino(ctx, kObj)
 }
 
 func controlPlaneProviderName() string {
@@ -430,10 +422,7 @@ func (r *KuadrantReconciler) reconcileClusterGateways(ctx context.Context, kObj
 		}
 	}
 
-	if err := errGroup.Wait(); err != nil {
-		return err
-	}
-	return nil
+	return errGroup.Wait()
 }
 
 func (r *KuadrantReconciler) removeAnnotationFromGateways(ctx context.Context, kObj *kuadrantv1beta1.Kuadrant) error {
@@ -461,10 +450,7 @@ func (r *KuadrantReconciler) removeAnnotationFromGateways(ctx context.Context, k
 		})
 	}
 
-	if err := errGroup.Wait(); err != nil {
-		return err
-	}
-	return nil
+	return errGroup.Wait()
 }
 
 func (r *KuadrantReconciler) reconcileLimitador(ctx context.Context, kObj *kuadrantv1beta1.Kuadrant) error {

controllers/kuadrant_status.go

@@ -8,7 +8,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
-	meta "k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -88,7 +88,7 @@ func (r *KuadrantReconciler) readyCondition(ctx context.Context, kObj *kuadrantv
 
 	if specErr != nil {
 		cond.Status = metav1.ConditionFalse
-		cond.Reason = "ReconcilliationError"
+		cond.Reason = "ReconciliationError"
 		cond.Message = specErr.Error()
 		return cond, nil
 	}

controllers/ratelimitpolicy_controller.go

@@ -211,7 +211,7 @@ func (r *RateLimitPolicyReconciler) deleteResources(ctx context.Context, rlp *ku
 
 	// remove direct back ref
 	if targetNetworkObject != nil {
-		if err := r.deleteNetworkResourceDirectBackReference(ctx, rlp, targetNetworkObject); err != nil {
+		if err := r.deleteNetworkResourceDirectBackReference(ctx, targetNetworkObject); err != nil {
 			return err
 		}
 	}
@@ -225,8 +225,8 @@ func (r *RateLimitPolicyReconciler) reconcileNetworkResourceDirectBackReference(
 	return r.ReconcileTargetBackReference(ctx, client.ObjectKeyFromObject(policy), targetNetworkObject, common.RateLimitPolicyBackRefAnnotation)
 }
 
-func (r *RateLimitPolicyReconciler) deleteNetworkResourceDirectBackReference(ctx context.Context, rlp *kuadrantv1beta2.RateLimitPolicy, targetNetworkObject client.Object) error {
-	return r.DeleteTargetBackReference(ctx, client.ObjectKeyFromObject(rlp), targetNetworkObject, common.RateLimitPolicyBackRefAnnotation)
+func (r *RateLimitPolicyReconciler) deleteNetworkResourceDirectBackReference(ctx context.Context, targetNetworkObject client.Object) error {
+	return r.DeleteTargetBackReference(ctx, targetNetworkObject, common.RateLimitPolicyBackRefAnnotation)
 }
 
 // SetupWithManager sets up the controller with the Manager.

controllers/ratelimitpolicy_controller_test.go

@@ -41,12 +41,12 @@ func testBuildBasicGateway(gwName, ns string) *gatewayapiv1beta1.Gateway {
 			Annotations: map[string]string{"networking.istio.io/service-type": string(corev1.ServiceTypeClusterIP)},
 		},
 		Spec: gatewayapiv1beta1.GatewaySpec{
-			GatewayClassName: gatewayapiv1beta1.ObjectName("istio"),
+			GatewayClassName: "istio",
 			Listeners: []gatewayapiv1beta1.Listener{
 				{
-					Name:     gatewayapiv1beta1.SectionName("default"),
+					Name:     "default",
 					Port:     gatewayapiv1beta1.PortNumber(80),
-					Protocol: gatewayapiv1beta1.ProtocolType("HTTP"),
+					Protocol: "HTTP",
 				},
 			},
 		},

controllers/ratelimitpolicy_status.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-logr/logr"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	meta "k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"

doc/development.md

@@ -26,7 +26,7 @@
 * [operator-sdk] version v1.28.1
 * [kind] version v0.20.0
 * [git][git_tool]
-* [go] version 1.19+
+* [go] version 1.20+
 * [kubernetes] version v1.19+
 * [kubectl] version v1.19+
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/kuadrant/kuadrant-operator
 
-go 1.19
+go 1.20
 
 require (
 	github.com/elliotchance/orderedmap/v2 v2.2.0

pkg/common/common.go

@@ -30,7 +30,6 @@ import (
 // TODO: move the const to a proper place, or get it from config
 const (
 	KuadrantRateLimitClusterName       = "kuadrant-rate-limiting-service"
-	HTTPRouteKind                      = "HTTPRoute"
 	RateLimitPoliciesBackRefAnnotation = "kuadrant.io/ratelimitpolicies"
 	RateLimitPolicyBackRefAnnotation   = "kuadrant.io/ratelimitpolicy"
 	AuthPoliciesBackRefAnnotation      = "kuadrant.io/authpolicies"
@@ -238,7 +237,7 @@ func UnMarshallObjectKey(keyStr string) (client.ObjectKey, error) {
 	return client.ObjectKey{Namespace: keyStr[:namespaceEndIndex], Name: keyStr[namespaceEndIndex+1:]}, nil
 }
 
-// HostnamesToStrings converts []gatewayapi_v1alpha2.Hostname to []string
+// HostnamesToStrings converts []gatewayapiv1beta1.Hostname to []string
 func HostnamesToStrings(hostnames []gatewayapiv1beta1.Hostname) []string {
 	return Map(hostnames, func(hostname gatewayapiv1beta1.Hostname) string {
 		return string(hostname)
@@ -249,8 +248,8 @@ func HostnamesToStrings(hostnames []gatewayapiv1beta1.Hostname) []string {
 // is a subset of at least one of the domains.
 // Domains and subdomains may be prefixed with a wildcard label (*.).
 // The wildcard label must appear by itself as the first label.
-// When one of the subdomains is not a subset of any of the domains, it returns false and
-// the subdomain not being subset of any of the domains
+// When one of the subdomains is not a subset of the domains, it returns false and
+// the subdomain not being subset of the domains
 func ValidSubdomains(domains, subdomains []string) (bool, string) {
 	for _, subdomain := range subdomains {
 		validSubdomain := false