Merge branch 'v2-upgrades-without-manager' into laverya/fix-TestHostP…

…reflightCustomSpec
replicatedhq · Jan 31, 2025 · f8063d4 · f8063d4
2 parents b452e2e + 4cdd659
commit f8063d4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/operator/pkg/cli/migrate_v2.go b/operator/pkg/cli/migrate_v2.go
@@ -2,6 +2,7 @@ package cli
 
 import (
 	"fmt"
+
 	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
 	"github.com/replicatedhq/embedded-cluster/operator/pkg/cli/migratev2"
 	"github.com/replicatedhq/embedded-cluster/operator/pkg/k8sutil"

diff --git a/pkg/addons2/highavailability.go b/pkg/addons2/highavailability.go
@@ -48,10 +48,15 @@ func EnableHA(ctx context.Context, kcli client.Client, isAirgap bool, serviceCID
 	loading := spinner.Start()
 	defer loading.Close()
 
+	airgapChartsPath := ""
+	if isAirgap {
+		airgapChartsPath = runtimeconfig.EmbeddedClusterChartsSubDir()
+	}
+
 	hcli, err := helm.NewHelm(helm.HelmOptions{
 		KubeConfig: runtimeconfig.PathToKubeConfig(),
 		K0sVersion: versions.K0sVersion,
-		AirgapPath: runtimeconfig.EmbeddedClusterChartsSubDir(),
+		AirgapPath: airgapChartsPath,
 	})
 	if err != nil {
 		return errors.Wrap(err, "create helm client")
@@ -91,9 +96,10 @@ func EnableHA(ctx context.Context, kcli client.Client, isAirgap bool, serviceCID
 
 	// TODO (@salah): add support for end user overrides
 	ac := &adminconsole.AdminConsole{
-		IsAirgap: isAirgap,
-		IsHA:     true,
-		Proxy:    proxy,
+		IsAirgap:    isAirgap,
+		IsHA:        true,
+		Proxy:       proxy,
+		ServiceCIDR: serviceCIDR,
 	}
 	if err := ac.Upgrade(ctx, kcli, hcli, addOnOverrides(ac, cfgspec, nil)); err != nil {
 		return errors.Wrap(err, "upgrade admin console")