From 8dd3b35466d104275f76b79fd5460d9572ba0f49 Mon Sep 17 00:00:00 2001
From: Ethan Mosbaugh <ethan@replicated.com>
Date: Tue, 21 Jan 2025 14:24:52 -0800
Subject: [PATCH] f

---
 Makefile                                     | 2 ++
 e2e/kots-release-upgrade/cluster-config.yaml | 1 +
 scripts/ci-embed-release.sh                  | 6 ++++++
 scripts/ci-release-app.sh                    | 6 ++++++
 4 files changed, 15 insertions(+)

diff --git a/Makefile b/Makefile
index 9692e4feb..79a4dcc21 100644
--- a/Makefile
+++ b/Makefile
@@ -189,6 +189,7 @@ output/bin/embedded-cluster-release-builder:
 initial-release: export EC_VERSION = $(VERSION)-$(CURRENT_USER)
 initial-release: export APP_VERSION = appver-dev-$(call random-string)
 initial-release: export RELEASE_YAML_DIR = e2e/kots-release-install
+initial-release: export V2_ENABLED = 0
 initial-release: check-env-EC_VERSION check-env-APP_VERSION
 	UPLOAD_BINARIES=0 \
 		./scripts/build-and-release.sh
@@ -205,6 +206,7 @@ rebuild-release: check-env-EC_VERSION check-env-APP_VERSION
 upgrade-release: RANDOM_STRING = $(call random-string)
 upgrade-release: export EC_VERSION = $(VERSION)-$(CURRENT_USER)-upgrade-$(RANDOM_STRING)
 upgrade-release: export APP_VERSION = appver-dev-$(call random-string)-upgrade-$(RANDOM_STRING)
+upgrade-release: export V2_ENABLED = 0
 upgrade-release: check-env-EC_VERSION check-env-APP_VERSION
 	UPLOAD_BINARIES=1 \
 	RELEASE_YAML_DIR=e2e/kots-release-upgrade \
diff --git a/e2e/kots-release-upgrade/cluster-config.yaml b/e2e/kots-release-upgrade/cluster-config.yaml
index dd677f9f3..d8265237f 100644
--- a/e2e/kots-release-upgrade/cluster-config.yaml
+++ b/e2e/kots-release-upgrade/cluster-config.yaml
@@ -4,6 +4,7 @@ metadata:
   name: "testconfig"
 spec:
   version: "__version_string__"
+  v2Enabled: "__v2_enabled__"
   binaryOverrideUrl: "__release_url__"
   metadataOverrideUrl: "__metadata_url__"
   roles:
diff --git a/scripts/ci-embed-release.sh b/scripts/ci-embed-release.sh
index 0878389e1..1c04a50f3 100755
--- a/scripts/ci-embed-release.sh
+++ b/scripts/ci-embed-release.sh
@@ -14,6 +14,7 @@ RELEASE_YAML_DIR=${RELEASE_YAML_DIR:-e2e/kots-release-install}
 EC_BINARY=${EC_BINARY:-output/bin/embedded-cluster}
 S3_BUCKET="${S3_BUCKET:-dev-embedded-cluster-bin}"
 USES_DEV_BUCKET=${USES_DEV_BUCKET:-1}
+V2_ENABLED=${V2_ENABLED:-0}
 
 require RELEASE_YAML_DIR "${RELEASE_YAML_DIR:-}"
 require EC_BINARY "${EC_BINARY:-}"
@@ -63,6 +64,11 @@ function create_release_archive() {
     fi
 
     sed -i.bak "s|__version_string__|${EC_VERSION}|g" output/tmp/release/cluster-config.yaml
+    if [ "$V2_ENABLED" == "1" ]; then
+        sed -i.bak "s|__v2_enabled__|true|g" output/tmp/release/cluster-config.yaml
+    else
+        sed -i.bak "s|__v2_enabled__|false|g" output/tmp/release/cluster-config.yaml
+    fi
     sed -i.bak "s|__release_url__|$release_url|g" output/tmp/release/cluster-config.yaml
     sed -i.bak "s|__metadata_url__|$metadata_url|g" output/tmp/release/cluster-config.yaml
 
diff --git a/scripts/ci-release-app.sh b/scripts/ci-release-app.sh
index 57c7a49ae..91aef3f99 100755
--- a/scripts/ci-release-app.sh
+++ b/scripts/ci-release-app.sh
@@ -13,6 +13,7 @@ REPLICATED_APP=${REPLICATED_APP:-embedded-cluster-smoke-test-staging-app}
 REPLICATED_API_ORIGIN=${REPLICATED_API_ORIGIN:-https://api.staging.replicated.com/vendor}
 S3_BUCKET="${S3_BUCKET:-dev-embedded-cluster-bin}"
 USES_DEV_BUCKET=${USES_DEV_BUCKET:-1}
+V2_ENABLED=${V2_ENABLED:-0}
 
 if [ "$USES_DEV_BUCKET" == "1" ]; then
     require S3_BUCKET "${S3_BUCKET:-}"
@@ -63,6 +64,11 @@ function create_release() {
     fi
 
     sed -i.bak "s|__version_string__|${EC_VERSION}|g" output/tmp/release/cluster-config.yaml
+    if [ "$V2_ENABLED" == "1" ]; then
+        sed -i.bak "s|__v2_enabled__|true|g" output/tmp/release/cluster-config.yaml
+    else
+        sed -i.bak "s|__v2_enabled__|false|g" output/tmp/release/cluster-config.yaml
+    fi
     sed -i.bak "s|__release_url__|$release_url|g" output/tmp/release/cluster-config.yaml
     sed -i.bak "s|__metadata_url__|$metadata_url|g" output/tmp/release/cluster-config.yaml