feat: enable v2 in the Config spec (#1726)

Author: emosbaugh

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 \

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:

kinds/apis/v1beta1/config_types.go

@@ -176,7 +176,12 @@ func ConvertFrom(e k0sv1beta1.HelmExtensions, t *Helm) (*Helm, error) {
 
 // ConfigSpec defines the desired state of Config
 type ConfigSpec struct {
-	Version              string               `json:"version,omitempty"`
+	Version string `json:"version,omitempty"`
+	// V2Enabled is a temporary property that can be used to opt-in to the new installer. If set,
+	// in addition to using the new v2 install method, v1 installations will be migrated to v2 on
+	// upgrade. This property will be removed once the new installer is fully implemented and the
+	// old installer is removed.
+	V2Enabled            bool                 `json:"v2Enabled,omitempty"`
 	BinaryOverrideURL    string               `json:"binaryOverrideUrl,omitempty"`
 	MetadataOverrideURL  string               `json:"metadataOverrideUrl,omitempty"`
 	Roles                Roles                `json:"roles,omitempty"`

operator/charts/embedded-cluster-operator/charts/crds/templates/resources.yaml

@@ -218,6 +218,13 @@ spec:
                       to use a string here.
                     type: string
                 type: object
+              v2Enabled:
+                description: |-
+                  V2Enabled is a temporary property that can be used to opt-in to the new installer. If set,
+                  in addition to using the new v2 install method, v1 installations will be migrated to v2 on
+                  upgrade. This property will be removed once the new installer is fully implemented and the
+                  old installer is removed.
+                type: boolean
               version:
                 type: string
             type: object
@@ -508,6 +515,13 @@ spec:
                           to use a string here.
                         type: string
                     type: object
+                  v2Enabled:
+                    description: |-
+                      V2Enabled is a temporary property that can be used to opt-in to the new installer. If set,
+                      in addition to using the new v2 install method, v1 installations will be migrated to v2 on
+                      upgrade. This property will be removed once the new installer is fully implemented and the
+                      old installer is removed.
+                    type: boolean
                   version:
                     type: string
                 type: object

operator/config/crd/bases/embeddedcluster.replicated.com_configs.yaml

@@ -227,6 +227,13 @@ spec:
                       to use a string here.
                     type: string
                 type: object
+              v2Enabled:
+                description: |-
+                  V2Enabled is a temporary property that can be used to opt-in to the new installer. If set,
+                  in addition to using the new v2 install method, v1 installations will be migrated to v2 on
+                  upgrade. This property will be removed once the new installer is fully implemented and the
+                  old installer is removed.
+                type: boolean
               version:
                 type: string
             type: object

operator/config/crd/bases/embeddedcluster.replicated.com_installations.yaml

@@ -289,6 +289,13 @@ spec:
                           to use a string here.
                         type: string
                     type: object
+                  v2Enabled:
+                    description: |-
+                      V2Enabled is a temporary property that can be used to opt-in to the new installer. If set,
+                      in addition to using the new v2 install method, v1 installations will be migrated to v2 on
+                      upgrade. This property will be removed once the new installer is fully implemented and the
+                      old installer is removed.
+                    type: boolean
                   version:
                     type: string
                 type: object

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
 

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