Merge tag 'refs/tags/v0.12.0' into OCPBUGS-25164

Changes since v0.11.0 Improvements * Register and improve prometheus client http metrics that were previously unregistered (kubernetes-sigs#599, @bogo-y) * Add new flag to disable HTTP/2 (kubernetes-sigs#618, @machine424) * Bump Golang to 1.22.2, Kubernetes libraries to 1.30.0 and other dependencies to their latest version (kubernetes-sigs#659, @dgrisonnet) Bug fixes * Fix multi-arch image build (kubernetes-sigs#601, @dgrisonnet) Signed-off-by: Jayapriya Pai <[email protected]>
slashpai · Jun 12, 2024 · 39dd9c6 · 39dd9c6
2 parents a23fe28 + 17cef51
commit 39dd9c6
Show file tree

Hide file tree

Showing 22 changed files with 1,610 additions and 1,217 deletions.
diff --git a/Makefile b/Makefile
@@ -8,8 +8,8 @@ VERSION=$(shell cat VERSION)
 TAG_PREFIX=v
 TAG?=$(TAG_PREFIX)$(VERSION)
 
-GO_VERSION?=1.20.10
-GOLANGCI_VERSION?=1.53.2
+GO_VERSION?=1.22.2
+GOLANGCI_VERSION?=1.56.2
 
 .PHONY: all
 all: prometheus-adapter
@@ -109,4 +109,10 @@ verify-generated: update-generated
 .PHONY: update-generated
 update-generated:
 	go install -mod=readonly k8s.io/kube-openapi/cmd/openapi-gen
-	$(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
+	$(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"
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.11.2
+0.12.0
diff --git a/cmd/adapter/adapter.go b/cmd/adapter/adapter.go
@@ -29,9 +29,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
-	"k8s.io/apiserver/pkg/features"
 	genericapiserver "k8s.io/apiserver/pkg/server"
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/client-go/metadata"
 	"k8s.io/client-go/metadata/metadatainformer"
 	"k8s.io/client-go/rest"
@@ -271,11 +269,23 @@ func (cmd *PrometheusAdapter) addResourceMetricsAPI(promClient prom.Client, stop
 		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 {
 		return err
 	}
@@ -308,7 +318,7 @@ func main() {
 		cmd.OpenAPIConfig.Info.Version = "1.0.0"
 	}
 
-	if cmd.OpenAPIV3Config == nil && utilfeature.DefaultFeatureGate.Enabled(features.OpenAPIV3) {
+	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"

diff --git a/deploy/manifests/api-service.yaml b/deploy/manifests/api-service.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.11.2
+    app.kubernetes.io/version: 0.12.0
   name: v1beta1.metrics.k8s.io
 spec:
   group: metrics.k8s.io

diff --git a/deploy/manifests/cluster-role-aggregated-metrics-reader.yaml b/deploy/manifests/cluster-role-aggregated-metrics-reader.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.11.2
+    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"

diff --git a/deploy/manifests/cluster-role-binding-delegator.yaml b/deploy/manifests/cluster-role-binding-delegator.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.11.2
+    app.kubernetes.io/version: 0.12.0
   name: resource-metrics:system:auth-delegator
   namespace: monitoring
 roleRef:

diff --git a/deploy/manifests/cluster-role-binding.yaml b/deploy/manifests/cluster-role-binding.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.11.2
+    app.kubernetes.io/version: 0.12.0
   name: prometheus-adapter
   namespace: monitoring
 roleRef:

diff --git a/deploy/manifests/cluster-role-metrics-server-resources.yaml b/deploy/manifests/cluster-role-metrics-server-resources.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.11.2
+    app.kubernetes.io/version: 0.12.0
   name: resource-metrics-server-resources
 rules:
 - apiGroups:

diff --git a/deploy/manifests/cluster-role.yaml b/deploy/manifests/cluster-role.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.11.2
+    app.kubernetes.io/version: 0.12.0
   name: prometheus-adapter
 rules:
 - apiGroups:

diff --git a/deploy/manifests/config-map.yaml b/deploy/manifests/config-map.yaml
@@ -48,6 +48,6 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.11.2
+    app.kubernetes.io/version: 0.12.0
   name: adapter-config
   namespace: monitoring
diff --git a/deploy/manifests/deployment.yaml b/deploy/manifests/deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.11.2
+    app.kubernetes.io/version: 0.12.0
   name: prometheus-adapter
   namespace: monitoring
 spec:
@@ -22,7 +22,7 @@ spec:
       labels:
         app.kubernetes.io/component: metrics-adapter
         app.kubernetes.io/name: prometheus-adapter
-        app.kubernetes.io/version: 0.11.2
+        app.kubernetes.io/version: 0.12.0
     spec:
       automountServiceAccountToken: true
       containers:
@@ -33,7 +33,7 @@ spec:
         - --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.11.2
+        image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.12.0
         livenessProbe:
           failureThreshold: 5
           httpGet:

diff --git a/deploy/manifests/network-policy.yaml b/deploy/manifests/network-policy.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.11.2
+    app.kubernetes.io/version: 0.12.0
   name: prometheus-adapter
   namespace: monitoring
 spec:

diff --git a/deploy/manifests/pod-disruption-budget.yaml b/deploy/manifests/pod-disruption-budget.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.11.2
+    app.kubernetes.io/version: 0.12.0
   name: prometheus-adapter
   namespace: monitoring
 spec:

diff --git a/deploy/manifests/role-binding-auth-reader.yaml b/deploy/manifests/role-binding-auth-reader.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.11.2
+    app.kubernetes.io/version: 0.12.0
   name: resource-metrics-auth-reader
   namespace: kube-system
 roleRef:

diff --git a/deploy/manifests/service-account.yaml b/deploy/manifests/service-account.yaml
@@ -5,6 +5,6 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.11.2
+    app.kubernetes.io/version: 0.12.0
   name: prometheus-adapter
   namespace: monitoring
diff --git a/deploy/manifests/service.yaml b/deploy/manifests/service.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: metrics-adapter
     app.kubernetes.io/name: prometheus-adapter
-    app.kubernetes.io/version: 0.11.2
+    app.kubernetes.io/version: 0.12.0
   name: prometheus-adapter
   namespace: monitoring
 spec: