Skip to content
This repository has been archived by the owner on May 31, 2024. It is now read-only.

fix: correct skip decryption #106

Merged
merged 1 commit into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion argocd-cmp/cmp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ spec:
- "."
- --env-regex
- "^ARGOCD_ENV_.*$"
- --must-decrypt
- --kubeconfig
- "/etc/kubernetes/kubeconfig"
1 change: 0 additions & 1 deletion pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ type Configuration struct {
SecretNamespace string `mapstructure:"secret-namespace"`
EjsonKey []string `mapstructure:"ejson-key"`
SkipDecrypt bool `mapstructure:"skip-decrypt"`
MustDecrypt bool `mapstructure:"must-decrypt"`
KubectlTimeout time.Duration `mapstructure:"kubectl-timeout"`
Kubeconfig string `mapstructure:"kubeconfig"`
KubeAPI string `mapstructure:"kube-api"`
Expand Down
4 changes: 2 additions & 2 deletions subst/cmd/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ func addRenderFlags(flags *flag.FlagSet) {
flags.StringSlice("ejson-key", []string{}, heredoc.Doc(`
Specify EJSON Private key used for decryption.
May be specified multiple times or separate values with commas`))
flags.Bool("must-decrypt", false, heredoc.Doc(`
Fail if not all ejson files can be decrypted`))
flags.Bool("skip-decrypt", false, heredoc.Doc(`
Skip decryption`))
flags.String("env-regex", "^ARGOCD_ENV_.*$", heredoc.Doc(`
Only expose environment variables that match the given regex`))
flags.String("output", "yaml", heredoc.Doc(`
Expand Down
Loading