From cf12fe4efdba73616d1c45bee11d9bd7eaeb3393 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Mon, 25 Jan 2021 21:50:30 -0600 Subject: [PATCH] Support additional feature flags specified via --env=KOPS_FEATURE_FLAGS=foo --- tests/e2e/kubetest2-kops/deployer/common.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/e2e/kubetest2-kops/deployer/common.go b/tests/e2e/kubetest2-kops/deployer/common.go index 9659403ec4..32ba262b17 100644 --- a/tests/e2e/kubetest2-kops/deployer/common.go +++ b/tests/e2e/kubetest2-kops/deployer/common.go @@ -138,7 +138,14 @@ func (d *deployer) featureFlags() string { "+SpecOverrideFlag", "+AlphaAllowGCE", } - return strings.Join(ff, ",") + val := strings.Join(ff, ",") + for _, env := range d.Env { + e := strings.Split(env, "=") + if e[0] == "KOPS_FEATURE_FLAGS" && len(e) > 1 { + val = fmt.Sprintf("%v,", e[1]) + } + } + return val } // defaultClusterName returns a kops cluster name to use when ClusterName is not set