Skip to content

Commit 9453da1

Browse files
movencemovence
authored
upgrade k8s dependencies to support DRA (#318)
1 parent b93c1a6 commit 9453da1

File tree

6 files changed

+198
-199
lines changed

6 files changed

+198
-199
lines changed

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ endif
4242
ENABLE_WEBHOOKS ?= false
4343
START_KIND_CLUSTER ?= true
4444

45-
KUBE_VERSION ?= 1.30
45+
KUBE_VERSION ?= 1.33
4646
KIND_CONFIG ?= kind-$(KUBE_VERSION).yaml
4747
KIND_CLUSTER_NAME ?= "cwa-operator"
4848

@@ -56,8 +56,8 @@ CHLOGGEN ?= $(LOCALBIN)/chloggen
5656
ADDLICENSE ?= $(LOCALBIN)/addlicense
5757
GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
5858

59-
KUSTOMIZE_VERSION ?= v5.0.3
60-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
59+
KUSTOMIZE_VERSION ?= v5.6.0
60+
CONTROLLER_TOOLS_VERSION ?= v0.18.0
6161
GOLANGCI_LINT_VERSION ?= v1.64.6
6262
ALL_SRC := $(shell find . -name '*.go' -type f | sort)
6363
CW_AGENT_OPERATOR_IMPORT_PATH = "github.com/aws/amazon-cloudwatch-agent-operator"
@@ -242,7 +242,7 @@ golangci-lint: ## Download golangci-lint locally if necessary.
242242
.PHONY: envtest
243243
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
244244
$(ENVTEST): $(LOCALBIN)
245-
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.18
245+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.21
246246

247247
# go-get-tool will 'go get' any package $2 and install it to $1.
248248
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))

‎go.mod‎

Lines changed: 54 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api
1010
require (
1111
dario.cat/mergo v1.0.0
1212
github.com/buraksezer/consistent v0.10.0
13-
github.com/cespare/xxhash/v2 v2.2.0
13+
github.com/cespare/xxhash/v2 v2.3.0
1414
github.com/fsnotify/fsnotify v1.7.0
1515
github.com/ghodss/yaml v1.0.0
1616
github.com/gin-gonic/gin v1.10.0
1717
github.com/go-kit/log v0.2.1
18-
github.com/go-logr/logr v1.4.1
18+
github.com/go-logr/logr v1.4.2
1919
github.com/google/uuid v1.6.0
2020
github.com/json-iterator/go v1.1.12
2121
github.com/mitchellh/mapstructure v1.5.0
@@ -24,30 +24,30 @@ require (
2424
github.com/prometheus-operator/prometheus-operator v0.70.0
2525
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.70.0
2626
github.com/prometheus-operator/prometheus-operator/pkg/client v0.70.0
27-
github.com/prometheus/client_golang v1.19.0
28-
github.com/prometheus/common v0.53.0
27+
github.com/prometheus/client_golang v1.22.0
28+
github.com/prometheus/common v0.62.0
2929
github.com/prometheus/prometheus v0.48.1
3030
github.com/spf13/pflag v1.0.5
31-
github.com/stretchr/testify v1.9.0
31+
github.com/stretchr/testify v1.10.0
3232
go.opentelemetry.io/collector/confmap v0.101.0
3333
go.opentelemetry.io/collector/featuregate v0.77.0
34-
go.opentelemetry.io/otel v1.21.0
34+
go.opentelemetry.io/otel v1.33.0
3535
go.uber.org/zap v1.27.0
36-
golang.org/x/exp v0.0.0-20231127185646-65229373498e
36+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
3737
gopkg.in/yaml.v2 v2.4.0
3838
gopkg.in/yaml.v3 v3.0.1
39-
k8s.io/api v0.29.0
40-
k8s.io/apimachinery v0.29.0
41-
k8s.io/client-go v0.29.0
42-
k8s.io/component-base v0.29.0
43-
k8s.io/klog/v2 v2.110.1
44-
k8s.io/kubectl v0.29.0
45-
k8s.io/utils v0.0.0-20231127182322-b307cd553661
46-
sigs.k8s.io/controller-runtime v0.16.3
39+
k8s.io/api v0.33.1
40+
k8s.io/apimachinery v0.33.1
41+
k8s.io/client-go v0.33.1
42+
k8s.io/component-base v0.33.1
43+
k8s.io/klog/v2 v2.130.1
44+
k8s.io/kubectl v0.33.1
45+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
46+
sigs.k8s.io/controller-runtime v0.21.0
4747
)
4848

4949
require (
50-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
50+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
5151
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
5252
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 // indirect
5353
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
@@ -65,38 +65,38 @@ require (
6565
github.com/bytedance/sonic/loader v0.1.1 // indirect
6666
github.com/cloudwego/base64x v0.1.4 // indirect
6767
github.com/cloudwego/iasm v0.2.0 // indirect
68-
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
68+
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
6969
github.com/containerd/log v0.1.0 // indirect
7070
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7171
github.com/dennwc/varint v1.0.0 // indirect
7272
github.com/digitalocean/godo v1.104.1 // indirect
73-
github.com/distribution/reference v0.5.0 // indirect
73+
github.com/distribution/reference v0.6.0 // indirect
7474
github.com/docker/docker v25.0.6+incompatible // indirect
7575
github.com/docker/go-connections v0.4.0 // indirect
7676
github.com/docker/go-units v0.5.0 // indirect
7777
github.com/edsrzf/mmap-go v1.1.0 // indirect
7878
github.com/efficientgo/core v1.0.0-rc.2 // indirect
7979
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
80-
github.com/envoyproxy/go-control-plane v0.11.1 // indirect
81-
github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
82-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
83-
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
80+
github.com/envoyproxy/go-control-plane v0.13.0 // indirect
81+
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
82+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
8483
github.com/fatih/color v1.16.0 // indirect
85-
github.com/felixge/httpsnoop v1.0.3 // indirect
84+
github.com/felixge/httpsnoop v1.0.4 // indirect
85+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
8686
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
8787
github.com/gin-contrib/sse v0.1.0 // indirect
8888
github.com/go-logfmt/logfmt v0.6.0 // indirect
8989
github.com/go-logr/stdr v1.2.2 // indirect
90-
github.com/go-logr/zapr v1.2.4 // indirect
90+
github.com/go-logr/zapr v1.3.0 // indirect
9191
github.com/go-openapi/analysis v0.21.4 // indirect
9292
github.com/go-openapi/errors v0.20.4 // indirect
93-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
93+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
9494
github.com/go-openapi/jsonreference v0.20.2 // indirect
9595
github.com/go-openapi/loads v0.21.2 // indirect
9696
github.com/go-openapi/runtime v0.26.0 // indirect
9797
github.com/go-openapi/spec v0.20.9 // indirect
9898
github.com/go-openapi/strfmt v0.21.7 // indirect
99-
github.com/go-openapi/swag v0.22.4 // indirect
99+
github.com/go-openapi/swag v0.23.0 // indirect
100100
github.com/go-openapi/validate v0.22.1 // indirect
101101
github.com/go-playground/locales v0.14.1 // indirect
102102
github.com/go-playground/universal-translator v0.18.1 // indirect
@@ -108,17 +108,17 @@ require (
108108
github.com/gogo/protobuf v1.3.2 // indirect
109109
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
110110
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
111-
github.com/golang/protobuf v1.5.3 // indirect
111+
github.com/golang/protobuf v1.5.4 // indirect
112112
github.com/golang/snappy v0.0.4 // indirect
113-
github.com/google/gnostic-models v0.6.8 // indirect
114-
github.com/google/go-cmp v0.6.0 // indirect
113+
github.com/google/btree v1.1.3 // indirect
114+
github.com/google/gnostic-models v0.6.9 // indirect
115+
github.com/google/go-cmp v0.7.0 // indirect
115116
github.com/google/go-querystring v1.1.0 // indirect
116-
github.com/google/gofuzz v1.2.0 // indirect
117117
github.com/google/s2a-go v0.1.7 // indirect
118118
github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
119119
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
120120
github.com/gophercloud/gophercloud v1.7.0 // indirect
121-
github.com/gorilla/websocket v1.5.0 // indirect
121+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
122122
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
123123
github.com/hashicorp/consul/api v1.25.1 // indirect
124124
github.com/hashicorp/cronexpr v1.1.2 // indirect
@@ -134,13 +134,12 @@ require (
134134
github.com/hashicorp/nomad/api v0.0.0-20230721134942-515895c7690c // indirect
135135
github.com/hashicorp/serf v0.10.1 // indirect
136136
github.com/hetznercloud/hcloud-go/v2 v2.4.0 // indirect
137-
github.com/imdario/mergo v0.3.16 // indirect
138137
github.com/inconshreveable/mousetrap v1.1.0 // indirect
139138
github.com/ionos-cloud/sdk-go/v6 v6.1.9 // indirect
140139
github.com/jmespath/go-jmespath v0.4.0 // indirect
141140
github.com/josharian/intern v1.0.0 // indirect
142141
github.com/jpillora/backoff v1.0.0 // indirect
143-
github.com/klauspost/compress v1.17.1 // indirect
142+
github.com/klauspost/compress v1.18.0 // indirect
144143
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
145144
github.com/knadh/koanf/maps v0.1.1 // indirect
146145
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
@@ -169,49 +168,53 @@ require (
169168
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
170169
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
171170
github.com/pkg/errors v0.9.1 // indirect
171+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
172172
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
173173
github.com/prometheus-community/prom-label-proxy v0.7.0 // indirect
174174
github.com/prometheus/alertmanager v0.26.0 // indirect
175-
github.com/prometheus/client_model v0.6.0 // indirect
175+
github.com/prometheus/client_model v0.6.1 // indirect
176176
github.com/prometheus/common/sigv4 v0.1.0 // indirect
177-
github.com/prometheus/procfs v0.12.0 // indirect
177+
github.com/prometheus/procfs v0.15.1 // indirect
178178
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 // indirect
179-
github.com/spf13/cobra v1.7.0 // indirect
179+
github.com/spf13/cobra v1.8.1 // indirect
180180
github.com/stretchr/objx v0.5.2 // indirect
181181
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
182182
github.com/ugorji/go/codec v1.2.12 // indirect
183183
github.com/vultr/govultr/v2 v2.17.2 // indirect
184+
github.com/x448/float16 v0.8.4 // indirect
184185
go.mongodb.org/mongo-driver v1.12.0 // indirect
185186
go.opencensus.io v0.24.0 // indirect
186-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
187-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
188-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
187+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
188+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
189+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
190+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
189191
go.uber.org/atomic v1.11.0 // indirect
190192
go.uber.org/goleak v1.3.0 // indirect
191193
go.uber.org/multierr v1.11.0 // indirect
192194
golang.org/x/arch v0.8.0 // indirect
193195
golang.org/x/crypto v0.36.0 // indirect
194-
golang.org/x/mod v0.17.0 // indirect
196+
golang.org/x/mod v0.21.0 // indirect
195197
golang.org/x/net v0.38.0 // indirect
196198
golang.org/x/oauth2 v0.27.0 // indirect
197199
golang.org/x/sync v0.12.0 // indirect
198200
golang.org/x/sys v0.31.0 // indirect
199201
golang.org/x/term v0.30.0 // indirect
200202
golang.org/x/text v0.23.0 // indirect
201-
golang.org/x/time v0.5.0 // indirect
202-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
203+
golang.org/x/time v0.9.0 // indirect
204+
golang.org/x/tools v0.26.0 // indirect
203205
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
204206
google.golang.org/api v0.147.0 // indirect
205-
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
206-
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a // indirect
207-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c // indirect
208-
google.golang.org/grpc v1.58.3 // indirect
209-
google.golang.org/protobuf v1.34.1 // indirect
207+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
208+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
209+
google.golang.org/grpc v1.68.1 // indirect
210+
google.golang.org/protobuf v1.36.5 // indirect
211+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
210212
gopkg.in/inf.v0 v0.9.1 // indirect
211213
gopkg.in/ini.v1 v1.67.0 // indirect
212-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
213-
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a // indirect
214-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
215-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
214+
k8s.io/apiextensions-apiserver v0.33.0 // indirect
215+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
216+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
217+
sigs.k8s.io/randfill v1.0.0 // indirect
218+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
216219
sigs.k8s.io/yaml v1.4.0 // indirect
217220
)

0 commit comments

Comments
 (0)