Merge pull request #890 from zalando-incubator/dependabot/go_modules/all-go-mod-patch-and-minor-27074441d2

Bump the all-go-mod-patch-and-minor group with 9 updates

.github/workflows/ci.yaml

@@ -10,10 +10,10 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
+    - uses: actions/checkout@v6.0.2
+    - uses: actions/setup-go@v6.4.0
       with:
-        go-version: '^1.25'
+        go-version: '^1.26'
     - run: go version
     - run: go install github.com/mattn/goveralls@latest
     - run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest

.github/workflows/codeql-analysis.yml

@@ -38,16 +38,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6.0.2
 
     - name: setup go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6.4.0
       with:
-        go-version: '1.22'
+        go-version: '1.26'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,7 +61,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -74,4 +74,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

.github/workflows/gh-packages.yaml

@@ -25,15 +25,15 @@ jobs:
       packages: write # to push packages
     steps:
       - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+        uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
 
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c
         with:
           # https://www.npmjs.com/package/semver#caret-ranges-123-025-004
-          go-version: '^1.25'
+          go-version: '^1.26'
 
       - name: Login to Github Container Registry
-        uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -47,21 +47,21 @@ jobs:
           make build.linux.amd64 build.linux.arm64
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7
+        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4c0219f9ac95b02789c1075625400b2acbff50b1
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
 
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Docker meta
-        uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
+        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf
         id: meta
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
@@ -70,7 +70,7 @@ jobs:
             type=semver,pattern=v{{major}}.{{minor}}
 
       - name: Build and push
-        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
         with:
           context: .
           build-args: BASE_IMAGE=gcr.io/distroless/static-debian12
@@ -81,7 +81,7 @@ jobs:
 
       # Build and push latest tag
       - name: Build and push latest
-        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
         with:
           context: .
           build-args: BASE_IMAGE=gcr.io/distroless/static-debian12

.github/workflows/release-chart.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6.0.2
         with:
           fetch-depth: 0
 
@@ -20,7 +20,7 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.4.0
+        uses: helm/chart-releaser-action@v1.7.0
         with:
           charts_dir: docs
         env:

Makefile

@@ -34,12 +34,12 @@ $(GENERATED): go.mod $(CRD_TYPE_SOURCE) $(OPENAPI)
 	./hack/update-codegen.sh
 
 $(GENERATED_CRDS): $(GENERATED) $(CRD_SOURCES)
-	go run sigs.k8s.io/controller-tools/cmd/controller-gen crd:crdVersions=v1 paths=./pkg/apis/... output:crd:dir=docs
+	go tool controller-gen crd:crdVersions=v1 paths=./pkg/apis/... output:crd:dir=docs
 	mv docs/zalando.org_clusterscalingschedules.yaml docs/cluster_scaling_schedules_crd.yaml
 	mv docs/zalando.org_scalingschedules.yaml docs/scaling_schedules_crd.yaml
 
 $(OPENAPI): go.mod
-	go run k8s.io/kube-openapi/cmd/openapi-gen \
+	go tool openapi-gen \
 		--go-header-file hack/boilerplate.go.txt \
 		--logtostderr \
 		--output-dir pkg/api/generated/openapi \

docs/cluster_scaling_schedules_crd.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.3
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: clusterscalingschedules.zalando.org
 spec:
   group: zalando.org

docs/helm/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: kube-metrics-adapter
-version: 0.2.3
+version: 0.2.6
 description: kube-metrics-adapter helm chart
 home: https://github.com/zalando-incubator/kube-metrics-adapter
 maintainers:

docs/helm/templates/custom-metrics-apiservice.yaml

@@ -3,6 +3,13 @@ apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
   name: v1beta1.custom.metrics.k8s.io
+  {{- with .Values.customMetricsApi.annotations }}
+  annotations:
+    {{- range $k, $v := . }}
+      {{- $value := $v | quote }}
+      {{- printf "%s: %s" (tpl $k $) (tpl $value $) | nindent 4 }}
+    {{- end }}
+  {{- end }}
 spec:
   service:
     name: kube-metrics-adapter

docs/helm/templates/external-metrics-apiservice.yaml

@@ -3,6 +3,13 @@ apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
   name: v1beta1.external.metrics.k8s.io
+  {{- with .Values.externalMetricsApi.annotations }}
+  annotations:
+    {{- range $k, $v := . }}
+      {{- $value := $v | quote }}
+      {{- printf "%s: %s" (tpl $k $) (tpl $value $) | nindent 4 }}
+    {{- end }}
+  {{- end }}
 spec:
   service:
     name: kube-metrics-adapter

docs/helm/values.yaml

@@ -4,7 +4,7 @@ replicas: 1
 
 registry:
   image: ghcr.io/zalando-incubator/kube-metrics-adapter
-  imageTag: v0.2.3
+  imageTag: v0.2.6
   imagePullPolicy: IfNotPresent
 
 service:
@@ -15,7 +15,19 @@ addDirectoryHeader:
 contentionProfiling:
 profiling:
 enableCustomMetricsApi: true
+
+# -- add annotations to the custom metrics apiservice resource, e.g.
+# cert-manager.io/inject-ca-from: {{.Release.Namespace}}/kube-metrics-adapter to inject the CA certificate form a cert-manager-issued cert used for the deployment
+customMetricsApi:
+  annotations: {}
+
 enableExternalMetricsApi: true
+
+# -- add annotations to the custom metrics apiservice resource, e.g.
+# cert-manager.io/inject-ca-from: {{.Release.Namespace}}/kube-metrics-adapter to inject the CA certificate form a cert-manager-issued cert used for the deployment
+externalMetricsApi:
+  annotations: {}
+
 credentialsDirectory:
 disregardIncompatibleHPAs:
 http2MaxStreamsPerConnection:

docs/scaling_schedules_crd.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.3
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: scalingschedules.zalando.org
 spec:
   group: zalando.org

example/main.go

@@ -10,7 +10,7 @@ import (
 
 func metricsHandler(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(200)
-	_, err := w.Write([]byte(fmt.Sprintf(`{"queue": {"length": %d}}`, size)))
+	_, err := fmt.Fprintf(w, `{"queue": {"length": %d}}`, size)
 	if err != nil {
 		log.Fatalf("failed to write: %v", err)
 	}

hack/tools.go

@@ -1,23 +0,0 @@
-// +build tools
-
-/*
-Copyright 2019 The Kubernetes Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This package imports things required by build scripts, to force `go mod` to see them as dependencies
-package tools
-
-import (
-	_ "k8s.io/code-generator"
-	_ "k8s.io/kube-openapi/cmd/openapi-gen"
-	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
-)

hack/update-codegen.sh

@@ -31,14 +31,14 @@ APIS_PKG="${GOPKG}/pkg/apis"
 GROUPS_WITH_VERSIONS="${CUSTOM_RESOURCE_NAME}:${CUSTOM_RESOURCE_VERSION}"
 
 echo "Generating deepcopy funcs"
-go run k8s.io/code-generator/cmd/deepcopy-gen \
+go tool deepcopy-gen \
   --output-file zz_generated.deepcopy.go \
   --bounding-dirs "${APIS_PKG}" \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \
   "${APIS_PKG}/${CUSTOM_RESOURCE_NAME}/${CUSTOM_RESOURCE_VERSION}"
 
 echo "Generating clientset for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}"
-go run k8s.io/code-generator/cmd/client-gen \
+go tool client-gen \
   --clientset-name versioned \
   --input-base "" \
   --input "${APIS_PKG}/${CUSTOM_RESOURCE_NAME}/${CUSTOM_RESOURCE_VERSION}" \
@@ -47,14 +47,14 @@ go run k8s.io/code-generator/cmd/client-gen \
   --output-dir "${OUTPUT_DIR}/clientset"
 
 echo "Generating listers for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/listers"
-go run k8s.io/code-generator/cmd/lister-gen \
+go tool lister-gen \
   --output-pkg "${OUTPUT_PKG}/listers" \
   --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \
   --output-dir "${OUTPUT_DIR}/listers" \
   "${APIS_PKG}/${CUSTOM_RESOURCE_NAME}/${CUSTOM_RESOURCE_VERSION}"
 
 echo "Generating informers for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/informers"
-go run k8s.io/code-generator/cmd/informer-gen \
+go tool informer-gen \
   --versioned-clientset-package "${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}/${CLIENTSET_NAME_VERSIONED:-versioned}" \
   --listers-package "${OUTPUT_PKG}/listers" \
   --output-pkg "${OUTPUT_PKG}/informers" \

pkg/apis/zalando.org/v1/types.go

@@ -35,7 +35,7 @@ type ScalingSchedule struct {
 // Identifier returns the namespaced scalingScale Identifier in the format
 // `<namespace>/<name>`.
 func (s *ScalingSchedule) Identifier() string {
-	return s.ObjectMeta.Namespace + "/" + s.ObjectMeta.Name
+	return s.Namespace + "/" + s.Name
 }
 
 // ResourceSpec returns the ScalingScheduleSpec of the ScalingSchedule.
@@ -66,7 +66,7 @@ type ClusterScalingSchedule struct {
 // Identifier returns the cluster scalingScale Identifier in the format
 // `<name>`.
 func (s *ClusterScalingSchedule) Identifier() string {
-	return s.ObjectMeta.Name
+	return s.Name
 }
 
 // ResourceSpec returns the ScalingScheduleSpec of the ClusterScalingSchedule.

pkg/client/clientset/versioned/fake/clientset_generated.go

@@ -22,6 +22,7 @@ import (
 	clientset "github.com/zalando-incubator/kube-metrics-adapter/pkg/client/clientset/versioned"
 	zalandov1 "github.com/zalando-incubator/kube-metrics-adapter/pkg/client/clientset/versioned/typed/zalando.org/v1"
 	fakezalandov1 "github.com/zalando-incubator/kube-metrics-adapter/pkg/client/clientset/versioned/typed/zalando.org/v1/fake"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/discovery"
@@ -33,10 +34,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// DEPRECATED: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
@@ -49,9 +46,13 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake}
 	cs.AddReactor("*", "*", testing.ObjectReaction(o))
 	cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) {
+		var opts metav1.ListOptions
+		if watchAction, ok := action.(testing.WatchActionImpl); ok {
+			opts = watchAction.ListOptions
+		}
 		gvr := action.GetResource()
 		ns := action.GetNamespace()
-		watch, err := o.Watch(gvr, ns)
+		watch, err := o.Watch(gvr, ns, opts)
 		if err != nil {
 			return false, nil, err
 		}
@@ -78,6 +79,17 @@ func (c *Clientset) Tracker() testing.ObjectTracker {
 	return c.tracker
 }
 
+// IsWatchListSemanticsSupported informs the reflector that this client
+// doesn't support WatchList semantics.
+//
+// This is a synthetic method whose sole purpose is to satisfy the optional
+// interface check performed by the reflector.
+// Returning true signals that WatchList can NOT be used.
+// No additional logic is implemented here.
+func (c *Clientset) IsWatchListSemanticsUnSupported() bool {
+	return true
+}
+
 var (
 	_ clientset.Interface = &Clientset{}
 	_ testing.FakeClient  = &Clientset{}

pkg/client/clientset/versioned/typed/zalando.org/v1/zalando.org_client.go

@@ -50,9 +50,7 @@ func (c *ZalandoV1Client) ScalingSchedules(namespace string) ScalingScheduleInte
 // where httpClient was generated with rest.HTTPClientFor(c).
 func NewForConfig(c *rest.Config) (*ZalandoV1Client, error) {
 	config := *c
-	if err := setConfigDefaults(&config); err != nil {
-		return nil, err
-	}
+	setConfigDefaults(&config)
 	httpClient, err := rest.HTTPClientFor(&config)
 	if err != nil {
 		return nil, err
@@ -64,9 +62,7 @@ func NewForConfig(c *rest.Config) (*ZalandoV1Client, error) {
 // Note the http client provided takes precedence over the configured transport values.
 func NewForConfigAndClient(c *rest.Config, h *http.Client) (*ZalandoV1Client, error) {
 	config := *c
-	if err := setConfigDefaults(&config); err != nil {
-		return nil, err
-	}
+	setConfigDefaults(&config)
 	client, err := rest.RESTClientForConfigAndClient(&config, h)
 	if err != nil {
 		return nil, err
@@ -89,7 +85,7 @@ func New(c rest.Interface) *ZalandoV1Client {
 	return &ZalandoV1Client{c}
 }
 
-func setConfigDefaults(config *rest.Config) error {
+func setConfigDefaults(config *rest.Config) {
 	gv := zalandoorgv1.SchemeGroupVersion
 	config.GroupVersion = &gv
 	config.APIPath = "/apis"
@@ -98,8 +94,6 @@ func setConfigDefaults(config *rest.Config) error {
 	if config.UserAgent == "" {
 		config.UserAgent = rest.DefaultKubernetesUserAgent()
 	}
-
-	return nil
 }
 
 // RESTClient returns a RESTClient that is used to communicate

pkg/client/informers/externalversions/factory.go

@@ -97,6 +97,7 @@ func NewSharedInformerFactory(client versioned.Interface, defaultResync time.Dur
 // NewFilteredSharedInformerFactory constructs a new instance of sharedInformerFactory.
 // Listers obtained via this SharedInformerFactory will be subject to the same filters
 // as specified here.
+//
 // Deprecated: Please use NewSharedInformerFactoryWithOptions instead
 func NewFilteredSharedInformerFactory(client versioned.Interface, defaultResync time.Duration, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerFactory {
 	return NewSharedInformerFactoryWithOptions(client, defaultResync, WithNamespace(namespace), WithTweakListOptions(tweakListOptions))
@@ -204,7 +205,7 @@ func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internal
 //
 // It is typically used like this:
 //
-//	ctx, cancel := context.Background()
+//	ctx, cancel := context.WithCancel(context.Background())
 //	defer cancel()
 //	factory := NewSharedInformerFactory(client, resyncPeriod)
 //	defer factory.WaitForStop()    // Returns immediately if nothing was started.

pkg/client/informers/externalversions/zalando.org/v1/clusterscalingschedule.go

@@ -56,20 +56,32 @@ func NewClusterScalingScheduleInformer(client versioned.Interface, resyncPeriod
 // one. This reduces memory footprint and number of connections to the server.
 func NewFilteredClusterScalingScheduleInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
 	return cache.NewSharedIndexInformer(
-		&cache.ListWatch{
+		cache.ToListWatcherWithWatchListSemantics(&cache.ListWatch{
 			ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.ZalandoV1().ClusterScalingSchedules().List(context.TODO(), options)
+				return client.ZalandoV1().ClusterScalingSchedules().List(context.Background(), options)
 			},
 			WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.ZalandoV1().ClusterScalingSchedules().Watch(context.TODO(), options)
+				return client.ZalandoV1().ClusterScalingSchedules().Watch(context.Background(), options)
 			},
-		},
+			ListWithContextFunc: func(ctx context.Context, options metav1.ListOptions) (runtime.Object, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ZalandoV1().ClusterScalingSchedules().List(ctx, options)
+			},
+			WatchFuncWithContext: func(ctx context.Context, options metav1.ListOptions) (watch.Interface, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ZalandoV1().ClusterScalingSchedules().Watch(ctx, options)
+			},
+		}, client),
 		&apiszalandoorgv1.ClusterScalingSchedule{},
 		resyncPeriod,
 		indexers,

pkg/client/informers/externalversions/zalando.org/v1/scalingschedule.go

@@ -57,20 +57,32 @@ func NewScalingScheduleInformer(client versioned.Interface, namespace string, re
 // one. This reduces memory footprint and number of connections to the server.
 func NewFilteredScalingScheduleInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
 	return cache.NewSharedIndexInformer(
-		&cache.ListWatch{
+		cache.ToListWatcherWithWatchListSemantics(&cache.ListWatch{
 			ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.ZalandoV1().ScalingSchedules(namespace).List(context.TODO(), options)
+				return client.ZalandoV1().ScalingSchedules(namespace).List(context.Background(), options)
 			},
 			WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.ZalandoV1().ScalingSchedules(namespace).Watch(context.TODO(), options)
+				return client.ZalandoV1().ScalingSchedules(namespace).Watch(context.Background(), options)
 			},
-		},
+			ListWithContextFunc: func(ctx context.Context, options metav1.ListOptions) (runtime.Object, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ZalandoV1().ScalingSchedules(namespace).List(ctx, options)
+			},
+			WatchFuncWithContext: func(ctx context.Context, options metav1.ListOptions) (watch.Interface, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ZalandoV1().ScalingSchedules(namespace).Watch(ctx, options)
+			},
+		}, client),
 		&apiszalandoorgv1.ScalingSchedule{},
 		resyncPeriod,
 		indexers,

pkg/collector/collector.go

@@ -3,6 +3,7 @@ package collector
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -182,6 +183,25 @@ type MetricTypeName struct {
 	Metric autoscalingv2.MetricIdentifier
 }
 
+func (m MetricTypeName) String() string {
+	str := fmt.Sprintf("%s/%s", m.Type, m.Metric.Name)
+	if m.Metric.Selector != nil && len(m.Metric.Selector.MatchLabels) > 0 {
+		str += " " + mapToString(m.Metric.Selector.MatchLabels)
+	}
+	return str
+}
+
+func mapToString(m map[string]string) string {
+	str := "{"
+	keyVals := make([]string, 0, len(m))
+	for k, v := range m {
+		keyVals = append(keyVals, fmt.Sprintf("%s=%s", k, v))
+	}
+	str += strings.Join(keyVals, ",")
+	str += "}"
+	return str
+}
+
 type CollectedMetric struct {
 	Type      autoscalingv2.MetricSourceType
 	Namespace string

pkg/collector/collector_test.go

@@ -30,6 +30,88 @@ func (c *mockCollector) Interval() time.Duration {
 	return 0
 }
 
+func TestMetricTypeName_String(t *testing.T) {
+	for _, tc := range []struct {
+		name          string
+		metricType    autoscalingv2.MetricSourceType
+		metricName    string
+		selector      *metav1.LabelSelector
+		expectedStr   string
+		shouldContain []string
+	}{
+		{
+			name:        "nil selector with PodsMetricSourceType",
+			metricType:  autoscalingv2.PodsMetricSourceType,
+			metricName:  "metric-name",
+			selector:    nil,
+			expectedStr: "Pods/metric-name",
+		},
+		{
+			name:        "nil selector with ObjectMetricSourceType",
+			metricType:  autoscalingv2.ObjectMetricSourceType,
+			metricName:  "metric-name",
+			selector:    nil,
+			expectedStr: "Object/metric-name",
+		},
+		{
+			name:        "nil selector with ExternalMetricSourceType",
+			metricType:  autoscalingv2.ExternalMetricSourceType,
+			metricName:  "metric-name",
+			selector:    nil,
+			expectedStr: "External/metric-name",
+		},
+		{
+			name:       "empty selector (non-nil but empty MatchLabels)",
+			metricType: autoscalingv2.ExternalMetricSourceType,
+			metricName: "metric-name",
+			selector: &metav1.LabelSelector{
+				MatchLabels: map[string]string{},
+			},
+			expectedStr: "External/metric-name",
+		},
+		{
+			name:       "selector with single MatchLabel",
+			metricType: autoscalingv2.ExternalMetricSourceType,
+			metricName: "metric-name",
+			selector: &metav1.LabelSelector{
+				MatchLabels: map[string]string{"key": "value"},
+			},
+			shouldContain: []string{"External/metric-name", "key=value"},
+		},
+		{
+			name:       "selector with multiple MatchLabels",
+			metricType: autoscalingv2.ExternalMetricSourceType,
+			metricName: "metric-name",
+			selector: &metav1.LabelSelector{
+				MatchLabels: map[string]string{"key1": "val1", "key2": "val2"},
+			},
+			shouldContain: []string{"External/metric-name", "key1=val1", "key2=val2"},
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			mtn := MetricTypeName{
+				Type: tc.metricType,
+				Metric: autoscalingv2.MetricIdentifier{
+					Name:     tc.metricName,
+					Selector: tc.selector,
+				},
+			}
+
+			result := mtn.String()
+
+			if tc.expectedStr != "" {
+				require.Equal(t, tc.expectedStr, result)
+			}
+
+			if len(tc.shouldContain) > 0 {
+				for _, substring := range tc.shouldContain {
+					require.Contains(t, result, substring, "result should contain %q", substring)
+				}
+			}
+		})
+	}
+}
+
 func TestNewCollector(t *testing.T) {
 	for _, tc := range []struct {
 		msg               string

pkg/collector/external_rps_collector.go

@@ -63,7 +63,7 @@ func (p *ExternalRPSCollectorPlugin) NewCollector(
 	confCopy := *config
 
 	if _, ok := config.Config["hostnames"]; !ok {
-		return nil, fmt.Errorf("Hostname is not specified, unable to create collector")
+		return nil, fmt.Errorf("hostname is not specified, unable to create collector")
 	}
 
 	hostnames := strings.Split(config.Config["hostnames"], ",")

pkg/collector/fake_collector_test.go

@@ -1,9 +1,9 @@
 package collector
 
 import (
+	"context"
 	"time"
 
-	"golang.org/x/net/context"
 	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/metrics/pkg/apis/custom_metrics"

pkg/collector/http_collector_test.go

@@ -10,7 +10,6 @@ import (
 	"github.com/stretchr/testify/require"
 	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type testExternalMetricsHandler struct {
@@ -84,7 +83,7 @@ func makeTestHTTPCollectorConfig(endpoint, aggregator string) *MetricConfig {
 			Type: autoscalingv2.ExternalMetricSourceType,
 			Metric: autoscalingv2.MetricIdentifier{
 				Name: "test-metric",
-				Selector: &v1.LabelSelector{
+				Selector: &metav1.LabelSelector{
 					MatchLabels: map[string]string{"type": HTTPJSONPathType},
 				},
 			},

pkg/collector/httpmetrics/pod_metrics.go

@@ -2,6 +2,7 @@ package httpmetrics
 
 import (
 	"fmt"
+	"net"
 	"net/url"
 	"strconv"
 	"time"
@@ -88,7 +89,7 @@ func NewPodMetricsJSONPathGetter(config map[string]string) (*PodMetricsJSONPathG
 			return nil, err
 		}
 		if d < 0 {
-			return nil, fmt.Errorf("Invalid request-timeout config value: %s", v)
+			return nil, fmt.Errorf("invalid request-timeout config value: %s", v)
 		}
 		requestTimeout = d
 	}
@@ -99,7 +100,7 @@ func NewPodMetricsJSONPathGetter(config map[string]string) (*PodMetricsJSONPathG
 			return nil, err
 		}
 		if d < 0 {
-			return nil, fmt.Errorf("Invalid connect-timeout config value: %s", v)
+			return nil, fmt.Errorf("invalid connect-timeout config value: %s", v)
 		}
 		connectTimeout = d
 	}
@@ -122,7 +123,7 @@ func (g *PodMetricsJSONPathGetter) buildMetricsURL(podIP string) url.URL {
 
 	return url.URL{
 		Scheme:   scheme,
-		Host:     fmt.Sprintf("%s:%d", podIP, g.port),
+		Host:     net.JoinHostPort(podIP, strconv.Itoa(g.port)),
 		Path:     g.path,
 		RawQuery: g.rawQuery,
 	}

pkg/collector/influxdb_collector_test.go

@@ -8,7 +8,6 @@ import (
 
 	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func TestInfluxDBCollector_New(t *testing.T) {
@@ -24,7 +23,7 @@ func TestInfluxDBCollector_New(t *testing.T) {
 				Metric: autoscalingv2.MetricIdentifier{
 					Name: "flux-query",
 					// This is actually useless, because the selector should be flattened in Config when parsing.
-					Selector: &v1.LabelSelector{
+					Selector: &metav1.LabelSelector{
 						MatchLabels: map[string]string{
 							"query-name": "range2m",
 						},
@@ -62,7 +61,7 @@ func TestInfluxDBCollector_New(t *testing.T) {
 				Type: autoscalingv2.ExternalMetricSourceType,
 				Metric: autoscalingv2.MetricIdentifier{
 					Name: "flux-query",
-					Selector: &v1.LabelSelector{
+					Selector: &metav1.LabelSelector{
 						MatchLabels: map[string]string{
 							"query-name": "range2m",
 						},