2026-04-06 17:57:51 +00:00
74 changed files with 2379 additions and 4174 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,52 +0,0 @@
---
-name: Bug report
-about: Report a bug encountered while running prometheus-adapter
-title: ''
-labels: kind/bug
-assignees: ''
-
---
-
-<!-- Please use this template while reporting a bug and provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner. Thanks!
-
-If the matter is security related, please disclose it privately see https://github.com/kubernetes/kube-state-metrics/blob/master/SECURITY.md
-->
-
-**What happened?**:
-
-**What did you expect to happen?**:
-
-**Please provide the prometheus-adapter config**:
-<details open>
-<summary>prometheus-adapter config</summary>
-
-<!--- INSERT config HERE --->
-
-</details>
-
-**Please provide the HPA resource used for autoscaling**:
-<details open>
-<summary>HPA yaml</summary>
-
-<!--- INSERT yaml HERE --->
-
-</details>
-
-**Please provide the HPA status**:
-
-**Please provide the prometheus-adapter logs with -v=6 around the time the issue happened**:
-<details open>
-<summary>prometheus-adapter logs</summary>
-
-<!--- INSERT logs HERE --->
-
-</details>
-
-**Anything else we need to know?**:
-
-**Environment**:
- prometheus-adapter version: 
- prometheus version: 
- Kubernetes version (use `kubectl version`):
- Cloud provider or hardware configuration:
- Other info:
--- a/.gitignore
+++ b/.gitignore
@ -2,4 +2,3 @@
 *~
 /vendor
 /adapter
-.e2e
--- a/.golangci.yml
+++ b/.golangci.yml
@ -1,39 +0,0 @@
-run:
-  deadline: 5m
-
-linters:
-  disable-all: true
-  enable:
-    - bodyclose
-    - dogsled
-    - dupl
-    - errcheck
-    - exportloopref
-    - gocritic
-    - gocyclo
-    - gofmt
-    - goimports
-    - gosec
-    - goprintffuncname
-    - gosimple
-    - govet
-    - ineffassign
-    - misspell
-    - nakedret
-    - nolintlint
-    - revive
-    - staticcheck
-    - stylecheck
-    - typecheck
-    - unconvert
-    - unused
-    - whitespace
-
-linters-settings:
-  goimports:
-    local-prefixes: sigs.k8s.io/prometheus-adapter
-  revive:
-    rules:
-      - name: exported
-        arguments:
-          - disableStutteringCheck
--- a/3
+++ b/3
@ -1,4 +1,3 @@
-ARG ARCH
 ARG GO_VERSION

 FROM golang:${GO_VERSION} as build
@ -15,7 +14,7 @@ COPY Makefile Makefile
 ARG ARCH
 RUN make prometheus-adapter

-FROM gcr.io/distroless/static:latest-$ARCH
+FROM gcr.io/distroless/static:latest

 COPY --from=build /go/src/sigs.k8s.io/prometheus-adapter/adapter /
 USER 65534
--- a/47
+++ b/47
@ -2,14 +2,12 @@ REGISTRY?=gcr.io/k8s-staging-prometheus-adapter
 IMAGE=prometheus-adapter
 ARCH?=$(shell go env GOARCH)
 ALL_ARCH=amd64 arm arm64 ppc64le s390x
-GOPATH:=$(shell go env GOPATH)

 VERSION=$(shell cat VERSION)
 TAG_PREFIX=v
 TAG?=$(TAG_PREFIX)$(VERSION)

-GO_VERSION?=1.22.5
-GOLANGCI_VERSION?=1.56.2
+GO_VERSION?=1.16.4

 .PHONY: all
 all: prometheus-adapter
@ -55,38 +53,25 @@ push-multi-arch:
 test:
 	CGO_ENABLED=0 go test ./cmd/... ./pkg/...

-.PHONY: test-e2e
-test-e2e:
-	./test/run-e2e-tests.sh
-
-
 # Static analysis
 # ---------------

 .PHONY: verify
-verify: verify-lint verify-deps verify-generated
+verify: verify-gofmt verify-deps verify-generated test

 .PHONY: update
-update: update-lint update-generated
+update: update-generated

-# Format and lint
-# ---------------
+# Format
+# ------

-HAS_GOLANGCI_VERSION:=$(shell $(GOPATH)/bin/golangci-lint version --format=short)
-.PHONY: golangci
-golangci:
-ifneq ($(HAS_GOLANGCI_VERSION), $(GOLANGCI_VERSION))
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v$(GOLANGCI_VERSION)
-endif
-
-.PHONY: verify-lint
-verify-lint: golangci
-	$(GOPATH)/bin/golangci-lint run --modules-download-mode=readonly || (echo 'Run "make update-lint"' && exit 1)
-
-.PHONY: update-lint
-update-lint: golangci
-	$(GOPATH)/bin/golangci-lint run --fix --modules-download-mode=readonly
+.PHONY: verify-gofmt
+verify-gofmt:
+	./hack/gofmt-all.sh -v

+.PHONY: gofmt
+gofmt:
+	./hack/gofmt-all.sh

 # Dependencies
 # ------------
@ -103,16 +88,10 @@ verify-deps:
 generated_files=pkg/api/generated/openapi/zz_generated.openapi.go

 .PHONY: verify-generated
-verify-generated: update-generated
+verify-generated:
 	@git diff --exit-code -- $(generated_files)

 .PHONY: update-generated
 update-generated:
 	go install -mod=readonly k8s.io/kube-openapi/cmd/openapi-gen
-	$(GOPATH)/bin/openapi-gen --logtostderr \
-		--go-header-file ./hack/boilerplate.go.txt \
-		--output-pkg ./pkg/api/generated/openapi \
-		--output-file zz_generated.openapi.go \
-		--output-dir ./pkg/api/generated/openapi \
-		-r /dev/null \
-		"k8s.io/metrics/pkg/apis/custom_metrics" "k8s.io/metrics/pkg/apis/custom_metrics/v1beta1" "k8s.io/metrics/pkg/apis/custom_metrics/v1beta2" "k8s.io/metrics/pkg/apis/external_metrics" "k8s.io/metrics/pkg/apis/external_metrics/v1beta1" "k8s.io/metrics/pkg/apis/metrics" "k8s.io/metrics/pkg/apis/metrics/v1beta1" "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/version" "k8s.io/api/core/v1"
+	$(GOPATH)/bin/openapi-gen --logtostderr -i k8s.io/metrics/pkg/apis/custom_metrics,k8s.io/metrics/pkg/apis/custom_metrics/v1beta1,k8s.io/metrics/pkg/apis/custom_metrics/v1beta2,k8s.io/metrics/pkg/apis/external_metrics,k8s.io/metrics/pkg/apis/external_metrics/v1beta1,k8s.io/metrics/pkg/apis/metrics,k8s.io/metrics/pkg/apis/metrics/v1beta1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/version,k8s.io/api/core/v1 -h ./hack/boilerplate.go.txt -p ./pkg/api/generated/openapi -O zz_generated.openapi -o ./ -r /dev/null
--- a/15
+++ b/15
@ -1,17 +1,16 @@
 # See the OWNERS docs at https://go.k8s.io/owners
+owners:
+- dgrisonnet
+- s-urbaniak
+
 approvers:
-  - dgrisonnet
-  - logicalhan
-  - dashpole
+  - prometheus-adapter-approvers

 reviewers:
-  - dgrisonnet
-  - olivierlemasle
-  - logicalhan
-  - dashpole
+  - prometheus-adapter-approvers
+  - prometheus-adapter-reviewers

 emeritus_approvers:
 - brancz
 - directxman12
 - lilic
- s-urbaniak
--- a/7
+++ b/7
@ -0,0 +1,7 @@
+# See the OWNERS docs at https://go.k8s.io/owners#owners_aliases
+
+aliases:
+  prometheus-adapter-approvers:
+  - dgrisonnet
+  - s-urbaniak
+  prometheus-adapter-reviewers: []
--- a/README.md
+++ b/README.md
@ -1,7 +1,9 @@
 # Prometheus Adapter for Kubernetes Metrics APIs

-This repository contains an implementation of the Kubernetes Custom, Resource and External
-[Metric APIs](https://github.com/kubernetes/metrics).
+This repository contains an implementation of the Kubernetes
+[resource metrics](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/instrumentation/resource-metrics-api.md),
+[custom metrics](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/instrumentation/custom-metrics-api.md), and
+[external metrics](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/instrumentation/external-metrics-api.md) APIs.

 This adapter is therefore suitable for use with the autoscaling/v2 Horizontal Pod Autoscaler in Kubernetes 1.6+.  
 It can also replace the [metrics server](https://github.com/kubernetes-incubator/metrics-server) on clusters that already run Prometheus and collect the appropriate metrics.
@ -19,22 +21,15 @@ If you're a helm user, a helm chart is listed on prometheus-community repository

 To install it with the release name `my-release`, run this Helm command:

-For Helm2
 ```console
 $ helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 $ helm repo update
 $ helm install --name my-release prometheus-community/prometheus-adapter
 ```
-For Helm3 ( as name is mandatory )
-```console
-$ helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
-$ helm repo update
-$ helm install my-release prometheus-community/prometheus-adapter
-```

 Official images
 ---
-All official images for releases after v0.8.4 are available in `registry.k8s.io/prometheus-adapter/prometheus-adapter:$VERSION`. The project also maintains a [staging registry](https://console.cloud.google.com/gcr/images/k8s-staging-prometheus-adapter/GLOBAL/) where images for each commit from the master branch are published. You can use this registry if you need to test a version from a specific commit, or if you need to deploy a patch while waiting for a new release.
+All official images for releases after v0.8.4 are available in [gcr.io](http://k8s.gcr.io/prometheus-adapter/prometheus-adapter). The project also maintains a [staging registry](https://console.cloud.google.com/gcr/images/k8s-staging-prometheus-adapter/GLOBAL/) where images for each commit from the master branch are published. You can use this registry if you need to test a version from a specific commit, or if you need to deploy a patch while waiting for a new release.

 Images for versions v0.8.4 and prior are only available in unofficial registries:
 * https://quay.io/repository/coreos/k8s-prometheus-adapter-amd64
@ -49,7 +44,7 @@ will attempt to using [Kubernetes in-cluster
 config](https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod)
 to connect to the cluster.

-It takes the following additional arguments specific to configuring how the
+It takes the following addition arguments specific to configuring how the
 adapter talks to Prometheus and the main Kubernetes cluster:

 - `--lister-kubeconfig=<path-to-kubeconfig>`: This configures
--- a/RELEASE.md
+++ b/RELEASE.md
@ -7,7 +7,7 @@ prometheus-adapter is released on an as-needed basis. The process is as follows:
 1. A PR that bumps version hardcoded in code is created and merged
 1. An OWNER creates a draft Github release
 1. An OWNER creates a release tag using `git tag -s $VERSION`, inserts the changelog and pushes the tag with `git push $VERSION`. Then waits for [prow.k8s.io](https://prow.k8s.io) to build and push new images to [gcr.io/k8s-staging-prometheus-adapter](https://gcr.io/k8s-staging-prometheus-adapter)
-1. A PR in [kubernetes/k8s.io](https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/images/k8s-staging-prometheus-adapter/images.yaml) is created to release images to `k8s.gcr.io`
+1. A PR in [kubernetes/k8s.io](https://github.com/kubernetes/k8s.io/blob/master/k8s.gcr.io/images/k8s-staging-prometheus-adapter/images.yaml) is created to release images to `k8s.gcr.io`
 1. An OWNER publishes the GitHub release
 1. An announcement email is sent to `kubernetes-sig-instrumentation@googlegroups.com` with the subject `[ANNOUNCE] prometheus-adapter $VERSION is released`
 1. The release issue is closed
--- a/2
+++ b/2
@ -1 +1 @@
-0.12.0
+0.8.4
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@ -3,7 +3,7 @@ timeout: 3600s
 options:
  substitution_option: ALLOW_LOOSE
 steps:
-  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20211118-2f2d816b90'
+  - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210622-762366a'
    entrypoint: make
    env:
    - TAG=$_PULL_BASE_REF
--- a/cmd/adapter/adapter.go
+++ b/cmd/adapter/adapter.go
@ -19,7 +19,9 @@ package main
 import (
 	"crypto/tls"
 	"crypto/x509"
+	"flag"
 	"fmt"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@ -30,8 +32,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
 	genericapiserver "k8s.io/apiserver/pkg/server"
-	"k8s.io/client-go/metadata"
-	"k8s.io/client-go/metadata/metadatainformer"
+	"k8s.io/client-go/informers"
+	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/transport"
@ -72,16 +74,13 @@ type PrometheusAdapter struct {
 	PrometheusTokenFile string
 	// PrometheusHeaders is a k=v list of headers to set on requests to PrometheusURL
 	PrometheusHeaders []string
-	// PrometheusVerb is a verb to set on requests to PrometheusURL
-	PrometheusVerb string
 	// AdapterConfigFile points to the file containing the metrics discovery configuration.
 	AdapterConfigFile string
 	// MetricsRelistInterval is the interval at which to relist the set of available metrics
 	MetricsRelistInterval time.Duration
 	// MetricsMaxAge is the period to query available metrics for
 	MetricsMaxAge time.Duration
-	// DisableHTTP2 indicates that http2 should not be enabled.
-	DisableHTTP2  bool
+
 	metricsConfig *adaptercfg.MetricsDiscoveryConfig
 }

@ -91,10 +90,6 @@ func (cmd *PrometheusAdapter) makePromClient() (prom.Client, error) {
 		return nil, fmt.Errorf("invalid Prometheus URL %q: %v", baseURL, err)
 	}

-	if cmd.PrometheusVerb != http.MethodGet && cmd.PrometheusVerb != http.MethodPost {
-		return nil, fmt.Errorf("unsupported Prometheus HTTP verb %q; supported verbs: \"GET\" and \"POST\"", cmd.PrometheusVerb)
-	}
-
 	var httpClient *http.Client

 	if cmd.PrometheusCAFile != "" {
@ -114,19 +109,15 @@ func (cmd *PrometheusAdapter) makePromClient() (prom.Client, error) {
 	}

 	if cmd.PrometheusTokenFile != "" {
-		data, err := os.ReadFile(cmd.PrometheusTokenFile)
+		data, err := ioutil.ReadFile(cmd.PrometheusTokenFile)
 		if err != nil {
 			return nil, fmt.Errorf("failed to read prometheus-token-file: %v", err)
 		}
-		wrappedTransport := http.DefaultTransport
-		if httpClient.Transport != nil {
-			wrappedTransport = httpClient.Transport
-		}
-		httpClient.Transport = transport.NewBearerAuthRoundTripper(string(data), wrappedTransport)
+		httpClient.Transport = transport.NewBearerAuthRoundTripper(string(data), httpClient.Transport)
 	}
 	genericPromClient := prom.NewGenericAPIClient(httpClient, baseURL, parseHeaderArgs(cmd.PrometheusHeaders))
 	instrumentedGenericPromClient := mprom.InstrumentGenericAPIClient(genericPromClient, baseURL.String())
-	return prom.NewClientForAPI(instrumentedGenericPromClient, cmd.PrometheusVerb), nil
+	return prom.NewClientForAPI(instrumentedGenericPromClient), nil
 }

 func (cmd *PrometheusAdapter) addFlags() {
@ -146,20 +137,13 @@ func (cmd *PrometheusAdapter) addFlags() {
 		"Optional file containing the bearer token to use when connecting with Prometheus")
 	cmd.Flags().StringArrayVar(&cmd.PrometheusHeaders, "prometheus-header", cmd.PrometheusHeaders,
 		"Optional header to set on requests to prometheus-url. Can be repeated")
-	cmd.Flags().StringVar(&cmd.PrometheusVerb, "prometheus-verb", cmd.PrometheusVerb,
-		"HTTP verb to set on requests to Prometheus. Possible values: \"GET\", \"POST\"")
 	cmd.Flags().StringVar(&cmd.AdapterConfigFile, "config", cmd.AdapterConfigFile,
 		"Configuration file containing details of how to transform between Prometheus metrics "+
 			"and custom metrics API resources")
-	cmd.Flags().DurationVar(&cmd.MetricsRelistInterval, "metrics-relist-interval", cmd.MetricsRelistInterval,
+	cmd.Flags().DurationVar(&cmd.MetricsRelistInterval, "metrics-relist-interval", cmd.MetricsRelistInterval, ""+
 		"interval at which to re-list the set of all available metrics from Prometheus")
-	cmd.Flags().DurationVar(&cmd.MetricsMaxAge, "metrics-max-age", cmd.MetricsMaxAge,
+	cmd.Flags().DurationVar(&cmd.MetricsMaxAge, "metrics-max-age", cmd.MetricsMaxAge, ""+
 		"period for which to query the set of available metrics from Prometheus")
-	cmd.Flags().BoolVar(&cmd.DisableHTTP2, "disable-http2", cmd.DisableHTTP2,
-		"Disable HTTP/2 support")
-
-	// Add logging flags
-	logs.AddFlags(cmd.Flags())
 }

 func (cmd *PrometheusAdapter) loadConfig() error {
@ -227,7 +211,7 @@ func (cmd *PrometheusAdapter) makeExternalProvider(promClient prom.Client, stopC
 	}

 	// construct the provider and start it
-	emProvider, runner := extprov.NewExternalPrometheusProvider(promClient, namers, cmd.MetricsRelistInterval, cmd.MetricsMaxAge)
+	emProvider, runner := extprov.NewExternalPrometheusProvider(promClient, namers, cmd.MetricsRelistInterval)
 	runner.RunUntil(stopCh)

 	return emProvider, nil
@ -254,39 +238,27 @@ func (cmd *PrometheusAdapter) addResourceMetricsAPI(promClient prom.Client, stop
 		return err
 	}

-	client, err := metadata.NewForConfig(rest)
+	client, err := kubernetes.NewForConfig(rest)
 	if err != nil {
 		return err
 	}

-	podInformerFactory := metadatainformer.NewFilteredSharedInformerFactory(client, 0, corev1.NamespaceAll, func(options *metav1.ListOptions) {
+	podInformerFactory := informers.NewFilteredSharedInformerFactory(client, 0, corev1.NamespaceAll, func(options *metav1.ListOptions) {
 		options.FieldSelector = "status.phase=Running"
 	})
-	podInformer := podInformerFactory.ForResource(corev1.SchemeGroupVersion.WithResource("pods"))
+	podInformer := podInformerFactory.Core().V1().Pods()

 	informer, err := cmd.Informers()
 	if err != nil {
 		return err
 	}

-	config, err := cmd.Config()
-	if err != nil {
-		return err
-	}
-	config.GenericConfig.EnableMetrics = false
-
 	server, err := cmd.Server()
 	if err != nil {
 		return err
 	}

-	metricsHandler, err := mprom.MetricsHandler()
-	if err != nil {
-		return err
-	}
-	server.GenericAPIServer.Handler.NonGoRestfulMux.HandleFunc("/metrics", metricsHandler)
-
-	if err := api.Install(provider, podInformer.Lister(), informer.Core().V1().Nodes().Lister(), server.GenericAPIServer, nil); err != nil {
+	if err := api.Install(provider, podInformer.Lister(), informer.Core().V1().Nodes().Lister(), server.GenericAPIServer); err != nil {
 		return err
 	}

@ -302,28 +274,20 @@ func main() {
 	// set up flags
 	cmd := &PrometheusAdapter{
 		PrometheusURL:         "https://localhost",
-		PrometheusVerb:        http.MethodGet,
 		MetricsRelistInterval: 10 * time.Minute,
 	}
 	cmd.Name = "prometheus-metrics-adapter"

+	cmd.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(api.Scheme, customexternalmetrics.Scheme))
+	cmd.OpenAPIConfig.Info.Title = "prometheus-metrics-adapter"
+	cmd.OpenAPIConfig.Info.Version = "1.0.0"
+
 	cmd.addFlags()
+	cmd.Flags().AddGoFlagSet(flag.CommandLine) // make sure we get the klog flags
 	if err := cmd.Flags().Parse(os.Args); err != nil {
 		klog.Fatalf("unable to parse flags: %v", err)
 	}

-	if cmd.OpenAPIConfig == nil {
-		cmd.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(api.Scheme, customexternalmetrics.Scheme))
-		cmd.OpenAPIConfig.Info.Title = "prometheus-metrics-adapter"
-		cmd.OpenAPIConfig.Info.Version = "1.0.0"
-	}
-
-	if cmd.OpenAPIV3Config == nil {
-		cmd.OpenAPIV3Config = genericapiserver.DefaultOpenAPIV3Config(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(api.Scheme, customexternalmetrics.Scheme))
-		cmd.OpenAPIV3Config.Info.Title = "prometheus-metrics-adapter"
-		cmd.OpenAPIV3Config.Info.Version = "1.0.0"
-	}
-
 	// if --metrics-max-age is not set, make it equal to --metrics-relist-interval
 	if cmd.MetricsMaxAge == 0*time.Second {
 		cmd.MetricsMaxAge = cmd.MetricsRelistInterval
@ -370,14 +334,6 @@ func main() {
 		klog.Fatalf("unable to install resource metrics API: %v", err)
 	}

-	// disable HTTP/2 to mitigate CVE-2023-44487 until the Go standard library
-	// and golang.org/x/net are fully fixed.
-	server, err := cmd.Server()
-	if err != nil {
-		klog.Fatalf("unable to fetch server: %v", err)
-	}
-	server.GenericAPIServer.SecureServingInfo.DisableHTTP2 = cmd.DisableHTTP2
-
 	// run the server
 	if err := cmd.Run(stopCh); err != nil {
 		klog.Fatalf("unable to run custom metrics adapter: %v", err)
@ -420,7 +376,7 @@ func makeKubeconfigHTTPClient(inClusterAuth bool, kubeConfigPath string) (*http.
 }

 func makePrometheusCAClient(caFilePath string, tlsCertFilePath string, tlsKeyFilePath string) (*http.Client, error) {
-	data, err := os.ReadFile(caFilePath)
+	data, err := ioutil.ReadFile(caFilePath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read prometheus-ca-file: %v", err)
 	}
@ -440,7 +396,6 @@ func makePrometheusCAClient(caFilePath string, tlsCertFilePath string, tlsKeyFil
 				TLSClientConfig: &tls.Config{
 					RootCAs:      pool,
 					Certificates: []tls.Certificate{tlsClientCerts},
-					MinVersion:   tls.VersionTLS12,
 				},
 			},
 		}, nil
@ -449,8 +404,7 @@ func makePrometheusCAClient(caFilePath string, tlsCertFilePath string, tlsKeyFil
 	return &http.Client{
 		Transport: &http.Transport{
 			TLSClientConfig: &tls.Config{
-				RootCAs:    pool,
-				MinVersion: tls.VersionTLS12,
+				RootCAs: pool,
 			},
 		},
 	}, nil
--- a/cmd/adapter/adapter_test.go
+++ b/cmd/adapter/adapter_test.go
@ -27,6 +27,7 @@ import (
 const certsDir = "testdata"

 func TestMakeKubeconfigHTTPClient(t *testing.T) {
+
 	tests := []struct {
 		kubeconfigPath string
 		inClusterAuth  bool
@ -70,13 +71,16 @@ func TestMakeKubeconfigHTTPClient(t *testing.T) {
 					t.Error("HTTP client Transport is nil, expected http.RoundTripper")
 				}
 			}
-		} else if err == nil {
-			t.Errorf("Error is nil, expected %v", err)
+		} else {
+			if err == nil {
+				t.Errorf("Error is nil, expected %v", err)
+			}
 		}
 	}
 }

 func TestMakePrometheusCAClient(t *testing.T) {
+
 	tests := []struct {
 		caFilePath      string
 		tlsCertFilePath string
@ -136,13 +140,16 @@ func TestMakePrometheusCAClient(t *testing.T) {
 					t.Errorf("TLS certificates is %+v, expected nil", prometheusCAClient.Transport.(*http.Transport).TLSClientConfig.Certificates)
 				}
 			}
-		} else if err == nil {
-			t.Errorf("Error is nil, expected %v", err)
+		} else {
+			if err == nil {
+				t.Errorf("Error is nil, expected %v", err)
+			}
 		}
 	}
 }

 func TestParseHeaderArgs(t *testing.T) {
+
 	tests := []struct {
 		args    []string
 		headers http.Header
@ -178,34 +185,3 @@ func TestParseHeaderArgs(t *testing.T) {
 		}
 	}
 }
-
-func TestFlags(t *testing.T) {
-	cmd := &PrometheusAdapter{
-		PrometheusURL: "https://localhost",
-	}
-	cmd.addFlags()
-
-	flags := cmd.FlagSet
-	if flags == nil {
-		t.Fatalf("FlagSet should not be nil")
-	}
-
-	expectedFlags := []struct {
-		flag         string
-		defaultValue string
-	}{
-		{flag: "v", defaultValue: "0"},                              // logging flag (klog)
-		{flag: "prometheus-url", defaultValue: "https://localhost"}, // default is set in cmd
-	}
-
-	for _, e := range expectedFlags {
-		flag := flags.Lookup(e.flag)
-		if flag == nil {
-			t.Errorf("Flag %q expected to be present, was absent", e.flag)
-			continue
-		}
-		if flag.DefValue != e.defaultValue {
-			t.Errorf("Expected default value %q for flag %q, got %q", e.defaultValue, e.flag, flag.DefValue)
-		}
-	}
-}
--- a/cmd/config-gen/utils/default.go
+++ b/cmd/config-gen/utils/default.go
@ -7,7 +7,7 @@ import (
 	pmodel "github.com/prometheus/common/model"

 	prom "sigs.k8s.io/prometheus-adapter/pkg/client"
-	"sigs.k8s.io/prometheus-adapter/pkg/config"
+	. "sigs.k8s.io/prometheus-adapter/pkg/config"
 )

 // DefaultConfig returns a configuration equivalent to the former
@ -15,55 +15,55 @@ import (
 // will be of the form `<prefix><<.Resource>>`, cadvisor series will be
 // of the form `container_`, and have the label `pod`.  Any series ending
 // in total will be treated as a rate metric.
-func DefaultConfig(rateInterval time.Duration, labelPrefix string) *config.MetricsDiscoveryConfig {
-	return &config.MetricsDiscoveryConfig{
-		Rules: []config.DiscoveryRule{
+func DefaultConfig(rateInterval time.Duration, labelPrefix string) *MetricsDiscoveryConfig {
+	return &MetricsDiscoveryConfig{
+		Rules: []DiscoveryRule{
 			// container seconds rate metrics
 			{
 				SeriesQuery: string(prom.MatchSeries("", prom.NameMatches("^container_.*"), prom.LabelNeq("container", "POD"), prom.LabelNeq("namespace", ""), prom.LabelNeq("pod", ""))),
-				Resources: config.ResourceMapping{
-					Overrides: map[string]config.GroupResource{
+				Resources: ResourceMapping{
+					Overrides: map[string]GroupResource{
 						"namespace": {Resource: "namespace"},
 						"pod":       {Resource: "pod"},
 					},
 				},
-				Name:         config.NameMapping{Matches: "^container_(.*)_seconds_total$"},
+				Name:         NameMapping{Matches: "^container_(.*)_seconds_total$"},
 				MetricsQuery: fmt.Sprintf(`sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[%s])) by (<<.GroupBy>>)`, pmodel.Duration(rateInterval).String()),
 			},

 			// container rate metrics
 			{
 				SeriesQuery:   string(prom.MatchSeries("", prom.NameMatches("^container_.*"), prom.LabelNeq("container", "POD"), prom.LabelNeq("namespace", ""), prom.LabelNeq("pod", ""))),
-				SeriesFilters: []config.RegexFilter{{IsNot: "^container_.*_seconds_total$"}},
-				Resources: config.ResourceMapping{
-					Overrides: map[string]config.GroupResource{
+				SeriesFilters: []RegexFilter{{IsNot: "^container_.*_seconds_total$"}},
+				Resources: ResourceMapping{
+					Overrides: map[string]GroupResource{
 						"namespace": {Resource: "namespace"},
 						"pod":       {Resource: "pod"},
 					},
 				},
-				Name:         config.NameMapping{Matches: "^container_(.*)_total$"},
+				Name:         NameMapping{Matches: "^container_(.*)_total$"},
 				MetricsQuery: fmt.Sprintf(`sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[%s])) by (<<.GroupBy>>)`, pmodel.Duration(rateInterval).String()),
 			},

 			// container non-cumulative metrics
 			{
 				SeriesQuery:   string(prom.MatchSeries("", prom.NameMatches("^container_.*"), prom.LabelNeq("container", "POD"), prom.LabelNeq("namespace", ""), prom.LabelNeq("pod", ""))),
-				SeriesFilters: []config.RegexFilter{{IsNot: "^container_.*_total$"}},
-				Resources: config.ResourceMapping{
-					Overrides: map[string]config.GroupResource{
+				SeriesFilters: []RegexFilter{{IsNot: "^container_.*_total$"}},
+				Resources: ResourceMapping{
+					Overrides: map[string]GroupResource{
 						"namespace": {Resource: "namespace"},
 						"pod":       {Resource: "pod"},
 					},
 				},
-				Name:         config.NameMapping{Matches: "^container_(.*)$"},
+				Name:         NameMapping{Matches: "^container_(.*)$"},
 				MetricsQuery: `sum(<<.Series>>{<<.LabelMatchers>>,container!="POD"}) by (<<.GroupBy>>)`,
 			},

 			// normal non-cumulative metrics
 			{
 				SeriesQuery:   string(prom.MatchSeries("", prom.LabelNeq(fmt.Sprintf("%snamespace", labelPrefix), ""), prom.NameNotMatches("^container_.*"))),
-				SeriesFilters: []config.RegexFilter{{IsNot: ".*_total$"}},
-				Resources: config.ResourceMapping{
+				SeriesFilters: []RegexFilter{{IsNot: ".*_total$"}},
+				Resources: ResourceMapping{
 					Template: fmt.Sprintf("%s<<.Resource>>", labelPrefix),
 				},
 				MetricsQuery: "sum(<<.Series>>{<<.LabelMatchers>>}) by (<<.GroupBy>>)",
@ -72,9 +72,9 @@ func DefaultConfig(rateInterval time.Duration, labelPrefix string) *config.Metri
 			// normal rate metrics
 			{
 				SeriesQuery:   string(prom.MatchSeries("", prom.LabelNeq(fmt.Sprintf("%snamespace", labelPrefix), ""), prom.NameNotMatches("^container_.*"))),
-				SeriesFilters: []config.RegexFilter{{IsNot: ".*_seconds_total"}},
-				Name:          config.NameMapping{Matches: "^(.*)_total$"},
-				Resources: config.ResourceMapping{
+				SeriesFilters: []RegexFilter{{IsNot: ".*_seconds_total"}},
+				Name:          NameMapping{Matches: "^(.*)_total$"},
+				Resources: ResourceMapping{
 					Template: fmt.Sprintf("%s<<.Resource>>", labelPrefix),
 				},
 				MetricsQuery: fmt.Sprintf("sum(rate(<<.Series>>{<<.LabelMatchers>>}[%s])) by (<<.GroupBy>>)", pmodel.Duration(rateInterval).String()),
@ -83,20 +83,20 @@ func DefaultConfig(rateInterval time.Duration, labelPrefix string) *config.Metri
 			// seconds rate metrics
 			{
 				SeriesQuery: string(prom.MatchSeries("", prom.LabelNeq(fmt.Sprintf("%snamespace", labelPrefix), ""), prom.NameNotMatches("^container_.*"))),
-				Name:        config.NameMapping{Matches: "^(.*)_seconds_total$"},
-				Resources: config.ResourceMapping{
+				Name:        NameMapping{Matches: "^(.*)_seconds_total$"},
+				Resources: ResourceMapping{
 					Template: fmt.Sprintf("%s<<.Resource>>", labelPrefix),
 				},
 				MetricsQuery: fmt.Sprintf("sum(rate(<<.Series>>{<<.LabelMatchers>>}[%s])) by (<<.GroupBy>>)", pmodel.Duration(rateInterval).String()),
 			},
 		},

-		ResourceRules: &config.ResourceRules{
-			CPU: config.ResourceRule{
+		ResourceRules: &ResourceRules{
+			CPU: ResourceRule{
 				ContainerQuery: fmt.Sprintf("sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>}[%s])) by (<<.GroupBy>>)", pmodel.Duration(rateInterval).String()),
 				NodeQuery:      fmt.Sprintf("sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, id='/'}[%s])) by (<<.GroupBy>>)", pmodel.Duration(rateInterval).String()),
-				Resources: config.ResourceMapping{
-					Overrides: map[string]config.GroupResource{
+				Resources: ResourceMapping{
+					Overrides: map[string]GroupResource{
 						"namespace": {Resource: "namespace"},
 						"pod":       {Resource: "pod"},
 						"instance":  {Resource: "node"},
@ -104,11 +104,11 @@ func DefaultConfig(rateInterval time.Duration, labelPrefix string) *config.Metri
 				},
 				ContainerLabel: fmt.Sprintf("%scontainer", labelPrefix),
 			},
-			Memory: config.ResourceRule{
+			Memory: ResourceRule{
 				ContainerQuery: "sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)",
 				NodeQuery:      "sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)",
-				Resources: config.ResourceMapping{
-					Overrides: map[string]config.GroupResource{
+				Resources: ResourceMapping{
+					Overrides: map[string]GroupResource{
 						"namespace": {Resource: "namespace"},
 						"pod":       {Resource: "pod"},
 						"instance":  {Resource: "node"},
--- a/deploy/README.md
+++ b/deploy/README.md
@ -1,11 +1,20 @@
 Example Deployment
 ==================

-1. Make sure you've built the included Dockerfile with `TAG=latest make container`. The image should be tagged as `registry.k8s.io/prometheus-adapter/staging-prometheus-adapter:latest`.
+1. Make sure you've built the included Dockerfile with `TAG=latest make container`. The image should be tagged as `gcr.io/k8s-staging-prometheus-adapter:latest`.

-2. `kubectl create namespace monitoring` to ensure that the namespace that we're installing
+2. Create a secret called `cm-adapter-serving-certs` with two values:
+   `serving.crt` and `serving.key`. These are the serving certificates used
+   by the adapter for serving HTTPS traffic.  For more information on how to
+   generate these certificates, see the [auth concepts
+   documentation](https://github.com/kubernetes-incubator/apiserver-builder/blob/master/docs/concepts/auth.md)
+   in the apiserver-builder repository.
+   The kube-prometheus project published two scripts [gencerts.sh](https://github.com/prometheus-operator/kube-prometheus/blob/62fff622e9900fade8aecbd02bc9c557b736ef85/experimental/custom-metrics-api/gencerts.sh)
+   and [deploy.sh](https://github.com/prometheus-operator/kube-prometheus/blob/62fff622e9900fade8aecbd02bc9c557b736ef85/experimental/custom-metrics-api/deploy.sh) to create the `cm-adapter-serving-certs` secret.
+
+3. `kubectl create namespace custom-metrics` to ensure that the namespace that we're installing
   the custom metrics adapter in exists.

-3. `kubectl create -f manifests/`, modifying the Deployment as necessary to
+4. `kubectl create -f manifests/`, modifying the Deployment as necessary to
   point to your Prometheus server, and the ConfigMap to contain your desired
   metrics discovery configuration.
--- a/deploy/manifests/api-service.yaml
+++ b/deploy/manifests/api-service.yaml
@ -1,17 +0,0 @@
-apiVersion: apiregistration.k8s.io/v1
-kind: APIService
-metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.12.0
-  name: v1beta1.metrics.k8s.io
-spec:
-  group: metrics.k8s.io
-  groupPriorityMinimum: 100
-  insecureSkipTLSVerify: true
-  service:
-    name: prometheus-adapter
-    namespace: monitoring
-  version: v1beta1
-  versionPriority: 100
--- a/deploy/manifests/cluster-role-aggregated-metrics-reader.yaml
+++ b/deploy/manifests/cluster-role-aggregated-metrics-reader.yaml
@ -1,22 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.12.0
-    rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    rbac.authorization.k8s.io/aggregate-to-edit: "true"
-    rbac.authorization.k8s.io/aggregate-to-view: "true"
-  name: system:aggregated-metrics-reader
-  namespace: monitoring
-rules:
- apiGroups:
-  - metrics.k8s.io
-  resources:
-  - pods
-  - nodes
-  verbs:
-  - get
-  - list
-  - watch
--- a/deploy/manifests/cluster-role-binding-delegator.yaml
+++ b/deploy/manifests/cluster-role-binding-delegator.yaml
@ -1,17 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.12.0
-  name: resource-metrics:system:auth-delegator
-  namespace: monitoring
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: system:auth-delegator
-subjects:
- kind: ServiceAccount
-  name: prometheus-adapter
-  namespace: monitoring
--- a/deploy/manifests/cluster-role-binding.yaml
+++ b/deploy/manifests/cluster-role-binding.yaml
@ -1,17 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.12.0
-  name: prometheus-adapter
-  namespace: monitoring
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: prometheus-adapter
-subjects:
- kind: ServiceAccount
-  name: prometheus-adapter
-  namespace: monitoring
--- a/deploy/manifests/cluster-role-metrics-server-resources.yaml
+++ b/deploy/manifests/cluster-role-metrics-server-resources.yaml
@ -1,15 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.12.0
-  name: resource-metrics-server-resources
-rules:
- apiGroups:
-  - metrics.k8s.io
-  resources:
-  - '*'
-  verbs:
-  - '*'
--- a/deploy/manifests/cluster-role.yaml
+++ b/deploy/manifests/cluster-role.yaml
@ -1,20 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.12.0
-  name: prometheus-adapter
-rules:
- apiGroups:
-  - ""
-  resources:
-  - nodes
-  - namespaces
-  - pods
-  - services
-  verbs:
-  - get
-  - list
-  - watch
--- a/deploy/manifests/config-map.yaml
+++ b/deploy/manifests/config-map.yaml
@ -1,53 +0,0 @@
-apiVersion: v1
-data:
-  config.yaml: |-
-    "resourceRules":
-      "cpu":
-        "containerLabel": "container"
-        "containerQuery": |
-          sum by (<<.GroupBy>>) (
-            irate (
-                container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="",pod!=""}[4m]
-            )
-          )
-        "nodeQuery": |
-          sum by (<<.GroupBy>>) (
-            irate(
-                node_cpu_usage_seconds_total{<<.LabelMatchers>>}[4m]
-            )
-          )
-        "resources":
-          "overrides":
-            "namespace":
-              "resource": "namespace"
-            "node":
-              "resource": "node"
-            "pod":
-              "resource": "pod"
-      "memory":
-        "containerLabel": "container"
-        "containerQuery": |
-          sum by (<<.GroupBy>>) (
-            container_memory_working_set_bytes{<<.LabelMatchers>>,container!="",pod!=""}
-          )
-        "nodeQuery": |
-          sum by (<<.GroupBy>>) (
-            node_memory_working_set_bytes{<<.LabelMatchers>>}
-          )
-        "resources":
-          "overrides":
-            "node":
-              "resource": "node"
-            "namespace":
-              "resource": "namespace"
-            "pod":
-              "resource": "pod"
-      "window": "5m"
-kind: ConfigMap
-metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.12.0
-  name: adapter-config
-  namespace: monitoring
--- a/deploy/manifests/custom-metrics-apiserver-auth-delegator-cluster-role-binding.yaml
+++ b/deploy/manifests/custom-metrics-apiserver-auth-delegator-cluster-role-binding.yaml
@ -1,12 +1,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: prometheus
+  name: custom-metrics:system:auth-delegator
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: ClusterRole
-  name: prometheus
+  name: system:auth-delegator
 subjects:
 - kind: ServiceAccount
-  name: prometheus
-  namespace: prometheus-adapter-e2e
+  name: custom-metrics-apiserver
+  namespace: custom-metrics
--- a/deploy/manifests/custom-metrics-apiserver-auth-reader-role-binding.yaml
+++ b/deploy/manifests/custom-metrics-apiserver-auth-reader-role-binding.yaml
@ -1,11 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.12.0
-  name: resource-metrics-auth-reader
+  name: custom-metrics-auth-reader
  namespace: kube-system
 roleRef:
  apiGroup: rbac.authorization.k8s.io
@ -13,5 +9,5 @@ roleRef:
  name: extension-apiserver-authentication-reader
 subjects:
 - kind: ServiceAccount
-  name: prometheus-adapter
-  namespace: monitoring
+  name: custom-metrics-apiserver
+  namespace: custom-metrics
--- a/deploy/manifests/custom-metrics-apiserver-deployment.yaml
+++ b/deploy/manifests/custom-metrics-apiserver-deployment.yaml
@ -0,0 +1,51 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: custom-metrics-apiserver
+  name: custom-metrics-apiserver
+  namespace: custom-metrics
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: custom-metrics-apiserver
+  template:
+    metadata:
+      labels:
+        app: custom-metrics-apiserver
+      name: custom-metrics-apiserver
+    spec:
+      serviceAccountName: custom-metrics-apiserver
+      containers:
+      - name: custom-metrics-apiserver
+        image: gcr.io/k8s-staging-prometheus-adapter-amd64
+        args:
+        - --secure-port=6443
+        - --tls-cert-file=/var/run/serving-cert/serving.crt
+        - --tls-private-key-file=/var/run/serving-cert/serving.key
+        - --logtostderr=true
+        - --prometheus-url=http://prometheus.prom.svc:9090/
+        - --metrics-relist-interval=1m
+        - --v=10
+        - --config=/etc/adapter/config.yaml
+        ports:
+        - containerPort: 6443
+        volumeMounts:
+        - mountPath: /var/run/serving-cert
+          name: volume-serving-cert
+          readOnly: true
+        - mountPath: /etc/adapter/
+          name: config
+          readOnly: true
+        - mountPath: /tmp
+          name: tmp-vol
+      volumes:
+      - name: volume-serving-cert
+        secret:
+          secretName: cm-adapter-serving-certs
+      - name: config
+        configMap:
+          name: adapter-config
+      - name: tmp-vol
+        emptyDir: {}
--- a/deploy/manifests/custom-metrics-apiserver-resource-reader-cluster-role-binding.yaml
+++ b/deploy/manifests/custom-metrics-apiserver-resource-reader-cluster-role-binding.yaml
@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: custom-metrics-resource-reader
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: custom-metrics-resource-reader
+subjects:
+- kind: ServiceAccount
+  name: custom-metrics-apiserver
+  namespace: custom-metrics
--- a/deploy/manifests/custom-metrics-apiserver-service-account.yaml
+++ b/deploy/manifests/custom-metrics-apiserver-service-account.yaml
@ -0,0 +1,5 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: custom-metrics-apiserver
+  namespace: custom-metrics
--- a/deploy/manifests/custom-metrics-apiserver-service.yaml
+++ b/deploy/manifests/custom-metrics-apiserver-service.yaml
@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: custom-metrics-apiserver
+  namespace: custom-metrics
+spec:
+  ports:
+  - port: 443
+    targetPort: 6443
+  selector:
+    app: custom-metrics-apiserver
--- a/deploy/manifests/custom-metrics-apiservice.yaml
+++ b/deploy/manifests/custom-metrics-apiservice.yaml
@ -0,0 +1,42 @@
+apiVersion: apiregistration.k8s.io/v1beta1
+kind: APIService
+metadata:
+  name: v1beta1.custom.metrics.k8s.io
+spec:
+  service:
+    name: custom-metrics-apiserver
+    namespace: custom-metrics
+  group: custom.metrics.k8s.io
+  version: v1beta1
+  insecureSkipTLSVerify: true
+  groupPriorityMinimum: 100
+  versionPriority: 100
+---
+apiVersion: apiregistration.k8s.io/v1beta1
+kind: APIService
+metadata:
+  name: v1beta2.custom.metrics.k8s.io
+spec:
+  service:
+    name: custom-metrics-apiserver
+    namespace: custom-metrics
+  group: custom.metrics.k8s.io
+  version: v1beta2
+  insecureSkipTLSVerify: true
+  groupPriorityMinimum: 100
+  versionPriority: 200
+---
+apiVersion: apiregistration.k8s.io/v1beta1
+kind: APIService
+metadata:
+  name: v1beta1.external.metrics.k8s.io
+spec:
+  service:
+    name: custom-metrics-apiserver
+    namespace: custom-metrics
+  group: external.metrics.k8s.io
+  version: v1beta1
+  insecureSkipTLSVerify: true
+  groupPriorityMinimum: 100
+  versionPriority: 100
+---
--- a/deploy/manifests/custom-metrics-cluster-role.yaml
+++ b/deploy/manifests/custom-metrics-cluster-role.yaml
@ -0,0 +1,10 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: custom-metrics-server-resources
+rules:
+- apiGroups:
+  - custom.metrics.k8s.io
+  - external.metrics.k8s.io
+  resources: ["*"]
+  verbs: ["*"]
--- a/deploy/manifests/custom-metrics-config-map.yaml
+++ b/deploy/manifests/custom-metrics-config-map.yaml
@ -0,0 +1,117 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: adapter-config
+  namespace: custom-metrics
+data:
+  config.yaml: |
+    rules:
+    - seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}'
+      seriesFilters: []
+      resources:
+        overrides:
+          namespace:
+            resource: namespace
+          pod:
+            resource: pod
+      name:
+        matches: ^container_(.*)_seconds_total$
+        as: ""
+      metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[1m])) by (<<.GroupBy>>)
+    - seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}'
+      seriesFilters:
+      - isNot: ^container_.*_seconds_total$
+      resources:
+        overrides:
+          namespace:
+            resource: namespace
+          pod:
+            resource: pod
+      name:
+        matches: ^container_(.*)_total$
+        as: ""
+      metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>,container!="POD"}[1m])) by (<<.GroupBy>>)
+    - seriesQuery: '{__name__=~"^container_.*",container!="POD",namespace!="",pod!=""}'
+      seriesFilters:
+      - isNot: ^container_.*_total$
+      resources:
+        overrides:
+          namespace:
+            resource: namespace
+          pod:
+            resource: pod
+      name:
+        matches: ^container_(.*)$
+        as: ""
+      metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>,container!="POD"}) by (<<.GroupBy>>)
+    - seriesQuery: '{namespace!="",__name__!~"^container_.*"}'
+      seriesFilters:
+      - isNot: .*_total$
+      resources:
+        template: <<.Resource>>
+      name:
+        matches: ""
+        as: ""
+      metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>}) by (<<.GroupBy>>)
+    - seriesQuery: '{namespace!="",__name__!~"^container_.*"}'
+      seriesFilters:
+      - isNot: .*_seconds_total
+      resources:
+        template: <<.Resource>>
+      name:
+        matches: ^(.*)_total$
+        as: ""
+      metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>}[1m])) by (<<.GroupBy>>)
+    - seriesQuery: '{namespace!="",__name__!~"^container_.*"}'
+      seriesFilters: []
+      resources:
+        template: <<.Resource>>
+      name:
+        matches: ^(.*)_seconds_total$
+        as: ""
+      metricsQuery: sum(rate(<<.Series>>{<<.LabelMatchers>>}[1m])) by (<<.GroupBy>>)
+    resourceRules:
+      cpu:
+        containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>}[1m])) by (<<.GroupBy>>)
+        nodeQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, id='/'}[1m])) by (<<.GroupBy>>)
+        resources:
+          overrides:
+            instance:
+              resource: node
+            namespace:
+              resource: namespace
+            pod:
+              resource: pod
+        containerLabel: container
+      memory:
+        containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)
+        nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
+        resources:
+          overrides:
+            instance:
+              resource: node
+            namespace:
+              resource: namespace
+            pod:
+              resource: pod
+        containerLabel: container
+      window: 1m
+    externalRules:
+    - seriesQuery: '{__name__=~"^.*_queue_(length|size)$",namespace!=""}'
+      resources:
+        overrides:
+          namespace:
+            resource: namespace
+      name:
+        matches: ^.*_queue_(length|size)$
+        as: "$0"
+      metricsQuery: max(<<.Series>>{<<.LabelMatchers>>})
+    - seriesQuery: '{__name__=~"^.*_queue$",namespace!=""}'
+      resources:
+        overrides:
+          namespace:
+            resource: namespace
+      name:
+        matches: ^.*_queue$
+        as: "$0"
+      metricsQuery: max(<<.Series>>{<<.LabelMatchers>>})
--- a/deploy/manifests/custom-metrics-resource-reader-cluster-role.yaml
+++ b/deploy/manifests/custom-metrics-resource-reader-cluster-role.yaml
@ -0,0 +1,15 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: custom-metrics-resource-reader
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - nodes
+  - nodes/stats
+  verbs:
+  - get
+  - list
+  - watch
--- a/deploy/manifests/deployment.yaml
+++ b/deploy/manifests/deployment.yaml
@ -1,89 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.12.0
-  name: prometheus-adapter
-  namespace: monitoring
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app.kubernetes.io/component: metrics-adapter
-      app.kubernetes.io/name: prometheus-adapter
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/component: metrics-adapter
-        app.kubernetes.io/name: prometheus-adapter
-        app.kubernetes.io/version: 0.12.0
-    spec:
-      automountServiceAccountToken: true
-      containers:
-      - args:
-        - --cert-dir=/var/run/serving-cert
-        - --config=/etc/adapter/config.yaml
-        - --metrics-relist-interval=1m
-        - --prometheus-url=https://prometheus.monitoring.svc:9090/
-        - --secure-port=6443
-        - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
-        image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.12.0
-        livenessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /livez
-            port: https
-            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 5
-        name: prometheus-adapter
-        ports:
-        - containerPort: 6443
-          name: https
-        readinessProbe:
-          failureThreshold: 5
-          httpGet:
-            path: /readyz
-            port: https
-            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 5
-        resources:
-          requests:
-            cpu: 102m
-            memory: 180Mi
-        securityContext:
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-            - ALL
-          readOnlyRootFilesystem: true
-        terminationMessagePolicy: FallbackToLogsOnError
-        volumeMounts:
-        - mountPath: /tmp
-          name: tmpfs
-          readOnly: false
-        - mountPath: /var/run/serving-cert
-          name: volume-serving-cert
-          readOnly: false
-        - mountPath: /etc/adapter
-          name: config
-          readOnly: false
-      nodeSelector:
-        kubernetes.io/os: linux
-      securityContext: {}
-      serviceAccountName: prometheus-adapter
-      volumes:
-      - emptyDir: {}
-        name: tmpfs
-      - emptyDir: {}
-        name: volume-serving-cert
-      - configMap:
-          name: adapter-config
-        name: config
--- a/deploy/manifests/hpa-custom-metrics-cluster-role-binding.yaml
+++ b/deploy/manifests/hpa-custom-metrics-cluster-role-binding.yaml
@ -2,9 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
  name: hpa-controller-custom-metrics
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: ClusterRole
--- a/deploy/manifests/network-policy.yaml
+++ b/deploy/manifests/network-policy.yaml
@ -1,21 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.12.0
-  name: prometheus-adapter
-  namespace: monitoring
-spec:
-  egress:
-  - {}
-  ingress:
-  - {}
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/component: metrics-adapter
-      app.kubernetes.io/name: prometheus-adapter
-  policyTypes:
-  - Egress
-  - Ingress
--- a/deploy/manifests/pod-disruption-budget.yaml
+++ b/deploy/manifests/pod-disruption-budget.yaml
@ -1,15 +0,0 @@
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.12.0
-  name: prometheus-adapter
-  namespace: monitoring
-spec:
-  minAvailable: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/component: metrics-adapter
-      app.kubernetes.io/name: prometheus-adapter
--- a/deploy/manifests/service-account.yaml
+++ b/deploy/manifests/service-account.yaml
@ -1,10 +0,0 @@
-apiVersion: v1
-automountServiceAccountToken: false
-kind: ServiceAccount
-metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.12.0
-  name: prometheus-adapter
-  namespace: monitoring
--- a/deploy/manifests/service.yaml
+++ b/deploy/manifests/service.yaml
@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.12.0
-  name: prometheus-adapter
-  namespace: monitoring
-spec:
-  ports:
-  - name: https
-    port: 443
-    targetPort: 6443
-  selector:
-    app.kubernetes.io/component: metrics-adapter
-    app.kubernetes.io/name: prometheus-adapter
--- a/docs/config.md
+++ b/docs/config.md
@ -36,8 +36,8 @@ rules:
    # skip specifying generic resource<->label mappings, and just
    # attach only pod and namespace resources by mapping label names to group-resources
    overrides:
-      namespace: {resource: "namespace"}
-      pod: {resource: "pod"}
+      namespace: {resource: "namespace"},
+      pod: {resource: "pod"},
  # specify that the `container_` and `_seconds_total` suffixes should be removed.
  # this also introduces an implicit filter on metric family names
  name:
--- a/docs/sample-config.yaml
+++ b/docs/sample-config.yaml
@ -15,8 +15,8 @@ rules:
    # skip specifying generic resource<->label mappings, and just
    # attach only pod and namespace resources by mapping label names to group-resources
    overrides:
-      namespace: {resource: "namespace"}
-      pod: {resource: "pod"}
+      namespace: {resource: "namespace"},
+      pod: {resource: "pod"},
  # specify that the `container_` and `_seconds_total` suffixes should be removed.
  # this also introduces an implicit filter on metric family names
  name:
@ -33,8 +33,8 @@ rules:
 - seriesQuery: '{__name__=~"^container_.*_total",container!="POD",namespace!="",pod!=""}'
  resources:
    overrides:
-      namespace: {resource: "namespace"}
-      pod: {resource: "pod"}
+      namespace: {resource: "namespace"},
+      pod: {resource: "pod"},
  seriesFilters:
  # since this is a superset of the query above, we introduce an additional filter here
  - isNot: "^container_.*_seconds_total$"
@ -63,7 +63,7 @@ rules:
    overrides:
      # this should still resolve in our cluster
      brand: {group: "cheese.io", resource: "brand"}
-  metricsQuery: 'count(cheddar{sharp="true"})'
+  metricQuery: 'count(cheddar{sharp="true"})'

 # external rules are not tied to a Kubernetes resource and can reference any metric
 # https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/#autoscaling-on-metrics-not-related-to-kubernetes-objects
--- a/docs/walkthrough.md
+++ b/docs/walkthrough.md
@ -46,8 +46,7 @@ instance, if you're on an x86_64 machine, use
 `gcr.io/k8s-staging-prometheus-adapter/prometheus-adapter-amd64` image.

 There is also an official multi arch image available at
-`registry.k8s.io/prometheus-adapter/prometheus-adapter:${VERSION}`.
-
+`k8s.gcr.io/prometheus-adapter/prometheus-adapter:${VERSION}`.

 If you're feeling adventurous, you can build the latest version of
 prometheus-adapter by running `make container` or get the latest image from the
@ -142,11 +141,11 @@ a HorizontalPodAutoscaler like this to accomplish the autoscaling:

 <details>

-<summary>sample-app.hpa.yaml</summary>
+<summary>sample-app-hpa.yaml</summary>

 ```yaml
 kind: HorizontalPodAutoscaler
-apiVersion: autoscaling/v2
+apiVersion: autoscaling/v2beta1
 metadata:
  name: sample-app
 spec:
@ -165,13 +164,10 @@ spec:
  - type: Pods
    pods:
      # use the metric that you used above: pods/http_requests
-      metric:
-        name: http_requests
+      metricName: http_requests
      # target 500 milli-requests per second,
      # which is 1 request every two seconds
-      target:
-        type: Value
-        averageValue: 500m
+      targetAverageValue: 500m
 ```

 </details>
@ -179,7 +175,7 @@ spec:
 If you try creating that now (and take a look at your controller-manager
 logs), you'll see that the that the HorizontalPodAutoscaler controller is
 attempting to fetch metrics from
-`/apis/custom.metrics.k8s.io/v1beta2/namespaces/default/pods/*/http_requests?selector=app%3Dsample-app`,
+`/apis/custom.metrics.k8s.io/v1beta1/namespaces/default/pods/*/http_requests?selector=app%3Dsample-app`,
 but right now, nothing's serving that API.

 Before you can autoscale your application, you'll need to make sure that
@ -200,11 +196,11 @@ First, you'll need to deploy the Prometheus Operator.  Check out the
 guide](https://github.com/prometheus-operator/prometheus-operator#quickstart)
 for the Operator to deploy a copy of Prometheus.

-This walkthrough assumes that Prometheus is deployed in the `monitoring`
+This walkthrough assumes that Prometheus is deployed in the `prom`
 namespace. Most of the sample commands and files are namespace-agnostic,
 but there are a few commands or pieces of configuration that rely on that
 namespace.  If you're using a different namespace, simply substitute that
-in for `monitoring` when it appears.
+in for `prom` when it appears.

 ### Monitoring Your Application

@ -216,7 +212,7 @@ service:

 <details>

-<summary>sample-app.monitor.yaml</summary>
+<summary>service-monitor.yaml</summary>

 ```yaml
 kind: ServiceMonitor
@ -236,12 +232,12 @@ spec:
 </details>

 ```shell
-$ kubectl create -f sample-app.monitor.yaml
+$ kubectl create -f service-monitor.yaml
 ```

-Now, you should see your metrics (`http_requests_total`) appear in your Prometheus instance.  Look
+Now, you should see your metrics appear in your Prometheus instance.  Look
 them up via the dashboard, and make sure they have the `namespace` and
-`pod` labels. If not, check the labels on the service monitor match the ones on the Prometheus CRD.
+`pod` labels.

 ### Launching the Adapter

@ -259,46 +255,7 @@ the steps to deploy the adapter.  Note that if you're deploying on
 a non-x86_64 (amd64) platform, you'll need to change the `image` field in
 the Deployment to be the appropriate image for your platform.

-However an update to the adapter config is necessary in order to
-expose custom metrics.
-
-<details>
-
-<summary>prom-adapter.config.yaml</summary>
-
-```yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: adapter-config
-  namespace: monitoring
-data:
-  config.yaml: |-
-    "rules":
-    - "seriesQuery": |
-         {namespace!="",__name__!~"^container_.*"}
-      "resources":
-        "template": "<<.Resource>>"
-      "name":
-        "matches": "^(.*)_total"
-        "as": ""
-      "metricsQuery": |
-        sum by (<<.GroupBy>>) (
-          irate (
-            <<.Series>>{<<.LabelMatchers>>}[1m]
-          )
-        )
-```
-
-</details>
-
-```shell
-$ kubectl apply -f prom-adapter.config.yaml
-# Restart prom-adapter pods
-$ kubectl rollout restart deployment prometheus-adapter -n monitoring
-```
-
-This adapter configuration should work for this walkthrough together with
+The default adapter configuration should work for this walkthrough and
 a standard Prometheus Operator configuration, but if you've got custom
 relabelling rules, or your labels above weren't exactly `namespace` and
 `pod`, you may need to edit the configuration in the ConfigMap. The
@ -307,36 +264,11 @@ overview of how configuration works.

 ### The Registered API

-We also need to register the custom metrics API with the API aggregator (part of
-the main Kubernetes API server). For that we need to create an APIService resource
+As part of the creation of the adapter Deployment and associated objects
+(performed above), we registered the API with the API aggregator (part of
+the main Kubernetes API server).

-<details>
-
-<summary>api-service.yaml</summary>
-
-```yaml
-apiVersion: apiregistration.k8s.io/v1
-kind: APIService
-metadata:
-  name: v1beta2.custom.metrics.k8s.io
-spec:
-  group: custom.metrics.k8s.io
-  groupPriorityMinimum: 100
-  insecureSkipTLSVerify: true
-  service:
-    name: prometheus-adapter
-    namespace: monitoring
-  version: v1beta2
-  versionPriority: 100
-```
-
-</details>
-
-```shell
-$ kubectl create -f api-service.yaml
-```
-
-The API is registered as `custom.metrics.k8s.io/v1beta2`, and you can find
+The API is registered as `custom.metrics.k8s.io/v1beta1`, and you can find
 more information about aggregation at [Concepts:
 Aggregation](https://github.com/kubernetes-incubator/apiserver-builder/blob/master/docs/concepts/aggregation.md).

@ -347,7 +279,7 @@ With that all set, your custom metrics API should show up in discovery.
 Try fetching the discovery information for it:

 ```shell
-$ kubectl get --raw /apis/custom.metrics.k8s.io/v1beta2
+$ kubectl get --raw /apis/custom.metrics.k8s.io/v1beta1
 ```

 Since you've set up Prometheus to collect your app's metrics, you should
@ -361,12 +293,12 @@ sends a raw GET request to the Kubernetes API server, automatically
 injecting auth information:

 ```shell
-$ kubectl get --raw "/apis/custom.metrics.k8s.io/v1beta2/namespaces/default/pods/*/http_requests?selector=app%3Dsample-app"
+$ kubectl get --raw "/apis/custom.metrics.k8s.io/v1beta1/namespaces/default/pods/*/http_requests?selector=app%3Dsample-app"
 ```

 Because of the adapter's configuration, the cumulative metric
 `http_requests_total` has been converted into a rate metric,
-`pods/http_requests`, which measures requests per second over a 1 minute
+`pods/http_requests`, which measures requests per second over a 2 minute
 interval. The value should currently be close to zero, since there's no
 traffic to your app, except for the regular metrics collection from
 Prometheus.
@ -417,7 +349,7 @@ and make decisions based on it.
 If you didn't create the HorizontalPodAutoscaler above, create it now:

 ```shell
-$ kubectl create -f sample-app.hpa.yaml
+$ kubectl create -f sample-app-hpa.yaml
 ```

 Wait a little bit, and then examine the HPA:
@ -463,4 +395,4 @@ setting different labels or using the `Object` metric source type.

 For more information on how metrics are exposed by the Prometheus adapter,
 see [config documentation](/docs/config.md), and check the [default
-configuration](/deploy/manifests/config-map.yaml).
+configuration](/deploy/manifests/custom-metrics-config-map.yaml).
--- a/go.mod
+++ b/go.mod
@ -1,118 +1,23 @@
 module sigs.k8s.io/prometheus-adapter

-go 1.22.1
-
-toolchain go1.22.2
+go 1.16

 require (
-	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.33.1
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2
-	github.com/prometheus-operator/prometheus-operator/pkg/client v0.73.2
-	github.com/prometheus/client_golang v1.18.0
-	github.com/prometheus/common v0.46.0
-	github.com/spf13/cobra v1.8.0
-	github.com/stretchr/testify v1.9.0
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.15.0
+	github.com/prometheus/client_golang v1.11.0
+	github.com/prometheus/common v0.26.0
+	github.com/spf13/cobra v1.2.1
+	github.com/stretchr/testify v1.7.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.30.0
-	k8s.io/apimachinery v0.30.0
-	k8s.io/apiserver v0.30.0
-	k8s.io/client-go v0.30.0
-	k8s.io/component-base v0.30.0
-	k8s.io/klog/v2 v2.120.1
-	k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f
-	k8s.io/metrics v0.30.0
-	sigs.k8s.io/custom-metrics-apiserver v1.30.0
-	sigs.k8s.io/metrics-server v0.7.1
-)
-
-require (
-	github.com/NYTimes/gziphandler v1.1.1 // indirect
-	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
-	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/coreos/go-semver v0.3.1 // indirect
-	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/emicklei/go-restful/v3 v3.12.0 // indirect
-	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
-	github.com/go-logr/stdr v1.2.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/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/cel-go v0.17.8 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stoewer/go-strcase v1.3.0 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.11 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.11 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
-	go.opentelemetry.io/otel v1.21.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
-	go.opentelemetry.io/otel/metric v1.21.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
-	go.opentelemetry.io/otel/trace v1.21.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.26.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/oauth2 v0.18.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/term v0.27.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
-	google.golang.org/grpc v1.60.1 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.29.3 // indirect
-	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
-	k8s.io/kms v0.30.0 // indirect
-	k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
-	sigs.k8s.io/controller-runtime v0.17.2 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	k8s.io/api v0.22.0
+	k8s.io/apimachinery v0.22.0
+	k8s.io/apiserver v0.22.0
+	k8s.io/client-go v0.22.0
+	k8s.io/component-base v0.22.0
+	k8s.io/klog/v2 v2.9.0
+	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
+	k8s.io/metrics v0.22.0
+	sigs.k8s.io/custom-metrics-apiserver v1.22.0
+	sigs.k8s.io/metrics-server v0.5.0
 )
--- a/go.sum
+++ b/go.sum
--- a/hack/gofmt-all.sh
+++ b/hack/gofmt-all.sh
@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Copyright 2017 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.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+verify=0
+if [[ ${1:-} = "--verify" || ${1:-} = "-v" ]]; then
+  verify=1
+fi
+
+find_files() {
+  find . -not \( \( \
+    -wholename './_output' \
+    -o -wholename './vendor' \
+  \) -prune \) -name '*.go'
+}
+
+if [[ $verify -eq 1 ]]; then
+  diff=$(find_files | xargs gofmt -s -d 2>&1)
+  if [[ -n "${diff}" ]]; then
+    echo "gofmt -s -w $(echo "${diff}" | awk '/^diff / { print $2 }' | tr '\n' ' ')"
+    exit 1
+  fi
+else
+  find_files | xargs gofmt -s -w
+fi
--- a/hack/tools.go
+++ b/hack/tools.go
@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-//go:build tools
 // +build tools

 // Package tools tracks dependencies for tools that used in the build process.
--- a/pkg/api/generated/openapi/zz_generated.openapi.go
+++ b/pkg/api/generated/openapi/zz_generated.openapi.go
--- a/pkg/api/openapi-gen.go
+++ b/pkg/api/openapi-gen.go
@ -1,4 +1,3 @@
-//go:build codegen
 // +build codegen

 /*
--- a/pkg/client/api.go
+++ b/pkg/client/api.go
@ -21,10 +21,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 	"path"
-	"strings"
 	"time"

 	"github.com/prometheus/common/model"
@ -53,25 +53,13 @@ type httpAPIClient struct {
 func (c *httpAPIClient) Do(ctx context.Context, verb, endpoint string, query url.Values) (APIResponse, error) {
 	u := *c.baseURL
 	u.Path = path.Join(c.baseURL.Path, endpoint)
-	var reqBody io.Reader
-	if verb == http.MethodGet {
-		u.RawQuery = query.Encode()
-	} else if verb == http.MethodPost {
-		reqBody = strings.NewReader(query.Encode())
-	}
-
-	req, err := http.NewRequestWithContext(ctx, verb, u.String(), reqBody)
+	u.RawQuery = query.Encode()
+	req, err := http.NewRequest(verb, u.String(), nil)
 	if err != nil {
 		return APIResponse{}, fmt.Errorf("error constructing HTTP request to Prometheus: %v", err)
 	}
-	for key, values := range c.headers {
-		for _, value := range values {
-			req.Header.Add(key, value)
-		}
-	}
-	if verb == http.MethodPost {
-		req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	}
+	req.WithContext(ctx)
+	req.Header = c.headers

 	resp, err := c.client.Do(req)
 	defer func() {
@ -100,7 +88,7 @@ func (c *httpAPIClient) Do(ctx context.Context, verb, endpoint string, query url

 	var body io.Reader = resp.Body
 	if klog.V(8).Enabled() {
-		data, err := io.ReadAll(body)
+		data, err := ioutil.ReadAll(body)
 		if err != nil {
 			return APIResponse{}, fmt.Errorf("unable to log response body: %v", err)
 		}
@ -143,22 +131,20 @@ const (

 // queryClient is a Client that connects to the Prometheus HTTP API.
 type queryClient struct {
-	api  GenericAPIClient
-	verb string
+	api GenericAPIClient
 }

 // NewClientForAPI creates a Client for the given generic Prometheus API client.
-func NewClientForAPI(client GenericAPIClient, verb string) Client {
+func NewClientForAPI(client GenericAPIClient) Client {
 	return &queryClient{
-		api:  client,
-		verb: verb,
+		api: client,
 	}
 }

 // NewClient creates a Client for the given HTTP client and base URL (the location of the Prometheus server).
-func NewClient(client *http.Client, baseURL *url.URL, headers http.Header, verb string) Client {
+func NewClient(client *http.Client, baseURL *url.URL, headers http.Header) Client {
 	genericClient := NewGenericAPIClient(client, baseURL, headers)
-	return NewClientForAPI(genericClient, verb)
+	return NewClientForAPI(genericClient)
 }

 func (h *queryClient) Series(ctx context.Context, interval model.Interval, selectors ...Selector) ([]Series, error) {
@ -174,7 +160,7 @@ func (h *queryClient) Series(ctx context.Context, interval model.Interval, selec
 		vals.Add("match[]", string(selector))
 	}

-	res, err := h.api.Do(ctx, h.verb, seriesURL, vals)
+	res, err := h.api.Do(ctx, "GET", seriesURL, vals)
 	if err != nil {
 		return nil, err
 	}
@ -194,7 +180,7 @@ func (h *queryClient) Query(ctx context.Context, t model.Time, query Selector) (
 		vals.Set("timeout", model.Duration(timeout).String())
 	}

-	res, err := h.api.Do(ctx, h.verb, queryURL, vals)
+	res, err := h.api.Do(ctx, "GET", queryURL, vals)
 	if err != nil {
 		return QueryResult{}, err
 	}
@ -221,7 +207,7 @@ func (h *queryClient) QueryRange(ctx context.Context, r Range, query Selector) (
 		vals.Set("timeout", model.Duration(timeout).String())
 	}

-	res, err := h.api.Do(ctx, h.verb, queryRangeURL, vals)
+	res, err := h.api.Do(ctx, "GET", queryRangeURL, vals)
 	if err != nil {
 		return QueryResult{}, err
 	}
@ -235,7 +221,7 @@ func (h *queryClient) QueryRange(ctx context.Context, r Range, query Selector) (
 // when present
 func timeoutFromContext(ctx context.Context) (time.Duration, bool) {
 	if deadline, hasDeadline := ctx.Deadline(); hasDeadline {
-		return time.Since(deadline), true
+		return time.Now().Sub(deadline), true
 	}

 	return time.Duration(0), false
--- a/pkg/client/helpers.go
+++ b/pkg/client/helpers.go
@ -13,7 +13,6 @@ 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.
 */
-
 package client

 import (
--- a/pkg/client/interfaces.go
+++ b/pkg/client/interfaces.go
@ -13,7 +13,6 @@ 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.
 */
-
 package client

 import (
--- a/pkg/client/metrics/metrics.go
+++ b/pkg/client/metrics/metrics.go
@ -13,21 +13,15 @@ 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.
 */
-
 package metrics

 import (
 	"context"
-	"net/http"
 	"net/url"
 	"time"

 	"github.com/prometheus/client_golang/prometheus"

-	apimetrics "k8s.io/apiserver/pkg/endpoints/metrics"
-	"k8s.io/component-base/metrics"
-	"k8s.io/component-base/metrics/legacyregistry"
-
 	"sigs.k8s.io/prometheus-adapter/pkg/client"
 )

@ -35,29 +29,18 @@ var (
 	// queryLatency is the total latency of any query going through the
 	// various endpoints (query, range-query, series).  It includes some deserialization
 	// overhead and HTTP overhead.
-	queryLatency = metrics.NewHistogramVec(
-		&metrics.HistogramOpts{
-			Namespace: "prometheus_adapter",
-			Subsystem: "prometheus_client",
-			Name:      "request_duration_seconds",
-			Help:      "Prometheus client query latency in seconds.  Broken down by target prometheus endpoint and target server",
-			Buckets:   prometheus.DefBuckets,
+	queryLatency = prometheus.NewHistogramVec(
+		prometheus.HistogramOpts{
+			Name:    "cmgateway_prometheus_query_latency_seconds",
+			Help:    "Prometheus client query latency in seconds.  Broken down by target prometheus endpoint and target server",
+			Buckets: prometheus.ExponentialBuckets(0.0001, 2, 10),
 		},
-		[]string{"path", "server"},
+		[]string{"endpoint", "server"},
 	)
 )

-func MetricsHandler() (http.HandlerFunc, error) {
-	registry := metrics.NewKubeRegistry()
-	err := registry.Register(queryLatency)
-	if err != nil {
-		return nil, err
-	}
-	apimetrics.Register()
-	return func(w http.ResponseWriter, req *http.Request) {
-		legacyregistry.Handler().ServeHTTP(w, req)
-		metrics.HandlerFor(registry, metrics.HandlerOpts{}).ServeHTTP(w, req)
-	}, nil
+func init() {
+	prometheus.MustRegister(queryLatency)
 }

 // instrumentedClient is a client.GenericAPIClient which instruments calls to Do,
@ -79,7 +62,7 @@ func (c *instrumentedGenericClient) Do(ctx context.Context, verb, endpoint strin
 				return
 			}
 		}
-		queryLatency.With(prometheus.Labels{"path": endpoint, "server": c.serverName}).Observe(endTime.Sub(startTime).Seconds())
+		queryLatency.With(prometheus.Labels{"endpoint": endpoint, "server": c.serverName}).Observe(endTime.Sub(startTime).Seconds())
 	}()

 	var resp client.APIResponse
--- a/pkg/client/types.go
+++ b/pkg/client/types.go
@ -25,10 +25,10 @@ type ErrorType string

 const (
 	ErrBadData     ErrorType = "bad_data"
-	ErrTimeout     ErrorType = "timeout"
-	ErrCanceled    ErrorType = "canceled"
-	ErrExec        ErrorType = "execution"
-	ErrBadResponse ErrorType = "bad_response"
+	ErrTimeout               = "timeout"
+	ErrCanceled              = "canceled"
+	ErrExec                  = "execution"
+	ErrBadResponse           = "bad_response"
 )

 // Error is an error returned by the API.
@ -46,7 +46,7 @@ type ResponseStatus string

 const (
 	ResponseSucceeded ResponseStatus = "succeeded"
-	ResponseError     ResponseStatus = "error"
+	ResponseError                    = "error"
 )

 // APIResponse represents the raw response returned by the API.
--- a/pkg/config/loader.go
+++ b/pkg/config/loader.go
@ -2,7 +2,7 @@ package config

 import (
 	"fmt"
-	"io"
+	"io/ioutil"
 	"os"

 	yaml "gopkg.in/yaml.v2"
@ -11,11 +11,11 @@ import (
 // FromFile loads the configuration from a particular file.
 func FromFile(filename string) (*MetricsDiscoveryConfig, error) {
 	file, err := os.Open(filename)
+	defer file.Close()
 	if err != nil {
 		return nil, fmt.Errorf("unable to load metrics discovery config file: %v", err)
 	}
-	defer file.Close()
-	contents, err := io.ReadAll(file)
+	contents, err := ioutil.ReadAll(file)
 	if err != nil {
 		return nil, fmt.Errorf("unable to load metrics discovery config file: %v", err)
 	}
--- a/pkg/custom-provider/provider.go
+++ b/pkg/custom-provider/provider.go
@ -99,7 +99,7 @@ func (p *prometheusProvider) metricFor(value pmodel.SampleValue, name types.Name
 			Name: info.Metric,
 		},
 		// TODO(directxman12): use the right timestamp
-		Timestamp: metav1.Time{Time: time.Now()},
+		Timestamp: metav1.Time{time.Now()},
 		Value:     *q,
 	}

@ -256,7 +256,7 @@ func (l *cachingMetricsLister) updateMetrics() error {
 		}
 		selectors[sel] = struct{}{}
 		go func() {
-			series, err := l.promClient.Series(context.TODO(), pmodel.Interval{Start: startTime, End: 0}, sel)
+			series, err := l.promClient.Series(context.TODO(), pmodel.Interval{startTime, 0}, sel)
 			if err != nil {
 				errs <- fmt.Errorf("unable to fetch metrics for query %q: %v", sel, err)
 				return
--- a/pkg/custom-provider/provider_test.go
+++ b/pkg/custom-provider/provider_test.go
@ -87,7 +87,7 @@ var _ = Describe("Custom Metrics Provider", func() {
 		By("ensuring that no metrics are present before we start listing")
 		Expect(prov.ListAllMetrics()).To(BeEmpty())

-		By("setting the acceptable interval to now until the next update, with a bit of wiggle room")
+		By("setting the acceptible interval to now until the next update, with a bit of wiggle room")
 		startTime := pmodel.Now().Add(-1*fakeProviderUpdateInterval - fakeProviderUpdateInterval/10)
 		fakeProm.AcceptableInterval = pmodel.Interval{Start: startTime, End: 0}

@ -98,16 +98,16 @@ var _ = Describe("Custom Metrics Provider", func() {

 		By("listing all metrics, and checking that they contain the expected results")
 		Expect(prov.ListAllMetrics()).To(ConsistOf(
-			provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "services"}, Namespaced: true, Metric: "ingress_hits"},
-			provider.CustomMetricInfo{GroupResource: schema.GroupResource{Group: "extensions", Resource: "ingresses"}, Namespaced: true, Metric: "ingress_hits"},
-			provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "pods"}, Namespaced: true, Metric: "ingress_hits"},
-			provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "namespaces"}, Namespaced: false, Metric: "ingress_hits"},
-			provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "services"}, Namespaced: true, Metric: "service_proxy_packets"},
-			provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "namespaces"}, Namespaced: false, Metric: "service_proxy_packets"},
-			provider.CustomMetricInfo{GroupResource: schema.GroupResource{Group: "extensions", Resource: "deployments"}, Namespaced: true, Metric: "work_queue_wait"},
-			provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "namespaces"}, Namespaced: false, Metric: "work_queue_wait"},
-			provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "namespaces"}, Namespaced: false, Metric: "some_usage"},
-			provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "pods"}, Namespaced: true, Metric: "some_usage"},
+			provider.CustomMetricInfo{schema.GroupResource{Resource: "services"}, true, "ingress_hits"},
+			provider.CustomMetricInfo{schema.GroupResource{Group: "extensions", Resource: "ingresses"}, true, "ingress_hits"},
+			provider.CustomMetricInfo{schema.GroupResource{Resource: "pods"}, true, "ingress_hits"},
+			provider.CustomMetricInfo{schema.GroupResource{Resource: "namespaces"}, false, "ingress_hits"},
+			provider.CustomMetricInfo{schema.GroupResource{Resource: "services"}, true, "service_proxy_packets"},
+			provider.CustomMetricInfo{schema.GroupResource{Resource: "namespaces"}, false, "service_proxy_packets"},
+			provider.CustomMetricInfo{schema.GroupResource{Group: "extensions", Resource: "deployments"}, true, "work_queue_wait"},
+			provider.CustomMetricInfo{schema.GroupResource{Resource: "namespaces"}, false, "work_queue_wait"},
+			provider.CustomMetricInfo{schema.GroupResource{Resource: "namespaces"}, false, "some_usage"},
+			provider.CustomMetricInfo{schema.GroupResource{Resource: "pods"}, true, "some_usage"},
 		))
 	})
 })
--- a/pkg/custom-provider/series_registry_test.go
+++ b/pkg/custom-provider/series_registry_test.go
@ -84,7 +84,7 @@ var seriesRegistryTestSeries = [][]prom.Series{
 		},
 	},
 	{
-		// gauge metrics
+		// guage metrics
 		{
 			Name:   "node_gigawatts",
 			Labels: pmodel.LabelSet{"kube_node": "somenode"},
@ -159,7 +159,7 @@ var _ = Describe("Series Registry", func() {
 			// container metrics
 			{
 				title:          "container metrics gauge / multiple resource names",
-				info:           provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "pods"}, Namespaced: true, Metric: "some_usage"},
+				info:           provider.CustomMetricInfo{schema.GroupResource{Resource: "pods"}, true, "some_usage"},
 				namespace:      "somens",
 				resourceNames:  []string{"somepod1", "somepod2"},
 				metricSelector: labels.Everything(),
@ -168,7 +168,7 @@ var _ = Describe("Series Registry", func() {
 			},
 			{
 				title:          "container metrics counter",
-				info:           provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "pods"}, Namespaced: true, Metric: "some_count"},
+				info:           provider.CustomMetricInfo{schema.GroupResource{Resource: "pods"}, true, "some_count"},
 				namespace:      "somens",
 				resourceNames:  []string{"somepod1", "somepod2"},
 				metricSelector: labels.Everything(),
@ -177,7 +177,7 @@ var _ = Describe("Series Registry", func() {
 			},
 			{
 				title:          "container metrics seconds counter",
-				info:           provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "pods"}, Namespaced: true, Metric: "some_time"},
+				info:           provider.CustomMetricInfo{schema.GroupResource{Resource: "pods"}, true, "some_time"},
 				namespace:      "somens",
 				resourceNames:  []string{"somepod1", "somepod2"},
 				metricSelector: labels.Everything(),
@ -187,7 +187,7 @@ var _ = Describe("Series Registry", func() {
 			// namespaced metrics
 			{
 				title:          "namespaced metrics counter / multidimensional (service)",
-				info:           provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "service"}, Namespaced: true, Metric: "ingress_hits"},
+				info:           provider.CustomMetricInfo{schema.GroupResource{Resource: "service"}, true, "ingress_hits"},
 				namespace:      "somens",
 				resourceNames:  []string{"somesvc"},
 				metricSelector: labels.Everything(),
@ -196,7 +196,7 @@ var _ = Describe("Series Registry", func() {
 			},
 			{
 				title:         "namespaced metrics counter /  multidimensional (service) / selection using labels",
-				info:          provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "service"}, Namespaced: true, Metric: "ingress_hits"},
+				info:          provider.CustomMetricInfo{schema.GroupResource{Resource: "service"}, true, "ingress_hits"},
 				namespace:     "somens",
 				resourceNames: []string{"somesvc"},
 				metricSelector: labels.NewSelector().Add(
@ -206,7 +206,7 @@ var _ = Describe("Series Registry", func() {
 			},
 			{
 				title:          "namespaced metrics counter / multidimensional (ingress)",
-				info:           provider.CustomMetricInfo{GroupResource: schema.GroupResource{Group: "extensions", Resource: "ingress"}, Namespaced: true, Metric: "ingress_hits"},
+				info:           provider.CustomMetricInfo{schema.GroupResource{Group: "extensions", Resource: "ingress"}, true, "ingress_hits"},
 				namespace:      "somens",
 				resourceNames:  []string{"someingress"},
 				metricSelector: labels.Everything(),
@ -215,7 +215,7 @@ var _ = Describe("Series Registry", func() {
 			},
 			{
 				title:          "namespaced metrics counter / multidimensional (pod)",
-				info:           provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "pod"}, Namespaced: true, Metric: "ingress_hits"},
+				info:           provider.CustomMetricInfo{schema.GroupResource{Resource: "pod"}, true, "ingress_hits"},
 				namespace:      "somens",
 				resourceNames:  []string{"somepod"},
 				metricSelector: labels.Everything(),
@ -224,7 +224,7 @@ var _ = Describe("Series Registry", func() {
 			},
 			{
 				title:          "namespaced metrics gauge",
-				info:           provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "service"}, Namespaced: true, Metric: "service_proxy_packets"},
+				info:           provider.CustomMetricInfo{schema.GroupResource{Resource: "service"}, true, "service_proxy_packets"},
 				namespace:      "somens",
 				resourceNames:  []string{"somesvc"},
 				metricSelector: labels.Everything(),
@ -233,7 +233,7 @@ var _ = Describe("Series Registry", func() {
 			},
 			{
 				title:          "namespaced metrics seconds counter",
-				info:           provider.CustomMetricInfo{GroupResource: schema.GroupResource{Group: "extensions", Resource: "deployment"}, Namespaced: true, Metric: "work_queue_wait"},
+				info:           provider.CustomMetricInfo{schema.GroupResource{Group: "extensions", Resource: "deployment"}, true, "work_queue_wait"},
 				namespace:      "somens",
 				resourceNames:  []string{"somedep"},
 				metricSelector: labels.Everything(),
@ -243,7 +243,7 @@ var _ = Describe("Series Registry", func() {
 			// non-namespaced series
 			{
 				title:          "root scoped metrics gauge",
-				info:           provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "node"}, Namespaced: false, Metric: "node_gigawatts"},
+				info:           provider.CustomMetricInfo{schema.GroupResource{Resource: "node"}, false, "node_gigawatts"},
 				resourceNames:  []string{"somenode"},
 				metricSelector: labels.Everything(),

@ -251,7 +251,7 @@ var _ = Describe("Series Registry", func() {
 			},
 			{
 				title:          "root scoped metrics counter",
-				info:           provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "persistentvolume"}, Namespaced: false, Metric: "volume_claims"},
+				info:           provider.CustomMetricInfo{schema.GroupResource{Resource: "persistentvolume"}, false, "volume_claims"},
 				resourceNames:  []string{"somepv"},
 				metricSelector: labels.Everything(),

@ -259,7 +259,7 @@ var _ = Describe("Series Registry", func() {
 			},
 			{
 				title:          "root scoped metrics seconds counter",
-				info:           provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "node"}, Namespaced: false, Metric: "node_fan"},
+				info:           provider.CustomMetricInfo{schema.GroupResource{Resource: "node"}, false, "node_fan"},
 				resourceNames:  []string{"somenode"},
 				metricSelector: labels.Everything(),

@ -281,23 +281,23 @@ var _ = Describe("Series Registry", func() {

 		It("should list all metrics", func() {
 			Expect(registry.ListAllMetrics()).To(ConsistOf(
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "pods"}, Namespaced: true, Metric: "some_count"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "namespaces"}, Namespaced: false, Metric: "some_count"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "pods"}, Namespaced: true, Metric: "some_time"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "namespaces"}, Namespaced: false, Metric: "some_time"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "pods"}, Namespaced: true, Metric: "some_usage"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "namespaces"}, Namespaced: false, Metric: "some_usage"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "services"}, Namespaced: true, Metric: "ingress_hits"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Group: "extensions", Resource: "ingresses"}, Namespaced: true, Metric: "ingress_hits"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "pods"}, Namespaced: true, Metric: "ingress_hits"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "namespaces"}, Namespaced: false, Metric: "ingress_hits"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "services"}, Namespaced: true, Metric: "service_proxy_packets"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "namespaces"}, Namespaced: false, Metric: "service_proxy_packets"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Group: "extensions", Resource: "deployments"}, Namespaced: true, Metric: "work_queue_wait"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "namespaces"}, Namespaced: false, Metric: "work_queue_wait"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "nodes"}, Namespaced: false, Metric: "node_gigawatts"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "persistentvolumes"}, Namespaced: false, Metric: "volume_claims"},
-				provider.CustomMetricInfo{GroupResource: schema.GroupResource{Resource: "nodes"}, Namespaced: false, Metric: "node_fan"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "pods"}, true, "some_count"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "namespaces"}, false, "some_count"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "pods"}, true, "some_time"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "namespaces"}, false, "some_time"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "pods"}, true, "some_usage"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "namespaces"}, false, "some_usage"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "services"}, true, "ingress_hits"},
+				provider.CustomMetricInfo{schema.GroupResource{Group: "extensions", Resource: "ingresses"}, true, "ingress_hits"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "pods"}, true, "ingress_hits"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "namespaces"}, false, "ingress_hits"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "services"}, true, "service_proxy_packets"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "namespaces"}, false, "service_proxy_packets"},
+				provider.CustomMetricInfo{schema.GroupResource{Group: "extensions", Resource: "deployments"}, true, "work_queue_wait"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "namespaces"}, false, "work_queue_wait"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "nodes"}, false, "node_gigawatts"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "persistentvolumes"}, false, "volume_claims"},
+				provider.CustomMetricInfo{schema.GroupResource{Resource: "nodes"}, false, "node_fan"},
 			))
 		})
 	})
--- a/pkg/external-provider/basic_metric_lister.go
+++ b/pkg/external-provider/basic_metric_lister.go
@ -100,7 +100,7 @@ func (l *basicMetricLister) ListAllMetrics() (MetricUpdateResult, error) {
 		}
 		selectors[sel] = struct{}{}
 		go func() {
-			series, err := l.promClient.Series(context.TODO(), pmodel.Interval{Start: startTime, End: 0}, sel)
+			series, err := l.promClient.Series(context.TODO(), pmodel.Interval{startTime, 0}, sel)
 			if err != nil {
 				errs <- fmt.Errorf("unable to fetch metrics for query %q: %v", sel, err)
 				return
--- a/pkg/external-provider/external_series_registry.go
+++ b/pkg/external-provider/external_series_registry.go
@ -103,6 +103,7 @@ func (r *externalSeriesRegistry) filterAndStoreMetrics(result MetricUpdateResult

 	r.metrics = apiMetricsCache
 	r.metricsInfo = rawMetricsCache
+
 }

 func (r *externalSeriesRegistry) ListAllMetrics() []provider.ExternalMetricInfo {
--- a/pkg/external-provider/metric_converter.go
+++ b/pkg/external-provider/metric_converter.go
@ -61,7 +61,7 @@ func (c *metricConverter) convertSample(info provider.ExternalMetricInfo, sample
 	singleMetric := external_metrics.ExternalMetricValue{
 		MetricName: info.Metric,
 		Timestamp: metav1.Time{
-			Time: sample.Timestamp.Time(),
+			sample.Timestamp.Time(),
 		},
 		Value:        *resource.NewMilliQuantity(int64(sample.Value*1000.0), resource.DecimalSI),
 		MetricLabels: labels,
@ -133,7 +133,7 @@ func (c *metricConverter) convertScalar(info provider.ExternalMetricInfo, queryR
 			{
 				MetricName: info.Metric,
 				Timestamp: metav1.Time{
-					Time: toConvert.Timestamp.Time(),
+					toConvert.Timestamp.Time(),
 				},
 				Value: *resource.NewMilliQuantity(int64(toConvert.Value*1000.0), resource.DecimalSI),
 			},
--- a/pkg/external-provider/periodic_metric_lister.go
+++ b/pkg/external-provider/periodic_metric_lister.go
@ -69,9 +69,9 @@ func (l *periodicMetricLister) updateMetrics() error {
 		return err
 	}

-	// Cache the result.
+	//Cache the result.
 	l.mostRecentResult = result
-	// Let our listeners know we've got new data ready for them.
+	//Let our listeners know we've got new data ready for them.
 	l.notifyListeners()
 	return nil
 }
@ -85,7 +85,5 @@ func (l *periodicMetricLister) notifyListeners() {
 }

 func (l *periodicMetricLister) UpdateNow() {
-	if err := l.updateMetrics(); err != nil {
-		utilruntime.HandleError(err)
-	}
+	l.updateMetrics()
 }
--- a/pkg/external-provider/provider.go
+++ b/pkg/external-provider/provider.go
@ -77,9 +77,9 @@ func (p *externalPrometheusProvider) selectGroupResource(namespace string) schem
 }

 // NewExternalPrometheusProvider creates an ExternalMetricsProvider capable of responding to Kubernetes requests for external metric data
-func NewExternalPrometheusProvider(promClient prom.Client, namers []naming.MetricNamer, updateInterval time.Duration, maxAge time.Duration) (provider.ExternalMetricsProvider, Runnable) {
+func NewExternalPrometheusProvider(promClient prom.Client, namers []naming.MetricNamer, updateInterval time.Duration) (provider.ExternalMetricsProvider, Runnable) {
 	metricConverter := NewMetricConverter()
-	basicLister := NewBasicMetricLister(promClient, namers, maxAge)
+	basicLister := NewBasicMetricLister(promClient, namers, updateInterval)
 	periodicLister, _ := NewPeriodicMetricLister(basicLister, updateInterval)
 	seriesRegistry := NewExternalSeriesRegistry(periodicLister)
 	return &externalPrometheusProvider{
--- a/pkg/naming/lbl_res.go
+++ b/pkg/naming/lbl_res.go
@ -22,6 +22,7 @@ import (
 	"regexp"
 	"text/template"

+	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime/schema"

 	pmodel "github.com/prometheus/common/model"
@ -33,6 +34,7 @@ type labelGroupResExtractor struct {

 	resourceInd int
 	groupInd    *int
+	mapper      apimeta.RESTMapper
 }

 // newLabelGroupResExtractor creates a new labelGroupResExtractor for labels whose form
@ -40,10 +42,7 @@ type labelGroupResExtractor struct {
 // so anything in the template which limits resource or group name length will cause issues.
 func newLabelGroupResExtractor(labelTemplate *template.Template) (*labelGroupResExtractor, error) {
 	labelRegexBuff := new(bytes.Buffer)
-	if err := labelTemplate.Execute(labelRegexBuff, schema.GroupResource{
-		Group:    "(?P<group>.+?)",
-		Resource: "(?P<resource>.+?)"},
-	); err != nil {
+	if err := labelTemplate.Execute(labelRegexBuff, schema.GroupResource{"(?P<group>.+?)", "(?P<resource>.+?)"}); err != nil {
 		return nil, fmt.Errorf("unable to convert label template to matcher: %v", err)
 	}
 	if labelRegexBuff.Len() == 0 {
--- a/pkg/naming/metric_namer.go
+++ b/pkg/naming/metric_namer.go
@ -194,14 +194,13 @@ func NamersFromConfig(cfg []config.DiscoveryRule, mapper apimeta.RESTMapper) ([]
 		if nameAs == "" {
 			// check if we have an obvious default
 			subexpNames := nameMatches.SubexpNames()
-			switch len(subexpNames) {
-			case 1:
+			if len(subexpNames) == 1 {
 				// no capture groups, use the whole thing
 				nameAs = "$0"
-			case 2:
+			} else if len(subexpNames) == 2 {
 				// one capture group, use that
 				nameAs = "$1"
-			default:
+			} else {
 				return nil, fmt.Errorf("must specify an 'as' value for name matcher %q associated with series query %q", rule.Name.Matches, rule.SeriesQuery)
 			}
 		}
--- a/pkg/naming/metrics_query.go
+++ b/pkg/naming/metrics_query.go
@ -283,8 +283,9 @@ func (q *metricsQuery) processQueryParts(queryParts []queryPart) ([]string, map[
 }

 func (q *metricsQuery) selectMatcher(operator selection.Operator, values []string) (func(string, string) string, error) {
-	switch len(values) {
-	case 0:
+
+	numValues := len(values)
+	if numValues == 0 {
 		switch operator {
 		case selection.Exists:
 			return prom.LabelNeq, nil
@ -293,7 +294,7 @@ func (q *metricsQuery) selectMatcher(operator selection.Operator, values []strin
 		case selection.Equals, selection.DoubleEquals, selection.NotEquals, selection.In, selection.NotIn:
 			return nil, ErrMalformedQuery
 		}
-	case 1:
+	} else if numValues == 1 {
 		switch operator {
 		case selection.Equals, selection.DoubleEquals:
 			return prom.LabelEq, nil
@ -304,7 +305,7 @@ func (q *metricsQuery) selectMatcher(operator selection.Operator, values []strin
 		case selection.DoesNotExist, selection.NotIn:
 			return prom.LabelNotMatches, nil
 		}
-	default:
+	} else {
 		// Since labels can only have one value, providing multiple
 		// values results in a regex match, even if that's not what the user
 		// asked for.
@ -320,8 +321,8 @@ func (q *metricsQuery) selectMatcher(operator selection.Operator, values []strin
 }

 func (q *metricsQuery) selectTargetValue(operator selection.Operator, values []string) (string, error) {
-	switch len(values) {
-	case 0:
+	numValues := len(values)
+	if numValues == 0 {
 		switch operator {
 		case selection.Exists, selection.DoesNotExist:
 			// Return an empty string when values are equal to 0
@ -333,7 +334,7 @@ func (q *metricsQuery) selectTargetValue(operator selection.Operator, values []s
 		case selection.Equals, selection.DoubleEquals, selection.NotEquals, selection.In, selection.NotIn:
 			return "", ErrMalformedQuery
 		}
-	case 1:
+	} else if numValues == 1 {
 		switch operator {
 		case selection.Equals, selection.DoubleEquals, selection.NotEquals, selection.In, selection.NotIn:
 			// Pass the value through as-is.
@ -346,7 +347,7 @@ func (q *metricsQuery) selectTargetValue(operator selection.Operator, values []s
 		case selection.Exists, selection.DoesNotExist:
 			return "", ErrQueryUnsupportedValues
 		}
-	default:
+	} else {
 		switch operator {
 		case selection.Equals, selection.DoubleEquals, selection.NotEquals, selection.In, selection.NotIn:
 			// Pass the value through as-is.
--- a/pkg/resourceprovider/provider.go
+++ b/pkg/resourceprovider/provider.go
@ -26,9 +26,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/api/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	apitypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2"
 	metrics "k8s.io/metrics/pkg/apis/metrics"

@ -43,6 +43,7 @@ import (

 var (
 	nodeResource = schema.GroupResource{Resource: "nodes"}
+	nsResource   = schema.GroupResource{Resource: "ns"}
 	podResource  = schema.GroupResource{Resource: "pods"}
 )

@ -71,6 +72,7 @@ func newResourceQuery(cfg config.ResourceRule, mapper apimeta.RESTMapper) (resou
 		nodeQuery:      nodeQuery,
 		containerLabel: cfg.ContainerLabel,
 	}, nil
+
 }

 // resourceQuery represents query information for querying resource metrics for some resource,
@ -121,11 +123,12 @@ type nsQueryResults struct {
 }

 // GetPodMetrics implements the api.MetricsProvider interface.
-func (p *resourceProvider) GetPodMetrics(pods ...*metav1.PartialObjectMetadata) ([]metrics.PodMetrics, error) {
-	resMetrics := make([]metrics.PodMetrics, 0, len(pods))
+func (p *resourceProvider) GetPodMetrics(pods ...apitypes.NamespacedName) ([]api.TimeInfo, [][]metrics.ContainerMetrics, error) {
+	resTimes := make([]api.TimeInfo, len(pods))
+	resMetrics := make([][]metrics.ContainerMetrics, len(pods))

 	if len(pods) == 0 {
-		return resMetrics, nil
+		return resTimes, resMetrics, nil
 	}

 	// TODO(directxman12): figure out how well this scales if we go to list 1000+ pods
@ -165,40 +168,37 @@ func (p *resourceProvider) GetPodMetrics(pods ...*metav1.PartialObjectMetadata)

 	// convert the unorganized per-container results into results grouped
 	// together by namespace, pod, and container
-	for _, pod := range pods {
-		podMetric := p.assignForPod(pod, resultsByNs)
-		if podMetric != nil {
-			resMetrics = append(resMetrics, *podMetric)
-		}
+	for i, pod := range pods {
+		p.assignForPod(pod, resultsByNs, &resMetrics[i], &resTimes[i])
 	}

-	return resMetrics, nil
+	return resTimes, resMetrics, nil
 }

 // assignForPod takes the resource metrics for all containers in the given pod
 // from resultsByNs, and places them in MetricsProvider response format in resMetrics,
 // also recording the earliest time in resTime.  It will return without operating if
 // any data is missing.
-func (p *resourceProvider) assignForPod(pod *metav1.PartialObjectMetadata, resultsByNs map[string]nsQueryResults) *metrics.PodMetrics {
+func (p *resourceProvider) assignForPod(pod apitypes.NamespacedName, resultsByNs map[string]nsQueryResults, resMetrics *[]metrics.ContainerMetrics, resTime *api.TimeInfo) {
 	// check to make sure everything is present
 	nsRes, nsResPresent := resultsByNs[pod.Namespace]
 	if !nsResPresent {
 		klog.Errorf("unable to fetch metrics for pods in namespace %q, skipping pod %s", pod.Namespace, pod.String())
-		return nil
+		return
 	}
 	cpuRes, hasResult := nsRes.cpu[pod.Name]
 	if !hasResult {
 		klog.Errorf("unable to fetch CPU metrics for pod %s, skipping", pod.String())
-		return nil
+		return
 	}
 	memRes, hasResult := nsRes.mem[pod.Name]
 	if !hasResult {
 		klog.Errorf("unable to fetch memory metrics for pod %s, skipping", pod.String())
-		return nil
+		return
 	}

+	earliestTs := pmodel.Latest
 	containerMetrics := make(map[string]metrics.ContainerMetrics)
-	earliestTS := pmodel.Latest

 	// organize all the CPU results
 	for _, cpu := range cpuRes {
@ -210,8 +210,8 @@ func (p *resourceProvider) assignForPod(pod *metav1.PartialObjectMetadata, resul
 			}
 		}
 		containerMetrics[containerName].Usage[corev1.ResourceCPU] = *resource.NewMilliQuantity(int64(cpu.Value*1000.0), resource.DecimalSI)
-		if cpu.Timestamp.Before(earliestTS) {
-			earliestTS = cpu.Timestamp
+		if cpu.Timestamp.Before(earliestTs) {
+			earliestTs = cpu.Timestamp
 		}
 	}

@ -225,8 +225,8 @@ func (p *resourceProvider) assignForPod(pod *metav1.PartialObjectMetadata, resul
 			}
 		}
 		containerMetrics[containerName].Usage[corev1.ResourceMemory] = *resource.NewMilliQuantity(int64(mem.Value*1000.0), resource.BinarySI)
-		if mem.Timestamp.Before(earliestTS) {
-			earliestTS = mem.Timestamp
+		if mem.Timestamp.Before(earliestTs) {
+			earliestTs = mem.Timestamp
 		}
 	}

@ -241,50 +241,40 @@ func (p *resourceProvider) assignForPod(pod *metav1.PartialObjectMetadata, resul
 		}
 	}

-	podMetric := &metrics.PodMetrics{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:              pod.Name,
-			Namespace:         pod.Namespace,
-			Labels:            pod.Labels,
-			CreationTimestamp: metav1.Now(),
-		},
-		// store the time in the final format
-		Timestamp: metav1.NewTime(earliestTS.Time()),
-		Window:    metav1.Duration{Duration: p.window},
+	// store the time in the final format
+	*resTime = api.TimeInfo{
+		Timestamp: earliestTs.Time(),
+		Window:    p.window,
 	}

 	// store the container metrics in the final format
-	podMetric.Containers = make([]metrics.ContainerMetrics, 0, len(containerMetrics))
+	containerMetricsList := make([]metrics.ContainerMetrics, 0, len(containerMetrics))
 	for _, containerMetric := range containerMetrics {
-		podMetric.Containers = append(podMetric.Containers, containerMetric)
+		containerMetricsList = append(containerMetricsList, containerMetric)
 	}
-
-	return podMetric
+	*resMetrics = containerMetricsList
 }

 // GetNodeMetrics implements the api.MetricsProvider interface.
-func (p *resourceProvider) GetNodeMetrics(nodes ...*corev1.Node) ([]metrics.NodeMetrics, error) {
-	resMetrics := make([]metrics.NodeMetrics, 0, len(nodes))
+func (p *resourceProvider) GetNodeMetrics(nodes ...string) ([]api.TimeInfo, []corev1.ResourceList, error) {
+	resTimes := make([]api.TimeInfo, len(nodes))
+	resMetrics := make([]corev1.ResourceList, len(nodes))

 	if len(nodes) == 0 {
-		return resMetrics, nil
+		return resTimes, resMetrics, nil
 	}

 	now := pmodel.Now()
-	nodeNames := make([]string, 0, len(nodes))
-	for _, node := range nodes {
-		nodeNames = append(nodeNames, node.Name)
-	}

 	// run the actual query
-	qRes := p.queryBoth(now, nodeResource, "", nodeNames...)
+	qRes := p.queryBoth(now, nodeResource, "", nodes...)
 	if qRes.err != nil {
 		klog.Errorf("failed querying node metrics: %v", qRes.err)
-		return resMetrics, nil
+		return resTimes, resMetrics, nil
 	}

 	// organize the results
-	for i, nodeName := range nodeNames {
+	for i, nodeName := range nodes {
 		// skip if any data is missing
 		rawCPUs, gotResult := qRes.cpu[nodeName]
 		if !gotResult {
@ -300,30 +290,28 @@ func (p *resourceProvider) GetNodeMetrics(nodes ...*corev1.Node) ([]metrics.Node
 		rawMem := rawMems[0]
 		rawCPU := rawCPUs[0]

-		// use the earliest timestamp available (in order to be conservative
-		// when determining if metrics are tainted by startup)
-		ts := rawCPU.Timestamp.Time()
-		if ts.After(rawMem.Timestamp.Time()) {
-			ts = rawMem.Timestamp.Time()
+		// store the results
+		resMetrics[i] = corev1.ResourceList{
+			corev1.ResourceCPU:    *resource.NewMilliQuantity(int64(rawCPU.Value*1000.0), resource.DecimalSI),
+			corev1.ResourceMemory: *resource.NewMilliQuantity(int64(rawMem.Value*1000.0), resource.BinarySI),
 		}

-		// store the results
-		resMetrics = append(resMetrics, metrics.NodeMetrics{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:              nodes[i].Name,
-				Labels:            nodes[i].Labels,
-				CreationTimestamp: metav1.Now(),
-			},
-			Usage: corev1.ResourceList{
-				corev1.ResourceCPU:    *resource.NewMilliQuantity(int64(rawCPU.Value*1000.0), resource.DecimalSI),
-				corev1.ResourceMemory: *resource.NewMilliQuantity(int64(rawMem.Value*1000.0), resource.BinarySI),
-			},
-			Timestamp: metav1.NewTime(ts),
-			Window:    metav1.Duration{Duration: p.window},
-		})
+		// use the earliest timestamp available (in order to be conservative
+		// when determining if metrics are tainted by startup)
+		if rawMem.Timestamp.Before(rawCPU.Timestamp) {
+			resTimes[i] = api.TimeInfo{
+				Timestamp: rawMem.Timestamp.Time(),
+				Window:    p.window,
+			}
+		} else {
+			resTimes[i] = api.TimeInfo{
+				Timestamp: rawCPU.Timestamp.Time(),
+				Window:    1 * time.Minute,
+			}
+		}
 	}

-	return resMetrics, nil
+	return resTimes, resMetrics, nil
 }

 // queryBoth queries for both CPU and memory metrics on the given
--- a/pkg/resourceprovider/provider_test.go
+++ b/pkg/resourceprovider/provider_test.go
@ -23,9 +23,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/api/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/metrics/pkg/apis/metrics"

 	"sigs.k8s.io/metrics-server/pkg/api"
@ -122,10 +122,10 @@ var _ = Describe("Resource Metrics Provider", func() {
 	})

 	It("should be able to list metrics pods across different namespaces", func() {
-		pods := []*metav1.PartialObjectMetadata{
-			{ObjectMeta: metav1.ObjectMeta{Namespace: "some-ns", Name: "pod1"}},
-			{ObjectMeta: metav1.ObjectMeta{Namespace: "some-ns", Name: "pod3"}},
-			{ObjectMeta: metav1.ObjectMeta{Namespace: "other-ns", Name: "pod27"}},
+		pods := []types.NamespacedName{
+			{Namespace: "some-ns", Name: "pod1"},
+			{Namespace: "some-ns", Name: "pod3"},
+			{Namespace: "other-ns", Name: "pod27"},
 		}
 		fakeProm.QueryResults = map[prom.Selector]prom.QueryResult{
 			mustBuild(cpuQueries.contQuery.Build("", podResource, "some-ns", []string{cpuQueries.containerLabel}, labels.Everything(), "pod1", "pod3")): buildQueryRes("container_cpu_usage_seconds_total",
@ -149,34 +149,28 @@ var _ = Describe("Resource Metrics Provider", func() {
 		}

 		By("querying for metrics for some pods")
-		podMetrics, err := prov.GetPodMetrics(pods...)
+		times, metricVals, err := prov.GetPodMetrics(pods...)
 		Expect(err).NotTo(HaveOccurred())

-		By("verifying that metrics have been fetched for all the pods")
-		Expect(podMetrics).To(HaveLen(3))
-
 		By("verifying that the reported times for each are the earliest times for each pod")
-		Expect(podMetrics[0].Timestamp.Time).To(Equal(pmodel.Time(10).Time()))
-		Expect(podMetrics[0].Window.Duration).To(Equal(time.Minute))
-
-		Expect(podMetrics[1].Timestamp.Time).To(Equal(pmodel.Time(10).Time()))
-		Expect(podMetrics[1].Window.Duration).To(Equal(time.Minute))
-
-		Expect(podMetrics[2].Timestamp.Time).To(Equal(pmodel.Time(270).Time()))
-		Expect(podMetrics[2].Window.Duration).To(Equal(time.Minute))
+		Expect(times).To(Equal([]api.TimeInfo{
+			{Timestamp: pmodel.Time(10).Time(), Window: 1 * time.Minute},
+			{Timestamp: pmodel.Time(10).Time(), Window: 1 * time.Minute},
+			{Timestamp: pmodel.Time(270).Time(), Window: 1 * time.Minute},
+		}))

 		By("verifying that the right metrics were fetched")
-		Expect(podMetrics).To(HaveLen(3))
-		Expect(podMetrics[0].Containers).To(ConsistOf(
+		Expect(metricVals).To(HaveLen(3))
+		Expect(metricVals[0]).To(ConsistOf(
 			metrics.ContainerMetrics{Name: "cont1", Usage: buildResList(1100.0, 3100.0)},
 			metrics.ContainerMetrics{Name: "cont2", Usage: buildResList(1110.0, 3110.0)},
 		))
-		Expect(podMetrics[1].Containers).To(ConsistOf(
+		Expect(metricVals[1]).To(ConsistOf(
 			metrics.ContainerMetrics{Name: "cont1", Usage: buildResList(1300.0, 3300.0)},
 			metrics.ContainerMetrics{Name: "cont2", Usage: buildResList(1310.0, 3310.0)},
 		))

-		Expect(podMetrics[2].Containers).To(ConsistOf(
+		Expect(metricVals[2]).To(ConsistOf(
 			metrics.ContainerMetrics{Name: "cont1", Usage: buildResList(2200.0, 4200.0)},
 		))
 	})
@ -194,22 +188,23 @@ var _ = Describe("Resource Metrics Provider", func() {
 		}

 		By("querying for metrics for some pods, one of which is missing")
-		podMetrics, err := prov.GetPodMetrics(
-			&metav1.PartialObjectMetadata{ObjectMeta: metav1.ObjectMeta{Namespace: "some-ns", Name: "pod1"}},
-			&metav1.PartialObjectMetadata{ObjectMeta: metav1.ObjectMeta{Namespace: "some-ns", Name: "pod-nonexistant"}},
+		times, metricVals, err := prov.GetPodMetrics(
+			types.NamespacedName{Namespace: "some-ns", Name: "pod1"},
+			types.NamespacedName{Namespace: "some-ns", Name: "pod-nonexistant"},
 		)
 		Expect(err).NotTo(HaveOccurred())

-		By("verifying that the missing pod had no metrics")
-		Expect(podMetrics).To(HaveLen(1))
+		By("verifying that the missing pod had nil metrics")
+		Expect(metricVals).To(HaveLen(2))
+		Expect(metricVals[1]).To(BeNil())

 		By("verifying that the rest of time metrics and times are correct")
-		Expect(podMetrics[0].Timestamp.Time).To(Equal(pmodel.Time(10).Time()))
-		Expect(podMetrics[0].Window.Duration).To(Equal(time.Minute))
-		Expect(podMetrics[0].Containers).To(ConsistOf(
+		Expect(metricVals[0]).To(ConsistOf(
 			metrics.ContainerMetrics{Name: "cont1", Usage: buildResList(1100.0, 3100.0)},
 			metrics.ContainerMetrics{Name: "cont2", Usage: buildResList(1110.0, 3110.0)},
 		))
+		Expect(times).To(HaveLen(2))
+		Expect(times[0]).To(Equal(api.TimeInfo{Timestamp: pmodel.Time(10).Time(), Window: 1 * time.Minute}))
 	})

 	It("should return metrics of value zero when pod metrics have NaN or negative values", func() {
@ -229,27 +224,25 @@ var _ = Describe("Resource Metrics Provider", func() {
 		}

 		By("querying for metrics for some pods")
-		podMetrics, err := prov.GetPodMetrics(
-			&metav1.PartialObjectMetadata{ObjectMeta: metav1.ObjectMeta{Namespace: "some-ns", Name: "pod1"}},
-			&metav1.PartialObjectMetadata{ObjectMeta: metav1.ObjectMeta{Namespace: "some-ns", Name: "pod3"}},
+		times, metricVals, err := prov.GetPodMetrics(
+			types.NamespacedName{Namespace: "some-ns", Name: "pod1"},
+			types.NamespacedName{Namespace: "some-ns", Name: "pod3"},
 		)
 		Expect(err).NotTo(HaveOccurred())

-		By("verifying that metrics have been fetched for all the pods")
-		Expect(podMetrics).To(HaveLen(2))
-
 		By("verifying that the reported times for each are the earliest times for each pod")
-		Expect(podMetrics[0].Timestamp.Time).To(Equal(pmodel.Time(10).Time()))
-		Expect(podMetrics[0].Window.Duration).To(Equal(time.Minute))
-		Expect(podMetrics[1].Timestamp.Time).To(Equal(pmodel.Time(10).Time()))
-		Expect(podMetrics[1].Window.Duration).To(Equal(time.Minute))
+		Expect(times).To(Equal([]api.TimeInfo{
+			{Timestamp: pmodel.Time(10).Time(), Window: 1 * time.Minute},
+			{Timestamp: pmodel.Time(10).Time(), Window: 1 * time.Minute},
+		}))

 		By("verifying that NaN and negative values were replaced by zero")
-		Expect(podMetrics[0].Containers).To(ConsistOf(
+		Expect(metricVals).To(HaveLen(2))
+		Expect(metricVals[0]).To(ConsistOf(
 			metrics.ContainerMetrics{Name: "cont1", Usage: buildResList(0, 3100.0)},
 			metrics.ContainerMetrics{Name: "cont2", Usage: buildResList(0, 0)},
 		))
-		Expect(podMetrics[1].Containers).To(ConsistOf(
+		Expect(metricVals[1]).To(ConsistOf(
 			metrics.ContainerMetrics{Name: "cont1", Usage: buildResList(0, 0)},
 			metrics.ContainerMetrics{Name: "cont2", Usage: buildResList(1310.0, 0)},
 		))
@ -267,24 +260,20 @@ var _ = Describe("Resource Metrics Provider", func() {
 			),
 		}
 		By("querying for metrics for some nodes")
-		nodeMetrics, err := prov.GetNodeMetrics(
-			&corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: "node1"}},
-			&corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: "node2"}},
-		)
+		times, metricVals, err := prov.GetNodeMetrics("node1", "node2")
 		Expect(err).NotTo(HaveOccurred())

-		By("verifying that metrics have been fetched for all the nodes")
-		Expect(nodeMetrics).To(HaveLen(2))
-
-		By("verifying that the reported times for each are the earliest times for each node")
-		Expect(nodeMetrics[0].Timestamp.Time).To(Equal(pmodel.Time(10).Time()))
-		Expect(nodeMetrics[0].Window.Duration).To(Equal(time.Minute))
-		Expect(nodeMetrics[1].Timestamp.Time).To(Equal(pmodel.Time(12).Time()))
-		Expect(nodeMetrics[1].Window.Duration).To(Equal(time.Minute))
+		By("verifying that the reported times for each are the earliest times for each pod")
+		Expect(times).To(Equal([]api.TimeInfo{
+			{Timestamp: pmodel.Time(10).Time(), Window: 1 * time.Minute},
+			{Timestamp: pmodel.Time(12).Time(), Window: 1 * time.Minute},
+		}))

 		By("verifying that the right metrics were fetched")
-		Expect(nodeMetrics[0].Usage).To(Equal(buildResList(1100.0, 2100.0)))
-		Expect(nodeMetrics[1].Usage).To(Equal(buildResList(1200.0, 2200.0)))
+		Expect(metricVals).To(Equal([]corev1.ResourceList{
+			buildResList(1100.0, 2100.0),
+			buildResList(1200.0, 2200.0),
+		}))
 	})

 	It("should return nil metrics for missing nodes, but still return partial results", func() {
@ -299,23 +288,24 @@ var _ = Describe("Resource Metrics Provider", func() {
 			),
 		}
 		By("querying for metrics for some nodes, one of which is missing")
-		nodeMetrics, err := prov.GetNodeMetrics(
-			&corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: "node1"}},
-			&corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: "node2"}},
-			&corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: "node3"}},
-		)
+		times, metricVals, err := prov.GetNodeMetrics("node1", "node2", "node3")
 		Expect(err).NotTo(HaveOccurred())

-		By("verifying that the missing pod had no metrics")
-		Expect(nodeMetrics).To(HaveLen(2))
+		By("verifying that the missing pod had nil metrics")
+		Expect(metricVals).To(HaveLen(3))
+		Expect(metricVals[2]).To(BeNil())

 		By("verifying that the rest of time metrics and times are correct")
-		Expect(nodeMetrics[0].Usage).To(Equal(buildResList(1100.0, 2100.0)))
-		Expect(nodeMetrics[0].Timestamp.Time).To(Equal(pmodel.Time(10).Time()))
-		Expect(nodeMetrics[0].Window.Duration).To(Equal(time.Minute))
-		Expect(nodeMetrics[1].Usage).To(Equal(buildResList(1200.0, 2200.0)))
-		Expect(nodeMetrics[1].Timestamp.Time).To(Equal(pmodel.Time(12).Time()))
-		Expect(nodeMetrics[1].Window.Duration).To(Equal(time.Minute))
+		Expect(metricVals).To(Equal([]corev1.ResourceList{
+			buildResList(1100.0, 2100.0),
+			buildResList(1200.0, 2200.0),
+			nil,
+		}))
+		Expect(times).To(Equal([]api.TimeInfo{
+			{Timestamp: pmodel.Time(10).Time(), Window: 1 * time.Minute},
+			{Timestamp: pmodel.Time(12).Time(), Window: 1 * time.Minute},
+			{},
+		}))
 	})

 	It("should return metrics of value zero when node metrics have NaN or negative values", func() {
@ -330,23 +320,19 @@ var _ = Describe("Resource Metrics Provider", func() {
 			),
 		}
 		By("querying for metrics for some nodes")
-		nodeMetrics, err := prov.GetNodeMetrics(
-			&corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: "node1"}},
-			&corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: "node2"}},
-		)
+		times, metricVals, err := prov.GetNodeMetrics("node1", "node2")
 		Expect(err).NotTo(HaveOccurred())

-		By("verifying that metrics have been fetched for all the nodes")
-		Expect(nodeMetrics).To(HaveLen(2))
-
 		By("verifying that the reported times for each are the earliest times for each pod")
-		Expect(nodeMetrics[0].Timestamp.Time).To(Equal(pmodel.Time(10).Time()))
-		Expect(nodeMetrics[0].Window.Duration).To(Equal(time.Minute))
-		Expect(nodeMetrics[1].Timestamp.Time).To(Equal(pmodel.Time(12).Time()))
-		Expect(nodeMetrics[1].Window.Duration).To(Equal(time.Minute))
+		Expect(times).To(Equal([]api.TimeInfo{
+			{Timestamp: pmodel.Time(10).Time(), Window: 1 * time.Minute},
+			{Timestamp: pmodel.Time(12).Time(), Window: 1 * time.Minute},
+		}))

 		By("verifying that NaN and negative values were replaced by zero")
-		Expect(nodeMetrics[0].Usage).To(Equal(buildResList(0, 2100.0)))
-		Expect(nodeMetrics[1].Usage).To(Equal(buildResList(1200.0, 0)))
+		Expect(metricVals).To(Equal([]corev1.ResourceList{
+			buildResList(0, 2100.0),
+			buildResList(1200.0, 0),
+		}))
 	})
 })
--- a/test/README.md
+++ b/test/README.md
@ -1,41 +0,0 @@
-# End-to-end tests
-
-## With [kind](https://kind.sigs.k8s.io/)
-
-[`kind`](https://kind.sigs.k8s.io/) and `kubectl` are automatically downloaded
-except if `SKIP_INSTALL=true` is set.
-A `kind` cluster is automatically created before the tests, and deleted after
-the tests.
-The `prometheus-adapter` container image is build locally and imported
-into the cluster.
-
-```bash
-KIND_E2E=true make test-e2e
-```
-
-## With an existing Kubernetes cluster
-
-If you already have a Kubernetes cluster, you can use:
-
-```bash
-KUBECONFIG="/path/to/kube/config" REGISTRY="my.registry/prefix" make test-e2e
-```
-
- The cluster should not have a namespace `prometheus-adapter-e2e`.
-  The namespace will be created and deleted as part of the E2E tests.
- `KUBECONFIG` is the path of the [`kubeconfig` file].
-  **Optional**, defaults to `${HOME}/.kube/config`
- `REGISTRY` is the image registry where the container image should be pushed.
-  **Required**.
-
-[`kubeconfig` file]: https://kubernetes.io/docs/concepts/configuration/organize-cluster-access-kubeconfig/
-
-## Additional environment variables
-
-These environment variables may also be used (with any non-empty value):
-
- `SKIP_INSTALL`: skip the installation of `kind` and `kubectl` binaries;
- `SKIP_CLEAN_AFTER`: skip the deletion of resources (`Kind` cluster or
-  Kubernetes namespace) and of the temporary directory `.e2e`;
- `CLEAN_BEFORE`: clean before running the tests, e.g. if `SKIP_CLEAN_AFTER`
-  was used on the previous run.
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@ -1,213 +0,0 @@
-/*
-Copyright 2022 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.
-*/
-
-package e2e
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"os"
-	"testing"
-	"time"
-
-	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
-	monitoring "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/wait"
-	clientset "k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/tools/clientcmd"
-	metricsv1beta1 "k8s.io/metrics/pkg/apis/metrics/v1beta1"
-	metrics "k8s.io/metrics/pkg/client/clientset/versioned"
-)
-
-const (
-	ns                 = "prometheus-adapter-e2e"
-	prometheusInstance = "prometheus"
-	deployment         = "prometheus-adapter"
-)
-
-var (
-	client        clientset.Interface
-	promOpClient  monitoring.Interface
-	metricsClient metrics.Interface
-)
-
-func TestMain(m *testing.M) {
-	kubeconfig := os.Getenv("KUBECONFIG")
-	if len(kubeconfig) == 0 {
-		log.Fatal("KUBECONFIG not provided")
-	}
-
-	var err error
-	client, promOpClient, metricsClient, err = initializeClients(kubeconfig)
-	if err != nil {
-		log.Fatalf("Cannot create clients: %v", err)
-	}
-
-	ctx := context.Background()
-	err = waitForPrometheusReady(ctx, ns, prometheusInstance)
-	if err != nil {
-		log.Fatalf("Prometheus instance 'prometheus' not ready: %v", err)
-	}
-	err = waitForDeploymentReady(ctx, ns, deployment)
-	if err != nil {
-		log.Fatalf("Deployment prometheus-adapter not ready: %v", err)
-	}
-
-	exitVal := m.Run()
-	os.Exit(exitVal)
-}
-
-func initializeClients(kubeconfig string) (clientset.Interface, monitoring.Interface, metrics.Interface, error) {
-	cfg, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
-	if err != nil {
-		return nil, nil, nil, fmt.Errorf("Error during client configuration with %v", err)
-	}
-
-	clientSet, err := clientset.NewForConfig(cfg)
-	if err != nil {
-		return nil, nil, nil, fmt.Errorf("Error during client creation with %v", err)
-	}
-
-	promOpClient, err := monitoring.NewForConfig(cfg)
-	if err != nil {
-		return nil, nil, nil, fmt.Errorf("Error during dynamic client creation with %v", err)
-	}
-
-	metricsClientSet, err := metrics.NewForConfig(cfg)
-	if err != nil {
-		return nil, nil, nil, fmt.Errorf("Error during metrics client creation with %v", err)
-	}
-
-	return clientSet, promOpClient, metricsClientSet, nil
-}
-
-func waitForPrometheusReady(ctx context.Context, namespace string, name string) error {
-	return wait.PollUntilContextTimeout(ctx, 5*time.Second, 120*time.Second, true, func(ctx context.Context) (bool, error) {
-		prom, err := promOpClient.MonitoringV1().Prometheuses(ns).Get(ctx, name, metav1.GetOptions{})
-		if err != nil {
-			return false, err
-		}
-
-		var reconciled, available *monitoringv1.Condition
-		for _, condition := range prom.Status.Conditions {
-			cond := condition
-			if cond.Type == monitoringv1.Reconciled {
-				reconciled = &cond
-			} else if cond.Type == monitoringv1.Available {
-				available = &cond
-			}
-		}
-
-		if reconciled == nil {
-			log.Printf("Prometheus instance '%s': Waiting for reconciliation status...", name)
-			return false, nil
-		}
-		if reconciled.Status != monitoringv1.ConditionTrue {
-			log.Printf("Prometheus instance '%s': Reconciiled = %v. Waiting for reconciliation (reason %s, %q)...", name, reconciled.Status, reconciled.Reason, reconciled.Message)
-			return false, nil
-		}
-
-		specReplicas := *prom.Spec.Replicas
-		availableReplicas := prom.Status.AvailableReplicas
-		if specReplicas != availableReplicas {
-			log.Printf("Prometheus instance '%s': %v/%v pods are ready. Waiting for all pods to be ready...", name, availableReplicas, specReplicas)
-			return false, err
-		}
-
-		if available == nil {
-			log.Printf("Prometheus instance '%s': Waiting for Available status...", name)
-			return false, nil
-		}
-		if available.Status != monitoringv1.ConditionTrue {
-			log.Printf("Prometheus instance '%s': Available = %v. Waiting for Available status... (reason %s, %q)", name, available.Status, available.Reason, available.Message)
-			return false, nil
-		}
-
-		log.Printf("Prometheus instance '%s': Ready.", name)
-		return true, nil
-	})
-}
-
-func waitForDeploymentReady(ctx context.Context, namespace string, name string) error {
-	return wait.PollUntilContextTimeout(ctx, 5*time.Second, 30*time.Second, true, func(ctx context.Context) (bool, error) {
-		sts, err := client.AppsV1().Deployments(namespace).Get(ctx, name, metav1.GetOptions{})
-		if err != nil {
-			return false, err
-		}
-		if sts.Status.ReadyReplicas == *sts.Spec.Replicas {
-			log.Printf("Deployment %s: %v/%v pods are ready.", name, sts.Status.ReadyReplicas, *sts.Spec.Replicas)
-			return true, nil
-		}
-		log.Printf("Deployment %s: %v/%v pods are ready. Waiting for all pods to be ready...", name, sts.Status.ReadyReplicas, *sts.Spec.Replicas)
-		return false, nil
-	})
-}
-
-func TestNodeMetrics(t *testing.T) {
-	ctx := context.Background()
-	var nodeMetrics *metricsv1beta1.NodeMetricsList
-	err := wait.PollUntilContextTimeout(ctx, 2*time.Second, 30*time.Second, true, func(ctx context.Context) (bool, error) {
-		var err error
-		nodeMetrics, err = metricsClient.MetricsV1beta1().NodeMetricses().List(ctx, metav1.ListOptions{})
-		if err != nil {
-			return false, err
-		}
-		nonEmptyNodeMetrics := len(nodeMetrics.Items) > 0
-		if !nonEmptyNodeMetrics {
-			t.Logf("Node metrics empty... Retrying.")
-		}
-		return nonEmptyNodeMetrics, nil
-	})
-	require.NoErrorf(t, err, "Node metrics should not be empty")
-
-	for _, nodeMetric := range nodeMetrics.Items {
-		positiveMemory := nodeMetric.Usage.Memory().CmpInt64(0)
-		assert.Positivef(t, positiveMemory, "Memory usage for node %s is %v, should be > 0", nodeMetric.Name, nodeMetric.Usage.Memory())
-
-		positiveCPU := nodeMetric.Usage.Cpu().CmpInt64(0)
-		assert.Positivef(t, positiveCPU, "CPU usage for node %s is %v, should be > 0", nodeMetric.Name, nodeMetric.Usage.Cpu())
-	}
-}
-
-func TestPodMetrics(t *testing.T) {
-	ctx := context.Background()
-	var podMetrics *metricsv1beta1.PodMetricsList
-	err := wait.PollUntilContextTimeout(ctx, 2*time.Second, 30*time.Second, true, func(ctx context.Context) (bool, error) {
-		var err error
-		podMetrics, err = metricsClient.MetricsV1beta1().PodMetricses(ns).List(ctx, metav1.ListOptions{})
-		if err != nil {
-			return false, err
-		}
-		nonEmptyNodeMetrics := len(podMetrics.Items) > 0
-		if !nonEmptyNodeMetrics {
-			t.Logf("Pod metrics empty... Retrying.")
-		}
-		return nonEmptyNodeMetrics, nil
-	})
-	require.NoErrorf(t, err, "Pod metrics should not be empty")
-
-	for _, pod := range podMetrics.Items {
-		for _, containerMetric := range pod.Containers {
-			positiveMemory := containerMetric.Usage.Memory().CmpInt64(0)
-			assert.Positivef(t, positiveMemory, "Memory usage for pod %s/%s is %v, should be > 0", pod.Name, containerMetric.Name, containerMetric.Usage.Memory())
-		}
-	}
-}
--- a/test/prometheus-manifests/cluster-role.yaml
+++ b/test/prometheus-manifests/cluster-role.yaml
@ -1,24 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: prometheus
-rules:
- apiGroups: [""]
-  resources:
-  - nodes
-  - nodes/metrics
-  - services
-  - endpoints
-  - pods
-  verbs: ["get", "list", "watch"]
- apiGroups: [""]
-  resources:
-  - configmaps
-  verbs: ["get"]
- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses
-  verbs: ["get", "list", "watch"]
- nonResourceURLs: ["/metrics"]
-  verbs: ["get"]
--- a/test/prometheus-manifests/prometheus.yaml
+++ b/test/prometheus-manifests/prometheus.yaml
@ -1,9 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: Prometheus
-metadata:
-  name: prometheus
-  namespace: prometheus-adapter-e2e
-spec:
-  replicas: 2
-  serviceAccountName: prometheus
-  serviceMonitorSelector: {}
--- a/test/prometheus-manifests/service-account.yaml
+++ b/test/prometheus-manifests/service-account.yaml
@ -1,5 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: prometheus
-  namespace: prometheus-adapter-e2e
--- a/test/prometheus-manifests/service-monitor-kubelet.yaml
+++ b/test/prometheus-manifests/service-monitor-kubelet.yaml
@ -1,25 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app.kubernetes.io/name: kubelet
-  name: kubelet
-  namespace: prometheus-adapter-e2e
-spec:
-  endpoints:
-  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
-    honorLabels: true
-    honorTimestamps: false
-    interval: 10s
-    path: /metrics/resource
-    port: https-metrics
-    scheme: https
-    tlsConfig:
-      insecureSkipVerify: true
-  jobLabel: app.kubernetes.io/name
-  namespaceSelector:
-    matchNames:
-    - kube-system
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: kubelet
--- a/test/prometheus-manifests/service.yaml
+++ b/test/prometheus-manifests/service.yaml
@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: prometheus
-  namespace: prometheus-adapter-e2e
-spec:
-  ports:
-  - name: web
-    port: 9090
-    targetPort: web
-  selector:
-    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/name: prometheus
-  sessionAffinity: ClientIP
--- a/test/run-e2e-tests.sh
+++ b/test/run-e2e-tests.sh
@ -1,134 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2022 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.
-
-set -x
-set -o errexit
-set -o nounset
-
-# Tool versions
-K8S_VERSION=${KUBERNETES_VERSION:-v1.30.0}   # cf https://hub.docker.com/r/kindest/node/tags
-KIND_VERSION=${KIND_VERSION:-v0.23.0}        # cf https://github.com/kubernetes-sigs/kind/releases
-PROM_OPERATOR_VERSION=${PROM_OPERATOR_VERSION:-v0.73.2} # cf https://github.com/prometheus-operator/prometheus-operator/releases
-
-# Variables; set to empty if unbound/empty
-REGISTRY=${REGISTRY:-}
-KIND_E2E=${KIND_E2E:-}
-SKIP_INSTALL=${SKIP_INSTALL:-}
-SKIP_CLEAN_AFTER=${SKIP_CLEAN_AFTER:-}
-CLEAN_BEFORE=${CLEAN_BEFORE:-}
-
-# KUBECONFIG - will be overriden if a cluster is deployed with Kind
-KUBECONFIG=${KUBECONFIG:-"${HOME}/.kube/config"}
-
-# A temporary directory used by the tests
-E2E_DIR="${PWD}/.e2e"
-
-# The namespace where prometheus-adapter is deployed
-NAMESPACE="prometheus-adapter-e2e"
-
-if [[ -z "${REGISTRY}" && -z "${KIND_E2E}" ]]; then
-    echo -e "Either REGISTRY or KIND_E2E should be set."
-    exit 1
-fi
-
-function clean {
-    if [[ -n "${KIND_E2E}" ]]; then
-        kind delete cluster || true
-    else
-        kubectl delete -f ./deploy/manifests || true
-        kubectl delete -f ./test/prometheus-manifests || true
-        kubectl delete namespace "${NAMESPACE}" || true
-    fi
-
-    rm -rf "${E2E_DIR}"
-}
-
-if [[ -n "${CLEAN_BEFORE}" ]]; then
-    clean
-fi
-
-function on_exit {
-    local error_code="$?"
-
-    echo "Obtaining prometheus-adapter pod logs..."
-    kubectl logs -l app.kubernetes.io/name=prometheus-adapter -n "${NAMESPACE}" || true
-
-    if [[ -z "${SKIP_CLEAN_AFTER}" ]]; then
-        clean
-    fi
-
-    test "${error_code}" == 0 && return;
-}
-trap on_exit EXIT
-
-if [[ -d "${E2E_DIR}" ]]; then
-    echo -e "${E2E_DIR} already exists."
-    exit 1
-fi
-mkdir -p "${E2E_DIR}"
-
-if [[ -n "${KIND_E2E}" ]]; then
-    # Install kubectl and kind, if we did not set SKIP_INSTALL
-    if [[ -z "${SKIP_INSTALL}" ]]; then
-        BIN="${E2E_DIR}/bin"
-        mkdir -p "${BIN}"
-        curl -Lo "${BIN}/kubectl" "https://dl.k8s.io/release/${K8S_VERSION}/bin/linux/amd64/kubectl" && chmod +x "${BIN}/kubectl"
-        curl -Lo "${BIN}/kind" "https://kind.sigs.k8s.io/dl/${KIND_VERSION}/kind-linux-amd64" && chmod +x "${BIN}/kind"
-        export PATH="${BIN}:${PATH}"
-    fi
-
-    kind create cluster --image "kindest/node:${K8S_VERSION}"
-
-    REGISTRY="localhost"
-
-    KUBECONFIG="${E2E_DIR}/kubeconfig"
-    kind get kubeconfig > "${KUBECONFIG}"
-fi
-
-# Create the test namespace
-kubectl create namespace "${NAMESPACE}"
-
-export REGISTRY
-IMAGE_NAME="${REGISTRY}/prometheus-adapter-$(go env GOARCH)"
-IMAGE_TAG="v$(cat VERSION)"
-
-if [[ -n "${KIND_E2E}" ]]; then
-    make container
-    kind load docker-image "${IMAGE_NAME}:${IMAGE_TAG}"
-else
-    make push
-fi
-
-# Install prometheus-operator
-kubectl apply -f "https://github.com/prometheus-operator/prometheus-operator/releases/download/${PROM_OPERATOR_VERSION}/bundle.yaml" --server-side
-
-# Install and setup prometheus
-kubectl apply -f ./test/prometheus-manifests --server-side
-
-# Customize prometheus-adapter manifests
-# TODO: use Kustomize or generate manifests from Jsonnet
-cp -r ./deploy/manifests "${E2E_DIR}/manifests"
-prom_url="http://prometheus.${NAMESPACE}.svc:9090/"
-sed -i -e "s|--prometheus-url=.*$|--prometheus-url=${prom_url}|g" "${E2E_DIR}/manifests/deployment.yaml"
-sed -i -e "s|image: .*$|image: ${IMAGE_NAME}:${IMAGE_TAG}|g" "${E2E_DIR}/manifests/deployment.yaml"
-find "${E2E_DIR}/manifests" -type f -exec sed -i -e "s|namespace: monitoring|namespace: ${NAMESPACE}|g" {} \;
-
-# Deploy prometheus-adapter
-kubectl apply -f "${E2E_DIR}/manifests" --server-side
-
-PROJECT_PREFIX="sigs.k8s.io/prometheus-adapter"
-export KUBECONFIG
-go test "${PROJECT_PREFIX}/test/e2e/" -v -count=1
 @ -1 +1 @@
 .12.0
 .8.4