Merge pull request #1924 from akhilerm/cleanup-merge-errors

cleanup: fix merge conflict errors

site/content/docs/main/cli/sonobuoy.md

@@ -35,8 +35,4 @@ 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)

site/content/docs/main/cli/sonobuoy_delete.md

@@ -29,8 +29,4 @@ 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)

site/content/docs/main/cli/sonobuoy_e2e.md

@@ -29,8 +29,4 @@ 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)

site/content/docs/main/cli/sonobuoy_gen.md

@@ -39,11 +39,7 @@ 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[])
@@ -65,8 +61,4 @@ 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)

site/content/docs/main/cli/sonobuoy_gen_config.md

@@ -39,11 +39,7 @@ 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[])
@@ -62,8 +58,4 @@ 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)

site/content/docs/main/cli/sonobuoy_gen_default-image-config.md

@@ -24,8 +24,4 @@ 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)

site/content/docs/main/cli/sonobuoy_gen_plugin.md

@@ -42,8 +42,4 @@ 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)

site/content/docs/main/cli/sonobuoy_gen_plugin_e2e.md

@@ -40,11 +40,7 @@ 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[])
@@ -63,8 +59,4 @@ 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)

site/content/docs/main/cli/sonobuoy_gen_plugin_systemd-logs.md

@@ -39,11 +39,7 @@ 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[])
@@ -62,8 +58,4 @@ 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)

site/content/docs/main/cli/sonobuoy_get.md

@@ -19,8 +19,4 @@ 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)

site/content/docs/main/cli/sonobuoy_get_pod.md

@@ -24,8 +24,4 @@ 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)

site/content/docs/main/cli/sonobuoy_images.md

@@ -33,8 +33,4 @@ 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)

site/content/docs/main/cli/sonobuoy_images_delete.md

@@ -29,8 +29,4 @@ 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)

site/content/docs/main/cli/sonobuoy_images_download.md

@@ -29,8 +29,4 @@ 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)

site/content/docs/main/cli/sonobuoy_images_list.md

@@ -27,8 +27,4 @@ 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)

site/content/docs/main/cli/sonobuoy_images_pull.md

@@ -29,8 +29,4 @@ 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)

site/content/docs/main/cli/sonobuoy_images_push.md

@@ -30,8 +30,4 @@ 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)

site/content/docs/main/cli/sonobuoy_logs.md

@@ -27,8 +27,4 @@ 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)

site/content/docs/main/cli/sonobuoy_modes.md

@@ -23,8 +23,4 @@ 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)

site/content/docs/main/cli/sonobuoy_plugin.md

@@ -22,8 +22,4 @@ 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)

site/content/docs/main/cli/sonobuoy_plugin_install.md

@@ -22,8 +22,4 @@ 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)

site/content/docs/main/cli/sonobuoy_plugin_list.md

@@ -22,8 +22,4 @@ 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)

site/content/docs/main/cli/sonobuoy_plugin_show.md

@@ -22,8 +22,4 @@ 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)

site/content/docs/main/cli/sonobuoy_plugin_uninstall.md

@@ -22,8 +22,4 @@ 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)

site/content/docs/main/cli/sonobuoy_query.md

@@ -24,8 +24,4 @@ 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)

site/content/docs/main/cli/sonobuoy_results.md

@@ -26,8 +26,4 @@ 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)

site/content/docs/main/cli/sonobuoy_retrieve.md

@@ -28,8 +28,4 @@ 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)

site/content/docs/main/cli/sonobuoy_run.md

@@ -39,11 +39,7 @@ 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[])
@@ -62,8 +58,4 @@ 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)

site/content/docs/main/cli/sonobuoy_status.md

@@ -27,8 +27,4 @@ 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)

site/content/docs/main/cli/sonobuoy_version.md

@@ -25,8 +25,4 @@ 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)

site/content/docs/main/cli/sonobuoy_wait.md

@@ -39,11 +39,7 @@ 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[])
@@ -62,8 +58,4 @@ 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)