github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-08-27 00:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

mark a number of fields as not being required

Browse Source 
namespace/namepsaces in resource status analyzers, and the OS list in host package collectors
This commit is contained in:
Andrew Lavery
2022-01-06 23:54:19 +01:00
parent 877e43dd47
commit 8fc7d12e19
8 changed files with 76 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/crds/troubleshoot.sh_analyzers.yaml
+16 -5
View File
@@ -128,7 +128,6 @@ spec:
type: object
type: array
required:
- namespaces
- outcomes
type: object
clusterVersion:
@@ -316,6 +315,10 @@ spec:
type: string
namespace:
type: string
namespaces:
items:
type: string
type: array
outcomes:
items:
properties:
@@ -350,7 +353,6 @@ spec:
type: array
required:
- name
- namespace
- outcomes
type: object
distribution:
@@ -495,6 +497,10 @@ spec:
type: string
namespace:
type: string
namespaces:
items:
type: string
type: array
outcomes:
items:
properties:
@@ -529,7 +535,6 @@ spec:
type: array
required:
- name
- namespace
- outcomes
type: object
longhorn:
@@ -837,6 +842,10 @@ spec:
type: string
namespace:
type: string
namespaces:
items:
type: string
type: array
outcomes:
items:
properties:
@@ -875,7 +884,6 @@ spec:
type: array
required:
- name
- namespace
- outcomes
- selector
type: object
@@ -938,6 +946,10 @@ spec:
type: string
namespace:
type: string
namespaces:
items:
type: string
type: array
outcomes:
items:
properties:
@@ -972,7 +984,6 @@ spec:
type: array
required:
- name
- namespace
- outcomes
type: object
storageClass:
config/crds/troubleshoot.sh_hostcollectors.yaml
-16
View File
@@ -1060,22 +1060,6 @@ spec:
items:
type: string
type: array
required:
- amzn
- amzn2
- centos
- centos7
- centos8
- ol
- ol7
- ol8
- rhel
- rhel7
- rhel8
- ubuntu
- ubuntu16
- ubuntu18
- ubuntu20
type: object
tcpConnect:
properties:
config/crds/troubleshoot.sh_hostpreflights.yaml
-16
View File
@@ -1060,22 +1060,6 @@ spec:
items:
type: string
type: array
required:
- amzn
- amzn2
- centos
- centos7
- centos8
- ol
- ol7
- ol8
- rhel
- rhel7
- rhel8
- ubuntu
- ubuntu16
- ubuntu18
- ubuntu20
type: object
tcpConnect:
properties:
config/crds/troubleshoot.sh_preflights.yaml
+16 -5
View File
@@ -128,7 +128,6 @@ spec:
type: object
type: array
required:
- namespaces
- outcomes
type: object
clusterVersion:
@@ -316,6 +315,10 @@ spec:
type: string
namespace:
type: string
namespaces:
items:
type: string
type: array
outcomes:
items:
properties:
@@ -350,7 +353,6 @@ spec:
type: array
required:
- name
- namespace
- outcomes
type: object
distribution:
@@ -495,6 +497,10 @@ spec:
type: string
namespace:
type: string
namespaces:
items:
type: string
type: array
outcomes:
items:
properties:
@@ -529,7 +535,6 @@ spec:
type: array
required:
- name
- namespace
- outcomes
type: object
longhorn:
@@ -837,6 +842,10 @@ spec:
type: string
namespace:
type: string
namespaces:
items:
type: string
type: array
outcomes:
items:
properties:
@@ -875,7 +884,6 @@ spec:
type: array
required:
- name
- namespace
- outcomes
- selector
type: object
@@ -938,6 +946,10 @@ spec:
type: string
namespace:
type: string
namespaces:
items:
type: string
type: array
outcomes:
items:
properties:
@@ -972,7 +984,6 @@ spec:
type: array
required:
- name
- namespace
- outcomes
type: object
storageClass:
config/crds/troubleshoot.sh_supportbundles.yaml
+16 -5
View File
@@ -159,7 +159,6 @@ spec:
type: object
type: array
required:
- namespaces
- outcomes
type: object
clusterVersion:
@@ -347,6 +346,10 @@ spec:
type: string
namespace:
type: string
namespaces:
items:
type: string
type: array
outcomes:
items:
properties:
@@ -381,7 +384,6 @@ spec:
type: array
required:
- name
- namespace
- outcomes
type: object
distribution:
@@ -526,6 +528,10 @@ spec:
type: string
namespace:
type: string
namespaces:
items:
type: string
type: array
outcomes:
items:
properties:
@@ -560,7 +566,6 @@ spec:
type: array
required:
- name
- namespace
- outcomes
type: object
longhorn:
@@ -868,6 +873,10 @@ spec:
type: string
namespace:
type: string
namespaces:
items:
type: string
type: array
outcomes:
items:
properties:
@@ -906,7 +915,6 @@ spec:
type: array
required:
- name
- namespace
- outcomes
- selector
type: object
@@ -969,6 +977,10 @@ spec:
type: string
namespace:
type: string
namespaces:
items:
type: string
type: array
outcomes:
items:
properties:
@@ -1003,7 +1015,6 @@ spec:
type: array
required:
- name
- namespace
- outcomes
type: object
storageClass:
pkg/apis/troubleshoot/v1beta2/analyzer_shared.go
+9 -9
View File
@@ -53,32 +53,32 @@ type ImagePullSecret struct {
type DeploymentStatus struct {
AnalyzeMeta `json:",inline" yaml:",inline"`
Outcomes []*Outcome `json:"outcomes" yaml:"outcomes"`
Namespace string `json:"namespace" yaml:"namespace"`
Namespaces []string `json:"namespaces" yaml:"namespaces"`
Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
Namespaces []string `json:"namespaces,omitempty" yaml:"namespaces,omitempty"`
Name string `json:"name" yaml:"name"`
}
type StatefulsetStatus struct {
AnalyzeMeta `json:",inline" yaml:",inline"`
Outcomes []*Outcome `json:"outcomes" yaml:"outcomes"`
Namespace string `json:"namespace" yaml:"namespace"`
Namespaces []string `json:"namespaces" yaml:"namespaces"`
Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
Namespaces []string `json:"namespaces,omitempty" yaml:"namespaces,omitempty"`
Name string `json:"name" yaml:"name"`
}
type JobStatus struct {
AnalyzeMeta `json:",inline" yaml:",inline"`
Outcomes []*Outcome `json:"outcomes" yaml:"outcomes"`
Namespace string `json:"namespace" yaml:"namespace"`
Namespaces []string `json:"namespaces" yaml:"namespaces"`
Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
Namespaces []string `json:"namespaces,omitempty" yaml:"namespaces,omitempty"`
Name string `json:"name" yaml:"name"`
}
type ReplicaSetStatus struct {
AnalyzeMeta `json:",inline" yaml:",inline"`
Outcomes []*Outcome `json:"outcomes" yaml:"outcomes"`
Namespace string `json:"namespace" yaml:"namespace"`
Namespaces []string `json:"namespaces" yaml:"namespaces"`
Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
Namespaces []string `json:"namespaces,omitempty" yaml:"namespaces,omitempty"`
Name string `json:"name" yaml:"name"`
Selector []string `json:"selector" yaml:"selector"`
}
@@ -86,7 +86,7 @@ type ReplicaSetStatus struct {
type ClusterPodStatuses struct {
AnalyzeMeta `json:",inline" yaml:",inline"`
Outcomes []*Outcome `json:"outcomes" yaml:"outcomes"`
Namespaces []string `json:"namespaces" yaml:"namespaces"`
Namespaces []string `json:"namespaces,omitempty" yaml:"namespaces,omitempty"`
}
type ContainerRuntime struct {
pkg/apis/troubleshoot/v1beta2/hostcollector_shared.go
+15 -15
View File
@@ -69,21 +69,21 @@ type HostBlockDevices struct {
type HostSystemPackages struct {
HostCollectorMeta `json:",inline" yaml:",inline"`
Ubuntu []string `json:"ubuntu"`
Ubuntu16 []string `json:"ubuntu16"`
Ubuntu18 []string `json:"ubuntu18"`
Ubuntu20 []string `json:"ubuntu20"`
RHEL []string `json:"rhel"`
RHEL7 []string `json:"rhel7"`
RHEL8 []string `json:"rhel8"`
CentOS []string `json:"centos"`
CentOS7 []string `json:"centos7"`
CentOS8 []string `json:"centos8"`
OracleLinux []string `json:"ol"`
OracleLinux7 []string `json:"ol7"`
OracleLinux8 []string `json:"ol8"`
AmazonLinux []string `json:"amzn"`
AmazonLinux2 []string `json:"amzn2"`
Ubuntu []string `json:"ubuntu,omitempty"`
Ubuntu16 []string `json:"ubuntu16,omitempty"`
Ubuntu18 []string `json:"ubuntu18,omitempty"`
Ubuntu20 []string `json:"ubuntu20,omitempty"`
RHEL []string `json:"rhel,omitempty"`
RHEL7 []string `json:"rhel7,omitempty"`
RHEL8 []string `json:"rhel8,omitempty"`
CentOS []string `json:"centos,omitempty"`
CentOS7 []string `json:"centos7,omitempty"`
CentOS8 []string `json:"centos8,omitempty"`
OracleLinux []string `json:"ol,omitempty"`
OracleLinux7 []string `json:"ol7,omitempty"`
OracleLinux8 []string `json:"ol8,omitempty"`
AmazonLinux []string `json:"amzn,omitempty"`
AmazonLinux2 []string `json:"amzn2,omitempty"`
}
type HostKernelModules struct {
pkg/client/troubleshootclientset/fake/clientset_generated.go
+4 -1
View File
@@ -75,7 +75,10 @@ func (c *Clientset) Tracker() testing.ObjectTracker {
return c.tracker
}
var _ clientset.Interface = &Clientset{}
var (
_ clientset.Interface = &Clientset{}
_ testing.FakeClient = &Clientset{}
)
// TroubleshootV1beta1 retrieves the TroubleshootV1beta1Client
func (c *Clientset) TroubleshootV1beta1() troubleshootv1beta1.TroubleshootV1beta1Interface {