CR-11153 setting up shared configurations (#381)

* setUpSharedConfigsRepo

* wip

* --shared-config-repo

* wip

* wip

* generate isc namespace

* small fix

* transferring creating isc to app-proxy adjustment

* add --create-isc flag

* small changes

* indentation

* change commit message

* isc wip

* removed stuff

* - add flag to runtime upgrade command
- bump go-sdk
- codegen

* - rename function setIscRepo
- bump app-proxy
- bump go-sdk

* bump version

Author: rotem-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.362
+VERSION=v0.0.363
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/common.go

@@ -591,3 +591,12 @@ func askUserIfToProceedWithInsecure(ctx context.Context) error {
 
 	return nil
 }
+
+func setIscRepo(ctx context.Context, suggestedSharedConfigRepo string) (string, error) {
+	setIscRepoResponse, err := cfConfig.NewClient().V2().Runtime().SetSharedConfigRepo(ctx, suggestedSharedConfigRepo)
+	if err != nil {
+		return "", fmt.Errorf("failed to set shared config repo. Error: %w", err)
+	}
+
+	return setIscRepoResponse, nil
+}

cmd/commands/runtime.go

@@ -101,6 +101,7 @@ type (
 		KubeFactory                    kube.Factory
 		CommonConfig                   *runtime.CommonConfig
 		NamespaceLabels                map[string]string
+		SuggestedSharedConfigRepo      string
 		versionStr                     string
 		kubeContext                    string
 		kubeconfig                     string
@@ -121,11 +122,12 @@ type (
 	}
 
 	RuntimeUpgradeOptions struct {
-		RuntimeName      string
-		Version          *semver.Version
-		CloneOpts        *git.CloneOptions
-		CommonConfig     *runtime.CommonConfig
-		DisableTelemetry bool
+		RuntimeName               string
+		Version                   *semver.Version
+		CloneOpts                 *git.CloneOptions
+		CommonConfig              *runtime.CommonConfig
+		SuggestedSharedConfigRepo string
+		DisableTelemetry          bool
 	}
 
 	gvr struct {
@@ -257,6 +259,7 @@ func NewRuntimeInstallCommand() *cobra.Command {
 	cmd.Flags().StringVar(&installationOpts.InternalIngressHost, "internal-ingress-host", "", "The internal ingress host (by default the external ingress will be used for both internal and external traffic)")
 	cmd.Flags().StringVar(&installationOpts.GitIntegrationRegistrationOpts.Token, "personal-git-token", "", "The Personal git token for your user")
 	cmd.Flags().StringVar(&installationOpts.versionStr, "version", "", "The runtime version to install (default: latest)")
+	cmd.Flags().StringVar(&installationOpts.SuggestedSharedConfigRepo, "shared-config-repo", "", "URL to the shared configurations repo. (default: <installation-repo> or the existing one for this account)")
 	cmd.Flags().BoolVar(&installationOpts.InstallDemoResources, "demo-resources", true, "Installs demo resources (default: true)")
 	cmd.Flags().BoolVar(&installationOpts.SkipClusterChecks, "skip-cluster-checks", false, "Skips the cluster's checks")
 	cmd.Flags().BoolVar(&installationOpts.DisableRollback, "disable-rollback", false, "If true, will not perform installation rollback after a failed installation")
@@ -376,6 +379,14 @@ func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, opts *RuntimeInstall
 		}
 	}
 
+	if opts.SuggestedSharedConfigRepo != "" {
+		sharedConfigRepo, err := setIscRepo(cmd.Context(), opts.SuggestedSharedConfigRepo)
+		if err != nil {
+			return fmt.Errorf("failed to ensure shared config repo: %w", err)
+		}
+		log.G(cmd.Context()).Info("using repo '%s' as shared config repo for this account", sharedConfigRepo)
+	}
+
 	opts.Insecure = true // installs argo-cd in insecure mode, we need this so that the eventsource can talk to the argocd-server with http
 	opts.CommonConfig = &runtime.CommonConfig{CodefreshBaseURL: cfConfig.GetCurrentContext().URL}
 
@@ -436,6 +447,14 @@ func runtimeUpgradeCommandPreRunHandler(cmd *cobra.Command, args []string, opts
 		return err
 	}
 
+	if opts.SuggestedSharedConfigRepo != "" {
+		sharedConfigRepo, err := setIscRepo(cmd.Context(), opts.SuggestedSharedConfigRepo)
+		if err != nil {
+			return fmt.Errorf("failed to ensure shared config repo for account: %w", err)
+		}
+		log.G(cmd.Context()).Info("using repo '%s' as shared config repo for this account", sharedConfigRepo)
+	}
+
 	return nil
 }
 
@@ -934,7 +953,7 @@ func createGitSources(ctx context.Context, opts *RuntimeInstallOptions) error {
 func createGitIntegration(ctx context.Context, opts *RuntimeInstallOptions) error {
 	appProxyClient, err := cfConfig.NewClient().AppProxy(ctx, opts.RuntimeName, store.Get().InsecureIngressHost)
 	if err != nil {
-		return fmt.Errorf("failed to build app-proxy client: %w", err)
+		return fmt.Errorf("failed to build app-proxy client while creating git integration: %w", err)
 	}
 
 	err = addDefaultGitIntegration(ctx, appProxyClient, opts.RuntimeName, opts.GitIntegrationCreationOpts)
@@ -955,7 +974,7 @@ func createGitIntegration(ctx context.Context, opts *RuntimeInstallOptions) erro
 func removeGitIntegrations(ctx context.Context, opts *RuntimeUninstallOptions) error {
 	appProxyClient, err := cfConfig.NewClient().AppProxy(ctx, opts.RuntimeName, store.Get().InsecureIngressHost)
 	if err != nil {
-		return fmt.Errorf("failed to build app-proxy client: %w", err)
+		return fmt.Errorf("failed to build app-proxy client while removing git integration: %w", err)
 	}
 
 	integrations, err := appProxyClient.GitIntegrations().List(ctx)
@@ -1769,6 +1788,7 @@ func NewRuntimeUpgradeCommand() *cobra.Command {
 	}
 
 	cmd.Flags().StringVar(&versionStr, "version", "", "The runtime version to upgrade to, defaults to latest")
+	cmd.Flags().StringVar(&opts.SuggestedSharedConfigRepo, "shared-config-repo", "", "URL to the shared configurations repo. (default: <installation-repo> or the existing one for this account)")
 	cmd.Flags().BoolVar(&opts.DisableTelemetry, "disable-telemetry", false, "If true, will disable analytics reporting for the upgrade process")
 	cmd.Flags().BoolVar(&store.Get().SetDefaultResources, "set-default-resources", false, "If true, will set default requests and limits on all of the runtime components")
 	opts.CloneOpts = apu.AddCloneFlags(cmd, &apu.CloneFlagsOptions{CloneForWrite: true})

docs/commands/cli-v2_runtime_install.md

@@ -49,6 +49,7 @@ cli-v2 runtime install [runtime_name] [flags]
       --provider-api-url string                      Git provider API url
       --repo string                                  Repository URL [GIT_REPO]
       --set-default-resources                        If true, will set default requests and limits on all of the runtime components
+      --shared-config-repo string                    URL to the shared configurations repo. (default: <installation-repo> or the existing one for this account)
       --skip-cluster-checks                          Skips the cluster's checks
       --skip-ingress                                 Skips the creation of ingress resources
   -b, --upsert-branch                                If true will try to checkout the specified branch and create it if it doesn't exist

docs/commands/cli-v2_runtime_upgrade.md

@@ -28,14 +28,15 @@ cli-v2 runtime upgrade [RUNTIME_NAME] [flags]
 ### Options
 
 ```
-      --disable-telemetry       If true, will disable analytics reporting for the upgrade process
-  -t, --git-token string        Your git provider api token [GIT_TOKEN]
-  -u, --git-user string         Your git provider user name [GIT_USER] (not required in GitHub)
-  -h, --help                    help for upgrade
-      --repo string             Repository URL [GIT_REPO]
-      --set-default-resources   If true, will set default requests and limits on all of the runtime components
-  -b, --upsert-branch           If true will try to checkout the specified branch and create it if it doesn't exist
-      --version string          The runtime version to upgrade to, defaults to latest
+      --disable-telemetry           If true, will disable analytics reporting for the upgrade process
+  -t, --git-token string            Your git provider api token [GIT_TOKEN]
+  -u, --git-user string             Your git provider user name [GIT_USER] (not required in GitHub)
+  -h, --help                        help for upgrade
+      --repo string                 Repository URL [GIT_REPO]
+      --set-default-resources       If true, will set default requests and limits on all of the runtime components
+      --shared-config-repo string   URL to the shared configurations repo. (default: <installation-repo> or the existing one for this account)
+  -b, --upsert-branch               If true will try to checkout the specified branch and create it if it doesn't exist
+      --version string              The runtime version to upgrade to, defaults to latest
 ```
 
 ### Options inherited from parent commands

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.362/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.363/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.362/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.363/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/argoproj/argo-events v0.17.1-0.20220327045437-70eaafe9afec
 	github.com/argoproj/argo-workflows/v3 v3.3.1
 	github.com/briandowns/spinner v1.18.1
-	github.com/codefresh-io/go-sdk v0.43.9
+	github.com/codefresh-io/go-sdk v0.43.10
 	github.com/fatih/color v1.13.0
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-git/go-billy/v5 v5.3.1

go.sum

@@ -254,8 +254,8 @@ github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h
 github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/codefresh-io/go-sdk v0.43.9 h1:GemYddo4rDqB+qykq6AO5e4/N/FBCqLYI4BBTlX6EYo=
-github.com/codefresh-io/go-sdk v0.43.9/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
+github.com/codefresh-io/go-sdk v0.43.10 h1:SJbc1kOrgvesllkdMZsMFYWOmrFMIyi0d10jslIOIus=
+github.com/codefresh-io/go-sdk v0.43.10/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
 github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27/go.mod h1:VQx0hjo2oUeQkQUET7wRwradO6f+fN5jzXgB/zROxxE=
 github.com/container-storage-interface/spec v1.5.0/go.mod h1:8K96oQNkJ7pFcC2R9Z1ynGGBB1I93kcS6PGg3SsOk8s=

manifests/app-proxy/kustomization.yaml

@@ -3,7 +3,7 @@ kind: Kustomization
 images:
   - name: quay.io/codefresh/cap-app-proxy
     newName: quay.io/codefresh/cap-app-proxy
-    newTag: 1.1274.0
+    newTag: 1.1280.0
 resources:
   - app-proxy.deploy.yaml
   - app-proxy.svc.yaml

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.1
-  version: 0.0.362
+  version: 0.0.363
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events