Update HPA to autoscaling/v2 apiVersion (#551)

adidenko · web-flow · commit c4a1e08fdfbb · 2023-05-03T23:01:19.000+02:00
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Here's an example of a `HorizontalPodAutoscaler` resource configured to get
 `requests-per-second` metrics from each pod of the deployment `myapp`.
 
 ```yaml
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: myapp-hpa
@@ -54,10 +54,8 @@ policy](https://kubernetes.io/docs/setup/release/version-skew-policy/) offered
 for Kubernetes, this project aims to support the latest three minor releases of
 Kubernetes.
 
-The default supported API is `autoscaling/v2beta2` (available since `v1.12`).
-This API MUST be available in the cluster which is the default. However for
-GKE, this requires GKE v1.15.7 according to this [GKE
-Issue](https://issuetracker.google.com/issues/135624588).
+The default supported API is `autoscaling/v2` (available since `v1.23`).
+This API MUST be available in the cluster which is the default.
 
 ## Building
 
@@ -99,7 +97,7 @@ This is an example of using the pod collector to collect metrics from a json
 metrics endpoint of each pod matched by the HPA.
 
 ```yaml
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: myapp-hpa
@@ -219,7 +217,7 @@ with the result of the query.
 This allows having multiple prometheus queries associated with a single HPA.
 
 ```yaml
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: myapp-hpa
@@ -331,7 +329,7 @@ This is an example of an HPA that will scale based on `requests-per-second` for
 an ingress called `myapp`.
 
 ```yaml
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: myapp-hpa
@@ -365,7 +363,7 @@ This is an example of an HPA that will scale based on `requests-per-second` for
 a routegroup called `myapp`.
 
 ```yaml
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: myapp-hpa
@@ -426,7 +424,7 @@ the query name which will be associated with the result of the query.  This
 allows having multiple flux queries associated with a single HPA.
 
 ```yaml
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: myapp-hpa
@@ -514,7 +512,7 @@ This is an example of an HPA that will scale based on the length of an SQS
 queue.
 
 ```yaml
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: myapp-hpa
@@ -566,7 +564,7 @@ This is an example of an HPA that will scale based on the specified value
 exposed by a ZMON check with id `1234`.
 
 ```yaml
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: myapp-hpa
@@ -663,7 +661,7 @@ This is an example of using the HTTP collector to collect metrics from a json
 metrics endpoint specified in the annotations.
 
 ```yaml
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: myapp-hpa
@@ -830,7 +828,7 @@ An HPA can reference the deployed `ClusterScalingSchedule` object as
 this example:
 
 ```yaml
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: "myapp-hpa"
diff --git a/pkg/annotations/parser.go b/pkg/annotations/parser.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 )
 
 const (
diff --git a/pkg/annotations/parser_test.go b/pkg/annotations/parser_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 )
 
 func TestParser(t *testing.T) {
diff --git a/pkg/collector/aws_collector.go b/pkg/collector/aws_collector.go
@@ -9,7 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/sqs"
 	"github.com/aws/aws-sdk-go/service/sqs/sqsiface"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/metrics/pkg/apis/external_metrics"
diff --git a/pkg/collector/collector.go b/pkg/collector/collector.go
@@ -6,7 +6,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"github.com/zalando-incubator/kube-metrics-adapter/pkg/annotations"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	"k8s.io/metrics/pkg/apis/custom_metrics"
 	"k8s.io/metrics/pkg/apis/external_metrics"
 )
diff --git a/pkg/collector/collector_test.go b/pkg/collector/collector_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/pkg/collector/http_collector.go b/pkg/collector/http_collector.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/zalando-incubator/kube-metrics-adapter/pkg/collector/httpmetrics"
 
-	"k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/metrics/pkg/apis/external_metrics"
@@ -26,7 +26,7 @@ func NewHTTPCollectorPlugin() (*HTTPCollectorPlugin, error) {
 	return &HTTPCollectorPlugin{}, nil
 }
 
-func (p *HTTPCollectorPlugin) NewCollector(hpa *v2beta2.HorizontalPodAutoscaler, config *MetricConfig, interval time.Duration) (Collector, error) {
+func (p *HTTPCollectorPlugin) NewCollector(hpa *autoscalingv2.HorizontalPodAutoscaler, config *MetricConfig, interval time.Duration) (Collector, error) {
 	collector := &HTTPCollector{
 		namespace: hpa.Namespace,
 	}
@@ -73,9 +73,9 @@ type HTTPCollector struct {
 	endpoint      *url.URL
 	interval      time.Duration
 	namespace     string
-	metricType    v2beta2.MetricSourceType
+	metricType    autoscalingv2.MetricSourceType
 	metricsGetter *httpmetrics.JSONPathMetricsGetter
-	metric        v2beta2.MetricIdentifier
+	metric        autoscalingv2.MetricIdentifier
 }
 
 func (c *HTTPCollector) GetMetrics() ([]CollectedMetric, error) {
diff --git a/pkg/collector/http_collector_test.go b/pkg/collector/http_collector_test.go
@@ -7,8 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"k8s.io/api/autoscaling/v2beta2"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -81,8 +80,8 @@ func TestHTTPCollector(t *testing.T) {
 func makeTestHTTPCollectorConfig(endpoint, aggregator string) *MetricConfig {
 	config := &MetricConfig{
 		MetricTypeName: MetricTypeName{
-			Type: v2beta2.ExternalMetricSourceType,
-			Metric: v2beta2.MetricIdentifier{
+			Type: autoscalingv2.ExternalMetricSourceType,
+			Metric: autoscalingv2.MetricIdentifier{
 				Name: "test-metric",
 				Selector: &v1.LabelSelector{
 					MatchLabels: map[string]string{"type": HTTPJSONPathType},
diff --git a/pkg/collector/influxdb_collector.go b/pkg/collector/influxdb_collector.go
@@ -6,8 +6,7 @@ import (
 	"time"
 
 	"github.com/influxdata/influxdb-client-go"
-	"k8s.io/api/autoscaling/v2beta2"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
@@ -39,7 +38,7 @@ func NewInfluxDBCollectorPlugin(client kubernetes.Interface, address, token, org
 	}, nil
 }
 
-func (p *InfluxDBCollectorPlugin) NewCollector(hpa *v2beta2.HorizontalPodAutoscaler, config *MetricConfig, interval time.Duration) (Collector, error) {
+func (p *InfluxDBCollectorPlugin) NewCollector(hpa *autoscalingv2.HorizontalPodAutoscaler, config *MetricConfig, interval time.Duration) (Collector, error) {
 	return NewInfluxDBCollector(hpa, p.address, p.token, p.org, config, interval)
 }
 
@@ -56,7 +55,7 @@ type InfluxDBCollector struct {
 	namespace      string
 }
 
-func NewInfluxDBCollector(hpa *v2beta2.HorizontalPodAutoscaler, address string, token string, org string, config *MetricConfig, interval time.Duration) (*InfluxDBCollector, error) {
+func NewInfluxDBCollector(hpa *autoscalingv2.HorizontalPodAutoscaler, address string, token string, org string, config *MetricConfig, interval time.Duration) (*InfluxDBCollector, error) {
 	collector := &InfluxDBCollector{
 		interval:   interval,
 		metric:     config.Metric,
diff --git a/pkg/collector/influxdb_collector_test.go b/pkg/collector/influxdb_collector_test.go
@@ -5,8 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/api/autoscaling/v2beta2"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -20,8 +19,8 @@ func TestInfluxDBCollector_New(t *testing.T) {
 	t.Run("simple", func(t *testing.T) {
 		m := &MetricConfig{
 			MetricTypeName: MetricTypeName{
-				Type: v2beta2.ExternalMetricSourceType,
-				Metric: v2beta2.MetricIdentifier{
+				Type: autoscalingv2.ExternalMetricSourceType,
+				Metric: autoscalingv2.MetricIdentifier{
 					Name: "flux-query",
 					// This is actually useless, because the selector should be flattened in Config when parsing.
 					Selector: &v1.LabelSelector{
@@ -59,8 +58,8 @@ func TestInfluxDBCollector_New(t *testing.T) {
 	t.Run("override params", func(t *testing.T) {
 		m := &MetricConfig{
 			MetricTypeName: MetricTypeName{
-				Type: v2beta2.ExternalMetricSourceType,
-				Metric: v2beta2.MetricIdentifier{
+				Type: autoscalingv2.ExternalMetricSourceType,
+				Metric: autoscalingv2.MetricIdentifier{
 					Name: "flux-query",
 					Selector: &v1.LabelSelector{
 						MatchLabels: map[string]string{
@@ -107,15 +106,15 @@ func TestInfluxDBCollector_New(t *testing.T) {
 		{
 			name: "object metric",
 			mTypeName: MetricTypeName{
-				Type: v2beta2.ObjectMetricSourceType,
+				Type: autoscalingv2.ObjectMetricSourceType,
 			},
 			errorStartsWith: "InfluxDB does not support object",
 		},
 		{
 			name: "no selector",
 			mTypeName: MetricTypeName{
-				Type: v2beta2.ExternalMetricSourceType,
-				Metric: v2beta2.MetricIdentifier{
+				Type: autoscalingv2.ExternalMetricSourceType,
+				Metric: autoscalingv2.MetricIdentifier{
 					Name: "flux-query",
 				},
 			},
@@ -130,8 +129,8 @@ func TestInfluxDBCollector_New(t *testing.T) {
 		{
 			name: "referencing non-existing query",
 			mTypeName: MetricTypeName{
-				Type: v2beta2.ExternalMetricSourceType,
-				Metric: v2beta2.MetricIdentifier{
+				Type: autoscalingv2.ExternalMetricSourceType,
+				Metric: autoscalingv2.MetricIdentifier{
 					Name: "flux-query",
 				},
 			},
diff --git a/pkg/collector/pod_collector.go b/pkg/collector/pod_collector.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	log "github.com/sirupsen/logrus"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/collector/pod_collector_test.go b/pkg/collector/pod_collector_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	appsv1 "k8s.io/api/apps/v1"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
@@ -280,7 +280,7 @@ func makeTestHPA(t *testing.T, client kubernetes.Interface) *autoscalingv2.Horiz
 			},
 		},
 	}
-	_, err := client.AutoscalingV2beta2().HorizontalPodAutoscalers("test-namespace").Create(context.TODO(), hpa, v1.CreateOptions{})
+	_, err := client.AutoscalingV2().HorizontalPodAutoscalers("test-namespace").Create(context.TODO(), hpa, v1.CreateOptions{})
 	require.NoError(t, err)
 	return hpa
 }
diff --git a/pkg/collector/prometheus_collector.go b/pkg/collector/prometheus_collector.go
@@ -10,7 +10,7 @@ import (
 	"github.com/prometheus/client_golang/api"
 	promv1 "github.com/prometheus/client_golang/api/prometheus/v1"
 	"github.com/prometheus/common/model"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
diff --git a/pkg/collector/prometheus_collector_test.go b/pkg/collector/prometheus_collector_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/pkg/collector/scaling_schedule_collector.go b/pkg/collector/scaling_schedule_collector.go
@@ -8,7 +8,7 @@ import (
 
 	v1 "github.com/zalando-incubator/kube-metrics-adapter/pkg/apis/zalando.org/v1"
 	scheduledscaling "github.com/zalando-incubator/kube-metrics-adapter/pkg/controller/scheduledscaling"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/metrics/pkg/apis/custom_metrics"
diff --git a/pkg/collector/scaling_schedule_collector_test.go b/pkg/collector/scaling_schedule_collector_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 	v1 "github.com/zalando-incubator/kube-metrics-adapter/pkg/apis/zalando.org/v1"
 	scheduledscaling "github.com/zalando-incubator/kube-metrics-adapter/pkg/controller/scheduledscaling"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/pkg/collector/skipper_collector.go b/pkg/collector/skipper_collector.go
@@ -12,7 +12,7 @@ import (
 
 	rgv1 "github.com/szuecs/routegroup-client/apis/zalando.org/v1"
 	rginterface "github.com/szuecs/routegroup-client/client/clientset/versioned"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
diff --git a/pkg/collector/skipper_collector_test.go b/pkg/collector/skipper_collector_test.go
@@ -12,7 +12,7 @@ import (
 	rginterface "github.com/szuecs/routegroup-client/client/clientset/versioned"
 	rgfake "github.com/szuecs/routegroup-client/client/clientset/versioned/fake"
 	appsv1 "k8s.io/api/apps/v1"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 	netv1 "k8s.io/api/networking/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -35,7 +35,7 @@ func TestTargetRefReplicasDeployments(t *testing.T) {
 	require.NoError(t, err)
 
 	// Create an HPA with the deployment as ref
-	hpa, err := client.AutoscalingV2beta2().HorizontalPodAutoscalers(deployment.Namespace).
+	hpa, err := client.AutoscalingV2().HorizontalPodAutoscalers(deployment.Namespace).
 		Create(context.TODO(), newHPA(defaultNamespace, name, "Deployment"), metav1.CreateOptions{})
 	require.NoError(t, err)
 
@@ -52,7 +52,7 @@ func TestTargetRefReplicasStatefulSets(t *testing.T) {
 	require.NoError(t, err)
 
 	// Create an HPA with the statefulSet as ref
-	hpa, err := client.AutoscalingV2beta2().HorizontalPodAutoscalers(statefulSet.Namespace).
+	hpa, err := client.AutoscalingV2().HorizontalPodAutoscalers(statefulSet.Namespace).
 		Create(context.TODO(), newHPA(defaultNamespace, name, "StatefulSet"), metav1.CreateOptions{})
 	require.NoError(t, err)
 
diff --git a/pkg/collector/zmon_collector.go b/pkg/collector/zmon_collector.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/zalando-incubator/kube-metrics-adapter/pkg/zmon"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/metrics/pkg/apis/external_metrics"
diff --git a/pkg/collector/zmon_collector_test.go b/pkg/collector/zmon_collector_test.go
diff --git a/pkg/provider/hpa.go b/pkg/provider/hpa.go
diff --git a/pkg/provider/hpa_test.go b/pkg/provider/hpa_test.go
diff --git a/pkg/provider/metric_store.go b/pkg/provider/metric_store.go
diff --git a/pkg/provider/metric_store_test.go b/pkg/provider/metric_store_test.go

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"strings"`
`6`	`6`	`"time"`
`7`	`7`
`8`		`- autoscalingv2 "k8s.io/api/autoscaling/v2beta2"`
	`8`	`+ autoscalingv2 "k8s.io/api/autoscaling/v2"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`	`6`	`"github.com/stretchr/testify/require"`
`7`		`- autoscalingv2 "k8s.io/api/autoscaling/v2beta2"`
	`7`	`+ autoscalingv2 "k8s.io/api/autoscaling/v2"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func TestParser(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`log "github.com/sirupsen/logrus"`
`8`	`8`	`"github.com/zalando-incubator/kube-metrics-adapter/pkg/annotations"`
`9`		`- autoscalingv2 "k8s.io/api/autoscaling/v2beta2"`
	`9`	`+ autoscalingv2 "k8s.io/api/autoscaling/v2"`
`10`	`10`	`"k8s.io/metrics/pkg/apis/custom_metrics"`
`11`	`11`	`"k8s.io/metrics/pkg/apis/external_metrics"`
`12`	`12`	`)`