Skip to content

Commit

Permalink
global key flag should not have default to deletect if added by admin
Browse files Browse the repository at this point in the history
  • Loading branch information
asiyani committed Aug 15, 2023
1 parent b4500d9 commit 2f4e665
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ subjects:
| app arguments/ENVs | default | example / explanation |
|-|-|-|
| --allowed-namespaces-secret-annotation | argocd.voodoobox.plugin.io/allowed-namespaces | when shared secret is used this value is the annotation key to look for in secret to get comma-separated list of all the namespaces that are allowed to use it |
| --global-git-ssh-key-file | /etc/git-secret/ssh | The path to git ssh key file which will be used as global ssh key to fetch kustomize base from private repo for all application |
| --global-git-ssh-known-hosts-file | /etc/git-secret/known_hosts | The path to git known hosts file which will be used as with global ssh key to fetch kustomize base from private repo for all application |
| --global-git-ssh-key-file | | The path to git ssh key file which will be used as global ssh key to fetch kustomize base from private repo for all application |
| --global-git-ssh-known-hosts-file | | The path to git known hosts file which will be used as with global ssh key to fetch kustomize base from private repo for all application |
| --app-strongbox-secret-name | argocd-voodoobox-strongbox-keyring | the value should be the name of a secret resource containing strongbox keyring used to encrypt app secrets. name will be same across all applications |
| --app-git-ssh-secret-name | argocd-voodoobox-git-ssh | the value should be the name of a secret resource containing ssh keys used for fetching remote kustomize bases from private repositories. name will be same across all applications |
| ARGOCD_APP_NAME | set by argocd | name of application |
Expand Down
6 changes: 2 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,12 @@ var flags = []cli.Flag{
&cli.StringFlag{
Name: "global-git-ssh-key-file",
EnvVars: []string{"AVP_GLOBAL_GIT_SSH_KEY_FILE"},
Value: "/etc/git-secret/ssh",
Usage: "The path to git ssh key which will be used to setup GIT_SSH_COMMAND env.",
Usage: "The path to git ssh key file which will be used as global ssh key to fetch kustomize base from private repo for all application",
},
&cli.StringFlag{
Name: "global-git-ssh-known-hosts-file",
EnvVars: []string{"AVP_GLOBAL_GIT_SSH_KNOWN_HOSTS_FILE"},
Value: "/etc/git-secret/known_hosts",
Usage: "The local path to the known hosts file used to setup GIT_SSH_COMMAND env.",
Usage: "The path to git known hosts file which will be used as with global ssh key to fetch kustomize base from private repo for all application",
},
&cli.StringFlag{
Name: "allowed-namespaces-secret-annotation",
Expand Down

0 comments on commit 2f4e665

Please sign in to comment.