Merge branch 'main' into authenticated-repo

vmware-tanzu · Jun 19, 2023 · 55c8894 · 55c8894
2 parents 7804f7a + 1efd8d7
commit 55c8894
Show file tree

Hide file tree

Showing 96 changed files with 2,950 additions and 4 deletions.
diff --git a/pkg/buildinfo/version.go b/pkg/buildinfo/version.go
@@ -21,7 +21,7 @@ package buildinfo
 
 // Version is the current version of Sonobuoy, set by the go linker's -X flag at build time.
 // Ensure that this is bumped manually as well so that Sonobuoy, as a library, also has the right version.
-var Version = "v0.56.16"
+var Version = "v0.56.17"
 
 // GitSHA is the actual commit that is being built, set by the go linker's -X flag at build time.
 var GitSHA string

diff --git a/site/config.yaml b/site/config.yaml
@@ -32,10 +32,10 @@ params:
   docs_search_index_name: index_name
   docs_search_api_key: api_key
   docs_versioning: true
-  docs_latest: v0.56.16
+  docs_latest: v0.56.17
   docs_versions:
     - main
-    - v0.56.16
+    - v0.56.17
     - v0.56.15
     - v0.56.14
     - v0.56.13

diff --git a/site/content/docs/main/cli/sonobuoy.md b/site/content/docs/main/cli/sonobuoy.md
@@ -35,4 +35,8 @@ sonobuoy [flags]
 * [sonobuoy version](sonobuoy_version.md)	 - Print sonobuoy version
 * [sonobuoy wait](sonobuoy_wait.md)	 - Waits on the Sonobuoy run in the targeted namespace.
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_delete.md b/site/content/docs/main/cli/sonobuoy_delete.md
@@ -29,4 +29,8 @@ sonobuoy delete [flags]
 
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_e2e.md b/site/content/docs/main/cli/sonobuoy_e2e.md
@@ -29,4 +29,8 @@ sonobuoy e2e [flags]
 
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_gen.md b/site/content/docs/main/cli/sonobuoy_gen.md
@@ -39,7 +39,11 @@ sonobuoy gen [flags]
       --service-account-name string              Name of the service account to be used by sonobuoy. (default "sonobuoy-serviceaccount")
       --show-default-podspec                     If true, include the default pod spec used for plugins in the output.
       --skip-preflight strings[=true]            Skips the specified preflight checks. Valid values are [dnscheck, versioncheck, existingnamespace] or true to skip all of the checks.
+<<<<<<< HEAD
       --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:537203ab")
+=======
+      --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:1c88db1e")
+>>>>>>> 2846f353 (Add docs for v0.56.17)
       --ssh-key yamlFile                         Path to the private key enabling SSH to cluster nodes. May be required by some tests from the e2e plugin.
       --ssh-user envModifier                     SSH user for ssh-key. Required if running e2e plugin with certain tests that require SSH access to nodes.
       --systemd-logs-image image                 Container image override for the systemd-logs plugin. Shorthand for --plugin-image=systemd-logs:<string> (default map[])
@@ -61,4 +65,8 @@ sonobuoy gen [flags]
 * [sonobuoy gen default-image-config](sonobuoy_gen_default-image-config.md)	 - Generates the default image registry config for the e2e plugin
 * [sonobuoy gen plugin](sonobuoy_gen_plugin.md)	 - Generates the manifest Sonobuoy uses to define a plugin
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_gen_config.md b/site/content/docs/main/cli/sonobuoy_gen_config.md
@@ -39,7 +39,11 @@ sonobuoy gen config [flags]
       --service-account-name string              Name of the service account to be used by sonobuoy. (default "sonobuoy-serviceaccount")
       --show-default-podspec                     If true, include the default pod spec used for plugins in the output.
       --skip-preflight strings[=true]            Skips the specified preflight checks. Valid values are [dnscheck, versioncheck, existingnamespace] or true to skip all of the checks.
+<<<<<<< HEAD
       --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:537203ab")
+=======
+      --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:1c88db1e")
+>>>>>>> 2846f353 (Add docs for v0.56.17)
       --ssh-key yamlFile                         Path to the private key enabling SSH to cluster nodes. May be required by some tests from the e2e plugin.
       --ssh-user envModifier                     SSH user for ssh-key. Required if running e2e plugin with certain tests that require SSH access to nodes.
       --systemd-logs-image image                 Container image override for the systemd-logs plugin. Shorthand for --plugin-image=systemd-logs:<string> (default map[])
@@ -58,4 +62,8 @@ sonobuoy gen config [flags]
 
 * [sonobuoy gen](sonobuoy_gen.md)	 - Generates a sonobuoy manifest for submission via kubectl
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_gen_default-image-config.md b/site/content/docs/main/cli/sonobuoy_gen_default-image-config.md
@@ -24,4 +24,8 @@ sonobuoy gen default-image-config [flags]
 
 * [sonobuoy gen](sonobuoy_gen.md)	 - Generates a sonobuoy manifest for submission via kubectl
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_gen_plugin.md b/site/content/docs/main/cli/sonobuoy_gen_plugin.md
@@ -42,4 +42,8 @@ sonobuoy gen plugin -n myPlugin -i myregistry/myimage:v0
 * [sonobuoy gen plugin e2e](sonobuoy_gen_plugin_e2e.md)	 - Generates the e2e plugin definition based on the given options
 * [sonobuoy gen plugin systemd-logs](sonobuoy_gen_plugin_systemd-logs.md)	 - Generates the systemd-logs plugin definition based on the given options
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_gen_plugin_e2e.md b/site/content/docs/main/cli/sonobuoy_gen_plugin_e2e.md
@@ -40,7 +40,11 @@ sonobuoy gen plugin e2e [flags]
       --service-account-name string              Name of the service account to be used by sonobuoy. (default "sonobuoy-serviceaccount")
       --show-default-podspec                     If true, include the default pod spec used for plugins in the output.
       --skip-preflight strings[=true]            Skips the specified preflight checks. Valid values are [dnscheck, versioncheck, existingnamespace] or true to skip all of the checks.
+<<<<<<< HEAD
       --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:537203ab")
+=======
+      --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:1c88db1e")
+>>>>>>> 2846f353 (Add docs for v0.56.17)
       --ssh-key yamlFile                         Path to the private key enabling SSH to cluster nodes. May be required by some tests from the e2e plugin.
       --ssh-user envModifier                     SSH user for ssh-key. Required if running e2e plugin with certain tests that require SSH access to nodes.
       --systemd-logs-image image                 Container image override for the systemd-logs plugin. Shorthand for --plugin-image=systemd-logs:<string> (default map[])
@@ -59,4 +63,8 @@ sonobuoy gen plugin e2e [flags]
 
 * [sonobuoy gen plugin](sonobuoy_gen_plugin.md)	 - Generates the manifest Sonobuoy uses to define a plugin
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_gen_plugin_systemd-logs.md b/site/content/docs/main/cli/sonobuoy_gen_plugin_systemd-logs.md
@@ -39,7 +39,11 @@ sonobuoy gen plugin systemd-logs [flags]
       --service-account-name string              Name of the service account to be used by sonobuoy. (default "sonobuoy-serviceaccount")
       --show-default-podspec                     If true, include the default pod spec used for plugins in the output.
       --skip-preflight strings[=true]            Skips the specified preflight checks. Valid values are [dnscheck, versioncheck, existingnamespace] or true to skip all of the checks.
+<<<<<<< HEAD
       --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:537203ab")
+=======
+      --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:1c88db1e")
+>>>>>>> 2846f353 (Add docs for v0.56.17)
       --ssh-key yamlFile                         Path to the private key enabling SSH to cluster nodes. May be required by some tests from the e2e plugin.
       --ssh-user envModifier                     SSH user for ssh-key. Required if running e2e plugin with certain tests that require SSH access to nodes.
       --systemd-logs-image image                 Container image override for the systemd-logs plugin. Shorthand for --plugin-image=systemd-logs:<string> (default map[])
@@ -58,4 +62,8 @@ sonobuoy gen plugin systemd-logs [flags]
 
 * [sonobuoy gen plugin](sonobuoy_gen_plugin.md)	 - Generates the manifest Sonobuoy uses to define a plugin
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_get.md b/site/content/docs/main/cli/sonobuoy_get.md
@@ -19,4 +19,8 @@ Fetches Sonobuoy resources of a specified type
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 * [sonobuoy get pod](sonobuoy_get_pod.md)	 - Fetch sonobuoy pods
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_get_pod.md b/site/content/docs/main/cli/sonobuoy_get_pod.md
@@ -24,4 +24,8 @@ sonobuoy get pod [flags]
 
 * [sonobuoy get](sonobuoy_get.md)	 - Fetches Sonobuoy resources of a specified type
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_images.md b/site/content/docs/main/cli/sonobuoy_images.md
@@ -33,4 +33,8 @@ sonobuoy images [flags]
 * [sonobuoy images pull](sonobuoy_images_pull.md)	 - Pulls images to local docker client for a specific plugin
 * [sonobuoy images push](sonobuoy_images_push.md)	 - Pushes images to docker registry for a specific plugin
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_images_delete.md b/site/content/docs/main/cli/sonobuoy_images_delete.md
@@ -29,4 +29,8 @@ sonobuoy images delete [flags]
 
 * [sonobuoy images](sonobuoy_images.md)	 - Manage images used in a plugin to facilitate running them in airgapped (or similar) environments. Supported plugins are: 'e2e'
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_images_download.md b/site/content/docs/main/cli/sonobuoy_images_download.md
@@ -29,4 +29,8 @@ sonobuoy images download [flags]
 
 * [sonobuoy images](sonobuoy_images.md)	 - Manage images used in a plugin to facilitate running them in airgapped (or similar) environments. Supported plugins are: 'e2e'
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_images_list.md b/site/content/docs/main/cli/sonobuoy_images_list.md
@@ -27,4 +27,8 @@ sonobuoy images list [flags]
 
 * [sonobuoy images](sonobuoy_images.md)	 - Manage images used in a plugin to facilitate running them in airgapped (or similar) environments. Supported plugins are: 'e2e'
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_images_pull.md b/site/content/docs/main/cli/sonobuoy_images_pull.md
@@ -29,4 +29,8 @@ sonobuoy images pull [flags]
 
 * [sonobuoy images](sonobuoy_images.md)	 - Manage images used in a plugin to facilitate running them in airgapped (or similar) environments. Supported plugins are: 'e2e'
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_images_push.md b/site/content/docs/main/cli/sonobuoy_images_push.md
@@ -30,4 +30,8 @@ sonobuoy images push [flags]
 
 * [sonobuoy images](sonobuoy_images.md)	 - Manage images used in a plugin to facilitate running them in airgapped (or similar) environments. Supported plugins are: 'e2e'
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_logs.md b/site/content/docs/main/cli/sonobuoy_logs.md
@@ -27,4 +27,8 @@ sonobuoy logs [flags]
 
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_modes.md b/site/content/docs/main/cli/sonobuoy_modes.md
@@ -23,4 +23,8 @@ sonobuoy modes [flags]
 
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_plugin.md b/site/content/docs/main/cli/sonobuoy_plugin.md
@@ -22,4 +22,8 @@ Manage your installed plugins
 * [sonobuoy plugin show](sonobuoy_plugin_show.md)	 - Print the full definition of the named plugin file
 * [sonobuoy plugin uninstall](sonobuoy_plugin_uninstall.md)	 - Uninstall a plugin. You can continue to run any plugin via specifying a file or URL.
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_plugin_install.md b/site/content/docs/main/cli/sonobuoy_plugin_install.md
@@ -22,4 +22,8 @@ sonobuoy plugin install <save-as-filename> <source filename or URL> [flags]
 
 * [sonobuoy plugin](sonobuoy_plugin.md)	 - Manage your installed plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_plugin_list.md b/site/content/docs/main/cli/sonobuoy_plugin_list.md
@@ -22,4 +22,8 @@ sonobuoy plugin list [flags]
 
 * [sonobuoy plugin](sonobuoy_plugin.md)	 - Manage your installed plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_plugin_show.md b/site/content/docs/main/cli/sonobuoy_plugin_show.md
@@ -22,4 +22,8 @@ sonobuoy plugin show <plugin filename> [flags]
 
 * [sonobuoy plugin](sonobuoy_plugin.md)	 - Manage your installed plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_plugin_uninstall.md b/site/content/docs/main/cli/sonobuoy_plugin_uninstall.md
@@ -22,4 +22,8 @@ sonobuoy plugin uninstall <plugin filename> [flags]
 
 * [sonobuoy plugin](sonobuoy_plugin.md)	 - Manage your installed plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_query.md b/site/content/docs/main/cli/sonobuoy_query.md
@@ -24,4 +24,8 @@ sonobuoy query [flags]
 
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_results.md b/site/content/docs/main/cli/sonobuoy_results.md
@@ -26,4 +26,8 @@ sonobuoy results archive.tar.gz [flags]
 
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_retrieve.md b/site/content/docs/main/cli/sonobuoy_retrieve.md
@@ -28,4 +28,8 @@ sonobuoy retrieve [path] [flags]
 
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_run.md b/site/content/docs/main/cli/sonobuoy_run.md
@@ -39,7 +39,11 @@ sonobuoy run [flags]
       --service-account-name string              Name of the service account to be used by sonobuoy. (default "sonobuoy-serviceaccount")
       --show-default-podspec                     If true, include the default pod spec used for plugins in the output.
       --skip-preflight strings[=true]            Skips the specified preflight checks. Valid values are [dnscheck, versioncheck, existingnamespace] or true to skip all of the checks.
+<<<<<<< HEAD
       --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:537203ab")
+=======
+      --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:1c88db1e")
+>>>>>>> 2846f353 (Add docs for v0.56.17)
       --ssh-key yamlFile                         Path to the private key enabling SSH to cluster nodes. May be required by some tests from the e2e plugin.
       --ssh-user envModifier                     SSH user for ssh-key. Required if running e2e plugin with certain tests that require SSH access to nodes.
       --systemd-logs-image image                 Container image override for the systemd-logs plugin. Shorthand for --plugin-image=systemd-logs:<string> (default map[])
@@ -58,4 +62,8 @@ sonobuoy run [flags]
 
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_status.md b/site/content/docs/main/cli/sonobuoy_status.md
@@ -27,4 +27,8 @@ sonobuoy status [flags]
 
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_version.md b/site/content/docs/main/cli/sonobuoy_version.md
@@ -25,4 +25,8 @@ sonobuoy version [flags]
 
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)
diff --git a/site/content/docs/main/cli/sonobuoy_wait.md b/site/content/docs/main/cli/sonobuoy_wait.md
@@ -39,7 +39,11 @@ sonobuoy wait [flags]
       --service-account-name string              Name of the service account to be used by sonobuoy. (default "sonobuoy-serviceaccount")
       --show-default-podspec                     If true, include the default pod spec used for plugins in the output.
       --skip-preflight strings[=true]            Skips the specified preflight checks. Valid values are [dnscheck, versioncheck, existingnamespace] or true to skip all of the checks.
+<<<<<<< HEAD
       --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:537203ab")
+=======
+      --sonobuoy-image string                    Container image override for the sonobuoy worker and aggregator. (default "sonobuoy/sonobuoy:1c88db1e")
+>>>>>>> 2846f353 (Add docs for v0.56.17)
       --ssh-key yamlFile                         Path to the private key enabling SSH to cluster nodes. May be required by some tests from the e2e plugin.
       --ssh-user envModifier                     SSH user for ssh-key. Required if running e2e plugin with certain tests that require SSH access to nodes.
       --systemd-logs-image image                 Container image override for the systemd-logs plugin. Shorthand for --plugin-image=systemd-logs:<string> (default map[])
@@ -58,4 +62,8 @@ sonobuoy wait [flags]
 
 * [sonobuoy](sonobuoy.md)	 - Generate reports on your Kubernetes cluster by running plugins
 
+<<<<<<< HEAD
 ###### Auto generated by spf13/cobra on 2-Mar-2023
+=======
+###### Auto generated by spf13/cobra on 15-Jun-2023
+>>>>>>> 2846f353 (Add docs for v0.56.17)