Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support all three config modes #253

Merged
merged 31 commits into from
Jun 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
252cdcc
rough draft
weave-e2e-quickstart Jun 5, 2021
ca2ab7b
merge upstream cleanup
weave-e2e-quickstart Jun 5, 2021
4227cfd
remove .git from app config url
weave-e2e-quickstart Jun 5, 2021
21f5346
more testing of external
weave-e2e-quickstart Jun 6, 2021
07f377b
external repo working
weave-e2e-quickstart Jun 6, 2021
2553ef5
user repo working
weave-e2e-quickstart Jun 6, 2021
14989c0
update tests for new git client and add test for generateSource
weave-e2e-quickstart Jun 6, 2021
a0c9640
fix lint errors
weave-e2e-quickstart Jun 6, 2021
1202611
coverage for empty URL and non-default path
weave-e2e-quickstart Jun 6, 2021
d0cd52b
fix overzealous lint check
weave-e2e-quickstart Jun 6, 2021
27ddf33
coverage for non-user-repo add paths
weave-e2e-quickstart Jun 6, 2021
2d2cd83
add test for all config modes no dry-run
weave-e2e-quickstart Jun 6, 2021
4f35d82
more lint
weave-e2e-quickstart Jun 6, 2021
19720f0
remove unused function
weave-e2e-quickstart Jun 6, 2021
ab575c4
more no longer used code
weave-e2e-quickstart Jun 6, 2021
29de258
first attempt at fixing smoke tests
weave-e2e-quickstart Jun 6, 2021
c781d15
test tweaks
weave-e2e-quickstart Jun 6, 2021
cce9898
test lint
weave-e2e-quickstart Jun 6, 2021
b928ccc
dead code in tests
weave-e2e-quickstart Jun 6, 2021
05b250e
fix status, helmrelease naming, and kustomize naming
weave-e2e-quickstart Jun 7, 2021
2878ecd
reduce refresh intervals
weave-e2e-quickstart Jun 7, 2021
788bbe7
update interval in add test
weave-e2e-quickstart Jun 7, 2021
336829a
disambiguate kustomizations
weave-e2e-quickstart Jun 7, 2021
355c4ef
experimentally increase pod timeout for test
weave-e2e-quickstart Jun 7, 2021
d060125
disambiguate target kustomizations
weave-e2e-quickstart Jun 7, 2021
6282d33
remove uses of --private flag for now since we no longer create repos
weave-e2e-quickstart Jun 7, 2021
69db4ff
wait for correct source in test (repo, rather than app)
weave-e2e-quickstart Jun 7, 2021
32a49f6
lint error
weave-e2e-quickstart Jun 7, 2021
5064b05
update with new helm repository changes
weave-e2e-quickstart Jun 7, 2021
0d31108
remove dead code
weave-e2e-quickstart Jun 7, 2021
368a419
turn off audit for now
weave-e2e-quickstart Jun 7, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmd/wego/add/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -39,8 +39,8 @@ func init() {
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")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit - "URL of external repository" -> "URL of an external repository"

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) {
Expand Down
Loading