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

Author: DexterYan

config/crds/troubleshoot.sh_collectors.yaml

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

config/crds/troubleshoot.sh_preflights.yaml

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

config/crds/troubleshoot.sh_supportbundles.yaml

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

pkg/apis/troubleshoot/v1beta2/collector_shared.go

@@ -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"`
 }

pkg/collect/certificates_test.go

@@ -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",

pkg/collect/collector.go

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

schemas/collector-troubleshoot-v1beta2.json

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

schemas/preflight-troubleshoot-v1beta2.json

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

schemas/supportbundle-troubleshoot-v1beta2.json

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