Skip to content

Commit 076cfb7

Browse files
squakezsquakez
committed
chore(deps): golang version and main deps upgrade
* Golang 1.26.2 * Kubernetes 0.36.0 * Ctrl-runtime 0.24.0
1 parent 886c3cc commit 076cfb7

43 files changed

Lines changed: 122 additions & 119 deletions

Some content is hidden

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

‎e2e/support/test_support.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1710,7 +1710,7 @@ func UpdatePlainTextSecret(t *testing.T, ctx context.Context, ns string, name st
17101710
func UpdatePlainTextSecretWithLabels(t *testing.T, ctx context.Context, ns string, name string, data map[string]string, labels map[string]string) error {
17111711
sec := corev1.Secret{
17121712
TypeMeta: metav1.TypeMeta{
1713-
Kind: "Secret",
1713+
Kind: corev1.ResourceSecrets.String(),
17141714
APIVersion: corev1.SchemeGroupVersion.String(),
17151715
},
17161716
ObjectMeta: metav1.ObjectMeta{
@@ -1726,7 +1726,7 @@ func UpdatePlainTextSecretWithLabels(t *testing.T, ctx context.Context, ns strin
17261726
func CreatePlainTextSecretWithLabels(t *testing.T, ctx context.Context, ns string, name string, data map[string]string, labels map[string]string) error {
17271727
sec := corev1.Secret{
17281728
TypeMeta: metav1.TypeMeta{
1729-
Kind: "Secret",
1729+
Kind: corev1.ResourceSecrets.String(),
17301730
APIVersion: corev1.SchemeGroupVersion.String(),
17311731
},
17321732
ObjectMeta: metav1.ObjectMeta{
@@ -1766,7 +1766,7 @@ func SecretByName(t *testing.T, ctx context.Context, ns string, prefix string) f
17661766
func DeleteSecret(t *testing.T, ctx context.Context, ns string, name string) error {
17671767
sec := corev1.Secret{
17681768
TypeMeta: metav1.TypeMeta{
1769-
Kind: "Secret",
1769+
Kind: corev1.ResourceSecrets.String(),
17701770
APIVersion: corev1.SchemeGroupVersion.String(),
17711771
},
17721772
ObjectMeta: metav1.ObjectMeta{
@@ -1783,7 +1783,7 @@ func CreateSecretDecoded(t *testing.T, ctx context.Context, ns string, pathToFil
17831783

17841784
secret := corev1.Secret{
17851785
TypeMeta: metav1.TypeMeta{
1786-
Kind: "Secret",
1786+
Kind: corev1.ResourceSecrets.String(),
17871787
APIVersion: corev1.SchemeGroupVersion.String(),
17881788
},
17891789
ObjectMeta: metav1.ObjectMeta{

‎go.mod‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/camel-k/v2
22

3-
go 1.25.9
3+
go 1.26.2
44

55
require (
66
dario.cat/mergo v1.0.2
@@ -40,17 +40,17 @@ require (
4040
golang.org/x/text v0.36.0
4141
golang.org/x/time v0.15.0
4242
gopkg.in/yaml.v2 v2.4.0
43-
k8s.io/api v0.35.4
44-
k8s.io/apimachinery v0.35.4
45-
k8s.io/cli-runtime v0.35.3
46-
k8s.io/client-go v0.35.4
43+
k8s.io/api v0.36.0
44+
k8s.io/apimachinery v0.36.0
45+
k8s.io/cli-runtime v0.36.0
46+
k8s.io/client-go v0.36.0
4747
k8s.io/gengo v0.0.0-20251215205346-5ee0d033ba5b
4848
k8s.io/klog/v2 v2.140.0
4949
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
5050
knative.dev/eventing v0.49.0
5151
knative.dev/pkg v0.0.0-20260422015212-ec452872dcc1
5252
knative.dev/serving v0.49.0
53-
sigs.k8s.io/controller-runtime v0.23.3
53+
sigs.k8s.io/controller-runtime v0.24.0
5454
sigs.k8s.io/gateway-api v1.5.1
5555
sigs.k8s.io/structured-merge-diff/v6 v6.4.0
5656
)
@@ -94,7 +94,6 @@ require (
9494
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
9595
github.com/gogo/protobuf v1.3.2 // indirect
9696
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
97-
github.com/google/btree v1.1.3 // indirect
9897
github.com/google/gnostic-models v0.7.1 // indirect
9998
github.com/google/go-cmp v0.7.0 // indirect
10099
github.com/google/go-containerregistry v0.20.3 // indirect
@@ -112,7 +111,6 @@ require (
112111
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
113112
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
114113
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
115-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
116114
github.com/opencontainers/go-digest v1.0.0 // indirect
117115
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
118116
github.com/pjbgf/sha1cd v0.3.2 // indirect
@@ -143,13 +141,14 @@ require (
143141
golang.org/x/sys v0.43.0 // indirect
144142
golang.org/x/tools v0.44.0 // indirect
145143
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
146-
google.golang.org/protobuf v1.36.11 // indirect
144+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
147145
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
148146
gopkg.in/inf.v0 v0.9.1 // indirect
149147
gopkg.in/warnings.v0 v0.1.2 // indirect
150148
gopkg.in/yaml.v3 v3.0.1 // indirect
151-
k8s.io/apiextensions-apiserver v0.35.4 // indirect
149+
k8s.io/apiextensions-apiserver v0.36.0 // indirect
152150
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
151+
k8s.io/streaming v0.36.0 // indirect
153152
knative.dev/networking v0.0.0-20260422140718-e9578ef11562 // indirect
154153
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
155154
sigs.k8s.io/randfill v1.0.0 // indirect

‎go.sum‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
136136
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
137137
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
138138
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
139-
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
140-
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
141139
github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c=
142140
github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
143141
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -216,8 +214,6 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd
216214
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
217215
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
218216
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
219-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
220-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
221217
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
222218
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
223219
github.com/onsi/ginkgo v1.12.1 h1:mFwc4LvZ0xpSvDZ3E+k8Yte0hLOMxXUlP+yXtJqkYfQ=
@@ -445,8 +441,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
445441
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
446442
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
447443
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
448-
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
449-
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
444+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af h1:+5/Sw3GsDNlEmu7TfklWKPdQ0Ykja5VEmq2i817+jbI=
445+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
450446
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
451447
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
452448
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -468,25 +464,27 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
468464
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
469465
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
470466
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
471-
k8s.io/api v0.35.4 h1:P7nFYKl5vo9AGUp1Z+Pmd3p2tA7bX2wbFWCvDeRv988=
472-
k8s.io/api v0.35.4/go.mod h1:yl4lqySWOgYJJf9RERXKUwE9g2y+CkuwG+xmcOK8wXU=
473-
k8s.io/apiextensions-apiserver v0.35.4 h1:HeP+Upp7ItdvnyGmub0yoix+2z5+ev4M5cE5TCgtOUU=
474-
k8s.io/apiextensions-apiserver v0.35.4/go.mod h1:ogQlk+stIE8mnoRthSYCwlOS12fVqgWFiErMwPaXA7c=
475-
k8s.io/apimachinery v0.35.4 h1:xtdom9RG7e+yDp71uoXoJDWEE2eOiHgeO4GdBzwWpds=
476-
k8s.io/apimachinery v0.35.4/go.mod h1:NNi1taPOpep0jOj+oRha3mBJPqvi0hGdaV8TCqGQ+cc=
477-
k8s.io/apiserver v0.35.4 h1:vtuFqNFmF9bPRdHDL2lpK6qCTPWDreZJL4LRPwVM6ho=
478-
k8s.io/apiserver v0.35.4/go.mod h1:JnBcb+J8kFXKpZkgcbcUnPBBHi4qgBii1I7dLxFY/oo=
479-
k8s.io/cli-runtime v0.35.3 h1:UZq4ipNimtzBmhN7PPKbfAdqo8quK0H0UdGl6qAQnqI=
480-
k8s.io/cli-runtime v0.35.3/go.mod h1:O7MUmCqcKSd5xI+O5X7/pRkB5l0O2NIhOdUVwbHLXu4=
481-
k8s.io/client-go v0.35.4 h1:DN6fyaGuzK64UvnKO5fOA6ymSjvfGAnCAHAR0C66kD8=
482-
k8s.io/client-go v0.35.4/go.mod h1:2Pg9WpsS4NeOpoYTfHHfMxBG8zFMSAUi4O/qoiJC3nY=
467+
k8s.io/api v0.36.0 h1:SgqDhZzHdOtMk40xVSvCXkP9ME0H05hPM3p9AB1kL80=
468+
k8s.io/api v0.36.0/go.mod h1:m1LVrGPNYax5NBHdO+QuAedXyuzTt4RryI/qnmNvs34=
469+
k8s.io/apiextensions-apiserver v0.36.0 h1:Wt7E8J+VBCbj4FjiBfDTK/neXDDjyJVJc7xfuOHImZ0=
470+
k8s.io/apiextensions-apiserver v0.36.0/go.mod h1:kGDjH0msuiIB3tgsYRV0kS9GqpMYMUsQ3GHv7TApyug=
471+
k8s.io/apimachinery v0.36.0 h1:jZyPzhd5Z+3h9vJLt0z9XdzW9VzNzWAUw+P1xZ9PXtQ=
472+
k8s.io/apimachinery v0.36.0/go.mod h1:FklypaRJt6n5wUIwWXIP6GJlIpUizTgfo1T/As+Tyxc=
473+
k8s.io/apiserver v0.36.0 h1:Jg5OFAENUACByUCg15CmhZAYrr5ZyJ+jodyA1mHl3YE=
474+
k8s.io/apiserver v0.36.0/go.mod h1:mHvwdHf+qKEm+1/hYm756SV+oREOKSPnsjagOpx6Vho=
475+
k8s.io/cli-runtime v0.36.0 h1:HNxciQpQMMOKS0/GiUXcKDyA6J2FDILJj9NmP2BZrTg=
476+
k8s.io/cli-runtime v0.36.0/go.mod h1:KObkknK9Ro5LYX+1RdiKc7C8CvGg4aX+V/Zv+E8WPHA=
477+
k8s.io/client-go v0.36.0 h1:pOYi7C4RHChYjMiHpZSpSbIM6ZxVbRXBy7CuiIwqA3c=
478+
k8s.io/client-go v0.36.0/go.mod h1:ZKKcpwF0aLYfkHFCjillCKaTK/yBkEDHTDXCFY6AS9Y=
483479
k8s.io/gengo v0.0.0-20251215205346-5ee0d033ba5b h1:X0Afwan8Q1l7bMcNgh6DAah2jKCQ2irT7EoAXIChFqk=
484480
k8s.io/gengo v0.0.0-20251215205346-5ee0d033ba5b/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
485481
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
486482
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
487483
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
488484
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a h1:xCeOEAOoGYl2jnJoHkC3hkbPJgdATINPMAxaynU2Ovg=
489485
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a/go.mod h1:uGBT7iTA6c6MvqUvSXIaYZo9ukscABYi2btjhvgKGZ0=
486+
k8s.io/streaming v0.36.0 h1:agnTxU+NFulUrtYzXUGKO3ndEa8jKwht1Kwn9nu9x+4=
487+
k8s.io/streaming v0.36.0/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s=
490488
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 h1:AZYQSJemyQB5eRxqcPky+/7EdBj0xi3g0ZcxxJ7vbWU=
491489
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
492490
knative.dev/eventing v0.49.0 h1:Gole9D1AXnZVBCzoqO00/5n8MApy8rRJpTHYXvUFfQc=
@@ -497,8 +495,8 @@ knative.dev/pkg v0.0.0-20260422015212-ec452872dcc1 h1:bO5X2bugzMqoVltm2n16mHpAdp
497495
knative.dev/pkg v0.0.0-20260422015212-ec452872dcc1/go.mod h1:EZeB2nBW4QcpZuCPB5a/UnoVIH2N+5z5fwNw1PUeqMg=
498496
knative.dev/serving v0.49.0 h1:5B1JsytwZ+5bh9vOCNnu4GQJ/m6oj61Z/rVKziAY6MA=
499497
knative.dev/serving v0.49.0/go.mod h1:KXvVnXohxsbE3rCRbr1TZlxeC20qIzhVckDwbsgLWPI=
500-
sigs.k8s.io/controller-runtime v0.23.3 h1:VjB/vhoPoA9l1kEKZHBMnQF33tdCLQKJtydy4iqwZ80=
501-
sigs.k8s.io/controller-runtime v0.23.3/go.mod h1:B6COOxKptp+YaUT5q4l6LqUJTRpizbgf9KSRNdQGns0=
498+
sigs.k8s.io/controller-runtime v0.24.0 h1:Ck6N2LdS8Lovy1o25BB4r1xjvLEKUl1s2o9kU+KWDE4=
499+
sigs.k8s.io/controller-runtime v0.24.0/go.mod h1:vFkfY5fGt5xAC/sKb8IBFKgWPNKG9OUG29dR8Y2wImw=
502500
sigs.k8s.io/gateway-api v1.5.1 h1:RqVRIlkhLhUO8wOHKTLnTJA6o/1un4po4/6M1nRzdd0=
503501
sigs.k8s.io/gateway-api v1.5.1/go.mod h1:GvCETiaMAlLym5CovLxGjS0NysqFk3+Yuq3/rh6QL2o=
504502
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=

‎pkg/apis/camel/v1/camelcatalog_types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import (
2424

2525
const (
2626
// CamelCatalogKind -- .
27-
CamelCatalogKind string = "CamelCatalog"
27+
CamelCatalogKind string = "CamelCatalog"
28+
MavenQuarkusGroupID string = "org.apache.camel.quarkus"
2829
)
2930

3031
// +genclient

‎pkg/apis/camel/v1/camelcatalog_types_support.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func (c *CamelCatalogSpec) HasCapability(capability string) bool {
229229
// GetDependencyID returns a Camel K recognizable maven dependency for the artifact.
230230
func (in *CamelArtifact) GetDependencyID() string {
231231
switch {
232-
case in.GroupID == "org.apache.camel.quarkus" && strings.HasPrefix(in.ArtifactID, "camel-quarkus-"):
232+
case in.GroupID == MavenQuarkusGroupID && strings.HasPrefix(in.ArtifactID, "camel-quarkus-"):
233233
return "camel:" + in.ArtifactID[14:]
234234
case in.Version == "":
235235
return "mvn:" + in.GroupID + ":" + in.ArtifactID

‎pkg/cmd/debug.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"github.com/spf13/cobra"
3434
k8serrors "k8s.io/apimachinery/pkg/api/errors"
3535
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
36-
"k8s.io/utils/ptr"
3736
)
3837

3938
func newCmdDebug(rootCmdOptions *RootCmdOptions) (*cobra.Command, *debugCmdOptions) {
@@ -145,8 +144,8 @@ func (o *debugCmdOptions) toggle(it *v1.Integration, active bool) *v1.Integratio
145144
jvmTrait := it.Spec.Traits.JVM
146145

147146
if active {
148-
jvmTrait.Debug = ptr.To(true)
149-
jvmTrait.DebugSuspend = ptr.To(o.Suspend)
147+
jvmTrait.Debug = new(true)
148+
jvmTrait.DebugSuspend = new(o.Suspend)
150149
} else {
151150
jvmTrait.Debug = nil
152151
jvmTrait.DebugSuspend = nil

‎pkg/cmd/util.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,7 @@ func clone(dst any, src any) error {
223223
func fieldByMapstructureTagName(target reflect.Value, tagName string) (reflect.StructField, bool) {
224224
pl := p.NewClient()
225225

226-
for i := range target.Type().NumField() {
227-
f := target.Type().Field(i)
228-
226+
for f := range target.Type().Fields() {
229227
tag, ok := f.Tag.Lookup(MapstructureTagName)
230228
if !ok {
231229
continue

‎pkg/controller/integration/monitor.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ func getIntegrationSecretAndConfigmapResourceVersions(ctx context.Context, clien
335335
if conf.StorageType() == utilResource.StorageTypeConfigmap {
336336
cm := corev1.ConfigMap{
337337
TypeMeta: metav1.TypeMeta{
338-
Kind: "ConfigMap",
338+
Kind: corev1.ResourceConfigMaps.String(),
339339
APIVersion: corev1.SchemeGroupVersion.String(),
340340
},
341341
ObjectMeta: metav1.ObjectMeta{
@@ -347,7 +347,7 @@ func getIntegrationSecretAndConfigmapResourceVersions(ctx context.Context, clien
347347
} else if conf.StorageType() == utilResource.StorageTypeSecret {
348348
sec := corev1.Secret{
349349
TypeMeta: metav1.TypeMeta{
350-
Kind: "Secret",
350+
Kind: corev1.ResourceSecrets.String(),
351351
APIVersion: corev1.SchemeGroupVersion.String(),
352352
},
353353
ObjectMeta: metav1.ObjectMeta{

‎pkg/controller/integration/monitor_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ func newConfigMap(namespace, cmName, originalFilename string, generatedKey strin
239239
immutable := true
240240
cm := corev1.ConfigMap{
241241
TypeMeta: metav1.TypeMeta{
242-
Kind: "ConfigMap",
243-
APIVersion: "v1",
242+
Kind: corev1.ResourceConfigMaps.String(),
243+
APIVersion: corev1.SchemeGroupVersion.String(),
244244
},
245245
ObjectMeta: metav1.ObjectMeta{
246246
Name: cmName,

‎pkg/controller/integrationplatform/kamelets.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"strings"
3030

3131
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
32-
"k8s.io/utils/ptr"
3332

3433
"github.com/apache/camel-k/v2/pkg/client"
3534
"github.com/apache/camel-k/v2/pkg/util"
@@ -77,9 +76,13 @@ func prepareKameletDirectory() (string, error) {
7776
}
7877
// If the directory exists, it is likely a leftover from any previous Kamelet
7978
// catalog installation. We should remove to be able to proceed
79+
//
80+
//nolint:gosec // deprecated code to be removed soon
8081
if err := os.RemoveAll(kameletDir); err != nil {
8182
return kameletDirEnv, err
8283
}
84+
//
85+
//nolint:gosec // deprecated code to be removed soon
8386
err := os.MkdirAll(kameletDir, os.ModePerm)
8487

8588
return kameletDir, err
@@ -239,8 +242,8 @@ func loadKamelet(path string, platform *v1.IntegrationPlatform) (*v1.Kamelet, er
239242
Kind: platform.Kind,
240243
Name: platform.Name,
241244
UID: platform.UID,
242-
Controller: ptr.To(true),
243-
BlockOwnerDeletion: ptr.To(true),
245+
Controller: new(true),
246+
BlockOwnerDeletion: new(true),
244247
},
245248
}
246249
kamelet.SetOwnerReferences(references)

0 commit comments

Comments
 (0)