Skip to content

Commit 89d5853

Browse files
committed
Merge branch 'main' into 254/change-binary-names
2 parents e5e8428 + 233d9b5 commit 89d5853

File tree

9 files changed

+692
-513
lines changed

9 files changed

+692
-513
lines changed

.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ jobs:
7777
uses: actions/checkout@v2
7878
- name: Install UI Deps
7979
run: npm ci
80-
- name: NPM Audit
81-
run: npm audit
80+
# - name: NPM Audit
81+
# run: npm audit
8282
- name: Build UI Assets
8383
run: make cmd/ui/dist/main.js
8484
- name: Fake Install flux

cmd/wego/add/cmd.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var Cmd = &cobra.Command{
2424
Use: "add [--name <name>] [--url <url>] [--branch <branch>] [--path <path within repository>] [--private-key <keyfile>] <repository directory>",
2525
Short: "Add a workload repository to a wego cluster",
2626
Long: strings.TrimSpace(dedent.Dedent(`
27-
Associates an additional git repository with a wego cluster so that its contents may be managed via GitOps
27+
Associates an additional application in a git repository with a wego cluster so that its contents may be managed via GitOps
2828
`)),
2929
Example: "wego add .",
3030
Run: runCmd,
@@ -33,13 +33,14 @@ var Cmd = &cobra.Command{
3333
func init() {
3434
Cmd.Flags().StringVar(&params.Owner, "owner", "", "Owner of remote git repository")
3535
Cmd.Flags().StringVar(&params.Name, "name", "", "Name of remote git repository")
36-
Cmd.Flags().StringVar(&params.Url, "url", "", "URL of remote git repository")
36+
Cmd.Flags().StringVar(&params.Url, "url", "", "URL of remote repository")
3737
Cmd.Flags().StringVar(&params.Path, "path", "./", "Path of files within git repository")
3838
Cmd.Flags().StringVar(&params.Branch, "branch", "main", "Branch to watch within git repository")
3939
Cmd.Flags().StringVar(&params.DeploymentType, "deployment-type", "kustomize", "deployment type [kustomize, helm]")
40+
Cmd.Flags().StringVar(&params.Chart, "chart", "", "Specify chart for helm source")
4041
Cmd.Flags().StringVar(&params.PrivateKey, "private-key", filepath.Join(os.Getenv("HOME"), ".ssh", "id_rsa"), "Private key that provides access to git repository")
42+
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")
4143
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")
42-
Cmd.Flags().BoolVar(&params.IsPrivate, "private", true, "Set access control on the repo")
4344
}
4445

4546
func runCmd(cmd *cobra.Command, args []string) {

0 commit comments

Comments
 (0)