Skip to content

Commit 3693f32

Browse files
kvapskvaps
committed
chore: update go libs
go 1.20 --> 1.22 kamaji v0.4.0 --> v0.5.0 cluster-api v1.4.0-beta.2.0 --> v1.6.4 kubernetes v0.29.0 --> v0.30.0 controller-gen v0.12.0 --> v0.14.0 Signed-off-by: Andrei Kvapil <[email protected]>
1 parent 75b0578 commit 3693f32

8 files changed

+1111
-206
lines changed

‎.github/workflows/ci.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
commit_lint:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- uses: actions/checkout@v2
1414
with:
@@ -18,7 +18,7 @@ jobs:
1818
firstParent: true
1919
golangci:
2020
name: lint
21-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-22.04
2222
steps:
2323
- uses: actions/checkout@v2
2424
- uses: actions/setup-go@v3
@@ -27,16 +27,16 @@ jobs:
2727
- name: Run golangci-lint
2828
uses: golangci/[email protected]
2929
with:
30-
version: v1.53.2
30+
version: v1.54.2
3131
args: --timeout 5m --config .golangci.yml
3232
diff:
3333
name: diff
34-
runs-on: ubuntu-20.04
34+
runs-on: ubuntu-22.04
3535
steps:
3636
- uses: actions/checkout@v2
3737
with:
3838
fetch-depth: 0
39-
- uses: actions/setup-go@v2
39+
- uses: actions/setup-go@v3
4040
with:
4141
go-version-file: 'go.mod'
4242
- run: make release

‎.github/workflows/docker-ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
docker-ci:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v2

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
191191

192192
## Tool Versions
193193
KUSTOMIZE_VERSION ?= v3.8.7
194-
CONTROLLER_TOOLS_VERSION ?= v0.10.0
195-
GOLANGCI_LINT_VERSION ?= v1.53.2
194+
CONTROLLER_TOOLS_VERSION ?= v0.14.0
195+
GOLANGCI_LINT_VERSION ?= v1.54.2
196196

197197
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
198198
.PHONY: kustomize

‎config/control-plane-components.yaml

+159-19
Large diffs are not rendered by default.

‎config/crd/bases/controlplane.cluster.x-k8s.io_kamajicontrolplanes.yaml

+290-40
Large diffs are not rendered by default.

‎controllers/kamajicontrolplane_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ type KamajiControlPlaneReconciler struct {
3535
//+kubebuilder:rbac:groups=controlplane.cluster.x-k8s.io,resources=kamajicontrolplanes/finalizers,verbs=update
3636
//+kubebuilder:rbac:groups=cluster.x-k8s.io,resources=clusters,verbs=get;list;watch
3737

38-
func (r *KamajiControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { //nolint:funlen,cyclop,gocognit,maintidx
38+
func (r *KamajiControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { //nolint:funlen,cyclop,maintidx
3939
var err error
4040

4141
now, log := time.Now(), ctrllog.FromContext(ctx)

‎go.mod

+126-59
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,172 @@
11
module github.com/clastix/cluster-api-control-plane-provider-kamaji
22

3-
go 1.20
3+
go 1.22.0
4+
5+
toolchain go1.22.1
46

57
require (
6-
github.com/clastix/kamaji v0.4.0
7-
github.com/onsi/ginkgo/v2 v2.13.0
8-
github.com/onsi/gomega v1.29.0
8+
github.com/clastix/kamaji v0.5.0
9+
github.com/onsi/ginkgo/v2 v2.17.1
10+
github.com/onsi/gomega v1.32.0
911
github.com/pkg/errors v0.9.1
10-
k8s.io/api v0.29.0
11-
k8s.io/apimachinery v0.29.0
12-
k8s.io/client-go v0.29.0
13-
sigs.k8s.io/cluster-api v1.4.0-beta.2.0.20230613082000-a43982d398c3
14-
sigs.k8s.io/controller-runtime v0.16.3
12+
k8s.io/api v0.30.0
13+
k8s.io/apimachinery v0.30.0
14+
k8s.io/client-go v0.30.0
15+
sigs.k8s.io/cluster-api v1.6.4
16+
sigs.k8s.io/controller-runtime v0.17.1-0.20240416095710-67b27f27e514
1517
)
1618

1719
require (
20+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
21+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
22+
github.com/Masterminds/goutils v1.1.1 // indirect
23+
github.com/Masterminds/semver/v3 v3.2.0 // indirect
24+
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
25+
github.com/NYTimes/gziphandler v1.1.1 // indirect
26+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
27+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
1828
github.com/beorn7/perks v1.0.1 // indirect
1929
github.com/blang/semver v3.5.1+incompatible // indirect
2030
github.com/blang/semver/v4 v4.0.0 // indirect
31+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
2132
github.com/cespare/xxhash/v2 v2.2.0 // indirect
22-
github.com/davecgh/go-spew v1.1.1 // indirect
33+
github.com/chai2010/gettext-go v1.0.2 // indirect
34+
github.com/coredns/caddy v1.1.1 // indirect
35+
github.com/coredns/corefile-migration v1.0.21 // indirect
36+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
37+
github.com/docker/distribution v2.8.3+incompatible // indirect
2338
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
24-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
39+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
40+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
41+
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
42+
github.com/felixge/httpsnoop v1.0.4 // indirect
2543
github.com/fsnotify/fsnotify v1.7.0 // indirect
26-
github.com/go-logr/logr v1.3.0 // indirect
27-
github.com/go-logr/zapr v1.2.4 // indirect
44+
github.com/go-errors/errors v1.4.2 // indirect
45+
github.com/go-logr/logr v1.4.1 // indirect
46+
github.com/go-logr/stdr v1.2.2 // indirect
47+
github.com/go-logr/zapr v1.3.0 // indirect
2848
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2949
github.com/go-openapi/jsonreference v0.20.2 // indirect
3050
github.com/go-openapi/swag v0.22.3 // indirect
3151
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
52+
github.com/gobuffalo/flect v1.0.2 // indirect
3253
github.com/gogo/protobuf v1.3.2 // indirect
3354
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
34-
github.com/golang/protobuf v1.5.3 // indirect
55+
github.com/golang/protobuf v1.5.4 // indirect
56+
github.com/google/btree v1.0.1 // indirect
57+
github.com/google/cel-go v0.17.8 // indirect
3558
github.com/google/gnostic-models v0.6.8 // indirect
3659
github.com/google/go-cmp v0.6.0 // indirect
3760
github.com/google/gofuzz v1.2.0 // indirect
3861
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
39-
github.com/google/uuid v1.3.0 // indirect
62+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
63+
github.com/google/uuid v1.3.1 // indirect
64+
github.com/gorilla/websocket v1.5.0 // indirect
65+
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
66+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
67+
github.com/huandu/xstrings v1.3.3 // indirect
4068
github.com/imdario/mergo v0.3.13 // indirect
69+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4170
github.com/josharian/intern v1.0.0 // indirect
4271
github.com/json-iterator/go v1.1.12 // indirect
72+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
4373
github.com/mailru/easyjson v0.7.7 // indirect
44-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
74+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
75+
github.com/mitchellh/copystructure v1.2.0 // indirect
76+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
77+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
78+
github.com/moby/spdystream v0.2.0 // indirect
79+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
4580
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4681
github.com/modern-go/reflect2 v1.0.2 // indirect
82+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
4783
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
48-
github.com/prometheus/client_golang v1.16.0 // indirect
49-
github.com/prometheus/client_model v0.4.0 // indirect
50-
github.com/prometheus/common v0.44.0 // indirect
51-
github.com/prometheus/procfs v0.10.1 // indirect
84+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
85+
github.com/opencontainers/go-digest v1.0.0 // indirect
86+
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
87+
github.com/prometheus/client_golang v1.18.0 // indirect
88+
github.com/prometheus/client_model v0.5.0 // indirect
89+
github.com/prometheus/common v0.45.0 // indirect
90+
github.com/prometheus/procfs v0.12.0 // indirect
91+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
92+
github.com/shopspring/decimal v1.3.1 // indirect
93+
github.com/spf13/cast v1.5.1 // indirect
94+
github.com/spf13/cobra v1.8.0 // indirect
5295
github.com/spf13/pflag v1.0.5 // indirect
96+
github.com/stoewer/go-strcase v1.2.0 // indirect
97+
github.com/valyala/fastjson v1.6.4 // indirect
98+
github.com/xlab/treeprint v1.2.0 // indirect
99+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
100+
go.opentelemetry.io/otel v1.20.0 // indirect
101+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
102+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
103+
go.opentelemetry.io/otel/metric v1.20.0 // indirect
104+
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
105+
go.opentelemetry.io/otel/trace v1.20.0 // indirect
106+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
107+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
53108
go.uber.org/multierr v1.11.0 // indirect
54-
go.uber.org/zap v1.25.0 // indirect
55-
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
56-
golang.org/x/net v0.17.0 // indirect
57-
golang.org/x/oauth2 v0.10.0 // indirect
58-
golang.org/x/sys v0.13.0 // indirect
59-
golang.org/x/term v0.13.0 // indirect
60-
golang.org/x/text v0.13.0 // indirect
109+
go.uber.org/zap v1.26.0 // indirect
110+
golang.org/x/crypto v0.21.0 // indirect
111+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
112+
golang.org/x/net v0.23.0 // indirect
113+
golang.org/x/oauth2 v0.14.0 // indirect
114+
golang.org/x/sync v0.6.0 // indirect
115+
golang.org/x/sys v0.18.0 // indirect
116+
golang.org/x/term v0.18.0 // indirect
117+
golang.org/x/text v0.14.0 // indirect
61118
golang.org/x/time v0.3.0 // indirect
62-
golang.org/x/tools v0.12.0 // indirect
119+
golang.org/x/tools v0.18.0 // indirect
63120
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
64121
google.golang.org/appengine v1.6.7 // indirect
65-
google.golang.org/protobuf v1.31.0 // indirect
122+
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
123+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
124+
google.golang.org/grpc v1.59.0 // indirect
125+
google.golang.org/protobuf v1.33.0 // indirect
66126
gopkg.in/inf.v0 v0.9.1 // indirect
67127
gopkg.in/yaml.v2 v2.4.0 // indirect
68128
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
70-
k8s.io/component-base v0.29.0 // indirect
71-
k8s.io/klog/v2 v2.110.1 // indirect
72-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
129+
k8s.io/apiextensions-apiserver v0.30.0 // indirect
130+
k8s.io/apiserver v0.30.0 // indirect
131+
k8s.io/cli-runtime v0.30.0 // indirect
132+
k8s.io/cluster-bootstrap v0.28.4 // indirect
133+
k8s.io/component-base v0.30.0 // indirect
134+
k8s.io/klog/v2 v2.120.1 // indirect
135+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
136+
k8s.io/kubectl v0.28.4 // indirect
73137
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
138+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
74139
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
140+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
141+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
75142
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
76-
sigs.k8s.io/yaml v1.3.0 // indirect
143+
sigs.k8s.io/yaml v1.4.0 // indirect
77144
)
78145

79146
replace (
80-
k8s.io/api => k8s.io/api v0.29.0
81-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0
82-
k8s.io/apimachinery => k8s.io/apimachinery v0.29.0
83-
k8s.io/apiserver => k8s.io/apiserver v0.29.0
84-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0
85-
k8s.io/client-go => k8s.io/client-go v0.29.0
86-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.0
87-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0
88-
k8s.io/code-generator => k8s.io/code-generator v0.29.0
89-
k8s.io/component-base => k8s.io/component-base v0.29.0
90-
k8s.io/component-helpers => k8s.io/component-helpers v0.29.0
91-
k8s.io/controller-manager => k8s.io/controller-manager v0.29.0
92-
k8s.io/cri-api => k8s.io/cri-api v0.29.0
93-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0
94-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0
95-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0
96-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0
97-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0
98-
k8s.io/kubectl => k8s.io/kubectl v0.29.0
99-
k8s.io/kubelet => k8s.io/kubelet v0.29.0
100-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0
101-
k8s.io/metrics => k8s.io/metrics v0.29.0
102-
k8s.io/mount-utils => k8s.io/mount-utils v0.29.0
103-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0
104-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0
147+
k8s.io/api => k8s.io/api v0.30.0
148+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.0
149+
k8s.io/apimachinery => k8s.io/apimachinery v0.30.0
150+
k8s.io/apiserver => k8s.io/apiserver v0.30.0
151+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.0
152+
k8s.io/client-go => k8s.io/client-go v0.30.0
153+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.0
154+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.0
155+
k8s.io/code-generator => k8s.io/code-generator v0.30.0
156+
k8s.io/component-base => k8s.io/component-base v0.30.0
157+
k8s.io/component-helpers => k8s.io/component-helpers v0.30.0
158+
k8s.io/controller-manager => k8s.io/controller-manager v0.30.0
159+
k8s.io/cri-api => k8s.io/cri-api v0.30.0
160+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.0
161+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.0
162+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.0
163+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.0
164+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.0
165+
k8s.io/kubectl => k8s.io/kubectl v0.30.0
166+
k8s.io/kubelet => k8s.io/kubelet v0.30.0
167+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.0
168+
k8s.io/metrics => k8s.io/metrics v0.30.0
169+
k8s.io/mount-utils => k8s.io/mount-utils v0.30.0
170+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.0
171+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.0
105172
)

0 commit comments

Comments
 (0)