Align to scaler types (#21)

Author: levrado

cmd/dlx/main.go

@@ -12,7 +12,7 @@ import (
 
 func main() {
 	kubeconfigPath := flag.String("kubeconfig-path", os.Getenv("KUBECONFIG"), "Path of kubeconfig file")
-	namespace := flag.String("namepsace", "", "Kubernetes namespace")
+	namespace := flag.String("namespace", "", "Kubernetes namespace")
 	targetNameHeader := flag.String("target-name-header", "", "Name of the header that holds information on target name")
 	targetPathHeader := flag.String("target-path-header", "", "Name of the header that holds information on target path")
 	targetPort := flag.Int("target-port", 0, "Name of the header that holds information on target port")

pkg/autoscaler/autoscaler.go

@@ -77,7 +77,7 @@ func (as *Autoscaler) checkResourceToScale(t time.Time, activeResources []scaler
 				"deltaSeconds", t.Sub(minMetric.timestamp).Seconds(),
 				"windowSize", as.windowSize)
 
-			err := as.resourceScaler.SetScale(as.namespace, resourceName, 0)
+			err := as.resourceScaler.SetScale(resourceName, 0)
 			if err != nil {
 				as.logger.WarnWith("Failed to set scale", "err", err)
 			}
@@ -133,7 +133,7 @@ func (as *Autoscaler) Start() error {
 		for {
 			select {
 			case <-ticker.C:
-				resourcesList, err := as.resourceScaler.GetResources(as.namespace)
+				resourcesList, err := as.resourceScaler.GetResources()
 				if err != nil {
 					as.logger.WarnWith("Failed to build resource map")
 				}

pkg/autoscaler/autoscaler_test.go

@@ -19,12 +19,12 @@ type autoScalerTest struct {
 	ch         chan metricEntry
 }
 
-func (suite *autoScalerTest) SetScale(namespace string, resource scaler_types.Resource, scale int) error {
-	suite.Called(namespace, resource)
+func (suite *autoScalerTest) SetScale(resource scaler_types.Resource, scale int) error {
+	suite.Called(resource)
 	return nil
 }
 
-func (suite *autoScalerTest) GetResources(namespace string) ([]scaler_types.Resource, error) {
+func (suite *autoScalerTest) GetResources() ([]scaler_types.Resource, error) {
 	return []scaler_types.Resource{}, nil
 }
 

pkg/dlx/resourcestarter.go

@@ -122,7 +122,7 @@ func (r *ResourceStarter) startResource(resourceSinkChannel chan responseChannel
 }
 
 func (r *ResourceStarter) waitResourceReadiness(resourceName scaler_types.Resource, resourceReadyChannel chan error) {
-	err := r.scaler.SetScale(r.namespace, resourceName, 1)
+	err := r.scaler.SetScale(resourceName, 1)
 	resourceReadyChannel <- err
 }
 

pkg/dlx/resourcestarter_test.go

@@ -25,12 +25,12 @@ type mocker struct {
 	mock.Mock
 }
 
-func (suite *resourceStarterTest) SetScale(namespace string, resourceName scaler_types.Resource, scale int) error {
+func (suite *resourceStarterTest) SetScale(resourceName scaler_types.Resource, scale int) error {
 	suite.mocker.Called(resourceName)
 	return nil
 }
 
-func (suite *resourceStarterTest) GetResources(namespace string) ([]scaler_types.Resource, error) {
+func (suite *resourceStarterTest) GetResources() ([]scaler_types.Resource, error) {
 	return []scaler_types.Resource{}, nil
 }
 

pkg/resourcescaler/resourcescaler.go

@@ -10,11 +10,11 @@ func New(kubeconfigPath string, namespace string) (scaler_types.ResourceScaler,
 	return &NopResourceScaler{}, nil
 }
 
-func (r *NopResourceScaler) SetScale(namespace string, resource scaler_types.Resource, scale int) error {
+func (r *NopResourceScaler) SetScale(resource scaler_types.Resource, scale int) error {
 	return nil
 }
 
-func (r *NopResourceScaler) GetResources(namespace string) ([]scaler_types.Resource, error) {
+func (r *NopResourceScaler) GetResources() ([]scaler_types.Resource, error) {
 	return []scaler_types.Resource{}, nil
 }