feat(v3): pass isEmbeddedClusterV3 to adminconsole chart (#2723)

Author: emosbaugh

api/internal/managers/kubernetes/infra/install.go

@@ -157,6 +157,7 @@ func (m *infraManager) getAddonInstallOpts(license *kotsv1beta1.License, ki kube
 		EmbeddedConfigSpec: m.getECConfigSpec(),
 		EndUserConfigSpec:  m.getEndUserConfigSpec(),
 		ProxySpec:          ki.ProxySpec(),
+		IsV3:               true,
 	}
 
 	// TODO: no kots app install for now

api/internal/managers/linux/infra/install.go

@@ -298,6 +298,7 @@ func (m *infraManager) getAddonInstallOpts(ctx context.Context, license *kotsv1b
 		K0sDataDir:              rc.EmbeddedClusterK0sSubDir(),
 		OpenEBSDataDir:          rc.EmbeddedClusterOpenEBSLocalSubDir(),
 		ServiceCIDR:             rc.ServiceCIDR(),
+		IsV3:                    true,
 	}
 
 	return opts

pkg/addons/adminconsole/adminconsole.go

@@ -23,6 +23,7 @@ type AdminConsole struct {
 	IsMultiNodeEnabled bool
 	Proxy              *ecv1beta1.ProxySpec
 	AdminConsolePort   int
+	IsV3               bool
 
 	// Linux specific options
 	ClusterID        string

pkg/addons/adminconsole/values.go

@@ -50,6 +50,7 @@ func (a *AdminConsole) GenerateHelmValues(ctx context.Context, kcli client.Clien
 	copiedValues["isHA"] = a.IsHA
 	copiedValues["isMultiNodeEnabled"] = a.IsMultiNodeEnabled
 	copiedValues["isAirgap"] = a.IsAirgap
+	copiedValues["isEmbeddedClusterV3"] = a.IsV3
 
 	if domains.ReplicatedAppDomain != "" {
 		copiedValues["replicatedAppEndpoint"] = netutils.MaybeAddHTTPS(domains.ReplicatedAppDomain)

pkg/addons/adminconsole/values_test.go

@@ -95,6 +95,7 @@ func TestGenerateHelmValues_Target(t *testing.T) {
 			IsMultiNodeEnabled: false,
 			Proxy:              nil,
 			AdminConsolePort:   8080,
+			IsV3:               true,
 
 			ClusterID:        "123",
 			ServiceCIDR:      "10.0.0.0/24",
@@ -106,10 +107,10 @@ func TestGenerateHelmValues_Target(t *testing.T) {
 		values, err := adminConsole.GenerateHelmValues(context.Background(), nil, ecv1beta1.Domains{}, nil)
 		require.NoError(t, err, "GenerateHelmValues should not return an error")
 
-		assert.Contains(t, values, "embeddedClusterID")
 		assert.Equal(t, "123", values["embeddedClusterID"])
 		assert.Equal(t, dataDir, values["embeddedClusterDataDir"])
 		assert.Equal(t, filepath.Join(dataDir, "k0s"), values["embeddedClusterK0sDir"])
+		assert.Equal(t, true, values["isEmbeddedClusterV3"])
 
 		assert.Contains(t, values["extraEnv"], map[string]interface{}{
 			"name":  "SSL_CERT_CONFIGMAP",
@@ -128,6 +129,7 @@ func TestGenerateHelmValues_Target(t *testing.T) {
 			IsMultiNodeEnabled: false,
 			Proxy:              nil,
 			AdminConsolePort:   8080,
+			IsV3:               true,
 		}
 
 		values, err := adminConsole.GenerateHelmValues(context.Background(), nil, ecv1beta1.Domains{}, nil)
@@ -136,6 +138,7 @@ func TestGenerateHelmValues_Target(t *testing.T) {
 		assert.NotContains(t, values, "embeddedClusterID")
 		assert.NotContains(t, values, "embeddedClusterDataDir")
 		assert.NotContains(t, values, "embeddedClusterK0sDir")
+		assert.Equal(t, true, values["isEmbeddedClusterV3"])
 
 		for _, env := range values["extraEnv"].([]map[string]interface{}) {
 			assert.NotEqual(t, "SSL_CERT_CONFIGMAP", env["name"], "SSL_CERT_CONFIGMAP environment variable should not be set")

pkg/addons/highavailability.go

@@ -251,6 +251,7 @@ func (a *AddOns) EnableAdminConsoleHA(ctx context.Context, opts EnableHAOptions)
 		DataDir:            opts.DataDir,
 		K0sDataDir:         opts.K0sDataDir,
 		AdminConsolePort:   opts.AdminConsolePort,
+		IsV3:               false,
 	}
 	if err := ac.Upgrade(ctx, a.logf, a.kcli, a.mcli, a.hcli, a.domains, a.addOnOverrides(ac, opts.EmbeddedConfigSpec, opts.EndUserConfigSpec)); err != nil {
 		return errors.Wrap(err, "upgrade admin console")

pkg/addons/install.go

@@ -28,6 +28,7 @@ type InstallOptions struct {
 	EndUserConfigSpec  *ecv1beta1.ConfigSpec
 	KotsInstaller      adminconsole.KotsInstaller
 	ProxySpec          *ecv1beta1.ProxySpec
+	IsV3               bool
 
 	// Linux only options
 	ClusterID               string
@@ -52,6 +53,7 @@ type KubernetesInstallOptions struct {
 	EndUserConfigSpec  *ecv1beta1.ConfigSpec
 	KotsInstaller      adminconsole.KotsInstaller
 	ProxySpec          *ecv1beta1.ProxySpec
+	IsV3               bool
 }
 
 func (a *AddOns) Install(ctx context.Context, opts InstallOptions) error {
@@ -160,6 +162,7 @@ func GetAddOnsForInstall(opts InstallOptions) []types.AddOn {
 		DataDir:            opts.DataDir,
 		K0sDataDir:         opts.K0sDataDir,
 		AdminConsolePort:   opts.AdminConsolePort,
+		IsV3:               opts.IsV3,
 
 		Password:      opts.AdminConsolePwd,
 		TLSCertBytes:  opts.TLSCertBytes,
@@ -195,6 +198,7 @@ func GetAddOnsForKubernetesInstall(opts KubernetesInstallOptions) []types.AddOn
 		IsMultiNodeEnabled: opts.IsMultiNodeEnabled,
 		Proxy:              opts.ProxySpec,
 		AdminConsolePort:   opts.AdminConsolePort,
+		IsV3:               opts.IsV3,
 
 		Password:      opts.AdminConsolePwd,
 		TLSCertBytes:  opts.TLSCertBytes,

pkg/addons/upgrade.go

@@ -118,6 +118,7 @@ func (a *AddOns) getAddOnsForUpgrade(meta *ectypes.ReleaseMetadata, opts Upgrade
 		DataDir:            opts.DataDir,
 		K0sDataDir:         opts.K0sDataDir,
 		AdminConsolePort:   opts.AdminConsolePort,
+		IsV3:               false,
 	})
 
 	return addOns, nil

tests/dryrun/install_test.go

@@ -101,6 +101,7 @@ func testDefaultInstallationImpl(t *testing.T) {
 		"embeddedClusterID":      in.Spec.ClusterID,
 		"embeddedClusterDataDir": "/var/lib/embedded-cluster",
 		"embeddedClusterK0sDir":  "/var/lib/embedded-cluster/k0s",
+		"isEmbeddedClusterV3":    false,
 	})
 	assertHelmValuePrefixes(t, adminConsoleOpts.Values, map[string]string{
 		"images.kotsadm":    "fake-replicated-proxy.test.net/anonymous",