Skip to content

Commit 709ec73

Browse files
authored
Merge pull request #1526 from liranmauda/liran-backport-into-5.18
Bump go to 1.23 and dependencies according to ocs-operator
2 parents f36f37f + c75dbd4 commit 709ec73

16 files changed

+186
-181
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: "1.21"
16+
go-version: "1.23"
1717
- name: run lint
1818
id: run-build
1919
run: make lint || exit 1

.github/workflows/manual-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
ref: ${{ github.event.inputs.branch }}
2222
- uses: actions/setup-go@v5
2323
with:
24-
go-version: "1.21"
24+
go-version: "1.23"
2525

2626
- name: Get Current Date
2727
id: date

.github/workflows/run_admission_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Go on runner
1919
uses: actions/setup-go@v5
2020
with:
21-
go-version: "1.21"
21+
go-version: "1.23"
2222

2323
- name: Set environment variables
2424
run: |

.github/workflows/run_ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/checkout@v4
1919
- uses: actions/setup-go@v5
2020
with:
21-
go-version: "1.21"
21+
go-version: "1.23"
2222

2323
- name: Deploy Dependencies
2424
id: deploy
@@ -51,7 +51,7 @@ jobs:
5151
uses: actions/checkout@v4
5252
- uses: actions/setup-go@v5
5353
with:
54-
go-version: "1.21"
54+
go-version: "1.23"
5555

5656
- name: Deploy Dependencies
5757
id: deploy
@@ -80,7 +80,7 @@ jobs:
8080
uses: actions/checkout@v4
8181
- uses: actions/setup-go@v5
8282
with:
83-
go-version: "1.21"
83+
go-version: "1.23"
8484

8585
- name: Deploy Dependencies
8686
id: deploy

.github/workflows/run_cosi_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup Go on runner
2121
uses: actions/setup-go@v5
2222
with:
23-
go-version: "1.21"
23+
go-version: "1.23"
2424

2525
- name: Set environment variables
2626
run: |

.github/workflows/run_hac_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: "1.21"
16+
go-version: "1.23"
1717

1818
- name: Set environment variables
1919
run: |

.github/workflows/run_kms_azure_vault_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: "1.21"
16+
go-version: "1.23"
1717

1818
- name: Set environment variables
1919
run: |

.github/workflows/run_kms_dev_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: "1.21"
16+
go-version: "1.23"
1717

1818
- name: Set environment variables
1919
run: |

.github/workflows/run_kms_ibm_kp_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/checkout@v4
1717
- uses: actions/setup-go@v5
1818
with:
19-
go-version: "1.21"
19+
go-version: "1.23"
2020

2121
- name: Set environment variables
2222
run: |

.github/workflows/run_kms_kmip_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: "1.21"
16+
go-version: "1.23"
1717

1818
- name: Set environment variables
1919
run: |

.github/workflows/run_kms_rotate_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: "1.21"
16+
go-version: "1.23"
1717

1818
- name: Set environment variables
1919
run: |

.github/workflows/run_kms_tls_sa_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: "1.21"
16+
go-version: "1.23"
1717

1818
- name: Set environment variables
1919
run: |

.github/workflows/run_kms_tls_token_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: "1.21"
16+
go-version: "1.23"
1717

1818
- name: Set environment variables
1919
run: |

.github/workflows/testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: "1.21"
16+
go-version: "1.23"
1717

1818
- name: Get Current Date
1919
id: date

go.mod

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/noobaa/noobaa-operator/v5
22

3-
go 1.22.0
4-
5-
toolchain go1.22.6
3+
go 1.23.0
64

75
replace (
86
// TODO: remove this replace once https://github.com/libopenstorage/secrets/pull/83 is merged
@@ -29,40 +27,40 @@ require (
2927
github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20221122204822-d1a8c34382f1
3028
github.com/libopenstorage/secrets v0.0.0-20240416031220-a17cf7f72c6c
3129
github.com/marstr/randname v0.0.0-20200428202425-99aca53a2176
32-
github.com/onsi/ginkgo/v2 v2.20.2
33-
github.com/onsi/gomega v1.34.1
30+
github.com/onsi/ginkgo/v2 v2.21.0
31+
github.com/onsi/gomega v1.35.1
3432
github.com/openshift/api v0.0.0-20240301093301-ce10821dc999
3533
github.com/openshift/cloud-credential-operator v0.0.0-20231004191224-abdf0627a0cf
3634
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87
3735
github.com/operator-framework/api v0.27.0
3836
github.com/operator-framework/operator-lib v0.15.0
3937
github.com/pkg/errors v0.9.1
40-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.0
38+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2
4139
github.com/robfig/cron/v3 v3.0.1
42-
github.com/rook/rook/pkg/apis v0.0.0-20240828225153-88eab510dd2b
40+
github.com/rook/rook/pkg/apis v0.0.0-20241119201302-fc456553b3cc
4341
github.com/sirupsen/logrus v1.9.3
4442
github.com/spf13/cobra v1.8.1
45-
github.com/spf13/pflag v1.0.5
43+
github.com/spf13/pflag v1.0.6
4644
github.com/spf13/viper v1.16.0
47-
golang.org/x/term v0.27.0
45+
golang.org/x/term v0.29.0
4846
google.golang.org/api v0.162.0
49-
google.golang.org/grpc v1.66.0
50-
k8s.io/api v0.31.1
51-
k8s.io/apiextensions-apiserver v0.31.1
52-
k8s.io/apimachinery v0.31.1
47+
google.golang.org/grpc v1.70.0
48+
k8s.io/api v0.32.1
49+
k8s.io/apiextensions-apiserver v0.32.1
50+
k8s.io/apimachinery v0.32.1
5351
k8s.io/cli-runtime v0.28.4
54-
k8s.io/client-go v0.31.1
55-
k8s.io/code-generator v0.31.1
52+
k8s.io/client-go v0.32.1
53+
k8s.io/code-generator v0.32.1
5654
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01
5755
k8s.io/kube-aggregator v0.27.1
58-
k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094
56+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7
5957
k8s.io/kubectl v0.25.4
60-
k8s.io/utils v0.0.0-20240821151609-f90d01438635
58+
k8s.io/utils v0.0.0-20241210054802-24370beab758
6159
nhooyr.io/websocket v1.8.7
6260
sigs.k8s.io/container-object-storage-interface-api v0.1.0
6361
sigs.k8s.io/container-object-storage-interface-provisioner-sidecar v0.1.0
6462
sigs.k8s.io/container-object-storage-interface-spec v0.1.0
65-
sigs.k8s.io/controller-runtime v0.19.0
63+
sigs.k8s.io/controller-runtime v0.19.1
6664
sigs.k8s.io/yaml v1.4.0
6765
)
6866

@@ -74,6 +72,7 @@ require (
7472
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
7573
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
7674
github.com/Masterminds/semver/v3 v3.2.1 // indirect
75+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
7776
github.com/containernetworking/cni v1.2.0-rc1 // indirect
7877
github.com/felixge/httpsnoop v1.0.4 // indirect
7978
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -83,30 +82,33 @@ require (
8382
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
8483
github.com/go-test/deep v1.1.0 // indirect
8584
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
86-
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
87-
github.com/gorilla/websocket v1.5.0 // indirect
85+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
86+
github.com/gorilla/websocket v1.5.3 // indirect
8887
github.com/hashicorp/vault/api/auth/kubernetes v0.6.0 // indirect
89-
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.1 // indirect
88+
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.5 // indirect
9089
github.com/kylelemons/godebug v1.1.0 // indirect
9190
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
9291
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
9392
github.com/x448/float16 v0.8.4 // indirect
94-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
95-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
96-
go.opentelemetry.io/otel v1.28.0 // indirect
97-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
98-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
99-
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
100-
golang.org/x/sync v0.10.0 // indirect
101-
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
93+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
94+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
95+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
96+
go.opentelemetry.io/otel v1.34.0 // indirect
97+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
98+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
99+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
100+
golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 // indirect
101+
golang.org/x/sync v0.11.0 // indirect
102+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
103+
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
102104
)
103105

104106
require (
105107
cloud.google.com/go v0.112.0 // indirect
106-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
108+
cloud.google.com/go/compute/metadata v0.5.2 // indirect
107109
cloud.google.com/go/iam v1.1.6 // indirect
108110
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
109-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
111+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
110112
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
111113
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
112114
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
@@ -117,12 +119,11 @@ require (
117119
github.com/ansel1/merry/v2 v2.2.0 // indirect
118120
github.com/beorn7/perks v1.0.1 // indirect
119121
github.com/bytedance/sonic v1.10.0 // indirect
120-
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
121122
github.com/cespare/xxhash/v2 v2.3.0 // indirect
122123
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
123124
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
124-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
125-
github.com/fsnotify/fsnotify v1.7.0 // indirect
125+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
126+
github.com/fsnotify/fsnotify v1.8.0 // indirect
126127
github.com/gemalto/flume v0.13.1 // indirect
127128
github.com/gin-gonic/gin v1.9.1 // indirect
128129
github.com/go-logr/logr v1.4.2 // indirect
@@ -132,9 +133,9 @@ require (
132133
github.com/go-playground/validator/v10 v10.15.1 // indirect
133134
github.com/gogo/protobuf v1.3.2 // indirect
134135
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
135-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
136+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
136137
github.com/golang/protobuf v1.5.4 // indirect
137-
github.com/google/gnostic-models v0.6.8 // indirect
138+
github.com/google/gnostic-models v0.6.9 // indirect
138139
github.com/google/go-cmp v0.6.0 // indirect
139140
github.com/google/gofuzz v1.2.0 // indirect
140141
github.com/google/s2a-go v0.1.7 // indirect
@@ -149,9 +150,8 @@ require (
149150
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
150151
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
151152
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
152-
github.com/hashicorp/vault/api v1.14.0 // indirect
153+
github.com/hashicorp/vault/api v1.15.0 // indirect
153154
github.com/hashicorp/vault/api/auth/approle v0.6.0 // indirect
154-
github.com/imdario/mergo v0.3.16 // indirect
155155
github.com/inconshreveable/mousetrap v1.1.0 // indirect
156156
github.com/jmespath/go-jmespath v0.4.0 // indirect
157157
github.com/josharian/intern v1.0.0 // indirect
@@ -161,7 +161,7 @@ require (
161161
github.com/lib/pq v1.10.9
162162
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
163163
github.com/magiconair/properties v1.8.7 // indirect
164-
github.com/mailru/easyjson v0.7.7 // indirect
164+
github.com/mailru/easyjson v0.9.0 // indirect
165165
github.com/marstr/collection v1.0.1 // indirect
166166
github.com/mattn/go-colorable v0.1.13 // indirect
167167
github.com/mattn/go-ieproxy v0.0.1 // indirect
@@ -170,17 +170,17 @@ require (
170170
github.com/mitchellh/go-homedir v1.1.0 // indirect
171171
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
172172
github.com/mitchellh/mapstructure v1.5.0 // indirect
173-
github.com/moby/spdystream v0.4.0 // indirect
173+
github.com/moby/spdystream v0.5.0 // indirect
174174
github.com/moby/term v0.5.0 // indirect
175175
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
176176
github.com/modern-go/reflect2 v1.0.2 // indirect
177177
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
178178
github.com/opencontainers/go-digest v1.0.0 // indirect
179179
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
180180
github.com/portworx/sched-ops v1.20.4-rc1.0.20220208024433-611d861089d4 // indirect
181-
github.com/prometheus/client_golang v1.20.4 // indirect
181+
github.com/prometheus/client_golang v1.20.5 // indirect
182182
github.com/prometheus/client_model v0.6.1 // indirect
183-
github.com/prometheus/common v0.60.0 // indirect
183+
github.com/prometheus/common v0.62.0 // indirect
184184
github.com/prometheus/procfs v0.15.1 // indirect
185185
github.com/russross/blackfriday v1.5.2 // indirect
186186
github.com/ryanuber/go-glob v1.0.0 // indirect
@@ -190,29 +190,28 @@ require (
190190
github.com/subosito/gotenv v1.4.2 // indirect
191191
go.opencensus.io v0.24.0 // indirect
192192
go.uber.org/multierr v1.11.0 // indirect
193-
go.uber.org/zap v1.26.0 // indirect
193+
go.uber.org/zap v1.27.0 // indirect
194194
golang.org/x/arch v0.4.0 // indirect
195-
golang.org/x/crypto v0.31.0 // indirect
196-
golang.org/x/mod v0.21.0 // indirect
197-
golang.org/x/net v0.33.0 // indirect
198-
golang.org/x/oauth2 v0.23.0 // indirect
199-
golang.org/x/sys v0.28.0 // indirect
200-
golang.org/x/text v0.21.0 // indirect
201-
golang.org/x/time v0.7.0 // indirect
202-
golang.org/x/tools v0.26.0 // indirect
195+
golang.org/x/crypto v0.33.0 // indirect
196+
golang.org/x/mod v0.23.0 // indirect
197+
golang.org/x/net v0.34.0 // indirect
198+
golang.org/x/oauth2 v0.26.0 // indirect
199+
golang.org/x/sys v0.30.0 // indirect
200+
golang.org/x/text v0.22.0 // indirect
201+
golang.org/x/time v0.10.0 // indirect
202+
golang.org/x/tools v0.29.0 // indirect
203203
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
204204
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
205-
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
206-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
207-
google.golang.org/protobuf v1.35.1 // indirect
205+
google.golang.org/genproto/googleapis/api v0.0.0-20250207221924-e9438ea467c6 // indirect
206+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 // indirect
207+
google.golang.org/protobuf v1.36.5 // indirect
208208
gopkg.in/inf.v0 v0.9.1 // indirect
209209
gopkg.in/ini.v1 v1.67.0 // indirect
210-
gopkg.in/yaml.v2 v2.4.0 // indirect
211210
gopkg.in/yaml.v3 v3.0.1 // indirect
212211
k8s.io/klog/v2 v2.130.1 // indirect
213212
knative.dev/pkg v0.0.0-20220502225657-4fced0164c9a // indirect
214-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
215-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
213+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
214+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
216215
)
217216

218217
// see https://github.com/rook/rook/blob/master/go.mod#L42-L43

0 commit comments

Comments
 (0)