Use k8s 1.34 client libs

.golangci.yml

@@ -0,0 +1,28 @@
+version: "2"
+linters:
+  default: standard
+  enable:
+    - unparam
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: 'interface{}'
+          replacement: 'any'
+
+issues:
+  max-same-issues: 100
+
+  exclude-files:
+    - generated.*\\.go
+
+  exclude-dirs:
+    - client
+    - vendor
+
+run:
+  timeout: 10m

Makefile

@@ -249,8 +249,6 @@ unit-tests: $(BUILD_DIRS)
 	        ./hack/test.sh $(SRC_DIRS)                          \
 	    "
 
-ADDTL_LINTERS   := gofmt,goimports,unparam
-
 .PHONY: lint
 lint: $(BUILD_DIRS)
 	@echo "running linter"
@@ -268,7 +266,7 @@ lint: $(BUILD_DIRS)
 	    --env GO111MODULE=on                                    \
 	    --env GOFLAGS="-mod=vendor"                             \
 	    $(BUILD_IMAGE)                                          \
-	    golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default
+	    golangci-lint run
 
 $(BUILD_DIRS):
 	@mkdir -p $@

agents/prometheusoperator/lib.go

@@ -85,7 +85,7 @@ func (agent *PrometheusOperator) CreateOrUpdate(sp api.StatsAccessor, new *api.A
 				Interval:    promapi.Duration(new.Prometheus.ServiceMonitor.Interval),
 				Path:        sp.Path(),
 				HonorLabels: true,
-				Scheme:      sp.Scheme(),
+				Scheme:      func() *promapi.Scheme { s := promapi.Scheme(sp.Scheme()); return &s }(),
 				TLSConfig:   sp.TLSConfig(),
 				RelabelConfigs: []promapi.RelabelConfig{
 					{

api/v1/helpers.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 
 	"kmodules.xyz/client-go/policy/secomp"
-	app_api "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1"
 	appcatalog "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1"
 
 	"gomodules.xyz/pointer"
@@ -125,13 +124,13 @@ func (c *ConnectionSpec) ToAppBinding() (*appcatalog.AppBinding, error) {
 		},
 	}
 	if c.AuthSecret != nil {
-		app.Spec.Secret = &app_api.TypedLocalObjectReference{
+		app.Spec.Secret = &appcatalog.TypedLocalObjectReference{
 			Kind: "Secret", // It will create circular dependency, If we use Kubedb Constant .
 			Name: c.AuthSecret.Name,
 		}
 	}
 	if c.TLSSecret != nil {
-		app.Spec.TLSSecret = &app_api.TypedLocalObjectReference{
+		app.Spec.TLSSecret = &appcatalog.TypedLocalObjectReference{
 			Kind: "Secret",
 			Name: c.TLSSecret.Name,
 		}

client/builder.go

@@ -99,13 +99,13 @@ func (r *ClientBuilder) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 
 	app := &appcatalog.AppBinding{}
 	if err := r.mgr.GetClient().Get(ctx, key, app); err != nil {
-		klog.Infof("AppBinding %q doesn't exist anymore", req.NamespacedName.String())
+		klog.Infof("AppBinding %q doesn't exist anymore", req.String())
 		r.unset()
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
 	// Add or remove finalizer based on deletion timestamp
-	if app.ObjectMeta.DeletionTimestamp != nil {
+	if app.DeletionTimestamp != nil {
 		r.unset()
 		return ctrl.Result{}, nil
 	}

client/proxy.go

@@ -38,23 +38,23 @@ func ToPrometheusConfig(cfg *rest.Config, ref appcatalog.ServiceReference) (*Con
 	}
 
 	var caFile, certFile, keyFile string
-	if len(cfg.TLSClientConfig.CAData) > 0 {
+	if len(cfg.CAData) > 0 {
 		caFile = filepath.Join(certDir, "ca.crt")
-		if err = os.WriteFile(caFile, cfg.TLSClientConfig.CAData, 0o644); err != nil {
+		if err = os.WriteFile(caFile, cfg.CAData, 0o644); err != nil {
 			return nil, err
 		}
 	}
 
-	if len(cfg.TLSClientConfig.CertData) > 0 {
+	if len(cfg.CertData) > 0 {
 		certFile = filepath.Join(certDir, "tls.crt")
-		if err = os.WriteFile(certFile, cfg.TLSClientConfig.CertData, 0o644); err != nil {
+		if err = os.WriteFile(certFile, cfg.CertData, 0o644); err != nil {
 			return nil, err
 		}
 	}
 
-	if len(cfg.TLSClientConfig.KeyData) > 0 {
+	if len(cfg.KeyData) > 0 {
 		keyFile = filepath.Join(certDir, "tls.key")
-		if err = os.WriteFile(keyFile, cfg.TLSClientConfig.KeyData, 0o644); err != nil {
+		if err = os.WriteFile(keyFile, cfg.KeyData, 0o644); err != nil {
 			return nil, err
 		}
 	}
@@ -74,8 +74,8 @@ func ToPrometheusConfig(cfg *rest.Config, ref appcatalog.ServiceReference) (*Con
 			CAFile:             caFile,
 			CertFile:           certFile,
 			KeyFile:            keyFile,
-			ServerName:         cfg.TLSClientConfig.ServerName,
-			InsecureSkipVerify: cfg.TLSClientConfig.Insecure,
+			ServerName:         cfg.ServerName,
+			InsecureSkipVerify: cfg.Insecure,
 		},
 	}, nil
 }

client/resource.go

@@ -126,7 +126,7 @@ func getPromQueryResult(pc promv1.API, promQuery string) (map[string]float64, er
 		if len(valStr) != 2 {
 			return nil, fmt.Errorf("metrics %q is invalid for query %s", m, promQuery)
 		}
-		valStr[0] = strings.Replace(valStr[0], " ", "", -1)
+		valStr[0] = strings.ReplaceAll(valStr[0], " ", "")
 		metricVal, err := strconv.ParseFloat(valStr[0], 64)
 		if err != nil {
 			return nil, err

go.mod

@@ -1,6 +1,6 @@
 module kmodules.xyz/monitoring-agent-api
 
-go 1.23.0
+go 1.24.0
 
 toolchain go1.24.1
 
@@ -11,24 +11,24 @@ require (
 	github.com/hexops/gotextdiff v1.0.3
 	github.com/json-iterator/go v1.1.12
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.81.0
-	github.com/prometheus-operator/prometheus-operator/pkg/client v0.81.0
-	github.com/prometheus/client_golang v1.20.5
-	github.com/prometheus/common v0.55.0
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.87.1
+	github.com/prometheus-operator/prometheus-operator/pkg/client v0.87.1
+	github.com/prometheus/client_golang v1.22.0
+	github.com/prometheus/common v0.62.0
 	github.com/spf13/pflag v1.0.6
 	github.com/zeebo/xxh3 v1.0.2
-	go.bytebuilders.dev/license-verifier v0.14.6
+	go.bytebuilders.dev/license-verifier v0.14.10
 	gomodules.xyz/atomic-writer v0.0.2
 	gomodules.xyz/pointer v0.1.0
-	k8s.io/api v0.32.2
-	k8s.io/apimachinery v0.32.2
-	k8s.io/client-go v0.32.2
+	k8s.io/api v0.34.3
+	k8s.io/apimachinery v0.34.3
+	k8s.io/client-go v0.34.3
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kube-openapi v0.0.0-20250304201544-e5f78fe3ede9
-	k8s.io/utils v0.0.0-20241210054802-24370beab758
-	kmodules.xyz/client-go v0.32.0
-	kmodules.xyz/custom-resources v0.32.2
-	sigs.k8s.io/controller-runtime v0.20.3
+	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
+	k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
+	kmodules.xyz/client-go v0.34.2
+	kmodules.xyz/custom-resources v0.32.3-0.20251226151909-e0c7e447f3de
+	sigs.k8s.io/controller-runtime v0.22.4
 )
 
 require (
@@ -38,60 +38,69 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
-	github.com/fsnotify/fsnotify v1.8.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.21.0 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/go-sql-driver/mysql v1.9.0 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-openapi/jsonpointer v0.22.1 // indirect
+	github.com/go-openapi/jsonreference v0.21.2 // indirect
+	github.com/go-openapi/swag v0.25.1 // indirect
+	github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
+	github.com/go-openapi/swag/conv v0.25.1 // indirect
+	github.com/go-openapi/swag/fileutils v0.25.1 // indirect
+	github.com/go-openapi/swag/jsonname v0.25.1 // indirect
+	github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
+	github.com/go-openapi/swag/loading v0.25.1 // indirect
+	github.com/go-openapi/swag/mangling v0.25.1 // indirect
+	github.com/go-openapi/swag/netutils v0.25.1 // indirect
+	github.com/go-openapi/swag/stringutils v0.25.1 // indirect
+	github.com/go-openapi/swag/typeutils v0.25.1 // indirect
+	github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
+	github.com/go-sql-driver/mysql v1.9.3 // indirect
 	github.com/google/btree v1.1.3 // indirect
-	github.com/google/gnostic-models v0.6.9 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gnostic-models v0.7.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
-	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/yudai/gojsondiff v1.0.0 // indirect
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
-	golang.org/x/net v0.38.0 // indirect
-	golang.org/x/oauth2 v0.27.0 // indirect
-	golang.org/x/sync v0.12.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/term v0.30.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
-	golang.org/x/time v0.10.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/oauth2 v0.31.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/term v0.38.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
+	golang.org/x/time v0.13.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
 	gomodules.xyz/mergo v0.3.13 // indirect
 	gomodules.xyz/sets v0.0.0-20210218105342-2efe2fb519a2 // indirect
-	google.golang.org/protobuf v1.36.3 // indirect
-	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.32.2 // indirect
+	k8s.io/apiextensions-apiserver v0.34.3 // indirect
 	kmodules.xyz/apiversion v0.2.0 // indirect
-	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
+	sigs.k8s.io/yaml v1.6.0 // indirect
 )