Skip to content

Commit a0bd6fa

Browse files
Jont828Jont828
authored
✨ Bump CAPI to v1.8.1, Helm to v3.15.3, and Go version to 1.22.5 (kubernetes-sigs#272)
* Bump CAPI to v1.8.1 beta and Helm to v3.15.3 * Fix HCP watch * Regenerate * Bump go container version * Bump go to 1.22.6 and helm to 3.15.4 * Go mod tidy
1 parent d33aaaa commit a0bd6fa

File tree

6 files changed

+167
-179
lines changed

6 files changed

+167
-179
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash
2323
#
2424
# Go.
2525
#
26-
GO_VERSION ?= 1.21.5
26+
GO_VERSION ?= 1.22.6
2727
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
2828

2929
# Use GOPROXY environment variable if set

‎config/crd/bases/addons.cluster.x-k8s.io_helmchartproxies.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,13 @@ spec:
8888
items:
8989
type: string
9090
type: array
91+
x-kubernetes-list-type: atomic
9192
required:
9293
- key
9394
- operator
9495
type: object
9596
type: array
97+
x-kubernetes-list-type: atomic
9698
matchLabels:
9799
additionalProperties:
98100
type: string

‎controllers/helmchartproxy/helmchartproxy_controller.go

+10-27
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"sigs.k8s.io/controller-runtime/pkg/controller"
3636
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3737
"sigs.k8s.io/controller-runtime/pkg/handler"
38-
"sigs.k8s.io/controller-runtime/pkg/source"
3938
)
4039

4140
// HelmChartProxyReconciler reconciles a HelmChartProxy object.
@@ -51,35 +50,19 @@ type HelmChartProxyReconciler struct {
5150
func (r *HelmChartProxyReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
5251
log := ctrl.LoggerFrom(ctx)
5352

54-
c, err := ctrl.NewControllerManagedBy(mgr).
53+
return ctrl.NewControllerManagedBy(mgr).
5554
WithOptions(options).
5655
For(&addonsv1alpha1.HelmChartProxy{}).
5756
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(log, r.WatchFilterValue)).
58-
// WithEventFilter(predicates.ResourceIsNotExternallyManaged(log)).
59-
Build(r)
60-
if err != nil {
61-
return errors.Wrap(err, "error creating controller")
62-
}
63-
64-
// Add a watch on clusterv1.Cluster object for changes.
65-
if err = c.Watch(
66-
source.Kind(mgr.GetCache(), &clusterv1.Cluster{}),
67-
handler.EnqueueRequestsFromMapFunc(r.ClusterToHelmChartProxiesMapper),
68-
predicates.ResourceNotPausedAndHasFilterLabel(log, r.WatchFilterValue),
69-
); err != nil {
70-
return errors.Wrap(err, "failed adding a watch for Clusters")
71-
}
72-
73-
// Add a watch on HelmReleaseProxy object for changes.
74-
if err = c.Watch(
75-
source.Kind(mgr.GetCache(), &addonsv1alpha1.HelmReleaseProxy{}),
76-
handler.EnqueueRequestsFromMapFunc(HelmReleaseProxyToHelmChartProxyMapper),
77-
predicates.ResourceNotPausedAndHasFilterLabel(log, r.WatchFilterValue),
78-
); err != nil {
79-
return errors.Wrap(err, "failed adding a watch for HelmReleaseProxies")
80-
}
81-
82-
return nil
57+
Watches(
58+
&clusterv1.Cluster{},
59+
handler.EnqueueRequestsFromMapFunc(r.ClusterToHelmChartProxiesMapper),
60+
).
61+
Watches(
62+
&addonsv1alpha1.HelmReleaseProxy{},
63+
handler.EnqueueRequestsFromMapFunc(HelmReleaseProxyToHelmChartProxyMapper),
64+
).
65+
Complete(r)
8366
}
8467

8568
//+kubebuilder:rbac:groups=addons.cluster.x-k8s.io,resources=helmchartproxies,verbs=get;list;watch;create;update;patch;delete

‎go.mod

+44-40
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module sigs.k8s.io/cluster-api-addon-provider-helm
22

3-
go 1.21
3+
go 1.22.0
4+
5+
toolchain go1.22.5
46

57
require (
68
github.com/Masterminds/sprig/v3 v3.2.3
@@ -11,17 +13,17 @@ require (
1113
github.com/spf13/pflag v1.0.5
1214
go.uber.org/mock v0.4.0
1315
gopkg.in/yaml.v2 v2.4.0
14-
helm.sh/helm/v3 v3.14.4
15-
k8s.io/api v0.29.3
16-
k8s.io/apimachinery v0.29.3
17-
k8s.io/cli-runtime v0.29.3
18-
k8s.io/client-go v0.29.3
19-
k8s.io/component-base v0.29.3
20-
k8s.io/klog/v2 v2.110.1
16+
helm.sh/helm/v3 v3.15.4
17+
k8s.io/api v0.30.3
18+
k8s.io/apimachinery v0.30.3
19+
k8s.io/cli-runtime v0.30.3
20+
k8s.io/client-go v0.30.3
21+
k8s.io/component-base v0.30.3
22+
k8s.io/klog/v2 v2.120.1
2123
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
22-
sigs.k8s.io/cluster-api v1.7.4
23-
sigs.k8s.io/cluster-api/test v1.7.4
24-
sigs.k8s.io/controller-runtime v0.17.3
24+
sigs.k8s.io/cluster-api v1.8.1
25+
sigs.k8s.io/cluster-api/test v1.8.1
26+
sigs.k8s.io/controller-runtime v0.18.5
2527
)
2628

2729
require (
@@ -36,7 +38,7 @@ require (
3638
github.com/Microsoft/hcsshim v0.11.4 // indirect
3739
github.com/NYTimes/gziphandler v1.1.1 // indirect
3840
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
39-
github.com/adrg/xdg v0.4.0 // indirect
41+
github.com/adrg/xdg v0.5.0 // indirect
4042
github.com/alessio/shellescape v1.4.1 // indirect
4143
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
4244
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
@@ -50,20 +52,20 @@ require (
5052
github.com/containerd/log v0.1.0 // indirect
5153
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
5254
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
53-
github.com/distribution/reference v0.5.0 // indirect
55+
github.com/distribution/reference v0.6.0 // indirect
5456
github.com/docker/cli v25.0.5+incompatible // indirect
5557
github.com/docker/distribution v2.8.3+incompatible // indirect
56-
github.com/docker/docker v25.0.5+incompatible // indirect
58+
github.com/docker/docker v27.1.1+incompatible // indirect
5759
github.com/docker/docker-credential-helpers v0.7.0 // indirect
5860
github.com/docker/go-connections v0.5.0 // indirect
5961
github.com/docker/go-metrics v0.0.1 // indirect
6062
github.com/docker/go-units v0.5.0 // indirect
6163
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
62-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
64+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
6365
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
6466
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
6567
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
66-
github.com/fatih/color v1.16.0 // indirect
68+
github.com/fatih/color v1.17.0 // indirect
6769
github.com/felixge/httpsnoop v1.0.4 // indirect
6870
github.com/fsnotify/fsnotify v1.7.0 // indirect
6971
github.com/go-errors/errors v1.4.2 // indirect
@@ -81,15 +83,15 @@ require (
8183
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8284
github.com/golang/protobuf v1.5.4 // indirect
8385
github.com/google/btree v1.0.1 // indirect
84-
github.com/google/cel-go v0.17.7 // indirect
86+
github.com/google/cel-go v0.17.8 // indirect
8587
github.com/google/gnostic-models v0.6.8 // indirect
8688
github.com/google/go-github/v53 v53.2.0 // indirect
8789
github.com/google/go-querystring v1.1.0 // indirect
8890
github.com/google/gofuzz v1.2.0 // indirect
8991
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
9092
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
9193
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
92-
github.com/google/uuid v1.4.0 // indirect
94+
github.com/google/uuid v1.6.0 // indirect
9395
github.com/gorilla/mux v1.8.0 // indirect
9496
github.com/gorilla/websocket v1.5.0 // indirect
9597
github.com/gosuri/uitable v0.0.4 // indirect
@@ -104,7 +106,7 @@ require (
104106
github.com/jmoiron/sqlx v1.3.5 // indirect
105107
github.com/josharian/intern v1.0.0 // indirect
106108
github.com/json-iterator/go v1.1.12 // indirect
107-
github.com/klauspost/compress v1.17.0 // indirect
109+
github.com/klauspost/compress v1.17.2 // indirect
108110
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
109111
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
110112
github.com/lib/pq v1.10.9 // indirect
@@ -119,6 +121,7 @@ require (
119121
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
120122
github.com/mitchellh/mapstructure v1.5.0 // indirect
121123
github.com/mitchellh/reflectwalk v1.0.2 // indirect
124+
github.com/moby/docker-image-spec v1.3.1 // indirect
122125
github.com/moby/locker v1.0.1 // indirect
123126
github.com/moby/spdystream v0.2.0 // indirect
124127
github.com/moby/term v0.5.0 // indirect
@@ -130,10 +133,10 @@ require (
130133
github.com/opencontainers/go-digest v1.0.0 // indirect
131134
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
132135
github.com/pelletier/go-toml v1.9.5 // indirect
133-
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
136+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
134137
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
135138
github.com/prometheus/client_golang v1.18.0 // indirect
136-
github.com/prometheus/client_model v0.5.0 // indirect
139+
github.com/prometheus/client_model v0.6.0 // indirect
137140
github.com/prometheus/common v0.45.0 // indirect
138141
github.com/prometheus/procfs v0.12.0 // indirect
139142
github.com/rivo/uniseg v0.4.2 // indirect
@@ -146,57 +149,58 @@ require (
146149
github.com/sourcegraph/conc v0.3.0 // indirect
147150
github.com/spf13/afero v1.11.0 // indirect
148151
github.com/spf13/cast v1.6.0 // indirect
149-
github.com/spf13/cobra v1.8.0 // indirect
150-
github.com/spf13/viper v1.18.2 // indirect
152+
github.com/spf13/cobra v1.8.1 // indirect
153+
github.com/spf13/viper v1.19.0 // indirect
151154
github.com/stoewer/go-strcase v1.2.0 // indirect
152155
github.com/subosito/gotenv v1.6.0 // indirect
153156
github.com/valyala/fastjson v1.6.4 // indirect
154157
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
155158
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
156159
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
157160
github.com/xlab/treeprint v1.2.0 // indirect
158-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
159-
go.opentelemetry.io/otel v1.22.0 // indirect
161+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
162+
go.opentelemetry.io/otel v1.24.0 // indirect
160163
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
161164
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
162-
go.opentelemetry.io/otel/metric v1.22.0 // indirect
165+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
163166
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
164-
go.opentelemetry.io/otel/trace v1.22.0 // indirect
167+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
165168
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
166169
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
167170
go.uber.org/multierr v1.11.0 // indirect
168-
go.uber.org/zap v1.26.0 // indirect
171+
go.uber.org/zap v1.27.0 // indirect
169172
golang.org/x/crypto v0.26.0 // indirect
170173
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
171174
golang.org/x/mod v0.20.0 // indirect
172175
golang.org/x/net v0.28.0 // indirect
173-
golang.org/x/oauth2 v0.18.0 // indirect
176+
golang.org/x/oauth2 v0.21.0 // indirect
174177
golang.org/x/sync v0.8.0 // indirect
175178
golang.org/x/sys v0.23.0 // indirect
176179
golang.org/x/term v0.23.0 // indirect
177180
golang.org/x/text v0.17.0 // indirect
178181
golang.org/x/time v0.5.0 // indirect
179182
golang.org/x/tools v0.24.0 // indirect
180183
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
181-
google.golang.org/appengine v1.6.8 // indirect
182-
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
183-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
184-
google.golang.org/grpc v1.60.1 // indirect
184+
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
185+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
186+
google.golang.org/grpc v1.62.2 // indirect
185187
google.golang.org/protobuf v1.34.1 // indirect
186188
gopkg.in/inf.v0 v0.9.1 // indirect
187189
gopkg.in/ini.v1 v1.67.0 // indirect
188190
gopkg.in/yaml.v3 v3.0.1 // indirect
189-
k8s.io/apiextensions-apiserver v0.29.3 // indirect
190-
k8s.io/apiserver v0.29.3 // indirect
191-
k8s.io/cluster-bootstrap v0.29.3 // indirect
192-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
193-
k8s.io/kubectl v0.29.3 // indirect
194-
oras.land/oras-go v1.2.5-0.20240123054708-2afb6872ee1a // indirect
195-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
191+
k8s.io/apiextensions-apiserver v0.30.3 // indirect
192+
k8s.io/apiserver v0.30.3 // indirect
193+
k8s.io/cluster-bootstrap v0.30.3 // indirect
194+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
195+
k8s.io/kubectl v0.30.3 // indirect
196+
oras.land/oras-go v1.2.5 // indirect
197+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 // indirect
196198
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
197199
sigs.k8s.io/kind v0.23.0 // indirect
198200
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
199201
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
200202
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
201203
sigs.k8s.io/yaml v1.4.0 // indirect
202204
)
205+
206+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.1

0 commit comments

Comments
 (0)