From 51eafbaf062ed23105c609f79e1a992bfb95b78f Mon Sep 17 00:00:00 2001 From: Dexter Yan Date: Mon, 2 Dec 2024 16:17:03 +1300 Subject: [PATCH] test demo pr --- config/crds/troubleshoot.sh_collectors.yaml | 2 ++ config/crds/troubleshoot.sh_hostcollectors.yaml | 2 ++ config/crds/troubleshoot.sh_hostpreflights.yaml | 2 ++ config/crds/troubleshoot.sh_supportbundles.yaml | 2 ++ docs/preflight.md | 4 ++-- docs/preflight_oci-fetch.md | 2 +- docs/preflight_version.md | 2 +- docs/support-bundle.md | 6 +++--- docs/support-bundle_analyze.md | 2 +- docs/support-bundle_redact.md | 2 +- docs/support-bundle_version.md | 2 +- pkg/apis/troubleshoot/v1beta2/hostcollector_shared.go | 1 + schemas/collector-troubleshoot-v1beta2.json | 3 +++ schemas/supportbundle-troubleshoot-v1beta2.json | 3 +++ 14 files changed, 25 insertions(+), 10 deletions(-) diff --git a/config/crds/troubleshoot.sh_collectors.yaml b/config/crds/troubleshoot.sh_collectors.yaml index 931b53d68..c57ccca15 100644 --- a/config/crds/troubleshoot.sh_collectors.yaml +++ b/config/crds/troubleshoot.sh_collectors.yaml @@ -16944,6 +16944,8 @@ spec: type: string exclude: type: BoolString + generateTest: + type: string keyPath: type: string required: diff --git a/config/crds/troubleshoot.sh_hostcollectors.yaml b/config/crds/troubleshoot.sh_hostcollectors.yaml index a3c884f5b..e5eccbee8 100644 --- a/config/crds/troubleshoot.sh_hostcollectors.yaml +++ b/config/crds/troubleshoot.sh_hostcollectors.yaml @@ -1319,6 +1319,8 @@ spec: type: string exclude: type: BoolString + generateTest: + type: string keyPath: type: string required: diff --git a/config/crds/troubleshoot.sh_hostpreflights.yaml b/config/crds/troubleshoot.sh_hostpreflights.yaml index 3df2d7db9..0229b48fa 100644 --- a/config/crds/troubleshoot.sh_hostpreflights.yaml +++ b/config/crds/troubleshoot.sh_hostpreflights.yaml @@ -1319,6 +1319,8 @@ spec: type: string exclude: type: BoolString + generateTest: + type: string keyPath: type: string required: diff --git a/config/crds/troubleshoot.sh_supportbundles.yaml b/config/crds/troubleshoot.sh_supportbundles.yaml index bca8003a0..92cca1a29 100644 --- a/config/crds/troubleshoot.sh_supportbundles.yaml +++ b/config/crds/troubleshoot.sh_supportbundles.yaml @@ -19996,6 +19996,8 @@ spec: type: string exclude: type: BoolString + generateTest: + type: string keyPath: type: string required: diff --git a/docs/preflight.md b/docs/preflight.md index 5c2a34c05..f3003951e 100644 --- a/docs/preflight.md +++ b/docs/preflight.md @@ -17,7 +17,7 @@ preflight [url] [flags] --as string Username to impersonate for the operation. User could be a regular user or a service account in a namespace. --as-group stringArray Group to impersonate for the operation, this flag can be repeated to specify multiple groups. --as-uid string UID to impersonate for the operation. - --cache-dir string Default cache directory (default "$HOME/.kube/cache") + --cache-dir string Default cache directory (default "/Users/dexteryan/.kube/cache") --certificate-authority string Path to a cert file for the certificate authority --client-certificate string Path to a client certificate file for TLS --client-key string Path to a client key file for TLS @@ -55,4 +55,4 @@ preflight [url] [flags] * [preflight oci-fetch](preflight_oci-fetch.md) - Fetch a preflight from an OCI registry and print it to standard out * [preflight version](preflight_version.md) - Print the current version and exit -###### Auto generated by spf13/cobra on 23-Aug-2024 +###### Auto generated by spf13/cobra on 2-Dec-2024 diff --git a/docs/preflight_oci-fetch.md b/docs/preflight_oci-fetch.md index c3c056c39..8858b0bd9 100644 --- a/docs/preflight_oci-fetch.md +++ b/docs/preflight_oci-fetch.md @@ -34,4 +34,4 @@ preflight oci-fetch [URI] [flags] * [preflight](preflight.md) - Run and retrieve preflight checks in a cluster -###### Auto generated by spf13/cobra on 23-Aug-2024 +###### Auto generated by spf13/cobra on 2-Dec-2024 diff --git a/docs/preflight_version.md b/docs/preflight_version.md index 14d50fb4c..9f660fc48 100644 --- a/docs/preflight_version.md +++ b/docs/preflight_version.md @@ -37,4 +37,4 @@ preflight version [flags] * [preflight](preflight.md) - Run and retrieve preflight checks in a cluster -###### Auto generated by spf13/cobra on 23-Aug-2024 +###### Auto generated by spf13/cobra on 2-Dec-2024 diff --git a/docs/support-bundle.md b/docs/support-bundle.md index 2980079e2..fd95e3fb6 100644 --- a/docs/support-bundle.md +++ b/docs/support-bundle.md @@ -25,7 +25,7 @@ support-bundle [urls...] [flags] --as string Username to impersonate for the operation. User could be a regular user or a service account in a namespace. --as-group stringArray Group to impersonate for the operation, this flag can be repeated to specify multiple groups. --as-uid string UID to impersonate for the operation. - --cache-dir string Default cache directory (default "$HOME/.kube/cache") + --cache-dir string Default cache directory (default "/Users/dexteryan/.kube/cache") --certificate-authority string Path to a cert file for the certificate authority --client-certificate string Path to a client certificate file for TLS --client-key string Path to a client key file for TLS @@ -40,7 +40,7 @@ support-bundle [urls...] [flags] --insecure-skip-tls-verify If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure --interactive enable/disable interactive mode (default true) --kubeconfig string Path to the kubeconfig file to use for CLI requests. - --load-cluster-specs enable/disable loading additional troubleshoot specs found within the cluster. This is the default behavior if no spec is provided as an argument + --load-cluster-specs enable/disable loading additional troubleshoot specs found within the cluster. Do not load by default unless no specs are provided in the cli args --memprofile string File path to write memory profiling data -n, --namespace string If present, the namespace scope for this CLI request --no-uri When this flag is used, Troubleshoot does not attempt to retrieve the spec referenced by the uri: field` @@ -64,4 +64,4 @@ support-bundle [urls...] [flags] * [support-bundle redact](support-bundle_redact.md) - Redact information from a generated support bundle archive * [support-bundle version](support-bundle_version.md) - Print the current version and exit -###### Auto generated by spf13/cobra on 23-Aug-2024 +###### Auto generated by spf13/cobra on 2-Dec-2024 diff --git a/docs/support-bundle_analyze.md b/docs/support-bundle_analyze.md index 68b356173..610615858 100644 --- a/docs/support-bundle_analyze.md +++ b/docs/support-bundle_analyze.md @@ -30,4 +30,4 @@ support-bundle analyze [url] [flags] * [support-bundle](support-bundle.md) - Generate a support bundle from a Kubernetes cluster or specified sources -###### Auto generated by spf13/cobra on 23-Aug-2024 +###### Auto generated by spf13/cobra on 2-Dec-2024 diff --git a/docs/support-bundle_redact.md b/docs/support-bundle_redact.md index 1fd5b3297..0ffe21e95 100644 --- a/docs/support-bundle_redact.md +++ b/docs/support-bundle_redact.md @@ -39,4 +39,4 @@ support-bundle redact [urls...] [flags] * [support-bundle](support-bundle.md) - Generate a support bundle from a Kubernetes cluster or specified sources -###### Auto generated by spf13/cobra on 23-Aug-2024 +###### Auto generated by spf13/cobra on 2-Dec-2024 diff --git a/docs/support-bundle_version.md b/docs/support-bundle_version.md index f399f232e..106378f46 100644 --- a/docs/support-bundle_version.md +++ b/docs/support-bundle_version.md @@ -27,4 +27,4 @@ support-bundle version [flags] * [support-bundle](support-bundle.md) - Generate a support bundle from a Kubernetes cluster or specified sources -###### Auto generated by spf13/cobra on 23-Aug-2024 +###### Auto generated by spf13/cobra on 2-Dec-2024 diff --git a/pkg/apis/troubleshoot/v1beta2/hostcollector_shared.go b/pkg/apis/troubleshoot/v1beta2/hostcollector_shared.go index 383d6102a..8778757f6 100644 --- a/pkg/apis/troubleshoot/v1beta2/hostcollector_shared.go +++ b/pkg/apis/troubleshoot/v1beta2/hostcollector_shared.go @@ -185,6 +185,7 @@ type Certificate struct { HostCollectorMeta `json:",inline" yaml:",inline"` CertificatePath string `json:"certificatePath" yaml:"certificatepath"` KeyPath string `json:"keyPath" yaml:"keyPath"` + GenerateTest string `json:"generateTest,omitempty" yaml:"generateTest,omitempty"` } type HostCertificatesCollection struct { diff --git a/schemas/collector-troubleshoot-v1beta2.json b/schemas/collector-troubleshoot-v1beta2.json index bd5d00b34..5a0af003c 100644 --- a/schemas/collector-troubleshoot-v1beta2.json +++ b/schemas/collector-troubleshoot-v1beta2.json @@ -14504,6 +14504,9 @@ "exclude": { "oneOf": [{"type": "string"},{"type": "boolean"}] }, + "generateTest": { + "type": "string" + }, "keyPath": { "type": "string" } diff --git a/schemas/supportbundle-troubleshoot-v1beta2.json b/schemas/supportbundle-troubleshoot-v1beta2.json index d7c25e705..7a937df6e 100644 --- a/schemas/supportbundle-troubleshoot-v1beta2.json +++ b/schemas/supportbundle-troubleshoot-v1beta2.json @@ -19197,6 +19197,9 @@ "exclude": { "oneOf": [{"type": "string"},{"type": "boolean"}] }, + "generateTest": { + "type": "string" + }, "keyPath": { "type": "string" }