From 6ac023df8362412c537b998b5eebd4d390f2bf1b Mon Sep 17 00:00:00 2001 From: Austin Abro Date: Thu, 5 Dec 2024 16:50:56 +0000 Subject: [PATCH 1/4] move console to default Signed-off-by: Austin Abro --- src/cmd/root.go | 2 +- src/pkg/logger/logger.go | 10 +++++----- src/pkg/logger/logger_test.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cmd/root.go b/src/cmd/root.go index 5acfc9c278..1e02891796 100644 --- a/src/cmd/root.go +++ b/src/cmd/root.go @@ -165,7 +165,7 @@ func init() { // Logs rootCmd.PersistentFlags().StringVarP(&LogLevelCLI, "log-level", "l", v.GetString(common.VLogLevel), lang.RootCmdFlagLogLevel) - rootCmd.PersistentFlags().StringVar(&LogFormat, "log-format", v.GetString(common.VLogFormat), "[alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev'") + rootCmd.PersistentFlags().StringVar(&LogFormat, "log-format", v.GetString(common.VLogFormat), "[beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev'") rootCmd.PersistentFlags().BoolVar(&SkipLogFile, "no-log-file", v.GetBool(common.VNoLogFile), lang.RootCmdFlagSkipLogFile) rootCmd.PersistentFlags().BoolVar(&message.NoProgress, "no-progress", v.GetBool(common.VNoProgress), lang.RootCmdFlagNoProgress) rootCmd.PersistentFlags().BoolVar(&NoColor, "no-color", v.GetBool(common.VNoColor), lang.RootCmdFlagNoColor) diff --git a/src/pkg/logger/logger.go b/src/pkg/logger/logger.go index 0086fd65a9..35db6d5727 100644 --- a/src/pkg/logger/logger.go +++ b/src/pkg/logger/logger.go @@ -93,13 +93,13 @@ func (f Format) ToLower() Format { } var ( - // FormatText uses the standard slog TextHandler - FormatText Format = "text" + // FormatConsoleNoColor uses the standard slog TextHandler + FormatConsoleNoColor Format = "console-no-color" // FormatJSON uses the standard slog JSONHandler FormatJSON Format = "json" // FormatConsole uses console-slog to provide prettier colorful messages FormatConsole Format = "console" - // FormatDev uses a verbose and prettyprinting devslog handler + // FormatDev uses a verbose and pretty printing devslog handler FormatDev Format = "dev" // FormatNone sends log writes to DestinationNone / io.Discard FormatNone Format = "none" @@ -148,7 +148,7 @@ func (c Config) LogValue() slog.Value { func ConfigDefault() Config { return Config{ Level: Info, - Format: FormatText, + Format: FormatConsole, Destination: DestinationDefault, // Stderr } } @@ -171,7 +171,7 @@ func New(cfg Config) (*slog.Logger, error) { var handler slog.Handler switch cfg.Format.ToLower() { - case FormatText: + case FormatConsoleNoColor: handler = console.NewHandler(cfg.Destination, &console.HandlerOptions{ Level: slog.Level(cfg.Level), NoColor: true, diff --git a/src/pkg/logger/logger_test.go b/src/pkg/logger/logger_test.go index 74695ca063..f3faf13485 100644 --- a/src/pkg/logger/logger_test.go +++ b/src/pkg/logger/logger_test.go @@ -54,7 +54,7 @@ func Test_New(t *testing.T) { { name: "Text format is supported", cfg: Config{ - Format: FormatText, + Format: FormatConsoleNoColor, }, }, { From e34f198d842b6847d2d242d1f83e296dac05856b Mon Sep 17 00:00:00 2001 From: Austin Abro Date: Thu, 5 Dec 2024 16:53:08 +0000 Subject: [PATCH 2/4] make docs and schema Signed-off-by: Austin Abro --- site/src/content/docs/commands/zarf.md | 2 +- site/src/content/docs/commands/zarf_completion.md | 2 +- site/src/content/docs/commands/zarf_completion_bash.md | 2 +- site/src/content/docs/commands/zarf_completion_fish.md | 2 +- site/src/content/docs/commands/zarf_completion_powershell.md | 2 +- site/src/content/docs/commands/zarf_completion_zsh.md | 2 +- site/src/content/docs/commands/zarf_connect.md | 2 +- site/src/content/docs/commands/zarf_connect_list.md | 2 +- site/src/content/docs/commands/zarf_destroy.md | 2 +- site/src/content/docs/commands/zarf_dev.md | 2 +- site/src/content/docs/commands/zarf_dev_deploy.md | 2 +- site/src/content/docs/commands/zarf_dev_find-images.md | 2 +- site/src/content/docs/commands/zarf_dev_generate-config.md | 2 +- site/src/content/docs/commands/zarf_dev_generate.md | 2 +- site/src/content/docs/commands/zarf_dev_lint.md | 2 +- site/src/content/docs/commands/zarf_dev_patch-git.md | 2 +- site/src/content/docs/commands/zarf_dev_sha256sum.md | 2 +- site/src/content/docs/commands/zarf_init.md | 2 +- site/src/content/docs/commands/zarf_package.md | 2 +- site/src/content/docs/commands/zarf_package_create.md | 2 +- site/src/content/docs/commands/zarf_package_deploy.md | 2 +- site/src/content/docs/commands/zarf_package_inspect.md | 2 +- site/src/content/docs/commands/zarf_package_list.md | 2 +- site/src/content/docs/commands/zarf_package_mirror-resources.md | 2 +- site/src/content/docs/commands/zarf_package_publish.md | 2 +- site/src/content/docs/commands/zarf_package_pull.md | 2 +- site/src/content/docs/commands/zarf_package_remove.md | 2 +- site/src/content/docs/commands/zarf_tools.md | 2 +- site/src/content/docs/commands/zarf_tools_archiver.md | 2 +- site/src/content/docs/commands/zarf_tools_archiver_compress.md | 2 +- .../src/content/docs/commands/zarf_tools_archiver_decompress.md | 2 +- site/src/content/docs/commands/zarf_tools_archiver_version.md | 2 +- site/src/content/docs/commands/zarf_tools_clear-cache.md | 2 +- site/src/content/docs/commands/zarf_tools_download-init.md | 2 +- site/src/content/docs/commands/zarf_tools_gen-key.md | 2 +- site/src/content/docs/commands/zarf_tools_gen-pki.md | 2 +- site/src/content/docs/commands/zarf_tools_get-creds.md | 2 +- site/src/content/docs/commands/zarf_tools_update-creds.md | 2 +- site/src/content/docs/commands/zarf_version.md | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/site/src/content/docs/commands/zarf.md b/site/src/content/docs/commands/zarf.md index 2abaf2d473..851c039c6e 100644 --- a/site/src/content/docs/commands/zarf.md +++ b/site/src/content/docs/commands/zarf.md @@ -25,7 +25,7 @@ zarf COMMAND [flags] -a, --architecture string Architecture for OCI images and Zarf packages -h, --help help for zarf --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_completion.md b/site/src/content/docs/commands/zarf_completion.md index dfeb5e7d08..dfccd992f8 100644 --- a/site/src/content/docs/commands/zarf_completion.md +++ b/site/src/content/docs/commands/zarf_completion.md @@ -27,7 +27,7 @@ See each sub-command's help for details on how to use the generated script. ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_completion_bash.md b/site/src/content/docs/commands/zarf_completion_bash.md index 01a8516499..3d61956468 100644 --- a/site/src/content/docs/commands/zarf_completion_bash.md +++ b/site/src/content/docs/commands/zarf_completion_bash.md @@ -50,7 +50,7 @@ zarf completion bash ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_completion_fish.md b/site/src/content/docs/commands/zarf_completion_fish.md index 7b6953dece..b988dd9cb2 100644 --- a/site/src/content/docs/commands/zarf_completion_fish.md +++ b/site/src/content/docs/commands/zarf_completion_fish.md @@ -41,7 +41,7 @@ zarf completion fish [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_completion_powershell.md b/site/src/content/docs/commands/zarf_completion_powershell.md index 880f91bac3..c6f022d06a 100644 --- a/site/src/content/docs/commands/zarf_completion_powershell.md +++ b/site/src/content/docs/commands/zarf_completion_powershell.md @@ -38,7 +38,7 @@ zarf completion powershell [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_completion_zsh.md b/site/src/content/docs/commands/zarf_completion_zsh.md index 2806b879c5..64da6e2dfe 100644 --- a/site/src/content/docs/commands/zarf_completion_zsh.md +++ b/site/src/content/docs/commands/zarf_completion_zsh.md @@ -52,7 +52,7 @@ zarf completion zsh [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_connect.md b/site/src/content/docs/commands/zarf_connect.md index d4ee6637b1..054ac1b136 100644 --- a/site/src/content/docs/commands/zarf_connect.md +++ b/site/src/content/docs/commands/zarf_connect.md @@ -41,7 +41,7 @@ zarf connect { REGISTRY | GIT | connect-name } [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_connect_list.md b/site/src/content/docs/commands/zarf_connect_list.md index 51cece492e..519d147268 100644 --- a/site/src/content/docs/commands/zarf_connect_list.md +++ b/site/src/content/docs/commands/zarf_connect_list.md @@ -25,7 +25,7 @@ zarf connect list [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_destroy.md b/site/src/content/docs/commands/zarf_destroy.md index 5515c30c58..0f8b0afcb2 100644 --- a/site/src/content/docs/commands/zarf_destroy.md +++ b/site/src/content/docs/commands/zarf_destroy.md @@ -37,7 +37,7 @@ zarf destroy --confirm [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_dev.md b/site/src/content/docs/commands/zarf_dev.md index 2669e39b67..8482860146 100644 --- a/site/src/content/docs/commands/zarf_dev.md +++ b/site/src/content/docs/commands/zarf_dev.md @@ -21,7 +21,7 @@ Commands useful for developing packages ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_dev_deploy.md b/site/src/content/docs/commands/zarf_dev_deploy.md index e0e1842db7..148c54e1c5 100644 --- a/site/src/content/docs/commands/zarf_dev_deploy.md +++ b/site/src/content/docs/commands/zarf_dev_deploy.md @@ -38,7 +38,7 @@ zarf dev deploy [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_dev_find-images.md b/site/src/content/docs/commands/zarf_dev_find-images.md index fa6c843222..6280b1aea9 100644 --- a/site/src/content/docs/commands/zarf_dev_find-images.md +++ b/site/src/content/docs/commands/zarf_dev_find-images.md @@ -39,7 +39,7 @@ zarf dev find-images [ DIRECTORY ] [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_dev_generate-config.md b/site/src/content/docs/commands/zarf_dev_generate-config.md index 86878db2b9..0e8eb24c7e 100644 --- a/site/src/content/docs/commands/zarf_dev_generate-config.md +++ b/site/src/content/docs/commands/zarf_dev_generate-config.md @@ -34,7 +34,7 @@ zarf dev generate-config [ FILENAME ] [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_dev_generate.md b/site/src/content/docs/commands/zarf_dev_generate.md index 6f82e67995..07d40407e7 100644 --- a/site/src/content/docs/commands/zarf_dev_generate.md +++ b/site/src/content/docs/commands/zarf_dev_generate.md @@ -36,7 +36,7 @@ zarf dev generate podinfo --url https://github.com/stefanprodan/podinfo.git --ve ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_dev_lint.md b/site/src/content/docs/commands/zarf_dev_lint.md index 753362c5ef..3b2578269d 100644 --- a/site/src/content/docs/commands/zarf_dev_lint.md +++ b/site/src/content/docs/commands/zarf_dev_lint.md @@ -31,7 +31,7 @@ zarf dev lint [ DIRECTORY ] [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_dev_patch-git.md b/site/src/content/docs/commands/zarf_dev_patch-git.md index f4de661dab..9353aa256d 100644 --- a/site/src/content/docs/commands/zarf_dev_patch-git.md +++ b/site/src/content/docs/commands/zarf_dev_patch-git.md @@ -27,7 +27,7 @@ zarf dev patch-git HOST FILE [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_dev_sha256sum.md b/site/src/content/docs/commands/zarf_dev_sha256sum.md index 41b1d3f77e..d964f49e8e 100644 --- a/site/src/content/docs/commands/zarf_dev_sha256sum.md +++ b/site/src/content/docs/commands/zarf_dev_sha256sum.md @@ -26,7 +26,7 @@ zarf dev sha256sum { FILE | URL } [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_init.md b/site/src/content/docs/commands/zarf_init.md index 7a448e9281..e915b331c8 100644 --- a/site/src/content/docs/commands/zarf_init.md +++ b/site/src/content/docs/commands/zarf_init.md @@ -86,7 +86,7 @@ $ zarf init --artifact-push-password={PASSWORD} --artifact-push-username={USERNA ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_package.md b/site/src/content/docs/commands/zarf_package.md index 37ba5dfdf9..65b55d7ccd 100644 --- a/site/src/content/docs/commands/zarf_package.md +++ b/site/src/content/docs/commands/zarf_package.md @@ -23,7 +23,7 @@ Zarf package commands for creating, deploying, and inspecting packages ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_package_create.md b/site/src/content/docs/commands/zarf_package_create.md index 7fe3f104ae..14b6c33276 100644 --- a/site/src/content/docs/commands/zarf_package_create.md +++ b/site/src/content/docs/commands/zarf_package_create.md @@ -44,7 +44,7 @@ zarf package create [ DIRECTORY ] [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_package_deploy.md b/site/src/content/docs/commands/zarf_package_deploy.md index c423cad9ce..5c6b3944c1 100644 --- a/site/src/content/docs/commands/zarf_package_deploy.md +++ b/site/src/content/docs/commands/zarf_package_deploy.md @@ -39,7 +39,7 @@ zarf package deploy [ PACKAGE_SOURCE ] [flags] -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. -k, --key string Path to public key file for validating signed packages - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_package_inspect.md b/site/src/content/docs/commands/zarf_package_inspect.md index 833011a813..5535e7fbd1 100644 --- a/site/src/content/docs/commands/zarf_package_inspect.md +++ b/site/src/content/docs/commands/zarf_package_inspect.md @@ -34,7 +34,7 @@ zarf package inspect [ PACKAGE_SOURCE ] [flags] -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. -k, --key string Path to public key file for validating signed packages - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_package_list.md b/site/src/content/docs/commands/zarf_package_list.md index 233335dac3..2b932c76d5 100644 --- a/site/src/content/docs/commands/zarf_package_list.md +++ b/site/src/content/docs/commands/zarf_package_list.md @@ -26,7 +26,7 @@ zarf package list [flags] -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. -k, --key string Path to public key file for validating signed packages - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_package_mirror-resources.md b/site/src/content/docs/commands/zarf_package_mirror-resources.md index 659a1b7bd9..090e7502e1 100644 --- a/site/src/content/docs/commands/zarf_package_mirror-resources.md +++ b/site/src/content/docs/commands/zarf_package_mirror-resources.md @@ -67,7 +67,7 @@ $ zarf package mirror-resources \ -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. -k, --key string Path to public key file for validating signed packages - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_package_publish.md b/site/src/content/docs/commands/zarf_package_publish.md index 0ebfdb3516..4d921da448 100644 --- a/site/src/content/docs/commands/zarf_package_publish.md +++ b/site/src/content/docs/commands/zarf_package_publish.md @@ -41,7 +41,7 @@ $ zarf package publish ./path/to/dir oci://my-registry.com/my-namespace -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. -k, --key string Path to public key file for validating signed packages - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_package_pull.md b/site/src/content/docs/commands/zarf_package_pull.md index 1b87e49a33..bdc4dbf8ba 100644 --- a/site/src/content/docs/commands/zarf_package_pull.md +++ b/site/src/content/docs/commands/zarf_package_pull.md @@ -42,7 +42,7 @@ $ zarf package pull oci://ghcr.io/defenseunicorns/packages/dos-games:1.0.0 -a sk -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. -k, --key string Path to public key file for validating signed packages - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_package_remove.md b/site/src/content/docs/commands/zarf_package_remove.md index 104484e18c..b5f07601de 100644 --- a/site/src/content/docs/commands/zarf_package_remove.md +++ b/site/src/content/docs/commands/zarf_package_remove.md @@ -29,7 +29,7 @@ zarf package remove { PACKAGE_SOURCE | PACKAGE_NAME } --confirm [flags] -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. -k, --key string Path to public key file for validating signed packages - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_tools.md b/site/src/content/docs/commands/zarf_tools.md index e770789a98..30b2c219c9 100644 --- a/site/src/content/docs/commands/zarf_tools.md +++ b/site/src/content/docs/commands/zarf_tools.md @@ -21,7 +21,7 @@ Collection of additional tools to make airgap easier ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_tools_archiver.md b/site/src/content/docs/commands/zarf_tools_archiver.md index 9a17c3d5a2..22516a9e55 100644 --- a/site/src/content/docs/commands/zarf_tools_archiver.md +++ b/site/src/content/docs/commands/zarf_tools_archiver.md @@ -21,7 +21,7 @@ Compresses/Decompresses generic archives, including Zarf packages ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_tools_archiver_compress.md b/site/src/content/docs/commands/zarf_tools_archiver_compress.md index 9de8388512..b0bb13f98c 100644 --- a/site/src/content/docs/commands/zarf_tools_archiver_compress.md +++ b/site/src/content/docs/commands/zarf_tools_archiver_compress.md @@ -25,7 +25,7 @@ zarf tools archiver compress SOURCES ARCHIVE [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_tools_archiver_decompress.md b/site/src/content/docs/commands/zarf_tools_archiver_decompress.md index 05f0687f61..762cf41171 100644 --- a/site/src/content/docs/commands/zarf_tools_archiver_decompress.md +++ b/site/src/content/docs/commands/zarf_tools_archiver_decompress.md @@ -26,7 +26,7 @@ zarf tools archiver decompress ARCHIVE DESTINATION [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_tools_archiver_version.md b/site/src/content/docs/commands/zarf_tools_archiver_version.md index 86f490e7b3..8cf1c293aa 100644 --- a/site/src/content/docs/commands/zarf_tools_archiver_version.md +++ b/site/src/content/docs/commands/zarf_tools_archiver_version.md @@ -25,7 +25,7 @@ zarf tools archiver version [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_tools_clear-cache.md b/site/src/content/docs/commands/zarf_tools_clear-cache.md index 3e41fba093..49db596625 100644 --- a/site/src/content/docs/commands/zarf_tools_clear-cache.md +++ b/site/src/content/docs/commands/zarf_tools_clear-cache.md @@ -26,7 +26,7 @@ zarf tools clear-cache [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_tools_download-init.md b/site/src/content/docs/commands/zarf_tools_download-init.md index b6a616a80e..2b1889d35d 100644 --- a/site/src/content/docs/commands/zarf_tools_download-init.md +++ b/site/src/content/docs/commands/zarf_tools_download-init.md @@ -26,7 +26,7 @@ zarf tools download-init [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_tools_gen-key.md b/site/src/content/docs/commands/zarf_tools_gen-key.md index 93805806a7..679252cc31 100644 --- a/site/src/content/docs/commands/zarf_tools_gen-key.md +++ b/site/src/content/docs/commands/zarf_tools_gen-key.md @@ -25,7 +25,7 @@ zarf tools gen-key [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_tools_gen-pki.md b/site/src/content/docs/commands/zarf_tools_gen-pki.md index cdba8d052b..547b039e28 100644 --- a/site/src/content/docs/commands/zarf_tools_gen-pki.md +++ b/site/src/content/docs/commands/zarf_tools_gen-pki.md @@ -26,7 +26,7 @@ zarf tools gen-pki HOST [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_tools_get-creds.md b/site/src/content/docs/commands/zarf_tools_get-creds.md index 89b6b4c21f..984c3cc8ef 100644 --- a/site/src/content/docs/commands/zarf_tools_get-creds.md +++ b/site/src/content/docs/commands/zarf_tools_get-creds.md @@ -45,7 +45,7 @@ $ zarf tools get-creds artifact ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_tools_update-creds.md b/site/src/content/docs/commands/zarf_tools_update-creds.md index 50c3b0e037..a41cdb2941 100644 --- a/site/src/content/docs/commands/zarf_tools_update-creds.md +++ b/site/src/content/docs/commands/zarf_tools_update-creds.md @@ -74,7 +74,7 @@ $ zarf tools update-creds artifact --artifact-push-username={USERNAME} --artifac ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation diff --git a/site/src/content/docs/commands/zarf_version.md b/site/src/content/docs/commands/zarf_version.md index 8448928de4..ed946e0051 100644 --- a/site/src/content/docs/commands/zarf_version.md +++ b/site/src/content/docs/commands/zarf_version.md @@ -30,7 +30,7 @@ zarf version [flags] ``` -a, --architecture string Architecture for OCI images and Zarf packages --insecure-skip-tls-verify Skip checking server's certificate for validity. This flag should only be used if you have a specific reason and accept the reduced security posture. - --log-format string [alpha] Select a logging format. Defaults to 'text'. Valid options are: 'text', 'json', 'console', 'dev' + --log-format string [beta] Select a logging format. Defaults to 'console'. Valid options are: 'console', 'json', 'console-no-color', 'dev' -l, --log-level string Log level when running Zarf. Valid options are: warn, info, debug, trace (default "info") --no-color Disable colors in output --no-log-file Disable log file creation From 2ced645b00b15ae45e62cf0ca7739f351e168969 Mon Sep 17 00:00:00 2001 From: Austin Abro Date: Thu, 5 Dec 2024 17:53:36 +0000 Subject: [PATCH 3/4] console no color Signed-off-by: Austin Abro --- Dockerfile | 2 +- examples/helm-charts/zarf.yaml | 32 +------------------------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/Dockerfile b/Dockerfile index 69c114b941..94ccff0032 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ USER 65532:65532 COPY --chown=65532:65532 --chmod=0700 "build/zarf-linux-$TARGETARCH" /zarf -CMD ["/zarf", "internal", "agent", "--log-level=debug", "--log-format=text", "--no-log-file"] +CMD ["/zarf", "internal", "agent", "--log-level=debug", "--log-format=console-no-color", "--no-log-file"] diff --git a/examples/helm-charts/zarf.yaml b/examples/helm-charts/zarf.yaml index dbb2648204..50c3b50b61 100644 --- a/examples/helm-charts/zarf.yaml +++ b/examples/helm-charts/zarf.yaml @@ -10,7 +10,7 @@ components: charts: # Charts are organized in a list with unique chart names per component - note that a Zarf chart name does not need to match the chart name in a Chart.yaml - name: podinfo-local - version: 6.4.0 + version: 6.4.100 namespace: podinfo-from-local-chart # In this case `localPath` will load the podinfo chart that is located in the `chart` directory localPath: chart @@ -22,36 +22,6 @@ components: - name: REPLICA_COUNT description: "Override the number of pod replicas" path: replicaCount - - - name: podinfo-oci - version: 6.4.0 - namespace: podinfo-from-oci - # In this case `url` will load the helm chart located in the podinfo OCI repository - url: oci://ghcr.io/stefanprodan/charts/podinfo - valuesFiles: - - values.yaml - - - name: podinfo-git - version: 6.4.0 - namespace: podinfo-from-git - # In this case `url` will load the helm chart located in the podinfo git repository - url: https://github.com/stefanprodan/podinfo.git - # By default git will look in the root of the git repository but you can define a sub directory with `gitPath` - gitPath: charts/podinfo - valuesFiles: - - values.yaml - - - name: podinfo-repo - version: 6.4.0 - namespace: podinfo-from-repo - # In this case `url` will load the helm chart located in the podinfo helm repository - url: https://stefanprodan.github.io/podinfo - # By default the chart `name` will be what is used to search a repository but since Zarf chart names must be unique per-component you can override this with `repoName` - repoName: podinfo - # By default the release name will be the chart name, but you can override this with the `releaseName` key - releaseName: cool-release-name - valuesFiles: - - values.yaml images: - ghcr.io/stefanprodan/podinfo:6.4.0 # This is the cosign signature for the podinfo image for image signature verification From 7b34c642f829c7af921602667ee014944395033f Mon Sep 17 00:00:00 2001 From: Austin Abro Date: Thu, 5 Dec 2024 18:02:02 +0000 Subject: [PATCH 4/4] don't modify helm charts Signed-off-by: Austin Abro --- examples/helm-charts/zarf.yaml | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/examples/helm-charts/zarf.yaml b/examples/helm-charts/zarf.yaml index 50c3b50b61..dbb2648204 100644 --- a/examples/helm-charts/zarf.yaml +++ b/examples/helm-charts/zarf.yaml @@ -10,7 +10,7 @@ components: charts: # Charts are organized in a list with unique chart names per component - note that a Zarf chart name does not need to match the chart name in a Chart.yaml - name: podinfo-local - version: 6.4.100 + version: 6.4.0 namespace: podinfo-from-local-chart # In this case `localPath` will load the podinfo chart that is located in the `chart` directory localPath: chart @@ -22,6 +22,36 @@ components: - name: REPLICA_COUNT description: "Override the number of pod replicas" path: replicaCount + + - name: podinfo-oci + version: 6.4.0 + namespace: podinfo-from-oci + # In this case `url` will load the helm chart located in the podinfo OCI repository + url: oci://ghcr.io/stefanprodan/charts/podinfo + valuesFiles: + - values.yaml + + - name: podinfo-git + version: 6.4.0 + namespace: podinfo-from-git + # In this case `url` will load the helm chart located in the podinfo git repository + url: https://github.com/stefanprodan/podinfo.git + # By default git will look in the root of the git repository but you can define a sub directory with `gitPath` + gitPath: charts/podinfo + valuesFiles: + - values.yaml + + - name: podinfo-repo + version: 6.4.0 + namespace: podinfo-from-repo + # In this case `url` will load the helm chart located in the podinfo helm repository + url: https://stefanprodan.github.io/podinfo + # By default the chart `name` will be what is used to search a repository but since Zarf chart names must be unique per-component you can override this with `repoName` + repoName: podinfo + # By default the release name will be the chart name, but you can override this with the `releaseName` key + releaseName: cool-release-name + valuesFiles: + - values.yaml images: - ghcr.io/stefanprodan/podinfo:6.4.0 # This is the cosign signature for the podinfo image for image signature verification