Skip to content

Commit cbcf6e2

Browse files
authored
Use k8s 1.32 client libs (#27)
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 7c4bcba commit cbcf6e2

File tree

3,846 files changed

+413835
-89208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,846 files changed

+413835
-89208
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ COMPRESS ?= no
2525

2626
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
2727
CRD_OPTIONS ?= "crd:crdVersions={v1},allowDangerousTypes=true"
28-
CODE_GENERATOR_IMAGE ?= ghcr.io/appscode/gengo:release-1.29
28+
CODE_GENERATOR_IMAGE ?= ghcr.io/appscode/gengo:release-1.32
2929
API_GROUPS ?= apps:v1alpha1
3030

3131
# Where to push the docker image.
@@ -192,12 +192,12 @@ gen-crds:
192192
-v /tmp:/.cache \
193193
-v $$(pwd):$(DOCKER_REPO_ROOT) \
194194
-w $(DOCKER_REPO_ROOT) \
195-
--env HTTP_PROXY=$(HTTP_PROXY) \
196-
--env HTTPS_PROXY=$(HTTPS_PROXY) \
195+
--env HTTP_PROXY=$(HTTP_PROXY) \
196+
--env HTTPS_PROXY=$(HTTPS_PROXY) \
197197
$(CODE_GENERATOR_IMAGE) \
198198
controller-gen \
199-
$(CRD_OPTIONS) \
200-
paths="./apis/..." \
199+
$(CRD_OPTIONS) \
200+
paths="./apis/..." \
201201
output:crd:artifacts:config=crds
202202

203203
.PHONY: manifests

apis/apps/v1alpha1/openapi_generated.go

Lines changed: 532 additions & 177 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crds/apps.k8s.appscode.com_sidekicks.yaml

Lines changed: 3527 additions & 3414 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 87 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,142 @@
11
module kubeops.dev/sidekick
22

3-
go 1.22.1
3+
go 1.23.0
44

5-
toolchain go1.23.1
5+
toolchain go1.24.1
66

77
require (
88
github.com/google/gofuzz v1.2.0
9-
github.com/onsi/ginkgo/v2 v2.17.2
10-
github.com/onsi/gomega v1.33.1
11-
github.com/spf13/cobra v1.8.0
12-
go.bytebuilders.dev/license-verifier v0.14.4
9+
github.com/onsi/ginkgo/v2 v2.23.1
10+
github.com/onsi/gomega v1.36.2
11+
github.com/spf13/cobra v1.9.1
12+
go.bytebuilders.dev/license-verifier v0.14.6
1313
gomodules.xyz/logs v0.0.7
1414
gomodules.xyz/x v0.0.17
15-
k8s.io/api v0.30.2
16-
k8s.io/apimachinery v0.30.2
17-
k8s.io/client-go v0.30.2
18-
k8s.io/klog/v2 v2.120.1
19-
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f
20-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
21-
kmodules.xyz/client-go v0.30.44
22-
sigs.k8s.io/controller-runtime v0.18.4
15+
k8s.io/api v0.32.3
16+
k8s.io/apimachinery v0.32.3
17+
k8s.io/client-go v0.32.3
18+
k8s.io/klog/v2 v2.130.1
19+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
20+
k8s.io/utils v0.0.0-20241210054802-24370beab758
21+
kmodules.xyz/client-go v0.32.1
22+
sigs.k8s.io/controller-runtime v0.20.2
2323
sigs.k8s.io/yaml v1.4.0
2424
)
2525

2626
require (
27-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
27+
cel.dev/expr v0.18.0 // indirect
28+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
2829
github.com/PuerkitoBio/purell v1.2.1 // indirect
30+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
31+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2932
github.com/beorn7/perks v1.0.1 // indirect
33+
github.com/blang/semver/v4 v4.0.0 // indirect
34+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3035
github.com/cespare/xxhash/v2 v2.3.0 // indirect
31-
github.com/davecgh/go-spew v1.1.1 // indirect
32-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
33-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
34-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
36+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
37+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
38+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
39+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3540
github.com/fatih/structs v1.1.0 // indirect
36-
github.com/fsnotify/fsnotify v1.7.0 // indirect
41+
github.com/felixge/httpsnoop v1.0.4 // indirect
42+
github.com/fsnotify/fsnotify v1.8.0 // indirect
43+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3744
github.com/ghodss/yaml v1.0.0 // indirect
38-
github.com/go-logr/logr v1.4.1 // indirect
45+
github.com/go-logr/logr v1.4.2 // indirect
46+
github.com/go-logr/stdr v1.2.2 // indirect
3947
github.com/go-logr/zapr v1.3.0 // indirect
40-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
41-
github.com/go-openapi/jsonreference v0.20.2 // indirect
42-
github.com/go-openapi/swag v0.22.3 // indirect
48+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
49+
github.com/go-openapi/jsonreference v0.21.0 // indirect
50+
github.com/go-openapi/swag v0.23.0 // indirect
4351
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4452
github.com/gogo/protobuf v1.3.2 // indirect
45-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4653
github.com/golang/protobuf v1.5.4 // indirect
47-
github.com/google/gnostic-models v0.6.8 // indirect
54+
github.com/google/btree v1.1.3 // indirect
55+
github.com/google/cel-go v0.22.0 // indirect
56+
github.com/google/gnostic-models v0.6.9 // indirect
4857
github.com/google/go-cmp v0.6.0 // indirect
49-
github.com/google/go-containerregistry v0.19.1 // indirect
50-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
58+
github.com/google/go-containerregistry v0.20.3 // indirect
59+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
5160
github.com/google/uuid v1.6.0 // indirect
52-
github.com/gorilla/websocket v1.5.1 // indirect
53-
github.com/imdario/mergo v0.3.12 // indirect
61+
github.com/gorilla/websocket v1.5.3 // indirect
62+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
63+
github.com/imdario/mergo v0.3.6 // indirect
5464
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5565
github.com/josharian/intern v1.0.0 // indirect
5666
github.com/json-iterator/go v1.1.12 // indirect
67+
github.com/klauspost/compress v1.17.11 // indirect
5768
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
5869
github.com/mailru/easyjson v0.7.7 // indirect
59-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6070
github.com/mitchellh/mapstructure v1.5.0 // indirect
6171
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6272
github.com/modern-go/reflect2 v1.0.2 // indirect
6373
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6474
github.com/nxadm/tail v1.4.11 // indirect
6575
github.com/opencontainers/go-digest v1.0.0 // indirect
6676
github.com/pkg/errors v0.9.1 // indirect
67-
github.com/prometheus/client_golang v1.16.0 // indirect
68-
github.com/prometheus/client_model v0.4.0 // indirect
69-
github.com/prometheus/common v0.44.0 // indirect
70-
github.com/prometheus/procfs v0.12.0 // indirect
71-
github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9 // indirect
72-
github.com/rancher/rancher/pkg/client v0.0.0-20240710123941-93e332156bbe // indirect
73-
github.com/rancher/wrangler/v3 v3.0.0 // indirect
74-
github.com/sergi/go-diff v1.1.0 // indirect
77+
github.com/prometheus/client_golang v1.20.5 // indirect
78+
github.com/prometheus/client_model v0.6.1 // indirect
79+
github.com/prometheus/common v0.55.0 // indirect
80+
github.com/prometheus/procfs v0.15.1 // indirect
81+
github.com/rancher/norman v0.5.2 // indirect
82+
github.com/rancher/rancher/pkg/client v0.0.0-20250220153925-3abb578f42fe // indirect
83+
github.com/rancher/wrangler/v3 v3.2.0-rc.3 // indirect
84+
github.com/sergi/go-diff v1.2.0 // indirect
7585
github.com/sirupsen/logrus v1.9.3 // indirect
76-
github.com/spf13/pflag v1.0.5 // indirect
86+
github.com/spf13/pflag v1.0.6 // indirect
87+
github.com/stoewer/go-strcase v1.3.0 // indirect
88+
github.com/x448/float16 v0.8.4 // indirect
7789
github.com/yudai/gojsondiff v1.0.0 // indirect
7890
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
7991
github.com/zeebo/xxh3 v1.0.2 // indirect
92+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
93+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
94+
go.opentelemetry.io/otel v1.33.0 // indirect
95+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
96+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
97+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
98+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
99+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
100+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
80101
go.uber.org/multierr v1.11.0 // indirect
81-
go.uber.org/zap v1.26.0 // indirect
82-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
83-
golang.org/x/net v0.33.0 // indirect
84-
golang.org/x/oauth2 v0.22.0 // indirect
85-
golang.org/x/sys v0.28.0 // indirect
86-
golang.org/x/term v0.27.0 // indirect
87-
golang.org/x/text v0.21.0 // indirect
88-
golang.org/x/time v0.5.0 // indirect
89-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
102+
go.uber.org/zap v1.27.0 // indirect
103+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
104+
golang.org/x/net v0.36.0 // indirect
105+
golang.org/x/oauth2 v0.27.0 // indirect
106+
golang.org/x/sync v0.11.0 // indirect
107+
golang.org/x/sys v0.30.0 // indirect
108+
golang.org/x/term v0.29.0 // indirect
109+
golang.org/x/text v0.22.0 // indirect
110+
golang.org/x/time v0.10.0 // indirect
111+
golang.org/x/tools v0.30.0 // indirect
90112
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect
91113
gomodules.xyz/flags v0.1.3 // indirect
92-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
114+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
93115
gomodules.xyz/mergo v0.3.13 // indirect
94116
gomodules.xyz/pointer v0.1.0 // indirect
95117
gomodules.xyz/sets v0.2.1 // indirect
96118
gomodules.xyz/wait v0.2.0 // indirect
97-
google.golang.org/protobuf v1.33.0 // indirect
119+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
120+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
121+
google.golang.org/grpc v1.65.0 // indirect
122+
google.golang.org/protobuf v1.36.3 // indirect
123+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
98124
gopkg.in/inf.v0 v0.9.1 // indirect
99125
gopkg.in/yaml.v2 v2.4.0 // indirect
100126
gopkg.in/yaml.v3 v3.0.1 // indirect
101-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
102-
k8s.io/apiserver v0.30.1 // indirect
103-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
104-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
127+
k8s.io/apiextensions-apiserver v0.32.2 // indirect
128+
k8s.io/apiserver v0.32.2 // indirect
129+
k8s.io/component-base v0.32.2 // indirect
130+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
131+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
132+
sigs.k8s.io/randfill v1.0.0 // indirect
133+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
105134
)
106135

107-
replace github.com/Masterminds/sprig/v3 => github.com/gomodules/sprig/v3 v3.2.3-0.20240908185247-10b1687ea668
136+
replace github.com/Masterminds/sprig/v3 => github.com/gomodules/sprig/v3 v3.2.3-0.20220405051441-0a8a99bac1b8
108137

109-
replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.18.4-0.20240603164526-fa88ec2314fe
138+
replace sigs.k8s.io/controller-runtime => github.com/kmodules/controller-runtime v0.20.3-0.20250221050548-8eabe54e7dda
110139

111140
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.6
112141

113-
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.30.3-0.20240717062442-8d4dcc0bdd0b
142+
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.32.3-0.20250221062720-35dc674c7dd6

0 commit comments

Comments
 (0)