Merge pull request #335 from gianlucam76/deps

(chore) advance k8s to v1.35.0

Author: gianlucam76

Makefile

@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # KUBEBUILDER_ENVTEST_KUBERNETES_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.34.0
+KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.35.0
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -67,10 +67,10 @@ KIND := $(TOOLS_BIN_DIR)/kind
 KUBECTL := $(TOOLS_BIN_DIR)/kubectl
 CLUSTERCTL := $(TOOLS_BIN_DIR)/clusterctl
 
-GOLANGCI_LINT_VERSION := "v2.5.0"
-CLUSTERCTL_VERSION := v1.12.0
+GOLANGCI_LINT_VERSION := "v2.7.2"
+CLUSTERCTL_VERSION := v1.12.1
 
-KUSTOMIZE_VER := v5.7.0
+KUSTOMIZE_VER := v5.8.0
 KUSTOMIZE_BIN := kustomize
 KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
 KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v5
@@ -166,7 +166,7 @@ endif
 # K8S_VERSION for the Kind cluster can be set as environment variable. If not defined,
 # this default value is used
 ifndef K8S_VERSION
-K8S_VERSION := v1.34.0
+K8S_VERSION := v1.35.0
 endif
 
 KIND_CONFIG ?= kind-cluster.yaml

controllers/deployer_utils.go

@@ -473,9 +473,9 @@ func deployRole(ctx context.Context, remoteConfig *rest.Config, remoteClient cli
 	// Following labels are added to indentify ConfigMap/Secret causing this resource to be deployed.
 	// Those are used to identify conflicts (different ConfigMaps/Secrets) updating same resource.
 	// Note, it is possible and OK for different RoleRequest to reference same ConfigMap/Secret.
-	addLabel(policy, deployer.ReferenceKindLabel, referencedObject.GetObjectKind().GroupVersionKind().Kind)
-	addLabel(policy, deployer.ReferenceNameLabel, referencedObject.GetName())
-	addLabel(policy, deployer.ReferenceNamespaceLabel, referencedObject.GetNamespace())
+	addAnnotation(policy, deployer.ReferenceKindAnnotation, referencedObject.GetObjectKind().GroupVersionKind().Kind)
+	addAnnotation(policy, deployer.ReferenceNameAnnotation, referencedObject.GetName())
+	addAnnotation(policy, deployer.ReferenceNamespaceAnnotation, referencedObject.GetNamespace())
 
 	addLabel(policy, libsveltosv1beta1.RoleRequestLabel, "ok")
 
@@ -668,6 +668,16 @@ func collectContent(data map[string]string, logger logr.Logger) ([]*unstructured
 	return policies, nil
 }
 
+// addAnnotation adds annotation to an object
+func addAnnotation(obj metav1.Object, annotationKey, annotationValue string) {
+	annotations := obj.GetAnnotations()
+	if annotations == nil {
+		annotations = make(map[string]string)
+	}
+	annotations[annotationKey] = annotationValue
+	obj.SetAnnotations(annotations)
+}
+
 // addLabel adds label to an object
 func addLabel(obj metav1.Object, labelKey, labelValue string) {
 	labels := obj.GetLabels()

controllers/deployer_utils_test.go

@@ -325,7 +325,7 @@ var _ = Describe("Deployer utils", func() {
 			if err != nil {
 				return false
 			}
-			return validateLabels(currentClusterRole, configMap)
+			return validateAnnotations(currentClusterRole, configMap)
 		}, timeout, pollingInterval).Should(BeTrue())
 
 		// Corresponding ClusterRoleBinding must be present
@@ -354,7 +354,7 @@ var _ = Describe("Deployer utils", func() {
 			if err != nil {
 				return false
 			}
-			return validateLabels(currentClusterRole, secret)
+			return validateAnnotations(currentClusterRole, secret)
 		}, timeout, pollingInterval).Should(BeTrue())
 
 		// Corresponding ClusterRoleBinding must be present
@@ -482,29 +482,29 @@ var _ = Describe("Deployer utils", func() {
 	})
 })
 
-func validateLabels(deployedResource, ownerResource client.Object) bool {
-	labels := deployedResource.GetLabels()
-	if labels == nil {
+func validateAnnotations(deployedResource, ownerResource client.Object) bool {
+	annts := deployedResource.GetAnnotations()
+	if annts == nil {
 		return false
 	}
 
-	if !validateLabel(labels, deployer.ReferenceKindLabel, ownerResource.GetObjectKind().GroupVersionKind().Kind) {
+	if !validateAnnotation(annts, deployer.ReferenceKindAnnotation, ownerResource.GetObjectKind().GroupVersionKind().Kind) {
 		return false
 	}
 
-	if !validateLabel(labels, deployer.ReferenceNameLabel, ownerResource.GetName()) {
+	if !validateAnnotation(annts, deployer.ReferenceNameAnnotation, ownerResource.GetName()) {
 		return false
 	}
 
-	if !validateLabel(labels, deployer.ReferenceNamespaceLabel, ownerResource.GetNamespace()) {
+	if !validateAnnotation(annts, deployer.ReferenceNamespaceAnnotation, ownerResource.GetNamespace()) {
 		return false
 	}
 
 	return true
 }
 
-func validateLabel(labels map[string]string, key, value string) bool {
-	v, ok := labels[key]
+func validateAnnotation(annotations map[string]string, key, value string) bool {
+	v, ok := annotations[key]
 	if !ok {
 		return false
 	}

controllers/rolerequest_deployer.go

@@ -862,7 +862,7 @@ func cleanStaleClusterRoleResources(ctx context.Context, remoteClient client.Cli
 		logger.V(logs.LogVerbose).Info("considering clusterRole %s", cr.GetName())
 		// Verify if this policy was deployed because of a clustersummary (ReferenceLabelName
 		// is present as label in such a case).
-		if !hasLabel(cr, deployer.ReferenceNameLabel, "") {
+		if !hasAnnotation(cr, deployer.ReferenceNameAnnotation, "") {
 			continue
 		}
 
@@ -915,7 +915,7 @@ func cleanStaleRoleResources(ctx context.Context, remoteClient client.Client, ro
 		logger.V(logs.LogVerbose).Info("considering role %s:%s", r.GetNamespace(), r.GetName())
 		// Verify if this policy was deployed because of a clustersummary (ReferenceLabelName
 		// is present as label in such a case).
-		if !hasLabel(r, deployer.ReferenceNameLabel, "") {
+		if !hasAnnotation(r, deployer.ReferenceNameAnnotation, "") {
 			continue
 		}
 
@@ -1094,16 +1094,16 @@ func getPolicyInfo(policy *corev1.ObjectReference) string {
 		policy.Name)
 }
 
-// hasLabel search if key is one of the label.
+// hasAnnotation search if key is one of the annotations.
 // If value is empty, returns true if key is present.
 // If value is not empty, returns true if key is present and value is a match.
-func hasLabel(u client.Object, key, value string) bool {
-	lbls := u.GetLabels()
-	if lbls == nil {
+func hasAnnotation(u client.Object, key, value string) bool {
+	annts := u.GetAnnotations()
+	if annts == nil {
 		return false
 	}
 
-	v, ok := lbls[key]
+	v, ok := annts[key]
 
 	if value == "" {
 		return ok

controllers/rolerequest_deployer_test.go

@@ -168,7 +168,7 @@ var _ = Describe("Deployer", func() {
 			if err != nil {
 				return false
 			}
-			return validateLabels(currentClusterRole, configMap)
+			return validateAnnotations(currentClusterRole, configMap)
 		}, timeout, pollingInterval).Should(BeTrue())
 
 		Eventually(func() bool {
@@ -179,7 +179,7 @@ var _ = Describe("Deployer", func() {
 			if err != nil {
 				return false
 			}
-			return validateLabels(currentClusterRole, secret)
+			return validateAnnotations(currentClusterRole, secret)
 		}, timeout, pollingInterval).Should(BeTrue())
 
 		// Name of the ServiceAccount created by Sveltos in the managed cluster
@@ -266,7 +266,7 @@ var _ = Describe("Deployer", func() {
 			if err != nil {
 				return false
 			}
-			return validateLabels(currentClusterRole, configMap1)
+			return validateAnnotations(currentClusterRole, configMap1)
 		}, timeout, pollingInterval).Should(BeTrue())
 
 		// Name of the ServiceAccount created by Sveltos in the managed cluster
@@ -292,7 +292,7 @@ var _ = Describe("Deployer", func() {
 			if err != nil {
 				return false
 			}
-			return validateLabels(currentRole, configMap2)
+			return validateAnnotations(currentRole, configMap2)
 		}, timeout, pollingInterval).Should(BeTrue())
 
 		// Verify RoleBinding is present
@@ -377,12 +377,12 @@ var _ = Describe("Deployer", func() {
 
 		// Add labels as objects deployed by sveltos must have those labels.
 		// Sveltos wont clean up otherwise
-		labels := map[string]string{
-			deployer.ReferenceNameLabel:      randomString(),
-			deployer.ReferenceNamespaceLabel: randomString(),
-			deployer.ReferenceKindLabel:      "ConfigMap",
+		annotations := map[string]string{
+			deployer.ReferenceNameAnnotation:      randomString(),
+			deployer.ReferenceNamespaceAnnotation: randomString(),
+			deployer.ReferenceKindAnnotation:      "ConfigMap",
 		}
-		clusterRole.SetLabels(labels)
+		clusterRole.SetAnnotations(annotations)
 
 		apiVersion, kind := roleRequest.GetObjectKind().GroupVersionKind().ToAPIVersionAndKind()
 		clusterRole.SetOwnerReferences([]metav1.OwnerReference{

go.mod

@@ -9,25 +9,25 @@ require (
 	github.com/onsi/ginkgo/v2 v2.27.3
 	github.com/onsi/gomega v1.38.3
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/libsveltos v1.3.0
+	github.com/projectsveltos/libsveltos v1.3.2-0.20260103131048-3e231674542f
 	github.com/prometheus/client_golang v1.23.2
 	github.com/spf13/pflag v1.0.10
 	golang.org/x/text v0.32.0
-	k8s.io/api v0.34.3
-	k8s.io/apiextensions-apiserver v0.34.3
-	k8s.io/apimachinery v0.34.3
-	k8s.io/client-go v0.34.3
-	k8s.io/component-base v0.34.3
+	k8s.io/api v0.35.0
+	k8s.io/apiextensions-apiserver v0.35.0
+	k8s.io/apimachinery v0.35.0
+	k8s.io/client-go v0.35.0
+	k8s.io/component-base v0.35.0
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
-	sigs.k8s.io/cluster-api v1.12.0
+	k8s.io/utils v0.0.0-20251222233032-718f0e51e6d2
+	sigs.k8s.io/cluster-api v1.12.1
 	sigs.k8s.io/controller-runtime v0.22.4
 )
 
 require (
 	cel.dev/expr v0.25.1 // indirect
 	dario.cat/mergo v1.0.1 // indirect
-	github.com/BurntSushi/toml v1.5.0 // indirect
+	github.com/BurntSushi/toml v1.6.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.4.0 // indirect
 	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
@@ -49,7 +49,6 @@ require (
 	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gobuffalo/flect v1.0.3 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/cel-go v0.26.1 // indirect
 	github.com/google/gnostic-models v0.7.0 // indirect
@@ -80,13 +79,13 @@ require (
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-	go.opentelemetry.io/otel v1.35.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
+	go.opentelemetry.io/otel v1.36.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
-	go.opentelemetry.io/otel/metric v1.35.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
-	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+	go.opentelemetry.io/otel/metric v1.36.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.36.0 // indirect
+	go.opentelemetry.io/otel/trace v1.36.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
@@ -102,17 +101,17 @@ require (
 	golang.org/x/tools v0.39.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
 	google.golang.org/grpc v1.72.3 // indirect
 	google.golang.org/protobuf v1.36.10 // indirect
-	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiserver v0.34.3 // indirect
+	k8s.io/apiserver v0.35.0 // indirect
 	k8s.io/cluster-bootstrap v0.34.2 // indirect
-	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
+	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
-	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
 	sigs.k8s.io/kustomize/api v0.21.0 // indirect
 	sigs.k8s.io/kustomize/kyaml v0.21.0 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect