Upgrade uses new helm repo

cmd/gitops/upgrade/cmd.go

@@ -7,6 +7,12 @@ import (
 
 	"github.com/spf13/cobra"
 	wego "github.com/weaveworks/weave-gitops/api/v1alpha1"
+	"github.com/weaveworks/weave-gitops/cmd/internal"
+	"github.com/weaveworks/weave-gitops/pkg/flux"
+	"github.com/weaveworks/weave-gitops/pkg/osys"
+	"github.com/weaveworks/weave-gitops/pkg/runner"
+	"github.com/weaveworks/weave-gitops/pkg/services"
+	"github.com/weaveworks/weave-gitops/pkg/services/auth"
 	"github.com/weaveworks/weave-gitops/pkg/upgrade"
 )
 
@@ -23,7 +29,8 @@ var Cmd = &cobra.Command{
 }
 
 func init() {
-	Cmd.PersistentFlags().StringVar(&upgradeCmdFlags.RepoOrgAndName, "repo", "", "The repository to open a pull request against. E.g: acme/my-config-repo (default: git current working directory)")
+	Cmd.PersistentFlags().StringVar(&upgradeCmdFlags.AppConfigURL, "app-config-url", "", "URL of external repository that will hold automation manifests")
+	Cmd.PersistentFlags().StringVar(&upgradeCmdFlags.ProfileVersion, "profile-version", "", "Profile version to set the helm release version to")
 	Cmd.PersistentFlags().StringVar(&upgradeCmdFlags.Remote, "remote", "origin", "The remote to push the branch to")
 	Cmd.PersistentFlags().StringVar(&upgradeCmdFlags.BaseBranch, "base", "main", "The base branch to open the pull request against")
 	Cmd.PersistentFlags().StringVar(&upgradeCmdFlags.HeadBranch, "branch", "tier-upgrade-enterprise", "The branch to create the pull request from")
@@ -33,21 +40,44 @@ func init() {
 	Cmd.PersistentFlags().StringVar(&upgradeCmdFlags.Out, "out", "", "Optional location to create the profile installation folder in. This should be relative to the current working directory. (default: current)")
 	Cmd.PersistentFlags().StringVar(&upgradeCmdFlags.ProfileBranch, "profile-branch", "main", "The branch to use on the repository in which the profile is.")
 	Cmd.PersistentFlags().BoolVar(&upgradeCmdFlags.DryRun, "dry-run", false, "Output the generated profile without creating a pull request")
+	Cmd.PersistentFlags().StringArrayVar(&upgradeCmdFlags.Values, "set", []string{}, "set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
+
+	cobra.CheckErr(Cmd.MarkPersistentFlagRequired("app-config-url"))
 }
 
 func upgradeCmdRunE() func(*cobra.Command, []string) error {
 	return func(cmd *cobra.Command, args []string) error {
+		ctx := context.Background()
 		namespace, err := cmd.Parent().Flags().GetString("namespace")
+
 		if err != nil {
 			return fmt.Errorf("couldn't read namespace flag: %v", err)
 		}
 
 		// FIXME: maybe a better way to do this?
 		upgradeCmdFlags.Namespace = namespace
 
+		log := internal.NewCLILogger(os.Stdout)
+		fluxClient := flux.New(osys.New(), &runner.CLIRunner{})
+		factory := services.NewFactory(fluxClient, log)
+
+		providerClient := internal.NewGitProviderClient(os.Stdout, os.LookupEnv, auth.NewAuthCLIHandler, log)
+
+		gitClient, gitProvider, err := factory.GetGitClients(ctx, providerClient, services.GitConfigParams{
+			URL:       upgradeCmdFlags.AppConfigURL,
+			Namespace: upgradeCmdFlags.Namespace,
+			DryRun:    upgradeCmdFlags.DryRun,
+		})
+		if err != nil {
+			return fmt.Errorf("failed to get git clients: %w", err)
+		}
+
 		return upgrade.Upgrade(
-			context.Background(),
+			ctx,
+			gitClient,
+			gitProvider,
 			upgradeCmdFlags,
+			log,
 			os.Stdout,
 		)
 	}

go.mod

@@ -23,9 +23,9 @@ require (
 	github.com/google/go-github/v32 v32.1.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
 	github.com/grpc-ecosystem/protoc-gen-grpc-gateway-ts v1.1.1
+	github.com/helm/helm v2.17.0+incompatible // indirect
 	github.com/jandelgado/gcov2lcov v1.0.5
 	github.com/jarcoal/httpmock v1.0.8
-	github.com/jenkins-x/go-scm v1.10.10
 	github.com/lithammer/dedent v1.1.0
 	github.com/mattn/go-isatty v0.0.13
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.4.1

go.sum

@@ -681,6 +681,8 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
 github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
+github.com/helm/helm v2.17.0+incompatible h1:0iy95yMXrfWpwaoOA9XRP+cTvitTrq+LcJV9DvR5n1Y=
+github.com/helm/helm v2.17.0+incompatible/go.mod h1:ahXhuvluW4YnSL6W6hDVetZsVK8Pv4BP8OwKli7aMqo=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=

pkg/git/git.go

@@ -56,6 +56,9 @@ const WegoClusterOSWorkloadDir = "system"
 // WegoClusterUserWorloadDir is where user workload manifests will live in the GitOps repo
 const WegoClusterUserWorloadDir = "user"
 
+// WegoEnterpriseDir is where GitOps enterprise manifests will live in the GitOps repo
+const WegoEnterpriseDir = "enterprise"
+
 // Git is an interface for basic Git operations on a single branch of a
 // remote repository.
 //counterfeiter:generate . Git

pkg/kube/kube.go

@@ -3,6 +3,7 @@ package kube
 import (
 	"context"
 	"fmt"
+
 	"github.com/weaveworks/weave-gitops/pkg/logger"
 
 	wego "github.com/weaveworks/weave-gitops/api/v1alpha1"