Skip to content

Commit ce7710d

Browse files
Upgrade to go 1.20 and update dependencies + point to a compatible MCAD
1 parent a4590ea commit ce7710d

13 files changed

+100
-111
lines changed

Diff for: .github/workflows/e2e_tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Set Go
4646
uses: actions/setup-go@v3
4747
with:
48-
go-version: v1.19
48+
go-version: v1.20
4949

5050
- name: Set up gotestfmt
5151
uses: gotesttools/gotestfmt-action@v2

Diff for: .github/workflows/olm_tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Set Go
4545
uses: actions/setup-go@v3
4646
with:
47-
go-version: v1.19
47+
go-version: v1.20
4848

4949
- name: Set up gotestfmt
5050
uses: gotesttools/gotestfmt-action@v2

Diff for: .github/workflows/operator-image.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set Go
2323
uses: actions/setup-go@v3
2424
with:
25-
go-version: v1.19
25+
go-version: v1.20
2626

2727
- name: Login to Quay.io
2828
uses: redhat-actions/podman-login@v1

Diff for: .github/workflows/precommit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set Go
2727
uses: actions/setup-go@v3
2828
with:
29-
go-version: v1.19
29+
go-version: v1.20
3030

3131
- name: Activate cache
3232
uses: actions/cache@v3

Diff for: .github/workflows/tag-and-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- name: Set Go
6565
uses: actions/setup-go@v3
6666
with:
67-
go-version: v1.19
67+
go-version: v1.20
6868

6969
- name: Verify that release doesn't exist yet
7070
shell: bash {0}

Diff for: .github/workflows/unit_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Set Go
2828
uses: actions/setup-go@v3
2929
with:
30-
go-version: v1.19
30+
go-version: v1.20
3131

3232
- name: Activate cache
3333
uses: actions/cache@v3

Diff for: .github/workflows/verify_generated_files.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set Go
2525
uses: actions/setup-go@v3
2626
with:
27-
go-version: v1.19
27+
go-version: v1.20
2828
- name: Verify that imports are organized
2929
run: make verify-imports
3030

@@ -35,6 +35,6 @@ jobs:
3535
- name: Set Go
3636
uses: actions/setup-go@v3
3737
with:
38-
go-version: v1.19
38+
go-version: v1.20
3939
- name: Verify that the latest WebhookConfigurations, ClusterRoles, and CustomResourceDefinitions have been generated
4040
run: make manifests && git diff --exit-code

Diff for: CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Here are a few things to go over before getting started with CodeFlare Operator
55
## Environment setup
66

77
The following should be installed in your working environment:
8-
- Go 1.19.x
8+
- Go 1.20.x
99
- [Download release](https://go.dev/dl/)
1010
- [Install Instructions](https://go.dev/doc/install)
1111
- [Operator SDK](https://sdk.operatorframework.io/docs/installation/)

Diff for: 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/ubi8/go-toolset:1.19.13 as builder
2+
FROM registry.access.redhat.com/ubi8/go-toolset:1.20.10 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ SED ?= /usr/bin/sed
229229
KUSTOMIZE_VERSION ?= v4.5.4
230230
CODEGEN_VERSION ?= v0.27.2
231231
CONTROLLER_TOOLS_VERSION ?= v0.9.2
232-
YQ_VERSION ?= v4.30.8 ## latest version that works with go1.19
232+
YQ_VERSION ?= v4.35.2 ## latest version that works with go1.20
233233
OPERATOR_SDK_VERSION ?= v1.27.0
234234
GH_CLI_VERSION ?= 2.30.0
235235

Diff for: config/manager/manager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
# it is recommended to ensure that all your Pods/Containers are restrictive.
2929
# More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
3030
# Please uncomment the following code if your project does NOT have to work on old Kubernetes
31-
# versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
31+
# versions < 1.20 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
3232
# seccompProfile:
3333
# type: RuntimeDefault
3434
containers:

Diff for: go.mod

+27-23
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/project-codeflare/codeflare-operator
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/onsi/gomega v1.27.10
@@ -10,28 +10,31 @@ require (
1010
github.com/project-codeflare/multi-cluster-app-dispatcher v1.38.1
1111
github.com/ray-project/kuberay/ray-operator v1.0.0-rc.1
1212
go.uber.org/zap v1.26.0
13-
k8s.io/api v0.26.3
14-
k8s.io/apimachinery v0.26.3
15-
k8s.io/client-go v0.26.3
16-
k8s.io/component-base v0.26.2
13+
k8s.io/api v0.27.8
14+
k8s.io/apimachinery v0.27.8
15+
k8s.io/client-go v0.27.8
16+
k8s.io/component-base v0.27.8
1717
k8s.io/klog/v2 v2.90.1
1818
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
19-
sigs.k8s.io/controller-runtime v0.14.6
19+
sigs.k8s.io/controller-runtime v0.15.3
2020
sigs.k8s.io/yaml v1.3.0
2121
)
2222

2323
replace sigs.k8s.io/custom-metrics-apiserver => sigs.k8s.io/custom-metrics-apiserver v1.25.1-0.20230306170449-63d8c93851f3
2424

25+
replace github.com/project-codeflare/multi-cluster-app-dispatcher => github.com/ChristianZaccaria/multi-cluster-app-dispatcher v0.0.0-20231213170206-696368415a5a
26+
2527
require (
2628
github.com/NYTimes/gziphandler v1.1.1 // indirect
2729
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
30+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2831
github.com/aymerick/douceur v0.2.0 // indirect
2932
github.com/beorn7/perks v1.0.1 // indirect
3033
github.com/blang/semver/v4 v4.0.0 // indirect
3134
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3235
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3336
github.com/coreos/go-semver v0.3.0 // indirect
34-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
37+
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
3538
github.com/davecgh/go-spew v1.1.1 // indirect
3639
github.com/eapache/go-resiliency v1.3.0 // indirect
3740
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
@@ -41,7 +44,7 @@ require (
4144
github.com/fsnotify/fsnotify v1.6.0 // indirect
4245
github.com/go-logr/logr v1.2.4 // indirect
4346
github.com/go-logr/stdr v1.2.2 // indirect
44-
github.com/go-logr/zapr v1.2.3 // indirect
47+
github.com/go-logr/zapr v1.2.4 // indirect
4548
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4649
github.com/go-openapi/jsonreference v0.20.1 // indirect
4750
github.com/go-openapi/swag v0.22.3 // indirect
@@ -50,7 +53,7 @@ require (
5053
github.com/golang/glog v1.1.2 // indirect
5154
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5255
github.com/golang/protobuf v1.5.3 // indirect
53-
github.com/google/cel-go v0.12.6 // indirect
56+
github.com/google/cel-go v0.12.7 // indirect
5457
github.com/google/gnostic v0.6.9 // indirect
5558
github.com/google/go-cmp v0.5.9 // indirect
5659
github.com/google/gofuzz v1.2.0 // indirect
@@ -65,24 +68,25 @@ require (
6568
github.com/josharian/intern v1.0.0 // indirect
6669
github.com/json-iterator/go v1.1.12 // indirect
6770
github.com/mailru/easyjson v0.7.7 // indirect
68-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
71+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6972
github.com/microcosm-cc/bluemonday v1.0.18 // indirect
73+
github.com/mitchellh/mapstructure v1.4.1 // indirect
7074
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7175
github.com/modern-go/reflect2 v1.0.2 // indirect
7276
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7377
github.com/openshift-online/ocm-sdk-go v0.1.368 // indirect
7478
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c // indirect
7579
github.com/pkg/errors v0.9.1 // indirect
76-
github.com/prometheus/client_golang v1.14.0 // indirect
77-
github.com/prometheus/client_model v0.3.0 // indirect
78-
github.com/prometheus/common v0.37.0 // indirect
79-
github.com/prometheus/procfs v0.8.0 // indirect
80+
github.com/prometheus/client_golang v1.15.1 // indirect
81+
github.com/prometheus/client_model v0.4.0 // indirect
82+
github.com/prometheus/common v0.42.0 // indirect
83+
github.com/prometheus/procfs v0.9.0 // indirect
8084
github.com/spf13/cobra v1.7.0 // indirect
8185
github.com/spf13/pflag v1.0.5 // indirect
8286
github.com/stoewer/go-strcase v1.2.0 // indirect
83-
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
84-
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
85-
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
87+
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
88+
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
89+
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
8690
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect
8791
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
8892
go.opentelemetry.io/otel v1.19.0 // indirect
@@ -101,7 +105,7 @@ require (
101105
golang.org/x/term v0.13.0 // indirect
102106
golang.org/x/text v0.13.0 // indirect
103107
golang.org/x/time v0.3.0 // indirect
104-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
108+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
105109
google.golang.org/appengine v1.6.7 // indirect
106110
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
107111
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
@@ -112,13 +116,13 @@ require (
112116
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
113117
gopkg.in/yaml.v2 v2.4.0 // indirect
114118
gopkg.in/yaml.v3 v3.0.1 // indirect
115-
k8s.io/apiextensions-apiserver v0.26.1 // indirect
116-
k8s.io/apiserver v0.26.2 // indirect
119+
k8s.io/apiextensions-apiserver v0.27.7 // indirect
120+
k8s.io/apiserver v0.27.8 // indirect
117121
k8s.io/klog v1.0.0 // indirect
118-
k8s.io/kms v0.26.2 // indirect
119-
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
122+
k8s.io/kms v0.27.8 // indirect
123+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
120124
k8s.io/metrics v0.26.2 // indirect
121-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
125+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
122126
sigs.k8s.io/custom-metrics-apiserver v0.0.0 // indirect
123127
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
124128
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

0 commit comments

Comments
 (0)