Skip to content

Commit 383748b

Browse files
pmalekpmalek
authored
chore: fix go module to v2 (#3355)
1 parent 7c58797 commit 383748b

File tree

744 files changed

+2453
-2450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

744 files changed

+2453
-2450
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Builder
33
# ------------------------------------------------------------------------------
44

5-
FROM --platform=$BUILDPLATFORM golang:1.25.5@sha256:20b91eda7a9627c127c0225b0d4e8ec927b476fa4130c6760928b849d769c149 AS builder
5+
FROM --platform=$BUILDPLATFORM golang:1.25.7@sha256:85c0ab0b73087fda36bf8692efe2cf67c54a06d7ca3b49c489bbff98c9954d64 AS builder
66

77
WORKDIR /workspace
88
ARG GOPATH

‎Makefile‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ REPO_NAME ?= $(shell echo $(REPO) | cut -d / -f 3)
88
REPO_INFO ?= $(shell git config --get remote.origin.url)
99
TAG ?= $(shell git describe --tags)
1010
VERSION ?= $(shell cat VERSION)
11+
GO_MODULE_MAJOR_VERSION := $(shell go list -m -f '{{.Path}}' | awk -F'/v' '{print (NF>1) ? $$NF : "1"}')
12+
GO_METADATA_PACKAGE = $(REPO)/v$(GO_MODULE_MAJOR_VERSION)/modules/manager/metadata
1113

1214
ifndef COMMIT
1315
COMMIT := $(shell git rev-parse --short HEAD)
@@ -17,8 +19,9 @@ endif
1719
# Configuration - Build
1820
# ------------------------------------------------------------------------------
1921

22+
# Some sensible Make defaults: https://tech.davis-hansson.com/p/make/
2023
SHELL = bash
21-
.SHELLFLAGS = -ec -o pipefail
24+
.SHELLFLAGS = -euc -o pipefail
2225

2326
IMG ?= docker.io/kong/kong-operator
2427
KUSTOMIZE_IMG_NAME = docker.io/kong/kong-operator
@@ -28,11 +31,11 @@ LDFLAGS_COMMON ?= -extldflags=-Wl,-ld_classic
2831
endif
2932

3033
LDFLAGS_METADATA ?= \
31-
-X $(REPO)/modules/manager/metadata.projectName=$(REPO_NAME) \
32-
-X $(REPO)/modules/manager/metadata.release=$(TAG) \
33-
-X $(REPO)/modules/manager/metadata.commit=$(COMMIT) \
34-
-X $(REPO)/modules/manager/metadata.repo=$(REPO_INFO) \
35-
-X $(REPO)/modules/manager/metadata.repoURL=$(REPO_URL)
34+
-X $(GO_METADATA_PACKAGE).projectName=$(REPO_NAME) \
35+
-X $(GO_METADATA_PACKAGE).release=$(TAG) \
36+
-X $(GO_METADATA_PACKAGE).commit=$(COMMIT) \
37+
-X $(GO_METADATA_PACKAGE).repo=$(REPO_INFO) \
38+
-X $(GO_METADATA_PACKAGE).repoURL=$(REPO_URL)
3639

3740
# ------------------------------------------------------------------------------
3841
# Configuration - Tooling

‎cmd/main.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
ctrl "sigs.k8s.io/controller-runtime"
2323
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2424

25-
"github.com/kong/kong-operator/controller/pkg/secrets"
26-
"github.com/kong/kong-operator/modules/cli"
27-
"github.com/kong/kong-operator/modules/manager"
28-
"github.com/kong/kong-operator/modules/manager/metadata"
29-
"github.com/kong/kong-operator/modules/manager/scheme"
25+
"github.com/kong/kong-operator/v2/controller/pkg/secrets"
26+
"github.com/kong/kong-operator/v2/modules/cli"
27+
"github.com/kong/kong-operator/v2/modules/manager"
28+
"github.com/kong/kong-operator/v2/modules/manager/metadata"
29+
"github.com/kong/kong-operator/v2/modules/manager/scheme"
3030
)
3131

3232
func main() {

‎controller/controlplane/controller.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,23 @@ import (
3535
operatorv2beta1 "github.com/kong/kubernetes-configuration/v2/api/gateway-operator/v2beta1"
3636
konnectv1alpha2 "github.com/kong/kubernetes-configuration/v2/api/konnect/v1alpha2"
3737

38-
ctrlconsts "github.com/kong/kong-operator/controller/consts"
39-
"github.com/kong/kong-operator/controller/pkg/extensions"
40-
extensionserrors "github.com/kong/kong-operator/controller/pkg/extensions/errors"
41-
extensionskonnect "github.com/kong/kong-operator/controller/pkg/extensions/konnect"
42-
"github.com/kong/kong-operator/controller/pkg/log"
43-
"github.com/kong/kong-operator/controller/pkg/op"
44-
"github.com/kong/kong-operator/controller/pkg/secrets"
45-
ingresserrors "github.com/kong/kong-operator/ingress-controller/pkg/errors"
46-
"github.com/kong/kong-operator/ingress-controller/pkg/manager"
47-
managercfg "github.com/kong/kong-operator/ingress-controller/pkg/manager/config"
48-
"github.com/kong/kong-operator/ingress-controller/pkg/manager/multiinstance"
49-
gwtypes "github.com/kong/kong-operator/internal/types"
50-
"github.com/kong/kong-operator/internal/utils/index"
51-
"github.com/kong/kong-operator/modules/manager/logging"
52-
"github.com/kong/kong-operator/pkg/consts"
53-
gatewayutils "github.com/kong/kong-operator/pkg/utils/gateway"
54-
k8sutils "github.com/kong/kong-operator/pkg/utils/kubernetes"
38+
ctrlconsts "github.com/kong/kong-operator/v2/controller/consts"
39+
"github.com/kong/kong-operator/v2/controller/pkg/extensions"
40+
extensionserrors "github.com/kong/kong-operator/v2/controller/pkg/extensions/errors"
41+
extensionskonnect "github.com/kong/kong-operator/v2/controller/pkg/extensions/konnect"
42+
"github.com/kong/kong-operator/v2/controller/pkg/log"
43+
"github.com/kong/kong-operator/v2/controller/pkg/op"
44+
"github.com/kong/kong-operator/v2/controller/pkg/secrets"
45+
ingresserrors "github.com/kong/kong-operator/v2/ingress-controller/pkg/errors"
46+
"github.com/kong/kong-operator/v2/ingress-controller/pkg/manager"
47+
managercfg "github.com/kong/kong-operator/v2/ingress-controller/pkg/manager/config"
48+
"github.com/kong/kong-operator/v2/ingress-controller/pkg/manager/multiinstance"
49+
gwtypes "github.com/kong/kong-operator/v2/internal/types"
50+
"github.com/kong/kong-operator/v2/internal/utils/index"
51+
"github.com/kong/kong-operator/v2/modules/manager/logging"
52+
"github.com/kong/kong-operator/v2/pkg/consts"
53+
gatewayutils "github.com/kong/kong-operator/v2/pkg/utils/gateway"
54+
k8sutils "github.com/kong/kong-operator/v2/pkg/utils/kubernetes"
5555
)
5656

5757
// requeueAfterBoot gives the instance of ControlPlane controller in goroutine some time to start up.

‎controller/controlplane/controller_reconciler_utils.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import (
1717
operatorv1beta1 "github.com/kong/kubernetes-configuration/v2/api/gateway-operator/v1beta1"
1818
operatorv2beta1 "github.com/kong/kubernetes-configuration/v2/api/gateway-operator/v2beta1"
1919

20-
"github.com/kong/kong-operator/controller/pkg/op"
21-
"github.com/kong/kong-operator/controller/pkg/secrets"
22-
gwtypes "github.com/kong/kong-operator/internal/types"
23-
"github.com/kong/kong-operator/pkg/consts"
24-
k8sutils "github.com/kong/kong-operator/pkg/utils/kubernetes"
20+
"github.com/kong/kong-operator/v2/controller/pkg/op"
21+
"github.com/kong/kong-operator/v2/controller/pkg/secrets"
22+
gwtypes "github.com/kong/kong-operator/v2/internal/types"
23+
"github.com/kong/kong-operator/v2/pkg/consts"
24+
k8sutils "github.com/kong/kong-operator/v2/pkg/utils/kubernetes"
2525
)
2626

2727
// -----------------------------------------------------------------------------

‎controller/controlplane/controller_reconciler_utils_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
operatorv1beta1 "github.com/kong/kubernetes-configuration/v2/api/gateway-operator/v1beta1"
1414
operatorv2beta1 "github.com/kong/kubernetes-configuration/v2/api/gateway-operator/v2beta1"
1515

16-
gwtypes "github.com/kong/kong-operator/internal/types"
17-
"github.com/kong/kong-operator/modules/manager/scheme"
16+
gwtypes "github.com/kong/kong-operator/v2/internal/types"
17+
"github.com/kong/kong-operator/v2/modules/manager/scheme"
1818
)
1919

2020
func TestEnsureWatchNamespaceGrantsForNamespace(t *testing.T) {

‎controller/controlplane/controller_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import (
2020
operatorv1beta1 "github.com/kong/kubernetes-configuration/v2/api/gateway-operator/v1beta1"
2121
operatorv2beta1 "github.com/kong/kubernetes-configuration/v2/api/gateway-operator/v2beta1"
2222

23-
"github.com/kong/kong-operator/controller/pkg/op"
24-
"github.com/kong/kong-operator/ingress-controller/pkg/manager/multiinstance"
25-
gwtypes "github.com/kong/kong-operator/internal/types"
26-
"github.com/kong/kong-operator/internal/utils/index"
27-
"github.com/kong/kong-operator/modules/manager/scheme"
28-
"github.com/kong/kong-operator/pkg/consts"
29-
k8sutils "github.com/kong/kong-operator/pkg/utils/kubernetes"
30-
"github.com/kong/kong-operator/test/helpers"
23+
"github.com/kong/kong-operator/v2/controller/pkg/op"
24+
"github.com/kong/kong-operator/v2/ingress-controller/pkg/manager/multiinstance"
25+
gwtypes "github.com/kong/kong-operator/v2/internal/types"
26+
"github.com/kong/kong-operator/v2/internal/utils/index"
27+
"github.com/kong/kong-operator/v2/modules/manager/scheme"
28+
"github.com/kong/kong-operator/v2/pkg/consts"
29+
k8sutils "github.com/kong/kong-operator/v2/pkg/utils/kubernetes"
30+
"github.com/kong/kong-operator/v2/test/helpers"
3131
)
3232

3333
func TestReconciler_Reconcile(t *testing.T) {

‎controller/controlplane/controller_utils_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
operatorv2beta1 "github.com/kong/kubernetes-configuration/v2/api/gateway-operator/v2beta1"
99

10-
"github.com/kong/kong-operator/controller/pkg/controlplane"
11-
gwtypes "github.com/kong/kong-operator/internal/types"
10+
"github.com/kong/kong-operator/v2/controller/pkg/controlplane"
11+
gwtypes "github.com/kong/kong-operator/v2/internal/types"
1212
)
1313

1414
func TestControlPlaneSpecDeepEqual(t *testing.T) {

‎controller/controlplane/controller_watch.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
operatorv1alpha1 "github.com/kong/kubernetes-configuration/v2/api/gateway-operator/v1alpha1"
1616
operatorv1beta1 "github.com/kong/kubernetes-configuration/v2/api/gateway-operator/v1beta1"
1717

18-
operatorerrors "github.com/kong/kong-operator/internal/errors"
19-
gwtypes "github.com/kong/kong-operator/internal/types"
20-
"github.com/kong/kong-operator/internal/utils/index"
18+
operatorerrors "github.com/kong/kong-operator/v2/internal/errors"
19+
gwtypes "github.com/kong/kong-operator/v2/internal/types"
20+
"github.com/kong/kong-operator/v2/internal/utils/index"
2121
)
2222

2323
func (r *Reconciler) listControlPlanesForWatchNamespaceGrants(

‎controller/controlplane/manager_options.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212

1313
operatorv2beta1 "github.com/kong/kubernetes-configuration/v2/api/gateway-operator/v2beta1"
1414

15-
"github.com/kong/kong-operator/controller/pkg/log"
16-
managercfg "github.com/kong/kong-operator/ingress-controller/pkg/manager/config"
17-
telemetryTypes "github.com/kong/kong-operator/ingress-controller/pkg/telemetry/types"
18-
gwtypes "github.com/kong/kong-operator/internal/types"
19-
"github.com/kong/kong-operator/pkg/vars"
15+
"github.com/kong/kong-operator/v2/controller/pkg/log"
16+
managercfg "github.com/kong/kong-operator/v2/ingress-controller/pkg/manager/config"
17+
telemetryTypes "github.com/kong/kong-operator/v2/ingress-controller/pkg/telemetry/types"
18+
gwtypes "github.com/kong/kong-operator/v2/internal/types"
19+
"github.com/kong/kong-operator/v2/pkg/vars"
2020
)
2121

2222
// WithRestConfig sets the REST configuration for the manager, but when a kubeConfigPath is provided,

0 commit comments

Comments
 (0)