Skip to content

Commit aaa98e2

Browse files
gianlucam76gianlucam76
authored
Merge pull request #1570 from gianlucam76/deps
(chore) advance to k8s v1.35.0
2 parents f9c911e + 983a968 commit aaa98e2

13 files changed

+120
-117
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
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
# KUBEBUILDER_ENVTEST_KUBERNETES_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.34.0
5+
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.35.0
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))
@@ -75,7 +75,7 @@ GOVULNCHECK_VERSION := "v1.1.4"
7575
GOLANGCI_LINT_VERSION := "v2.7.2"
7676
CLUSTERCTL_VERSION := v1.12.1
7777

78-
KUSTOMIZE_VER := v5.7.0
78+
KUSTOMIZE_VER := v5.8.0
7979
KUSTOMIZE_BIN := kustomize
8080
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
8181
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v5

‎controllers/handlers_kustomize_test.go‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,12 @@ var _ = Describe("KustomizeRefs", func() {
119119
Namespace: namespace,
120120
Name: randomString(),
121121
Labels: map[string]string{
122-
deployer.ReferenceKindLabel: string(libsveltosv1beta1.ConfigMapReferencedResourceKind),
123-
deployer.ReferenceNameLabel: randomString(),
124-
deployer.ReferenceNamespaceLabel: randomString(),
125-
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureKustomize),
122+
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureKustomize),
123+
},
124+
Annotations: map[string]string{
125+
deployer.ReferenceKindAnnotation: string(libsveltosv1beta1.ConfigMapReferencedResourceKind),
126+
deployer.ReferenceNameAnnotation: randomString(),
127+
deployer.ReferenceNamespaceAnnotation: randomString(),
126128
},
127129
},
128130
}
@@ -138,10 +140,12 @@ var _ = Describe("KustomizeRefs", func() {
138140
ObjectMeta: metav1.ObjectMeta{
139141
Name: randomString(),
140142
Labels: map[string]string{
141-
deployer.ReferenceKindLabel: string(libsveltosv1beta1.ConfigMapReferencedResourceKind),
142-
deployer.ReferenceNameLabel: randomString(),
143-
deployer.ReferenceNamespaceLabel: randomString(),
144-
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureKustomize),
143+
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureKustomize),
144+
},
145+
Annotations: map[string]string{
146+
deployer.ReferenceKindAnnotation: string(libsveltosv1beta1.ConfigMapReferencedResourceKind),
147+
deployer.ReferenceNameAnnotation: randomString(),
148+
deployer.ReferenceNamespaceAnnotation: randomString(),
145149
},
146150
},
147151
}

‎controllers/handlers_resources_test.go‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,13 @@ var _ = Describe("HandlersResource", func() {
169169
Namespace: namespace,
170170
Name: randomString(),
171171
Labels: map[string]string{
172-
deployer.ReferenceKindLabel: string(libsveltosv1beta1.ConfigMapReferencedResourceKind),
173-
deployer.ReferenceNameLabel: randomString(),
174-
deployer.ReferenceNamespaceLabel: randomString(),
175-
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureResources),
172+
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureResources),
173+
},
174+
Annotations: map[string]string{
175+
deployer.ReferenceKindAnnotation: string(libsveltosv1beta1.ConfigMapReferencedResourceKind),
176+
deployer.ReferenceNameAnnotation: randomString(),
177+
deployer.ReferenceNamespaceAnnotation: randomString(),
178+
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureResources),
176179
},
177180
},
178181
}
@@ -188,10 +191,12 @@ var _ = Describe("HandlersResource", func() {
188191
ObjectMeta: metav1.ObjectMeta{
189192
Name: randomString(),
190193
Labels: map[string]string{
191-
deployer.ReferenceKindLabel: string(libsveltosv1beta1.ConfigMapReferencedResourceKind),
192-
deployer.ReferenceNameLabel: randomString(),
193-
deployer.ReferenceNamespaceLabel: randomString(),
194-
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureResources),
194+
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureResources),
195+
},
196+
Annotations: map[string]string{
197+
deployer.ReferenceKindAnnotation: string(libsveltosv1beta1.ConfigMapReferencedResourceKind),
198+
deployer.ReferenceNameAnnotation: randomString(),
199+
deployer.ReferenceNamespaceAnnotation: randomString(),
195200
},
196201
},
197202
}

‎controllers/handlers_utils_test.go‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -570,9 +570,9 @@ var _ = Describe("HandlersUtils", func() {
570570
var policyHash string
571571
policyHash, err = deployer.ComputePolicyHash(policy)
572572
Expect(err).To(BeNil())
573-
deployer.AddLabel(policy, deployer.ReferenceKindLabel, secret.Kind)
574-
deployer.AddLabel(policy, deployer.ReferenceNameLabel, secret.Name)
575-
deployer.AddLabel(policy, deployer.ReferenceNamespaceLabel, secret.Namespace)
573+
deployer.AddAnnotation(policy, deployer.ReferenceKindAnnotation, secret.Kind)
574+
deployer.AddAnnotation(policy, deployer.ReferenceNameAnnotation, secret.Name)
575+
deployer.AddAnnotation(policy, deployer.ReferenceNamespaceAnnotation, secret.Namespace)
576576
deployer.AddAnnotation(policy, deployer.PolicyHash, policyHash)
577577
deployer.AddAnnotation(policy, deployer.OwnerTier, "100")
578578
deployer.AddAnnotation(policy, deployer.OwnerName, clusterProfile.Name)
@@ -731,10 +731,12 @@ var _ = Describe("HandlersUtils", func() {
731731
clusterRole, err := k8s_utils.GetUnstructured([]byte(fmt.Sprintf(viewClusterRole, viewClusterRoleName)))
732732
Expect(err).To(BeNil())
733733
clusterRole.SetLabels(map[string]string{
734-
deployer.ReferenceKindLabel: string(libsveltosv1beta1.ConfigMapReferencedResourceKind),
735-
deployer.ReferenceNameLabel: configMap.Name,
736-
deployer.ReferenceNamespaceLabel: configMap.Namespace,
737-
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureResources),
734+
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureResources),
735+
})
736+
clusterRole.SetAnnotations(map[string]string{
737+
deployer.ReferenceKindAnnotation: string(libsveltosv1beta1.ConfigMapReferencedResourceKind),
738+
deployer.ReferenceNameAnnotation: configMap.Name,
739+
deployer.ReferenceNamespaceAnnotation: configMap.Namespace,
738740
})
739741
clusterRole.SetOwnerReferences([]metav1.OwnerReference{
740742
{Kind: configv1beta1.ClusterProfileKind, Name: clusterProfile.Name,
@@ -798,10 +800,12 @@ var _ = Describe("HandlersUtils", func() {
798800
ObjectMeta: metav1.ObjectMeta{
799801
Name: clusterRoleName1,
800802
Labels: map[string]string{
801-
deployer.ReferenceKindLabel: configMap1.Kind,
802-
deployer.ReferenceNamespaceLabel: configMap1.Namespace,
803-
deployer.ReferenceNameLabel: configMap1.Name,
804-
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureResources),
803+
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureResources),
804+
},
805+
Annotations: map[string]string{
806+
deployer.ReferenceKindAnnotation: configMap1.Kind,
807+
deployer.ReferenceNamespaceAnnotation: configMap1.Namespace,
808+
deployer.ReferenceNameAnnotation: configMap1.Name,
805809
},
806810
},
807811
}
@@ -812,10 +816,12 @@ var _ = Describe("HandlersUtils", func() {
812816
Name: clusterRoleName2,
813817
Namespace: "default",
814818
Labels: map[string]string{
815-
deployer.ReferenceKindLabel: configMap2.Kind,
816-
deployer.ReferenceNamespaceLabel: configMap2.Namespace,
817-
deployer.ReferenceNameLabel: configMap2.Name,
818-
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureResources),
819+
deployer.ReasonLabel: string(libsveltosv1beta1.FeatureResources),
820+
},
821+
Annotations: map[string]string{
822+
deployer.ReferenceKindAnnotation: configMap2.Kind,
823+
deployer.ReferenceNamespaceAnnotation: configMap2.Namespace,
824+
deployer.ReferenceNameAnnotation: configMap2.Name,
819825
},
820826
},
821827
}

‎controllers/resourcesummary_collection.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ func getClusterSummaryNameFromResourceSummary(rs *libsveltosv1beta1.ResourceSumm
244244

245245
if !ok { // If not found in annotations, try labels
246246
if rs.Labels != nil {
247+
//nolint: staticcheck // for backbaward compatibility
247248
clusterSummaryName, ok = rs.Labels[libsveltosv1beta1.ClusterSummaryNameLabel]
248249
}
249250
}
@@ -273,6 +274,7 @@ func getClusterSummaryNamespaceFromResourceSummary(rs *libsveltosv1beta1.Resourc
273274

274275
if !ok { // If not found in annotations, try labels
275276
if rs.Labels != nil {
277+
//nolint: staticcheck // for backbaward compatibility
276278
clusterSummaryNamespace, ok = rs.Labels[libsveltosv1beta1.ClusterSummaryNamespaceLabel]
277279
}
278280
}

‎go.mod‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ require (
1818
github.com/onsi/ginkgo/v2 v2.27.3
1919
github.com/onsi/gomega v1.38.3
2020
github.com/pkg/errors v0.9.1
21-
github.com/projectsveltos/libsveltos v1.3.1
21+
github.com/projectsveltos/libsveltos v1.3.2-0.20260103131048-3e231674542f
2222
github.com/prometheus/client_golang v1.23.2
2323
github.com/robfig/cron v1.2.0
2424
github.com/spf13/pflag v1.0.10
2525
github.com/yuin/gopher-lua v1.1.1
2626
golang.org/x/text v0.32.0
2727
helm.sh/helm/v3 v3.19.4
28-
k8s.io/api v0.34.3
29-
k8s.io/apiextensions-apiserver v0.34.3
30-
k8s.io/apimachinery v0.34.3
31-
k8s.io/cli-runtime v0.34.3
32-
k8s.io/client-go v0.34.3
33-
k8s.io/component-base v0.34.3
28+
k8s.io/api v0.35.0
29+
k8s.io/apiextensions-apiserver v0.35.0
30+
k8s.io/apimachinery v0.35.0
31+
k8s.io/cli-runtime v0.35.0
32+
k8s.io/client-go v0.35.0
33+
k8s.io/component-base v0.35.0
3434
k8s.io/klog/v2 v2.130.1
35-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
35+
k8s.io/utils v0.0.0-20251222233032-718f0e51e6d2
3636
sigs.k8s.io/cluster-api v1.12.1
3737
sigs.k8s.io/controller-runtime v0.22.4
3838
sigs.k8s.io/kustomize/api v0.21.0
@@ -44,7 +44,7 @@ require (
4444
cel.dev/expr v0.25.1 // indirect
4545
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
4646
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
47-
github.com/BurntSushi/toml v1.5.0 // indirect
47+
github.com/BurntSushi/toml v1.6.0 // indirect
4848
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4949
github.com/Masterminds/goutils v1.1.1 // indirect
5050
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
@@ -81,7 +81,6 @@ require (
8181
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
8282
github.com/gobuffalo/flect v1.0.3 // indirect
8383
github.com/gobwas/glob v0.2.3 // indirect
84-
github.com/gogo/protobuf v1.3.2 // indirect
8584
github.com/google/btree v1.1.3 // indirect
8685
github.com/google/cel-go v0.26.1 // indirect
8786
github.com/google/gnostic-models v0.7.0 // indirect
@@ -146,13 +145,13 @@ require (
146145
github.com/xlab/treeprint v1.2.0 // indirect
147146
github.com/zeebo/blake3 v0.2.4 // indirect
148147
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
149-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
150-
go.opentelemetry.io/otel v1.35.0 // indirect
148+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
149+
go.opentelemetry.io/otel v1.36.0 // indirect
151150
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
152151
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
153-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
154-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
155-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
152+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
153+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
154+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
156155
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
157156
go.yaml.in/yaml/v2 v2.4.3 // indirect
158157
go.yaml.in/yaml/v3 v3.0.4 // indirect
@@ -168,20 +167,20 @@ require (
168167
golang.org/x/tools v0.39.0 // indirect
169168
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
170169
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
171-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
170+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
172171
google.golang.org/grpc v1.72.3 // indirect
173172
google.golang.org/protobuf v1.36.10 // indirect
174-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
173+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
175174
gopkg.in/inf.v0 v0.9.1 // indirect
176175
gopkg.in/yaml.v3 v3.0.1 // indirect
177176
gotest.tools/v3 v3.4.0 // indirect
178-
k8s.io/apiserver v0.34.3 // indirect
177+
k8s.io/apiserver v0.35.0 // indirect
179178
k8s.io/cluster-bootstrap v0.34.2 // indirect
180-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
179+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
181180
k8s.io/kubectl v0.34.2 // indirect
182181
oras.land/oras-go/v2 v2.6.0 // indirect
183182
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
184-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
183+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
185184
sigs.k8s.io/randfill v1.0.0 // indirect
186185
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
187186
)

0 commit comments

Comments
 (0)