chore(go): bump KIC's Go module from v2 to v3 (#5014)

.golangci.yaml

@@ -53,7 +53,7 @@ linters-settings:
     sections:
     - standard
     - default
-    - prefix(github.com/kong/kubernetes-ingress-controller/v2)
+    - prefix(github.com/kong/kubernetes-ingress-controller/v3)
   importas:
     no-unaliased: true
     alias:
@@ -119,6 +119,9 @@ linters-settings:
           recommendations:
           - github.com/go-logr/zapr
           - github.com/go-logr/logr
+      - github.com/kong/kubernetes-ingress-controller/v2:
+          recommendations:
+          - github.com/kong/kubernetes-ingress-controller/v3
   tenv:
     all: true
   loggercheck:

Makefile

@@ -13,6 +13,7 @@ SHELL := bash
 MAKEFLAGS += --no-print-directory
 REPO_URL ?= github.com/kong/kubernetes-ingress-controller
 REPO_INFO ?= $(shell git config --get remote.origin.url)
+GO_MOD_MAJOR_VERSION ?= $(subst $(REPO_URL)/,,$(shell go list -m))
 TAG ?= $(shell git describe --tags)
 
 ifndef COMMIT
@@ -136,9 +137,9 @@ _build.fips:
 .PHONY: _build.template
 _build.template:
 	go build -o bin/manager -ldflags "-s -w \
-		-X $(REPO_URL)/v2/internal/manager/metadata.Release=$(TAG) \
-		-X $(REPO_URL)/v2/internal/manager/metadata.Commit=$(COMMIT) \
-		-X $(REPO_URL)/v2/internal/manager/metadata.Repo=$(REPO_INFO)" ${MAIN}
+		-X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Release=$(TAG) \
+		-X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Commit=$(COMMIT) \
+		-X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Repo=$(REPO_INFO)" ${MAIN}
 
 .PHONY: _build.debug
 _build.debug:
@@ -147,9 +148,9 @@ _build.debug:
 .PHONY: _build.template.debug
 _build.template.debug:
 	go build -o bin/manager-debug -trimpath -gcflags=all="-N -l" -ldflags " \
-		-X $(REPO_URL)/v2/internal/manager/metadata.Release=$(TAG) \
-		-X $(REPO_URL)/v2/internal/manager/metadata.Commit=$(COMMIT) \
-		-X $(REPO_URL)/v2/internal/manager/metadata.Repo=$(REPO_INFO)" ${MAIN}
+		-X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Release=$(TAG) \
+		-X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Commit=$(COMMIT) \
+		-X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Repo=$(REPO_INFO)" ${MAIN}
 
 .PHONY: fmt
 fmt:
@@ -244,12 +245,12 @@ generate.clientsets: client-gen
 		--go-header-file ./hack/boilerplate.go.txt \
 		--logtostderr \
 		--clientset-name clientset \
-		--input-base $(REPO_URL)/v2/pkg/apis/  \
+		--input-base $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/pkg/apis/ \
 		--input configuration/v1,configuration/v1beta1,configuration/v1alpha1 \
 		--input-dirs $(REPO_URL)/pkg/apis/configuration/v1alpha1/,$(REPO_URL)/pkg/apis/configuration/v1beta1/,$(REPO_URL)/pkg/apis/configuration/v1/ \
 		--output-base pkg/ \
-		--output-package $(REPO_URL)/v2/pkg/ \
-		--trim-path-prefix pkg/$(REPO_URL)/v2/
+		--output-package $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/pkg/ \
+		--trim-path-prefix pkg/$(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/
 
 .PHONY: generate.docs
 generate.docs: generate.apidocs generate.cli-arguments-docs
@@ -331,9 +332,9 @@ test.conformance-experimental: _check.container.environment go-junit-report
 		TEST_EXPERIMENTAL_CONFORMANCE="true" \
 		go test \
 		-ldflags " \
-		-X $(REPO_URL)/v2/internal/manager/metadata.ProjectURL=$(REPO_URL) \
-		-X $(REPO_URL)/v2/internal/manager/metadata.Release=$(TAG) \
-		-X $(REPO_URL)/v2/internal/manager/metadata.Repo=$(REPO_INFO)" \
+		-X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.ProjectURL=$(REPO_URL) \
+		-X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Release=$(TAG) \
+		-X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Repo=$(REPO_INFO)" \
 		-v \
 		-race $(GOTESTFLAGS) \
 		-timeout $(INTEGRATION_TEST_TIMEOUT) \

PROJECT

@@ -3,7 +3,7 @@ layout:
 - go.kubebuilder.io/v3
 multigroup: true
 projectName: kubernetes-ingress-controller
-repo: github.com/kong/kubernetes-ingress-controller/v2
+repo: github.com/kong/kubernetes-ingress-controller
 resources:
 - api:
     crdVersion: v1

README.md

@@ -1,6 +1,6 @@
 [![kong-logo]][kong-url]
 [![Build Status](https://github.com/Kong/kubernetes-ingress-controller/actions/workflows/checks.yaml/badge.svg)](https://github.com/Kong/kubernetes-ingress-controller/actions/workflows/checks.yaml)
-[![Go Reference](https://pkg.go.dev/badge/github.com/kong/kubernetes-ingress-controller/v2.svg)](https://pkg.go.dev/github.com/kong/kubernetes-ingress-controller/v2)
+[![Go Reference](https://pkg.go.dev/badge/github.com/kong/kubernetes-ingress-controller/v3.svg)](https://pkg.go.dev/github.com/kong/kubernetes-ingress-controller/v3)
 [![Codecov](https://codecov.io/gh/Kong/kubernetes-ingress-controller/branch/main/graph/badge.svg?token=S1aqcXiGEo)](https://codecov.io/gh/Kong/kubernetes-ingress-controller)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/Kong/kong/blob/master/LICENSE)
 [![Twitter](https://img.shields.io/twitter/follow/thekonginc.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=thekonginc)

go.mod

@@ -1,4 +1,4 @@
-module github.com/kong/kubernetes-ingress-controller/v2
+module github.com/kong/kubernetes-ingress-controller/v3
 
 go 1.21
 
@@ -74,6 +74,7 @@ require (
 	github.com/gammazero/workerpool v1.1.3 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
+	github.com/hashicorp/go-hclog v1.2.0 // indirect
 	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
@@ -138,7 +139,6 @@ require (
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
 	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-hclog v1.2.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-memdb v1.3.4 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.4

hack/cleanup/gke_clusters.go

@@ -12,7 +12,7 @@ import (
 	"github.com/go-logr/logr"
 	"google.golang.org/api/option"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/test/e2e"
+	"github.com/kong/kubernetes-ingress-controller/v3/test/e2e"
 )
 
 const timeUntilClusterOrphaned = time.Hour

hack/cleanup/konnect_runtime_groups.go

@@ -11,8 +11,8 @@ import (
 	"github.com/oapi-codegen/runtime/types"
 	"github.com/samber/lo"
 
-	cp "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/controlplanes"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/roles"
+	cp "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/controlplanes"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/roles"
 )
 
 const (

hack/generators/controllers/networking/main.go

@@ -20,9 +20,9 @@ const (
 	discoveryv1 = "k8s.io/api/discovery/v1"
 	netv1       = "k8s.io/api/networking/v1"
 
-	kongv1       = "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1"
-	kongv1beta1  = "github.com/kong/kubernetes-ingress-controller/v2/api/configuration/v1beta1"
-	kongv1alpha1 = "github.com/kong/kubernetes-ingress-controller/v2/api/configuration/v1alpha1"
+	kongv1       = "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1"
+	kongv1beta1  = "github.com/kong/kubernetes-ingress-controller/v3/api/configuration/v1beta1"
+	kongv1alpha1 = "github.com/kong/kubernetes-ingress-controller/v3/api/configuration/v1alpha1"
 )
 
 // inputControllersNeeded is a list of the supported Types for the
@@ -420,15 +420,15 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/controllers"
-	ctrlref "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/reference"
-	ctrlutils "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/utils"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/util"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object/status"
-	kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1"
-	kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1"
-	kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/controllers"
+	ctrlref "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/reference"
+	ctrlutils "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/utils"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/util"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object/status"
+	kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1"
+	kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1"
+	kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1"
 )
 `
 

internal/adminapi/backoff_strategy_konnect.go

@@ -13,7 +13,7 @@ import (
 	"github.com/kong/go-kong/kong"
 	"github.com/samber/lo"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckerrors"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckerrors"
 )
 
 const (

internal/adminapi/backoff_strategy_konnect_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/kong/go-kong/kong"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi"
 )
 
 type mockClock struct {

internal/adminapi/client.go

@@ -10,8 +10,8 @@ import (
 	"github.com/samber/lo"
 	k8stypes "k8s.io/apimachinery/pkg/types"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/util"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/util/clock"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/util"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/util/clock"
 )
 
 // Client is a wrapper around raw *kong.Client. It's advised to pass this wrapper across the codebase, and

internal/adminapi/client_test.go

@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/require"
 	k8stypes "k8s.io/apimachinery/pkg/types"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi"
-	"github.com/kong/kubernetes-ingress-controller/v2/test/mocks"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi"
+	"github.com/kong/kubernetes-ingress-controller/v3/test/mocks"
 )
 
 func TestClientFactory_CreateAdminAPIClientAttachesPodReference(t *testing.T) {

internal/adminapi/endpoints.go

@@ -12,7 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	cfgtypes "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/config/types"
+	cfgtypes "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/config/types"
 )
 
 // DiscoveredAdminAPI represents an Admin API discovered from a Kubernetes Service.

internal/adminapi/endpoints_test.go

@@ -17,8 +17,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
-	cfgtypes "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/config/types"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder"
+	cfgtypes "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/config/types"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder"
 )
 
 func TestDiscoverer_AddressesFromEndpointSlice(t *testing.T) {

internal/adminapi/kong.go

@@ -14,8 +14,8 @@ import (
 	"github.com/kong/go-kong/kong"
 	"github.com/samber/lo"
 
-	tlsutil "github.com/kong/kubernetes-ingress-controller/v2/internal/util/tls"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/versions"
+	tlsutil "github.com/kong/kubernetes-ingress-controller/v3/internal/util/tls"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/versions"
 )
 
 // KongClientNotReadyError is returned when the Kong client is not ready to be used yet.

internal/adminapi/kong_test.go

@@ -14,10 +14,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/versions"
-	"github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate"
-	"github.com/kong/kubernetes-ingress-controller/v2/test/mocks"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/versions"
+	"github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate"
+	"github.com/kong/kubernetes-ingress-controller/v3/test/mocks"
 )
 
 func TestMakeHTTPClientWithTLSOpts(t *testing.T) {

internal/adminapi/konnect.go

@@ -13,7 +13,7 @@ import (
 	"github.com/kong/go-kong/kong"
 	"github.com/samber/lo"
 
-	tlsutil "github.com/kong/kubernetes-ingress-controller/v2/internal/util/tls"
+	tlsutil "github.com/kong/kubernetes-ingress-controller/v3/internal/util/tls"
 )
 
 type KonnectConfig struct {

internal/adminapi/konnect_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi"
 )
 
 func TestNewKongClientForKonnectControlPlane(t *testing.T) {

internal/admission/adminapi_provider.go

@@ -3,7 +3,7 @@ package admission
 import (
 	"github.com/kong/go-kong/kong"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi"
 )
 
 // GatewayClientsProvider returns the most recent set of Gateway Admin API clients.

internal/admission/adminapi_provider_test.go

@@ -6,8 +6,8 @@ import (
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/require"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/admission"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/admission"
 )
 
 type fakeGatewayClientsProvider struct {

internal/admission/handler.go

@@ -12,10 +12,10 @@ import (
 	netv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/util"
-	kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1"
-	kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/util"
+	kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1"
+	kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1"
 )
 
 // RequestHandler is an HTTP server that can validate Kong Ingress Controllers'

internal/admission/response_builder_test.go

@@ -9,7 +9,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	k8stypes "k8s.io/apimachinery/pkg/types"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/admission"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/admission"
 )
 
 func TestResponseBuilder(t *testing.T) {

internal/admission/server_test.go

@@ -18,9 +18,9 @@ import (
 	netv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi"
-	kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1"
-	kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi"
+	kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1"
+	kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1"
 )
 
 var decoder = codecs.UniversalDeserializer()

internal/admission/utils.go

@@ -7,8 +7,8 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	credsvalidation "github.com/kong/kubernetes-ingress-controller/v2/internal/admission/validation/consumers/credentials"
-	kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1"
+	credsvalidation "github.com/kong/kubernetes-ingress-controller/v3/internal/admission/validation/consumers/credentials"
+	kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1"
 )
 
 // -----------------------------------------------------------------------------

internal/admission/validation/consumers/credentials/validation.go

@@ -7,8 +7,8 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/labels"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/util"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/labels"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/util"
 )
 
 // -----------------------------------------------------------------------------

internal/admission/validation/consumers/credentials/validation_test.go

@@ -9,7 +9,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/labels"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/labels"
 )
 
 func TestUniqueConstraintsValidation(t *testing.T) {

internal/admission/validation/gateway/httproute.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/kong/go-kong/kong"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi"
 )
 
 type routeValidator interface {

internal/admission/validation/gateway/httproute_test.go

@@ -10,8 +10,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser"
-	"github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser"
+	"github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi"
 )
 
 func TestValidateHTTPRoute(t *testing.T) {