Add --enable-forward-support flag

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

Author: mikkeloscar

cmd/stackset-controller/main.go

@@ -47,6 +47,7 @@ var (
 		ConfigMapSupportEnabled     bool
 		SecretSupportEnabled        bool
 		PCSSupportEnabled           bool
+		ForwardSupportEnabled       bool
 	}
 )
 
@@ -70,6 +71,7 @@ func main() {
 	kingpin.Flag("enable-configmap-support", "Enable support for ConfigMaps on StackSets.").Default("false").BoolVar(&config.ConfigMapSupportEnabled)
 	kingpin.Flag("enable-secret-support", "Enable support for Secrets on StackSets.").Default("false").BoolVar(&config.SecretSupportEnabled)
 	kingpin.Flag("enable-pcs-support", "Enable support for PlatformCredentialsSet on StackSets.").Default("false").BoolVar(&config.PCSSupportEnabled)
+	kingpin.Flag("enable-forward-support", "Enable support for skipper traffic forwarding.").Default("false").BoolVar(&config.ForwardSupportEnabled)
 	kingpin.Parse()
 
 	if config.Debug {
@@ -91,6 +93,7 @@ func main() {
 		ConfigMapSupportEnabled:  config.ConfigMapSupportEnabled,
 		SecretSupportEnabled:     config.SecretSupportEnabled,
 		PcsSupportEnabled:        config.PCSSupportEnabled,
+		ForwardSupportEnabled:    config.ForwardSupportEnabled,
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())

controller/stackset.go

@@ -77,6 +77,7 @@ type StackSetConfig struct {
 	ConfigMapSupportEnabled  bool
 	SecretSupportEnabled     bool
 	PcsSupportEnabled        bool
+	ForwardSupportEnabled    bool
 }
 
 type stacksetEvent struct {
@@ -758,7 +759,7 @@ func (c *StackSetController) ReconcileTrafficSegments(
 
 // CreateCurrentStack creates a new Stack object for the current stack, if needed
 func (c *StackSetController) CreateCurrentStack(ctx context.Context, ssc *core.StackSetContainer) error {
-	newStack, newStackVersion := ssc.NewStack()
+	newStack, newStackVersion := ssc.NewStack(c.config.ForwardSupportEnabled)
 	if newStack == nil {
 		return nil
 	}

pkg/core/stackset.go

@@ -53,8 +53,11 @@ func sanitizeServicePorts(service *zv1.StackServiceSpec) *zv1.StackServiceSpec {
 }
 
 // NewStack returns an (optional) stack that should be created
-func (ssc *StackSetContainer) NewStack() (*StackContainer, string) {
+func (ssc *StackSetContainer) NewStack(forwardSupportEnabled bool) (*StackContainer, string) {
 	_, forwardMigration := ssc.StackSet.ObjectMeta.Annotations[forwardBackendAnnotation]
+	if !forwardSupportEnabled {
+		forwardMigration = false
+	}
 	observedStackVersion := ssc.StackSet.Status.ObservedStackVersion
 	stackVersion := currentStackVersion(ssc.StackSet)
 	stackName := generateStackName(ssc.StackSet, stackVersion)

pkg/core/stackset_test.go

@@ -371,7 +371,7 @@ func TestStackSetNewStack(t *testing.T) {
 				StackContainers:             tc.stacks,
 				backendWeightsAnnotationKey: traffic.DefaultBackendWeightsAnnotationKey,
 			}
-			newStack, newStackName := stackset.NewStack()
+			newStack, newStackName := stackset.NewStack(false)
 			require.EqualValues(t, tc.expectedStack, newStack)
 			require.EqualValues(t, tc.expectedStackName, newStackName)
 		})