From a7b74eff9f3f7095727a8318664150c78c724c4f Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Thu, 15 Aug 2024 19:41:21 +0500 Subject: [PATCH] KubeLB is now built with Go 1.23 (#51) Signed-off-by: Waleed Malik --- .prow/postsubmits.yaml | 6 +++--- .prow/verify.yaml | 20 +++++++++---------- Makefile | 2 +- ccm.dockerfile | 2 +- .../crds/kubelb.k8c.io_syncsecrets.yaml | 2 +- .../crds/kubelb.k8c.io_addresses.yaml | 2 +- .../crds/kubelb.k8c.io_configs.yaml | 2 +- .../crds/kubelb.k8c.io_loadbalancers.yaml | 2 +- .../crds/kubelb.k8c.io_routes.yaml | 2 +- .../crds/kubelb.k8c.io_syncsecrets.yaml | 2 +- .../crds/kubelb.k8c.io_tenants.yaml | 2 +- config/crd/bases/kubelb.k8c.io_addresses.yaml | 2 +- config/crd/bases/kubelb.k8c.io_configs.yaml | 2 +- .../bases/kubelb.k8c.io_loadbalancers.yaml | 2 +- config/crd/bases/kubelb.k8c.io_routes.yaml | 2 +- .../crd/bases/kubelb.k8c.io_syncsecrets.yaml | 2 +- config/crd/bases/kubelb.k8c.io_tenants.yaml | 2 +- hack/verify-licenses.sh | 2 +- kubelb.dockerfile | 2 +- 19 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.prow/postsubmits.yaml b/.prow/postsubmits.yaml index daa7bbb..fea257f 100644 --- a/.prow/postsubmits.yaml +++ b/.prow/postsubmits.yaml @@ -30,7 +30,7 @@ postsubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.23-12 + - image: quay.io/kubermatic/build:go-1.23-node-20-kind-0.23-0 command: - /bin/bash - -c @@ -60,7 +60,7 @@ postsubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.23-12 + - image: quay.io/kubermatic/build:go-1.23-node-20-kind-0.23-0 command: - "./hack/ci/upload-gocache.sh" resources: @@ -83,7 +83,7 @@ postsubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.23-12 + - image: quay.io/kubermatic/build:go-1.23-node-20-kind-0.23-0 command: - make args: diff --git a/.prow/verify.yaml b/.prow/verify.yaml index a80adfc..e0dbb64 100644 --- a/.prow/verify.yaml +++ b/.prow/verify.yaml @@ -22,7 +22,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: golang:1.22 + - image: golang:1.23 command: - make args: @@ -39,7 +39,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: golangci/golangci-lint:v1.59.1 + - image: golangci/golangci-lint:v1.60.1 command: - make args: @@ -57,7 +57,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.23-12 + - image: quay.io/kubermatic/build:go-1.23-node-20-kind-0.23-0 command: - make args: @@ -72,7 +72,7 @@ presubmits: clone_uri: "ssh://git@github.com/kubermatic/kubelb.git" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.23-12 + - image: quay.io/kubermatic/build:go-1.23-node-20-kind-0.23-0 command: - make args: @@ -84,7 +84,7 @@ presubmits: clone_uri: "ssh://git@github.com/kubermatic/kubelb.git" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.23-12 + - image: quay.io/kubermatic/build:go-1.23-node-20-kind-0.23-0 command: - make args: @@ -98,7 +98,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: golang:1.22 + - image: golang:1.23 command: - make args: @@ -119,7 +119,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: golang:1.22 + - image: golang:1.23 command: - make args: @@ -141,7 +141,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.23-12 + - image: quay.io/kubermatic/build:go-1.23-node-20-kind-0.23-0 securityContext: privileged: true env: @@ -175,7 +175,7 @@ presubmits: clone_uri: "ssh://git@github.com/kubermatic/kubelb.git" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.23-12 + - image: quay.io/kubermatic/build:go-1.23-node-20-kind-0.23-0 command: - shfmt args: @@ -205,7 +205,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.23-12 + - image: quay.io/kubermatic/build:go-1.23-node-20-kind-0.23-0 command: - ./hack/verify-licenses.sh resources: diff --git a/Makefile b/Makefile index 79ba53c..1316efe 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ KUBELB_CCM_IMG ?= quay.io/kubermatic/kubelb-ccm ENVTEST_K8S_VERSION = 1.30.0 KUSTOMIZE_VERSION ?= v5.4.3 CONTROLLER_TOOLS_VERSION ?= v0.15.0 -GO_VERSION = 1.22.6 +GO_VERSION = 1.23.0 HELM_DOCS_VERSION ?= v1.14.2 CRD_REF_DOCS_VERSION ?= v0.1.0 diff --git a/ccm.dockerfile b/ccm.dockerfile index 77d6085..1a15f5e 100644 --- a/ccm.dockerfile +++ b/ccm.dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/golang:1.22.6 as builder +FROM docker.io/golang:1.23.0 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/charts/kubelb-ccm/crds/kubelb.k8c.io_syncsecrets.yaml b/charts/kubelb-ccm/crds/kubelb.k8c.io_syncsecrets.yaml index b8cd115..9867a3d 100644 --- a/charts/kubelb-ccm/crds/kubelb.k8c.io_syncsecrets.yaml +++ b/charts/kubelb-ccm/crds/kubelb.k8c.io_syncsecrets.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: syncsecrets.kubelb.k8c.io spec: group: kubelb.k8c.io diff --git a/charts/kubelb-manager/crds/kubelb.k8c.io_addresses.yaml b/charts/kubelb-manager/crds/kubelb.k8c.io_addresses.yaml index 7be50ad..5fcf2c2 100644 --- a/charts/kubelb-manager/crds/kubelb.k8c.io_addresses.yaml +++ b/charts/kubelb-manager/crds/kubelb.k8c.io_addresses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: addresses.kubelb.k8c.io spec: group: kubelb.k8c.io diff --git a/charts/kubelb-manager/crds/kubelb.k8c.io_configs.yaml b/charts/kubelb-manager/crds/kubelb.k8c.io_configs.yaml index 759c0ad..0dd0156 100644 --- a/charts/kubelb-manager/crds/kubelb.k8c.io_configs.yaml +++ b/charts/kubelb-manager/crds/kubelb.k8c.io_configs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: configs.kubelb.k8c.io spec: group: kubelb.k8c.io diff --git a/charts/kubelb-manager/crds/kubelb.k8c.io_loadbalancers.yaml b/charts/kubelb-manager/crds/kubelb.k8c.io_loadbalancers.yaml index 38ae808..a388371 100644 --- a/charts/kubelb-manager/crds/kubelb.k8c.io_loadbalancers.yaml +++ b/charts/kubelb-manager/crds/kubelb.k8c.io_loadbalancers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: loadbalancers.kubelb.k8c.io spec: group: kubelb.k8c.io diff --git a/charts/kubelb-manager/crds/kubelb.k8c.io_routes.yaml b/charts/kubelb-manager/crds/kubelb.k8c.io_routes.yaml index 7eb04e5..a8a69df 100644 --- a/charts/kubelb-manager/crds/kubelb.k8c.io_routes.yaml +++ b/charts/kubelb-manager/crds/kubelb.k8c.io_routes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: routes.kubelb.k8c.io spec: group: kubelb.k8c.io diff --git a/charts/kubelb-manager/crds/kubelb.k8c.io_syncsecrets.yaml b/charts/kubelb-manager/crds/kubelb.k8c.io_syncsecrets.yaml index b8cd115..9867a3d 100644 --- a/charts/kubelb-manager/crds/kubelb.k8c.io_syncsecrets.yaml +++ b/charts/kubelb-manager/crds/kubelb.k8c.io_syncsecrets.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: syncsecrets.kubelb.k8c.io spec: group: kubelb.k8c.io diff --git a/charts/kubelb-manager/crds/kubelb.k8c.io_tenants.yaml b/charts/kubelb-manager/crds/kubelb.k8c.io_tenants.yaml index 2de5283..da5a800 100644 --- a/charts/kubelb-manager/crds/kubelb.k8c.io_tenants.yaml +++ b/charts/kubelb-manager/crds/kubelb.k8c.io_tenants.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: tenants.kubelb.k8c.io spec: group: kubelb.k8c.io diff --git a/config/crd/bases/kubelb.k8c.io_addresses.yaml b/config/crd/bases/kubelb.k8c.io_addresses.yaml index 7be50ad..5fcf2c2 100644 --- a/config/crd/bases/kubelb.k8c.io_addresses.yaml +++ b/config/crd/bases/kubelb.k8c.io_addresses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: addresses.kubelb.k8c.io spec: group: kubelb.k8c.io diff --git a/config/crd/bases/kubelb.k8c.io_configs.yaml b/config/crd/bases/kubelb.k8c.io_configs.yaml index 759c0ad..0dd0156 100644 --- a/config/crd/bases/kubelb.k8c.io_configs.yaml +++ b/config/crd/bases/kubelb.k8c.io_configs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: configs.kubelb.k8c.io spec: group: kubelb.k8c.io diff --git a/config/crd/bases/kubelb.k8c.io_loadbalancers.yaml b/config/crd/bases/kubelb.k8c.io_loadbalancers.yaml index 38ae808..a388371 100644 --- a/config/crd/bases/kubelb.k8c.io_loadbalancers.yaml +++ b/config/crd/bases/kubelb.k8c.io_loadbalancers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: loadbalancers.kubelb.k8c.io spec: group: kubelb.k8c.io diff --git a/config/crd/bases/kubelb.k8c.io_routes.yaml b/config/crd/bases/kubelb.k8c.io_routes.yaml index 7eb04e5..a8a69df 100644 --- a/config/crd/bases/kubelb.k8c.io_routes.yaml +++ b/config/crd/bases/kubelb.k8c.io_routes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: routes.kubelb.k8c.io spec: group: kubelb.k8c.io diff --git a/config/crd/bases/kubelb.k8c.io_syncsecrets.yaml b/config/crd/bases/kubelb.k8c.io_syncsecrets.yaml index b8cd115..9867a3d 100644 --- a/config/crd/bases/kubelb.k8c.io_syncsecrets.yaml +++ b/config/crd/bases/kubelb.k8c.io_syncsecrets.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: syncsecrets.kubelb.k8c.io spec: group: kubelb.k8c.io diff --git a/config/crd/bases/kubelb.k8c.io_tenants.yaml b/config/crd/bases/kubelb.k8c.io_tenants.yaml index 2de5283..da5a800 100644 --- a/config/crd/bases/kubelb.k8c.io_tenants.yaml +++ b/config/crd/bases/kubelb.k8c.io_tenants.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: tenants.kubelb.k8c.io spec: group: kubelb.k8c.io diff --git a/hack/verify-licenses.sh b/hack/verify-licenses.sh index d71426d..7553833 100755 --- a/hack/verify-licenses.sh +++ b/hack/verify-licenses.sh @@ -19,7 +19,7 @@ set -euo pipefail cd $(dirname $0)/.. source hack/lib.sh -CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.22-node-20-kind-0.23-12 containerize ./hack/verify-licenses.sh +CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.23-node-20-kind-0.23-0 containerize ./hack/verify-licenses.sh go mod vendor diff --git a/kubelb.dockerfile b/kubelb.dockerfile index 197daa5..e923175 100644 --- a/kubelb.dockerfile +++ b/kubelb.dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/golang:1.22.6 as builder +FROM docker.io/golang:1.23.0 as builder WORKDIR /workspace # Copy the Go Modules manifests