From 997e67bbe0ab4f47f65b3c6ab518918a74a7c0b7 Mon Sep 17 00:00:00 2001 From: Salah Aldeen Al Saleh Date: Fri, 31 Jan 2025 09:45:28 -0800 Subject: [PATCH 1/2] fix build --- operator/pkg/cli/migrate_v2.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/operator/pkg/cli/migrate_v2.go b/operator/pkg/cli/migrate_v2.go index 778d2d00b..4ff779730 100644 --- a/operator/pkg/cli/migrate_v2.go +++ b/operator/pkg/cli/migrate_v2.go @@ -2,7 +2,6 @@ package cli import ( "fmt" - "log" ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1" "github.com/replicatedhq/embedded-cluster/operator/pkg/cli/migratev2" @@ -42,7 +41,7 @@ func MigrateV2Cmd() *cobra.Command { return fmt.Errorf("failed to create kubernetes client: %w", err) } - err = migratev2.Run(ctx, log.Printf, cli, installation) + err = migratev2.Run(ctx, cli, installation) if err != nil { return fmt.Errorf("failed to run v2 migration: %w", err) } From 4cdd659f73a922439826fb7d4f18395662ddf4e3 Mon Sep 17 00:00:00 2001 From: Salah Aldeen Al Saleh Date: Fri, 31 Jan 2025 09:49:47 -0800 Subject: [PATCH 2/2] fix ha join --- pkg/addons2/highavailability.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/addons2/highavailability.go b/pkg/addons2/highavailability.go index 91de7b84c..3de1b2b38 100644 --- 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")