Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to using K8s Scale API + unstructured API #163

Merged
merged 4 commits into from
Mar 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
40 changes: 7 additions & 33 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
1,199 changes: 0 additions & 1,199 deletions go.sum

Large diffs are not rendered by default.

24 changes: 21 additions & 3 deletions internal/api/v1/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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(),
Expand Down Expand Up @@ -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 {
Expand All @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down
Loading