From b67e1f425d8f75468ef6fa5c89862674813161ca Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Tue, 3 Jan 2023 14:11:20 +0200 Subject: [PATCH] Release-v0.4.8 (#396) * unhide the new flag Signed-off-by: Noam Gal * v0.4.8 Signed-off-by: Noam Gal Signed-off-by: Noam Gal --- CHANGELOG.md | 4 ++++ Makefile | 2 +- .../argocd-autopilot_application_create.md | 2 ++ .../argocd-autopilot_application_delete.md | 15 ++++++++------- .../commands/argocd-autopilot_application_list.md | 9 +++++---- docs/commands/argocd-autopilot_project_create.md | 1 + docs/commands/argocd-autopilot_project_delete.md | 11 ++++++----- docs/commands/argocd-autopilot_project_list.md | 9 +++++---- docs/commands/argocd-autopilot_repo_bootstrap.md | 1 + docs/commands/argocd-autopilot_repo_uninstall.md | 1 + docs/releases/release_notes.md | 9 +++++---- pkg/git/repository.go | 1 - 12 files changed, 39 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 514d05b2..d5d15de3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog: +# v0.4.8 +- [chore] bumped argo-cd to 2.5.2, removed applicationset pkg (already in argo-cd), updated golang to 1.19 [#394](https://github.com/argoproj-labs/argocd-autopilot/pull/394) +- [fix] add support for git servers with self-signed certificates [#392](https://github.com/argoproj-labs/argocd-autopilot/pull/392) + # v0.4.7 - [fix] 0.4.6 fix caused a regression when `--repo` contained path and/or ref [#375](https://github.com/argoproj-labs/argocd-autopilot/pull/375) diff --git a/Makefile b/Makefile index 2b20c8a7..0cdf123a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=v0.4.7 +VERSION=v0.4.8 OUT_DIR=dist CLI_NAME?=argocd-autopilot diff --git a/docs/commands/argocd-autopilot_application_create.md b/docs/commands/argocd-autopilot_application_create.md index 2a8ccbf8..c20ed633 100644 --- a/docs/commands/argocd-autopilot_application_create.md +++ b/docs/commands/argocd-autopilot_application_create.md @@ -50,6 +50,7 @@ argocd-autopilot application create [APP_NAME] [flags] ``` --annotations stringToString Optional annotations that will be set on the Application resource. (e.g. "{{ placeholder }}=my-org" (default []) --app string The application specifier (e.g. github.com/argoproj/argo-workflows/manifests/cluster-install/?ref=v3.0.3) + --apps-git-server-crt string Git Server certificate fileAPPS_ --apps-git-token string Your git provider api token [APPS_GIT_TOKEN] --apps-git-user string Your git provider user name [APPS_GIT_USER] (not required in GitHub) --apps-repo string Repository URL [APPS_GIT_REPO] @@ -57,6 +58,7 @@ argocd-autopilot application create [APP_NAME] [flags] --dest-namespace string K8s target namespace (overrides the namespace specified in the kustomization.yaml) --dest-server string K8s cluster URL (e.g. https://kubernetes.default.svc) (default "https://kubernetes.default.svc") --exclude string Optional glob for files to exclude + --git-server-crt string Git Server certificate file -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 create diff --git a/docs/commands/argocd-autopilot_application_delete.md b/docs/commands/argocd-autopilot_application_delete.md index 88178070..28c3dc88 100644 --- a/docs/commands/argocd-autopilot_application_delete.md +++ b/docs/commands/argocd-autopilot_application_delete.md @@ -29,13 +29,14 @@ argocd-autopilot application delete [APP_NAME] [flags] ### Options ``` - -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) - -g, --global global - -h, --help help for delete - -p, --project string Project name - --repo string Repository URL [GIT_REPO] - -b, --upsert-branch If true will try to checkout the specified branch and create it if it doesn't exist + --git-server-crt string Git Server certificate file + -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) + -g, --global global + -h, --help help for delete + -p, --project string Project name + --repo string Repository URL [GIT_REPO] + -b, --upsert-branch If true will try to checkout the specified branch and create it if it doesn't exist ``` ### SEE ALSO diff --git a/docs/commands/argocd-autopilot_application_list.md b/docs/commands/argocd-autopilot_application_list.md index 953e6bae..c986a733 100644 --- a/docs/commands/argocd-autopilot_application_list.md +++ b/docs/commands/argocd-autopilot_application_list.md @@ -29,10 +29,11 @@ argocd-autopilot application list [PROJECT_NAME] [flags] ### Options ``` - -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 list - --repo string Repository URL [GIT_REPO] + --git-server-crt string Git Server certificate file + -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 list + --repo string Repository URL [GIT_REPO] ``` ### SEE ALSO diff --git a/docs/commands/argocd-autopilot_project_create.md b/docs/commands/argocd-autopilot_project_create.md index 71a74edd..c52a6ce8 100644 --- a/docs/commands/argocd-autopilot_project_create.md +++ b/docs/commands/argocd-autopilot_project_create.md @@ -47,6 +47,7 @@ argocd-autopilot project create [PROJECT] [flags] --exec-command-args stringArray Arguments to supply to the --exec-command executable --exec-command-env stringToString Environment vars to set when running the --exec-command executable (default []) --exec-command-install-hint string Text shown to the user when the --exec-command executable doesn't seem to be present + --git-server-crt string Git Server certificate file -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) --grpc-web Enables gRPC-web protocol. Useful if Argo CD server is behind proxy which does not support HTTP2. diff --git a/docs/commands/argocd-autopilot_project_delete.md b/docs/commands/argocd-autopilot_project_delete.md index ec48e005..673737a9 100644 --- a/docs/commands/argocd-autopilot_project_delete.md +++ b/docs/commands/argocd-autopilot_project_delete.md @@ -29,11 +29,12 @@ argocd-autopilot project delete [PROJECT_NAME] [flags] ### Options ``` - -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 delete - --repo string Repository URL [GIT_REPO] - -b, --upsert-branch If true will try to checkout the specified branch and create it if it doesn't exist + --git-server-crt string Git Server certificate file + -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 delete + --repo string Repository URL [GIT_REPO] + -b, --upsert-branch If true will try to checkout the specified branch and create it if it doesn't exist ``` ### SEE ALSO diff --git a/docs/commands/argocd-autopilot_project_list.md b/docs/commands/argocd-autopilot_project_list.md index 2cef0e8d..555d51e4 100644 --- a/docs/commands/argocd-autopilot_project_list.md +++ b/docs/commands/argocd-autopilot_project_list.md @@ -29,10 +29,11 @@ argocd-autopilot project list [flags] ### Options ``` - -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 list - --repo string Repository URL [GIT_REPO] + --git-server-crt string Git Server certificate file + -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 list + --repo string Repository URL [GIT_REPO] ``` ### SEE ALSO diff --git a/docs/commands/argocd-autopilot_repo_bootstrap.md b/docs/commands/argocd-autopilot_repo_bootstrap.md index 5aa122f4..59508420 100644 --- a/docs/commands/argocd-autopilot_repo_bootstrap.md +++ b/docs/commands/argocd-autopilot_repo_bootstrap.md @@ -37,6 +37,7 @@ argocd-autopilot repo bootstrap [flags] --app string The application specifier (e.g. github.com/argoproj-labs/argocd-autopilot/manifests?ref=v0.2.5), overrides the default installation argo-cd manifests --context string The name of the kubeconfig context to use --dry-run If true, print manifests instead of applying them to the cluster (nothing will be commited to git) + --git-server-crt string Git Server certificate file -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 bootstrap diff --git a/docs/commands/argocd-autopilot_repo_uninstall.md b/docs/commands/argocd-autopilot_repo_uninstall.md index 714d306a..ec96156f 100644 --- a/docs/commands/argocd-autopilot_repo_uninstall.md +++ b/docs/commands/argocd-autopilot_repo_uninstall.md @@ -42,6 +42,7 @@ argocd-autopilot repo uninstall [flags] ``` --context string The name of the kubeconfig context to use --force If true, will try to complete the uninstallation even if one or more of the uninstallation steps failed + --git-server-crt string Git Server certificate file -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 uninstall diff --git a/docs/releases/release_notes.md b/docs/releases/release_notes.md index ec338f28..b4b401cc 100644 --- a/docs/releases/release_notes.md +++ b/docs/releases/release_notes.md @@ -1,6 +1,7 @@ ### Changes -- [fix] 0.4.6 fix caused a regression when `--repo` contained path and/or ref [#375](https://github.com/argoproj-labs/argocd-autopilot/pull/375) +- [chore] bumped argo-cd to 2.5.2, removed applicationset pkg (already in argo-cd), updated golang to 1.19 [#394](https://github.com/argoproj-labs/argocd-autopilot/pull/394) +- [fix] add support for git servers with self-signed certificates [#392](https://github.com/argoproj-labs/argocd-autopilot/pull/392) ### Contributors: @@ -47,7 +48,7 @@ argocd-autopilot version ```bash # download and extract the binary -curl -L --output - https://github.com/argoproj-labs/argocd-autopilot/releases/download/v0.4.7/argocd-autopilot-linux-amd64.tar.gz | tar zx +curl -L --output - https://github.com/argoproj-labs/argocd-autopilot/releases/download/v0.4.8/argocd-autopilot-linux-amd64.tar.gz | tar zx # move the binary to your $PATH mv ./argocd-autopilot-* /usr/local/bin/argocd-autopilot @@ -60,7 +61,7 @@ argocd-autopilot version ```bash # download and extract the binary -curl -L --output - https://github.com/argoproj-labs/argocd-autopilot/releases/download/v0.4.7/argocd-autopilot-darwin-amd64.tar.gz | tar zx +curl -L --output - https://github.com/argoproj-labs/argocd-autopilot/releases/download/v0.4.8/argocd-autopilot-darwin-amd64.tar.gz | tar zx # move the binary to your $PATH mv ./argocd-autopilot-* /usr/local/bin/argocd-autopilot @@ -77,5 +78,5 @@ When using the Docker image, you have to provide the `.kube` and `.gitconfig` di docker run \ -v ~/.kube:/home/autopilot/.kube \ -v ~/.gitconfig:/home/autopilot/.gitconfig \ - -it quay.io/argoprojlabs/argocd-autopilot:v0.4.7 + -it quay.io/argoprojlabs/argocd-autopilot:v0.4.8 ``` diff --git a/pkg/git/repository.go b/pkg/git/repository.go index e4b1e691..82167966 100644 --- a/pkg/git/repository.go +++ b/pkg/git/repository.go @@ -162,7 +162,6 @@ func AddFlags(cmd *cobra.Command, opts *AddFlagsOptions) *CloneOptions { util.Die(viper.BindEnv(opts.Prefix+"git-token", envPrefix+"GIT_TOKEN")) util.Die(viper.BindEnv(opts.Prefix+"git-user", envPrefix+"GIT_USER")) util.Die(viper.BindEnv(opts.Prefix+"repo", envPrefix+"GIT_REPO")) - util.Die(cmd.PersistentFlags().MarkHidden(opts.Prefix + "git-server-crt")) if opts.Prefix == "" { cmd.Flag("git-token").Shorthand = "t"