Switch to using K8s Scale API + unstructured API (#163)

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Now internally using the Kubernetes Scale API for determining replica count and selectors, removing any direct
+dependencies on the Kubernetes core types when used in conjunction with the Kubernetes unstructured API.
+- Can now install the project by using the `go install` command since replace directives have been removed.
 
 ## [v2.4.1] - 2022-02-22
 ### Fixed

go.mod

@@ -3,44 +3,18 @@ module github.com/jthomperoo/custom-pod-autoscaler/v2
 go 1.16
 
 require (
-	github.com/argoproj/argo-rollouts v1.0.7
 	github.com/go-chi/chi v4.0.2+incompatible
-	github.com/go-openapi/spec v0.20.4 // indirect
 	github.com/golang/glog v1.0.0
 	github.com/google/go-cmp v0.5.5
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/onsi/ginkgo v1.14.1 // indirect
+	github.com/onsi/gomega v1.10.2 // indirect
+	github.com/stretchr/testify v1.7.0 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/appengine v1.6.6 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 	k8s.io/api v0.21.8
 	k8s.io/apimachinery v0.21.8
 	k8s.io/client-go v0.21.8
-	k8s.io/kubernetes v1.21.8
 	k8s.io/metrics v0.21.8
 )
-
-replace (
-	k8s.io/api => k8s.io/api v0.21.8
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.8
-	k8s.io/apimachinery => k8s.io/apimachinery v0.21.8
-	k8s.io/apiserver => k8s.io/apiserver v0.21.8
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.8
-	k8s.io/client-go => k8s.io/client-go v0.21.8
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.8
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.8
-	k8s.io/code-generator => k8s.io/code-generator v0.21.8
-	k8s.io/component-base => k8s.io/component-base v0.21.8
-	k8s.io/component-helpers => k8s.io/component-helpers v0.21.8
-	k8s.io/controller-manager => k8s.io/controller-manager v0.21.8
-	k8s.io/cri-api => k8s.io/cri-api v0.21.8
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.8
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.8
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.8
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.8
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.8
-	k8s.io/kubectl => k8s.io/kubectl v0.21.8
-	k8s.io/kubelet => k8s.io/kubelet v0.21.8
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.8
-	k8s.io/metrics => k8s.io/metrics v0.21.8
-	k8s.io/mount-utils => k8s.io/mount-utils v0.21.8
-	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.21.8
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.8
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.21.8
-	k8s.io/sample-controller => k8s.io/sample-controller v0.21.8
-)

internal/api/v1/api.go

@@ -90,6 +90,15 @@ func (api *API) getMetrics(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	scaleResource, err := api.Scaler.GetScaleSubResource(api.Config.ScaleTargetRef.APIVersion, api.Config.ScaleTargetRef.Kind, api.Config.Namespace, api.Config.ScaleTargetRef.Name)
+	if err != nil {
+		apiError(w, &apiv1.Error{
+			Message: err.Error(),
+			Code:    http.StatusInternalServerError,
+		})
+		return
+	}
+
 	// Set run type
 	runType := config.APIRunType
 	if dryRun {
@@ -100,7 +109,7 @@ func (api *API) getMetrics(w http.ResponseWriter, r *http.Request) {
 	metrics, err := api.GetMetricer.GetMetrics(metric.Info{
 		Resource: resource,
 		RunType:  runType,
-	})
+	}, scaleResource)
 	if err != nil {
 		apiError(w, &apiv1.Error{
 			Message: err.Error(),
@@ -147,6 +156,15 @@ func (api *API) getEvaluation(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	scaleResource, err := api.Scaler.GetScaleSubResource(api.Config.ScaleTargetRef.APIVersion, api.Config.ScaleTargetRef.Kind, api.Config.Namespace, api.Config.ScaleTargetRef.Name)
+	if err != nil {
+		apiError(w, &apiv1.Error{
+			Message: err.Error(),
+			Code:    http.StatusInternalServerError,
+		})
+		return
+	}
+
 	// Set run type
 	runType := config.APIRunType
 	if dryRun {
@@ -157,7 +175,7 @@ func (api *API) getEvaluation(w http.ResponseWriter, r *http.Request) {
 	metrics, err := api.GetMetricer.GetMetrics(metric.Info{
 		Resource: resource,
 		RunType:  runType,
-	})
+	}, scaleResource)
 	if err != nil {
 		apiError(w, &apiv1.Error{
 			Message: err.Error(),
@@ -190,7 +208,7 @@ func (api *API) getEvaluation(w http.ResponseWriter, r *http.Request) {
 			Namespace:      api.Config.Namespace,
 			ScaleTargetRef: api.Config.ScaleTargetRef,
 			RunType:        runType,
-		})
+		}, scaleResource)
 		if err != nil {
 			apiError(w, &apiv1.Error{
 				Message: err.Error(),