Improve forward feature

Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>

Author: mikkeloscar

controller/stack_resources.go

@@ -44,6 +44,23 @@ func isOwned(ownerReferences []metav1.OwnerReference) (bool, types.UID) {
 func (c *StackSetController) ReconcileStackDeployment(ctx context.Context, stack *zv1.Stack, existing *apps.Deployment, generateUpdated func() *apps.Deployment) error {
 	deployment := generateUpdated()
 
+	// no deployment
+	if deployment == nil {
+		if existing != nil {
+			err := c.client.AppsV1().Deployments(existing.Namespace).Delete(ctx, existing.Name, metav1.DeleteOptions{})
+			if err != nil {
+				return err
+			}
+			c.recorder.Eventf(
+				stack,
+				apiv1.EventTypeNormal,
+				"DeletedDeployment",
+				"Deleted Deployment %s",
+				existing.Name)
+		}
+		return nil
+	}
+
 	// Create new deployment
 	if existing == nil {
 		_, err := c.client.AppsV1().Deployments(deployment.Namespace).Create(ctx, deployment, metav1.CreateOptions{})
@@ -88,7 +105,7 @@ func (c *StackSetController) ReconcileStackHPA(ctx context.Context, stack *zv1.S
 		return err
 	}
 
-	// HPA removed
+	// no HPA
 	if hpa == nil {
 		if existing != nil {
 			err := c.client.AutoscalingV2().HorizontalPodAutoscalers(existing.Namespace).Delete(ctx, existing.Name, metav1.DeleteOptions{})
@@ -100,7 +117,7 @@ func (c *StackSetController) ReconcileStackHPA(ctx context.Context, stack *zv1.S
 				apiv1.EventTypeNormal,
 				"DeletedHPA",
 				"Deleted HPA %s",
-				existing.Namespace)
+				existing.Name)
 		}
 		return nil
 	}

pkg/core/stack_resources.go

@@ -196,6 +196,10 @@ func (sc *StackContainer) selector() map[string]string {
 // "zalando.org/forward-backend", the deployment will be set to
 // replicas 1.
 func (sc *StackContainer) GenerateDeployment() *appsv1.Deployment {
+	if sc.TrafficForward() {
+		// during traffic forwarding we do not need a deployment
+		return nil
+	}
 
 	stack := sc.Stack
 
@@ -234,12 +238,6 @@ func (sc *StackContainer) GenerateDeployment() *appsv1.Deployment {
 		Labels:      embeddedCopy.Labels,
 	}
 
-	if _, clusterMigration := sc.Stack.Annotations[forwardBackendAnnotation]; clusterMigration && *updatedReplicas != 0 {
-		updatedReplicas = wrapReplicas(1)
-		sc.deploymentReplicas = 1
-		sc.stackReplicas = 1
-	}
-
 	deployment := &appsv1.Deployment{
 		ObjectMeta: sc.resourceMeta(),
 		Spec: appsv1.DeploymentSpec{
@@ -270,7 +268,7 @@ func (sc *StackContainer) GenerateHPA() (
 	*autoscaling.HorizontalPodAutoscaler,
 	error,
 ) {
-	if _, clusterMigration := sc.Stack.Annotations[forwardBackendAnnotation]; clusterMigration {
+	if sc.TrafficForward() {
 		return nil, nil
 	}
 
@@ -477,7 +475,7 @@ func (sc *StackContainer) generateIngress(segment bool) (
 			Rules: rules,
 		},
 	}
-	if _, clusterMigration := sc.Stack.Annotations[forwardBackendAnnotation]; clusterMigration {
+	if sc.TrafficForward() {
 		// see https://opensource.zalando.com/skipper/kubernetes/ingress-usage/#skipper-ingress-annotations
 		result.Annotations["zalando.org/skipper-backend"] = "forward"
 	}

pkg/core/types.go

@@ -159,6 +159,12 @@ func (sc *StackContainer) HasTraffic() bool {
 }
 
 func (sc *StackContainer) IsReady() bool {
+	if sc.TrafficForward() {
+		// if stack is configured to forward traffic, consider it
+		// ready.
+		return true
+	}
+
 	// Calculate minimum required replicas for the Deployment to be considered ready
 	minRequiredReplicas := int32(math.Ceil(float64(sc.deploymentReplicas) * sc.minReadyPercent))
 
@@ -187,6 +193,11 @@ func (sc *StackContainer) ScaledDown() bool {
 	return !sc.noTrafficSince.IsZero() && time.Since(sc.noTrafficSince) > sc.scaledownTTL
 }
 
+func (sc *StackContainer) TrafficForward() bool {
+	_, clusterMigration := sc.Stack.Annotations[forwardBackendAnnotation]
+	return clusterMigration
+}
+
 func (sc *StackContainer) Name() string {
 	return sc.Stack.Name
 }