Skip to content

Commit 91398b9

Browse files
committed
THREESCALE-11598 go 1.22 update
1 parent 8999fed commit 91398b9

File tree

9 files changed

+545
-285
lines changed

9 files changed

+545
-285
lines changed

.circleci/config.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ commands:
3434
jobs:
3535
install-operator:
3636
docker:
37-
- image: quay.io/3scale/operators-ci-images:v1.20
37+
- image: quay.io/3scale/operators-ci-images:v1.22
3838
steps:
3939
- setup_remote_docker:
4040
docker_layer_caching: true
@@ -51,7 +51,7 @@ jobs:
5151

5252
license-check:
5353
docker:
54-
- image: quay.io/3scale/operators-ci-images:v1.20
54+
- image: quay.io/3scale/operators-ci-images:v1.22
5555
steps:
5656
- run:
5757
name: Installing ruby
@@ -127,7 +127,7 @@ jobs:
127127
128128
run-unit-test:
129129
docker:
130-
- image: quay.io/3scale/operators-ci-images:v1.20
130+
- image: quay.io/3scale/operators-ci-images:v1.22
131131
steps:
132132
- checkout
133133
- run:
@@ -141,7 +141,7 @@ jobs:
141141
docker_layer_caching: true
142142
steps:
143143
- go/install:
144-
version: '1.20.14'
144+
version: '1.22.8'
145145
- checkout
146146
- run:
147147
name: Install KinD
@@ -159,7 +159,7 @@ jobs:
159159

160160
lint:
161161
docker:
162-
- image: quay.io/3scale/operators-ci-images:v1.20
162+
- image: quay.io/3scale/operators-ci-images:v1.22
163163
steps:
164164
- checkout
165165
- run:
@@ -169,7 +169,7 @@ jobs:
169169
170170
bundle-validate:
171171
docker:
172-
- image: quay.io/3scale/operators-ci-images:v1.20
172+
- image: quay.io/3scale/operators-ci-images:v1.22
173173
steps:
174174
- checkout
175175
- run: make bundle

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM registry.access.redhat.com/ubi9/go-toolset:1.20.12 as builder
2+
FROM mirror.gcr.io/library/golang:1.22.10 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ CURRENT_DATE=$(shell date +%s)
4343
# download controller-gen if necessary
4444
CONTROLLER_GEN=$(PROJECT_PATH)/bin/controller-gen
4545
$(CONTROLLER_GEN):
46-
$(call go-bin-install,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2)
46+
$(call go-bin-install,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
4747

4848
.PHONY: controller-gen
4949
controller-gen: $(CONTROLLER_GEN)
@@ -222,7 +222,7 @@ bundle-run: $(OPERATOR_SDK)
222222
GOLANGCI-LINT=$(PROJECT_PATH)/bin/golangci-lint
223223
$(GOLANGCI-LINT):
224224
mkdir -p $(PROJECT_PATH)/bin
225-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_PATH)/bin v1.52.2
225+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_PATH)/bin v1.56.0
226226

227227
.PHONY: golangci-lint
228228
golangci-lint: $(GOLANGCI-LINT)

apis/apps/v1alpha1/zz_generated.deepcopy.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bundle/manifests/apps.3scale.net_apicasts.yaml

+187-49
Large diffs are not rendered by default.

config/crd/bases/apps.3scale.net_apicasts.yaml

+193-146
Large diffs are not rendered by default.

config/rbac/role.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: Role
44
metadata:
5-
creationTimestamp: null
65
name: manager-role
76
namespace: placeholder
87
rules:

go.mod

+19-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/3scale/apicast-operator
22

3-
go 1.20
3+
go 1.22
4+
5+
toolchain go1.22.10
46

57
require (
68
github.com/RHsyseng/operator-utils v1.4.13
@@ -19,24 +21,25 @@ require (
1921
)
2022

2123
require (
22-
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
24+
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
2325
github.com/beorn7/perks v1.0.1 // indirect
2426
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2527
github.com/davecgh/go-spew v1.1.1 // indirect
2628
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
27-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
29+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
2830
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
2931
github.com/fsnotify/fsnotify v1.7.0 // indirect
3032
github.com/go-logr/zapr v1.3.0 // indirect
31-
github.com/go-openapi/analysis v0.21.2 // indirect
32-
github.com/go-openapi/errors v0.20.2 // indirect
33+
github.com/go-openapi/analysis v0.19.10 // indirect
34+
github.com/go-openapi/errors v0.19.7 // indirect
3335
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3436
github.com/go-openapi/jsonreference v0.20.2 // indirect
35-
github.com/go-openapi/loads v0.21.1 // indirect
36-
github.com/go-openapi/spec v0.20.7 // indirect
37-
github.com/go-openapi/strfmt v0.21.3 // indirect
37+
github.com/go-openapi/loads v0.19.5 // indirect
38+
github.com/go-openapi/runtime v0.19.31 // indirect
39+
github.com/go-openapi/spec v0.19.9 // indirect
40+
github.com/go-openapi/strfmt v0.19.5 // indirect
3841
github.com/go-openapi/swag v0.22.3 // indirect
39-
github.com/go-openapi/validate v0.22.0 // indirect
42+
github.com/go-openapi/validate v0.19.11 // indirect
4043
github.com/go-playground/locales v0.14.0 // indirect
4144
github.com/go-playground/universal-translator v0.18.0 // indirect
4245
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
@@ -56,26 +59,25 @@ require (
5659
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5760
github.com/modern-go/reflect2 v1.0.2 // indirect
5861
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
59-
github.com/oklog/ulid v1.3.1 // indirect
6062
github.com/pkg/errors v0.9.1 // indirect
6163
github.com/pmezard/go-difflib v1.0.0 // indirect
6264
github.com/prometheus/client_golang v1.18.0 // indirect
6365
github.com/prometheus/client_model v0.5.0 // indirect
6466
github.com/prometheus/common v0.45.0 // indirect
6567
github.com/prometheus/procfs v0.12.0 // indirect
6668
github.com/spf13/pflag v1.0.5 // indirect
67-
go.mongodb.org/mongo-driver v1.10.0 // indirect
69+
go.mongodb.org/mongo-driver v1.17.2 // indirect
6870
go.uber.org/multierr v1.11.0 // indirect
6971
go.uber.org/zap v1.26.0 // indirect
70-
golang.org/x/crypto v0.21.0 // indirect
72+
golang.org/x/crypto v0.31.0 // indirect
7173
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
72-
golang.org/x/net v0.21.0 // indirect
74+
golang.org/x/net v0.33.0 // indirect
7375
golang.org/x/oauth2 v0.12.0 // indirect
74-
golang.org/x/sys v0.18.0 // indirect
75-
golang.org/x/term v0.18.0 // indirect
76-
golang.org/x/text v0.14.0 // indirect
76+
golang.org/x/sys v0.28.0 // indirect
77+
golang.org/x/term v0.27.0 // indirect
78+
golang.org/x/text v0.21.0 // indirect
7779
golang.org/x/time v0.3.0 // indirect
78-
golang.org/x/tools v0.17.0 // indirect
80+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
7981
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
8082
google.golang.org/appengine v1.6.7 // indirect
8183
google.golang.org/protobuf v1.31.0 // indirect

0 commit comments

Comments
 (0)