github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-02-14 18:29:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(collector): removed unused name in certificates collector (#1200)

Browse Source
This commit is contained in:
Dexter Yan
2023-06-01 20:46:34 +12:00
committed by GitHub
parent 27c68a7e53
commit 2b8e3fb6bb
9 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/crds/troubleshoot.sh_collectors.yaml
View File

@@ -99,8 +99,6 @@ spec:
type: array
exclude:
type: BoolString
name:
type: string
secrets:
items:
properties:

2
config/crds/troubleshoot.sh_preflights.yaml
View File

@@ -1594,8 +1594,6 @@ spec:
type: array
exclude:
type: BoolString
name:
type: string
secrets:
items:
properties:

2
config/crds/troubleshoot.sh_supportbundles.yaml
View File

@@ -1625,8 +1625,6 @@ spec:
type: array
exclude:
type: BoolString
name:
type: string
secrets:
items:
properties:

1
pkg/apis/troubleshoot/v1beta2/collector_shared.go
View File

@@ -218,7 +218,6 @@ type RegistryImages struct {
type Certificates struct {
CollectorMeta `json:",inline" yaml:",inline"`
Name string `json:"name,omitempty" yaml:"name,omitempty"`
Secrets []CertificateSource `json:"secrets,omitempty" yaml:"secrets,omitempty"`
ConfigMaps []CertificateSource `json:"configMaps,omitempty" yaml:"configMaps,omitempty"`
}

4
pkg/collect/certificates_test.go
View File

@@ -143,7 +143,6 @@ func TestCertParser(t *testing.T) {
CollectorMeta: troubleshootv1beta2.CollectorMeta{
CollectorName: "collectorname",
},
Name: "expired certificate",
Secrets: []troubleshootv1beta2.CertificateSource{
{
Name: "expiredCert",
@@ -183,7 +182,6 @@ func TestCertParser(t *testing.T) {
CollectorMeta: troubleshootv1beta2.CollectorMeta{
CollectorName: "collectorname",
},
Name: "multiple certificate",
Secrets: []troubleshootv1beta2.CertificateSource{
{
Name: "multiCert",
@@ -232,7 +230,6 @@ func TestCertParser(t *testing.T) {
CollectorMeta: troubleshootv1beta2.CollectorMeta{
CollectorName: "collectorname",
},
Name: "valid certificate",
Secrets: []troubleshootv1beta2.CertificateSource{
{
Name: "validCert",
@@ -277,7 +274,6 @@ func TestCertParser(t *testing.T) {
CollectorMeta: troubleshootv1beta2.CollectorMeta{
CollectorName: "collectorname",
},
Name: "non valid certificate",
Secrets: []troubleshootv1beta2.CertificateSource{
{
Name: "nonCert",

1
pkg/collect/collector.go
View File

@@ -180,7 +180,6 @@ func getCollectorName(c interface{}) string {
name = v.Collector.Name
case *CollectCertificates:
collector = "certificates"
name = v.Collector.Name
default:
collector = "<none>"
}

3
schemas/collector-troubleshoot-v1beta2.json
View File

@@ -114,9 +114,6 @@
"exclude": {
"oneOf": [{"type": "string"},{"type": "boolean"}]
},
"name": {
"type": "string"
},
"secrets": {
"type": "array",
"items": {

3
schemas/preflight-troubleshoot-v1beta2.json
View File

@@ -2417,9 +2417,6 @@
"exclude": {
"oneOf": [{"type": "string"},{"type": "boolean"}]
},
"name": {
"type": "string"
},
"secrets": {
"type": "array",
"items": {

3
schemas/supportbundle-troubleshoot-v1beta2.json
View File

@@ -2463,9 +2463,6 @@
"exclude": {
"oneOf": [{"type": "string"},{"type": "boolean"}]
},
"name": {
"type": "string"
},
"secrets": {
"type": "array",
"items": {