Move autoscaler (#395)

Update README.md

Update auto_scaling_test.go

Update verify.go

Add polling to handle edge cases

Update verify.go

Author: susesgartner

actions/features/features.go

@@ -100,6 +100,26 @@ func UpdateFeatureFlag(client *rancher.Client, name string, value bool) error {
 	return nil
 }
 
+func IsEnabled(client *rancher.Client, name string) (bool, error) {
+	featureOpts := &types.ListOpts{Filters: map[string]interface{}{
+		"name": name,
+	}}
+
+	features, err := client.Management.Feature.List(featureOpts)
+	if err != nil {
+		return false, err
+	}
+
+	enabled := false
+	for _, feature := range features.Data {
+		if *feature.Value == true {
+			enabled = true
+		}
+	}
+
+	return enabled, nil
+}
+
 func ConfigureAutoscaler(client *rancher.Client, repository, image string) error {
 	downstreamClient, err := client.Steve.ProxyDownstream(local)
 	if err != nil {

actions/scaling/config.go

@@ -1,10 +1,10 @@
 package scaling
 
 const (
-	ScalingConfigurationKey = "scalingConfig"
+	AutoScalingConfigurationKey = "autoScalingConfig"
 )
 
-type Config struct {
-	AutoscalerChartRepository string `json:"autoscalerChartRepository" yaml:"autoscalerChartRepository"`
-	AutoscalerImage           string `json:"autoscalerImage" yaml:"autoscalerImage"`
+type AutoscalingConfig struct {
+	ChartRepository string `json:"chartRepository,omitempty" yaml:"chartRepository,omitempty"`
+	Image           string `json:"image,omitempty" yaml:"image,omitempty"`
 }

actions/scaling/scaling.go

@@ -67,18 +67,22 @@ func getAutoscalerMachinePools(cluster *v1.SteveAPIObject) ([]apisV1.RKEMachineP
 	return autoscalerPools, err
 }
 
-func PauseAutoscaler(client *rancher.Client, cluster *v1.SteveAPIObject) error {
+func UpdateAutoscalerState(client *rancher.Client, cluster *v1.SteveAPIObject, pause bool) error {
 	apiCluster, cluster, err := clusters.GetProvisioningClusterByName(client, cluster.Name, namespaces.FleetDefault)
 	if err != nil {
 		return err
 	}
 
-	apiCluster.Annotations[autoscalerPausedAnnotation] = "true"
+	if pause {
+		apiCluster.Annotations[autoscalerPausedAnnotation] = "true"
+	} else {
+		delete(apiCluster.Annotations, autoscalerPausedAnnotation)
+	}
 
 	_, err = client.Steve.SteveType(stevetypes.Provisioning).Update(cluster, apiCluster)
 	if err != nil {
 		return err
 	}
 
-	return nil
+	return err
 }

actions/scaling/verify.go

@@ -1,20 +1,25 @@
 package scaling
 
 import (
+	"context"
 	"testing"
+	"time"
 
 	provv1 "github.com/rancher/rancher/pkg/apis/provisioning.cattle.io/v1"
 	"github.com/rancher/shepherd/clients/rancher"
 	steveV1 "github.com/rancher/shepherd/clients/rancher/v1"
 	v1 "github.com/rancher/shepherd/clients/rancher/v1"
+	"github.com/rancher/shepherd/extensions/defaults"
 	"github.com/rancher/shepherd/extensions/defaults/namespaces"
 	"github.com/rancher/shepherd/extensions/defaults/stevetypes"
+	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
 	appv1 "k8s.io/api/apps/v1"
+	kwait "k8s.io/apimachinery/pkg/util/wait"
 )
 
 const (
-	autoscalerDeployment       = "cluster-autoscaler-clusterapi-kubernetes-cluster-autoscaler"
+	AutoscalerDeploymentName   = "cluster-autoscaler-clusterapi-kubernetes-cluster-autoscaler"
 	autoscalerPausedAnnotation = "provisioning.cattle.io/cluster-autoscaler-paused"
 )
 
@@ -29,14 +34,24 @@ func VerifyAutoscaler(t *testing.T, client *rancher.Client, cluster *v1.SteveAPI
 
 	deploymentClient := downstreamClient.SteveType(stevetypes.Deployment)
 
-	autoscalerDeployment, err := deploymentClient.ByID(namespaces.KubeSystem + "/" + autoscalerDeployment)
+	logrus.Debug("Waiting for autoscaler deployment replicas to be available")
+	var deployment *appv1.Deployment
+	err = kwait.PollUntilContextTimeout(context.TODO(), 5*time.Second, defaults.TwoMinuteTimeout, true, func(context.Context) (done bool, err error) {
+		autoscalerDeployment, err := deploymentClient.ByID(namespaces.KubeSystem + "/" + AutoscalerDeploymentName)
+		if err != nil {
+			return false, nil
+		}
+
+		deployment = &appv1.Deployment{}
+		err = steveV1.ConvertToK8sType(autoscalerDeployment.JSONResp, deployment)
+		if *deployment.Spec.Replicas != deployment.Status.AvailableReplicas {
+			return false, nil
+		}
+
+		return true, nil
+	})
 	require.NoError(t, err)
 
-	deployment := &appv1.Deployment{}
-	err = steveV1.ConvertToK8sType(autoscalerDeployment.JSONResp, deployment)
-	require.NoError(t, err)
-	require.Equal(t, *deployment.Spec.Replicas, deployment.Status.AvailableReplicas)
-
 	if cluster.Annotations[autoscalerPausedAnnotation] == "true" {
 		require.Zero(t, *deployment.Spec.Replicas)
 	} else {

actions/workloads/deployment/deployment.go

@@ -1,20 +1,27 @@
 package deployment
 
 import (
+	"context"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
 
+	apisV1 "github.com/rancher/rancher/pkg/apis/provisioning.cattle.io/v1"
 	"github.com/rancher/shepherd/clients/rancher"
+	steveV1 "github.com/rancher/shepherd/clients/rancher/v1"
 	"github.com/rancher/shepherd/extensions/charts"
+	"github.com/rancher/shepherd/extensions/defaults"
+	"github.com/rancher/shepherd/extensions/defaults/stevestates"
+	"github.com/rancher/shepherd/extensions/defaults/stevetypes"
 	"github.com/rancher/shepherd/extensions/kubectl"
 	"github.com/rancher/shepherd/extensions/workloads"
 	namegen "github.com/rancher/shepherd/pkg/namegenerator"
 	"github.com/rancher/shepherd/pkg/wrangler"
 	"github.com/rancher/tests/actions/kubeapi/workloads/deployments"
 	"github.com/rancher/tests/actions/rbac"
 	"github.com/rancher/tests/actions/workloads/pods"
+	"github.com/sirupsen/logrus"
 	appv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -282,3 +289,39 @@ func RestartDeployment(client *rancher.Client, clusterID, namespaceName, deploym
 
 	return nil
 }
+
+func WaitForDeploymentUpdate(client *rancher.Client, clusterID, deploymentNamespace, deploymentName string) error {
+	cluster, err := client.Steve.SteveType(stevetypes.Provisioning).ByID(clusterID)
+
+	status := &apisV1.ClusterStatus{}
+	err = steveV1.ConvertToK8sType(cluster.Status, status)
+	if err != nil {
+		return err
+	}
+
+	downstreamClient, err := client.Steve.ProxyDownstream(status.ClusterName)
+	if err != nil {
+		return err
+	}
+
+	deploymentClient := downstreamClient.SteveType(stevetypes.Deployment)
+
+	logrus.Debugf("Waiting for %s deployment to be updated", deploymentName)
+	var deployment *appv1.Deployment
+	err = kwait.PollUntilContextTimeout(context.TODO(), 100*time.Millisecond, defaults.TwoMinuteTimeout, true, func(context.Context) (done bool, err error) {
+		autoscalerDeployment, err := deploymentClient.ByID(deploymentNamespace + "/" + deploymentName)
+		if err != nil {
+			return false, nil
+		}
+
+		deployment = &appv1.Deployment{}
+		err = steveV1.ConvertToK8sType(autoscalerDeployment.JSONResp, deployment)
+		if autoscalerDeployment.State.Name == stevestates.Updating {
+			return true, nil
+		}
+
+		return false, nil
+	})
+
+	return err
+}