Skip to content

Commit 4725d14

Browse files
authored
fix(deps): upgraded dependencies (#94)
1 parent ac0e5ce commit 4725d14

16 files changed

+331
-345
lines changed

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Set up Go
2828
uses: actions/setup-go@v5
2929
with:
30-
go-version: 1.21.1
30+
go-version-file: go.mod
3131
- name: Setup QEMU
3232
uses: docker/setup-qemu-action@v3
3333
- name: Setup Docker Buildx

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ dist
2121

2222
# editor and IDE paraphernalia
2323
.idea
24+
*.iml
2425
*.swp
2526
*.swo
2627
*~

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
ENVTEST_K8S_VERSION = 1.24.2
5+
ENVTEST_K8S_VERSION = 1.30.0
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))
@@ -117,8 +117,8 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
117117
ENVTEST ?= $(LOCALBIN)/setup-envtest
118118

119119
## Tool Versions
120-
KUSTOMIZE_VERSION ?= v5.3.0
121-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
120+
KUSTOMIZE_VERSION ?= v5.4.2
121+
CONTROLLER_TOOLS_VERSION ?= v0.15.0
122122

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

api/v1alpha1/zz_generated.deepcopy.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/templates.kluctl.io_githubcomments.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: githubcomments.templates.kluctl.io
88
spec:
99
group: templates.kluctl.io

config/crd/bases/templates.kluctl.io_gitlabcomments.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: gitlabcomments.templates.kluctl.io
88
spec:
99
group: templates.kluctl.io

config/crd/bases/templates.kluctl.io_gitprojectors.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: gitprojectors.templates.kluctl.io
88
spec:
99
group: templates.kluctl.io

config/crd/bases/templates.kluctl.io_listgithubpullrequests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: listgithubpullrequests.templates.kluctl.io
88
spec:
99
group: templates.kluctl.io

config/crd/bases/templates.kluctl.io_listgitlabmergerequests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: listgitlabmergerequests.templates.kluctl.io
88
spec:
99
group: templates.kluctl.io

config/crd/bases/templates.kluctl.io_objecthandlers.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: objecthandlers.templates.kluctl.io
88
spec:
99
group: templates.kluctl.io

config/crd/bases/templates.kluctl.io_objecttemplates.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: objecttemplates.templates.kluctl.io
88
spec:
99
group: templates.kluctl.io

config/crd/bases/templates.kluctl.io_texttemplates.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: texttemplates.templates.kluctl.io
88
spec:
99
group: templates.kluctl.io

controllers/base_template_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (r *BaseTemplateReconciler) getClientForObjects(serviceAccountName string,
5555
return c, nil
5656
}
5757

58-
func (r *BaseTemplateReconciler) addWatchForKind(ctx context.Context, gvk schema.GroupVersionKind, key string, eventHandler handler.EventHandler) error {
58+
func (r *BaseTemplateReconciler) addWatchForKind(ctx context.Context, gvk schema.GroupVersionKind, key string, eventHandler handler.TypedEventHandler[client.Object]) error {
5959
logger := log.FromContext(ctx)
6060

6161
r.mutex.Lock()
@@ -76,7 +76,7 @@ func (r *BaseTemplateReconciler) addWatchForKind(ctx context.Context, gvk schema
7676
var dummy unstructured.Unstructured
7777
dummy.SetGroupVersionKind(gvk)
7878

79-
err := r.controller.Watch(source.Kind(r.Manager.GetCache(), &dummy), eventHandler)
79+
err := r.controller.Watch(source.Kind[client.Object](r.Manager.GetCache(), &dummy, eventHandler))
8080
if err != nil {
8181
return err
8282
}

controllers/objecthandler/objecthandler_controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ func (r *ObjectHandlerReconciler) addWatchForKind(ctx context.Context, sr *templ
260260
var dummy unstructured.Unstructured
261261
dummy.SetGroupVersionKind(gvk)
262262

263-
err = r.controller.Watch(source.Kind(r.Manager.GetCache(), &dummy), handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []reconcile.Request {
263+
err = r.controller.Watch(source.Kind[client.Object](r.Manager.GetCache(), &dummy, handler.TypedEnqueueRequestsFromMapFunc[client.Object](func(ctx context.Context, object client.Object) []reconcile.Request {
264264
var list templatesv1alpha1.ObjectHandlerList
265265
err := r.List(ctx, &list, client.MatchingFields{
266266
forObjectIndexKey: controllers.BuildObjectIndexValue(object),
@@ -278,7 +278,7 @@ func (r *ObjectHandlerReconciler) addWatchForKind(ctx context.Context, sr *templ
278278
})
279279
}
280280
return reqs
281-
}))
281+
})))
282282
if err != nil {
283283
return err
284284
}

go.mod

+80-86
Original file line numberDiff line numberDiff line change
@@ -1,153 +1,147 @@
11
module github.com/kluctl/template-controller
22

3-
go 1.21
4-
5-
toolchain go1.21.2
3+
go 1.22.4
64

75
require (
8-
github.com/evanphx/json-patch v5.7.0+incompatible
9-
github.com/go-git/go-git/v5 v5.10.0
6+
github.com/evanphx/json-patch v5.9.0+incompatible
7+
github.com/go-git/go-git/v5 v5.12.1-0.20240409060936-cd6633c3c665
108
github.com/gobwas/glob v0.2.3
119
github.com/google/go-github/v47 v47.1.0
1210
github.com/hashicorp/go-multierror v1.1.1
13-
github.com/kluctl/go-jinja2 v0.0.0-20230828163747-df21eb5fbda2
14-
github.com/kluctl/kluctl/v2 v2.22.1
15-
github.com/ohler55/ojg v1.21.0
11+
github.com/kluctl/go-jinja2 v0.0.0-20240619083358-c137395943eb
12+
github.com/kluctl/kluctl/v2 v2.25.0
13+
github.com/ohler55/ojg v1.22.1
1614
github.com/onsi/ginkgo v1.16.5
17-
github.com/onsi/gomega v1.30.0
18-
github.com/xanzy/go-gitlab v0.95.2
19-
golang.org/x/oauth2 v0.15.0
15+
github.com/onsi/gomega v1.33.1
16+
github.com/xanzy/go-gitlab v0.106.0
17+
golang.org/x/oauth2 v0.21.0
2018
gopkg.in/yaml.v3 v3.0.1
21-
k8s.io/api v0.29.0
22-
k8s.io/apiextensions-apiserver v0.29.0
23-
k8s.io/apimachinery v0.29.0
24-
k8s.io/client-go v0.29.0
25-
sigs.k8s.io/cli-utils v0.35.0
26-
sigs.k8s.io/controller-runtime v0.16.3
19+
k8s.io/api v0.30.2
20+
k8s.io/apiextensions-apiserver v0.30.2
21+
k8s.io/apimachinery v0.30.2
22+
k8s.io/client-go v0.30.2
23+
sigs.k8s.io/cli-utils v0.37.1
24+
sigs.k8s.io/controller-runtime v0.18.4
2725
)
2826

2927
//replace github.com/kluctl/kluctl/v2 => /Users/ablock/go/src/github.com/kluctl/kluctl
3028

3129
require (
3230
dario.cat/mergo v1.0.0 // indirect
3331
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
34-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
3532
github.com/Masterminds/semver/v3 v3.2.1 // indirect
36-
github.com/Microsoft/go-winio v0.6.1 // indirect
37-
github.com/Microsoft/hcsshim v0.11.0 // indirect
38-
github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
33+
github.com/Microsoft/go-winio v0.6.2 // indirect
34+
github.com/ProtonMail/go-crypto v1.0.0 // indirect
3935
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
40-
github.com/acomagu/bufpipe v1.0.4 // indirect
4136
github.com/beorn7/perks v1.0.1 // indirect
42-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
43-
github.com/cloudflare/circl v1.3.3 // indirect
44-
github.com/containerd/containerd v1.7.6 // indirect
45-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
37+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
38+
github.com/cloudflare/circl v1.3.9 // indirect
39+
github.com/containerd/containerd v1.7.19 // indirect
40+
github.com/containerd/errdefs v0.1.0 // indirect
41+
github.com/containerd/log v0.1.0 // indirect
42+
github.com/containerd/platforms v0.2.1 // indirect
43+
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
4644
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
47-
github.com/distribution/reference v0.5.0 // indirect
48-
github.com/docker/cli v24.0.6+incompatible // indirect
45+
github.com/distribution/reference v0.6.0 // indirect
46+
github.com/docker/cli v27.0.3+incompatible // indirect
4947
github.com/docker/distribution v2.8.3+incompatible // indirect
50-
github.com/docker/docker v24.0.6+incompatible // indirect
51-
github.com/docker/docker-credential-helpers v0.8.0 // indirect
52-
github.com/docker/go-connections v0.4.0 // indirect
48+
github.com/docker/docker v27.0.3+incompatible // indirect
49+
github.com/docker/docker-credential-helpers v0.8.2 // indirect
50+
github.com/docker/go-connections v0.5.0 // indirect
5351
github.com/docker/go-metrics v0.0.1 // indirect
54-
github.com/docker/go-units v0.5.0 // indirect
55-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
52+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
5653
github.com/emirpasic/gods v1.18.1 // indirect
57-
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
54+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
55+
github.com/felixge/httpsnoop v1.0.4 // indirect
5856
github.com/fsnotify/fsnotify v1.7.0 // indirect
59-
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
57+
github.com/gabriel-vasile/mimetype v1.4.4 // indirect
58+
github.com/go-errors/errors v1.5.1 // indirect
6059
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
6160
github.com/go-git/go-billy/v5 v5.5.0 // indirect
62-
github.com/go-logr/logr v1.3.0 // indirect
61+
github.com/go-logr/logr v1.4.2 // indirect
6362
github.com/go-logr/stdr v1.2.2 // indirect
64-
github.com/go-logr/zapr v1.2.4 // indirect
65-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
66-
github.com/go-openapi/jsonreference v0.20.2 // indirect
67-
github.com/go-openapi/swag v0.22.4 // indirect
63+
github.com/go-logr/zapr v1.3.0 // indirect
64+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
65+
github.com/go-openapi/jsonreference v0.21.0 // indirect
66+
github.com/go-openapi/swag v0.23.0 // indirect
6867
github.com/go-playground/locales v0.14.1 // indirect
6968
github.com/go-playground/universal-translator v0.18.1 // indirect
70-
github.com/go-playground/validator/v10 v10.15.5 // indirect
69+
github.com/go-playground/validator/v10 v10.22.0 // indirect
7170
github.com/gogo/protobuf v1.3.2 // indirect
7271
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
73-
github.com/golang/protobuf v1.5.3 // indirect
72+
github.com/golang/protobuf v1.5.4 // indirect
7473
github.com/google/gnostic-models v0.6.8 // indirect
7574
github.com/google/go-cmp v0.6.0 // indirect
7675
github.com/google/go-querystring v1.1.0 // indirect
7776
github.com/google/gofuzz v1.2.0 // indirect
78-
github.com/google/uuid v1.4.0 // indirect
79-
github.com/gorilla/mux v1.8.0 // indirect
77+
github.com/google/uuid v1.6.0 // indirect
78+
github.com/gorilla/mux v1.8.1 // indirect
8079
github.com/hashicorp/errwrap v1.1.0 // indirect
8180
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
82-
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
81+
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
8382
github.com/imdario/mergo v0.3.16 // indirect
8483
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
8584
github.com/jinzhu/copier v0.4.0 // indirect
8685
github.com/josharian/intern v1.0.0 // indirect
8786
github.com/json-iterator/go v1.1.12 // indirect
8887
github.com/kevinburke/ssh_config v1.2.0 // indirect
89-
github.com/klauspost/compress v1.17.0 // indirect
90-
github.com/kluctl/go-embed-python v0.0.0-3.10.9-20230206-2 // indirect
91-
github.com/leodido/go-urn v1.2.4 // indirect
88+
github.com/klauspost/compress v1.17.9 // indirect
89+
github.com/kluctl/go-embed-python v0.0.0-3.12.3-20240415-1 // indirect
90+
github.com/leodido/go-urn v1.4.0 // indirect
9291
github.com/mailru/easyjson v0.7.7 // indirect
9392
github.com/mattn/go-isatty v0.0.20 // indirect
9493
github.com/mattn/go-runewidth v0.0.15 // indirect
95-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
9694
github.com/mitchellh/reflectwalk v1.0.2 // indirect
9795
github.com/moby/locker v1.0.1 // indirect
98-
github.com/moby/term v0.5.0 // indirect
9996
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
10097
github.com/modern-go/reflect2 v1.0.2 // indirect
101-
github.com/morikuni/aec v1.0.0 // indirect
10298
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
103-
github.com/nxadm/tail v1.4.8 // indirect
99+
github.com/nxadm/tail v1.4.11 // indirect
104100
github.com/opencontainers/go-digest v1.0.0 // indirect
105-
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
101+
github.com/opencontainers/image-spec v1.1.0 // indirect
106102
github.com/otiai10/copy v1.14.0 // indirect
107103
github.com/pjbgf/sha1cd v0.3.0 // indirect
108104
github.com/pkg/errors v0.9.1 // indirect
109-
github.com/prometheus/client_golang v1.17.0 // indirect
110-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
111-
github.com/prometheus/common v0.44.0 // indirect
112-
github.com/prometheus/procfs v0.11.1 // indirect
113-
github.com/rivo/uniseg v0.4.4 // indirect
114-
github.com/rogpeppe/go-internal v1.11.0 // indirect
115-
github.com/sergi/go-diff v1.3.1 // indirect
105+
github.com/prometheus/client_golang v1.19.1 // indirect
106+
github.com/prometheus/client_model v0.6.1 // indirect
107+
github.com/prometheus/common v0.55.0 // indirect
108+
github.com/prometheus/procfs v0.15.1 // indirect
109+
github.com/rivo/uniseg v0.4.7 // indirect
110+
github.com/rogpeppe/go-internal v1.12.0 // indirect
111+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
116112
github.com/sirupsen/logrus v1.9.3 // indirect
117-
github.com/skeema/knownhosts v1.2.0 // indirect
113+
github.com/skeema/knownhosts v1.2.2 // indirect
118114
github.com/spf13/pflag v1.0.5 // indirect
119115
github.com/xanzy/ssh-agent v0.3.3 // indirect
120-
go.opentelemetry.io/otel v1.19.0 // indirect
121-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
122-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
116+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
117+
go.opentelemetry.io/otel v1.28.0 // indirect
118+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
119+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
123120
go.uber.org/multierr v1.11.0 // indirect
124-
go.uber.org/zap v1.25.0 // indirect
125-
golang.org/x/crypto v0.16.0 // indirect
126-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
127-
golang.org/x/mod v0.12.0 // indirect
128-
golang.org/x/net v0.19.0 // indirect
129-
golang.org/x/sync v0.4.0 // indirect
130-
golang.org/x/sys v0.15.0 // indirect
131-
golang.org/x/term v0.15.0 // indirect
132-
golang.org/x/text v0.14.0 // indirect
133-
golang.org/x/time v0.3.0 // indirect
134-
golang.org/x/tools v0.13.0 // indirect
121+
go.uber.org/zap v1.27.0 // indirect
122+
golang.org/x/crypto v0.25.0 // indirect
123+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
124+
golang.org/x/mod v0.19.0 // indirect
125+
golang.org/x/net v0.27.0 // indirect
126+
golang.org/x/sync v0.7.0 // indirect
127+
golang.org/x/sys v0.22.0 // indirect
128+
golang.org/x/term v0.22.0 // indirect
129+
golang.org/x/text v0.16.0 // indirect
130+
golang.org/x/time v0.5.0 // indirect
135131
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
136-
google.golang.org/appengine v1.6.7 // indirect
137-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
138-
google.golang.org/grpc v1.59.0 // indirect
139-
google.golang.org/protobuf v1.31.0 // indirect
132+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
133+
google.golang.org/grpc v1.65.0 // indirect
134+
google.golang.org/protobuf v1.34.2 // indirect
140135
gopkg.in/inf.v0 v0.9.1 // indirect
141136
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
142137
gopkg.in/warnings.v0 v0.1.2 // indirect
143138
gopkg.in/yaml.v2 v2.4.0 // indirect
144-
helm.sh/helm/v3 v3.13.1 // indirect
145-
k8s.io/component-base v0.29.0 // indirect
146-
k8s.io/klog/v2 v2.110.1 // indirect
147-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
148-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
149-
oras.land/oras-go v1.2.4 // indirect
139+
helm.sh/helm/v3 v3.15.2 // indirect
140+
k8s.io/klog/v2 v2.130.1 // indirect
141+
k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 // indirect
142+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
143+
oras.land/oras-go v1.2.5 // indirect
150144
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
151145
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
152-
sigs.k8s.io/yaml v1.3.0 // indirect
146+
sigs.k8s.io/yaml v1.4.0 // indirect
153147
)

0 commit comments

Comments
 (0)