Merge branch 'main' into 254/change-binary-names

weaveworks · Jun 8, 2021 · 89d5853 · 89d5853
2 parents e5e8428 + 233d9b5
commit 89d5853
Show file tree

Hide file tree

Showing 9 changed files with 692 additions and 513 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -77,8 +77,8 @@ jobs:
       uses: actions/checkout@v2
     - name: Install UI Deps
       run: npm ci
-    - name: NPM Audit
-      run: npm audit
+    # - name: NPM Audit
+    #   run: npm audit
     - name: Build UI Assets
       run: make cmd/ui/dist/main.js
     - name: Fake Install flux

diff --git a/cmd/wego/add/cmd.go b/cmd/wego/add/cmd.go
@@ -24,7 +24,7 @@ var Cmd = &cobra.Command{
 	Use:   "add [--name <name>] [--url <url>] [--branch <branch>] [--path <path within repository>] [--private-key <keyfile>] <repository directory>",
 	Short: "Add a workload repository to a wego cluster",
 	Long: strings.TrimSpace(dedent.Dedent(`
-        Associates an additional git repository with a wego cluster so that its contents may be managed via GitOps
+        Associates an additional application in a git repository with a wego cluster so that its contents may be managed via GitOps
     `)),
 	Example: "wego add .",
 	Run:     runCmd,
@@ -33,13 +33,14 @@ var Cmd = &cobra.Command{
 func init() {
 	Cmd.Flags().StringVar(&params.Owner, "owner", "", "Owner of remote git repository")
 	Cmd.Flags().StringVar(&params.Name, "name", "", "Name of remote git repository")
-	Cmd.Flags().StringVar(&params.Url, "url", "", "URL of remote git repository")
+	Cmd.Flags().StringVar(&params.Url, "url", "", "URL of remote repository")
 	Cmd.Flags().StringVar(&params.Path, "path", "./", "Path of files within git repository")
 	Cmd.Flags().StringVar(&params.Branch, "branch", "main", "Branch to watch within git repository")
 	Cmd.Flags().StringVar(&params.DeploymentType, "deployment-type", "kustomize", "deployment type [kustomize, helm]")
+	Cmd.Flags().StringVar(&params.Chart, "chart", "", "Specify chart for helm source")
 	Cmd.Flags().StringVar(&params.PrivateKey, "private-key", filepath.Join(os.Getenv("HOME"), ".ssh", "id_rsa"), "Private key that provides access to git repository")
+	Cmd.Flags().StringVar(&params.AppConfigUrl, "app-config-url", "", "URL of external repository (if any) which will hold automation manifests; NONE to store only in the cluster")
 	Cmd.Flags().BoolVar(&params.DryRun, "dry-run", false, "If set, 'wego add' will not make any changes to the system; it will just display the actions that would have been taken")
-	Cmd.Flags().BoolVar(&params.IsPrivate, "private", true, "Set access control on the repo")
 }
 
 func runCmd(cmd *cobra.Command, args []string) {