Merge pull request #76 from replicatedhq/divolgin/containerz

Change containers to containerNames to not break kustomize
replicatedhq · Oct 31, 2019 · b19ac90 · b19ac90
2 parents 218b9c0 + 13fb6ab
commit b19ac90
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/pkg/apis/troubleshoot/v1beta1/collector_shared.go b/pkg/apis/troubleshoot/v1beta1/collector_shared.go
@@ -24,12 +24,12 @@ type LogLimits struct {
 }
 
 type Logs struct {
-	CollectorMeta `json:",inline" yaml:",inline"`
-	Name          string     `json:"name,omitempty" yaml:"name,omitempty"`
-	Selector      []string   `json:"selector" yaml:"selector"`
-	Namespace     string     `json:"namespace,omitempty" yaml:"namespace,omitempty"`
-	Containers    []string   `json:"containers,omitempty" yaml:"containers,omitempty"`
-	Limits        *LogLimits `json:"limits,omitempty" yaml:"omitempty"`
+	CollectorMeta  `json:",inline" yaml:",inline"`
+	Name           string     `json:"name,omitempty" yaml:"name,omitempty"`
+	Selector       []string   `json:"selector" yaml:"selector"`
+	Namespace      string     `json:"namespace,omitempty" yaml:"namespace,omitempty"`
+	ContainerNames []string   `json:"containerNames,omitempty" yaml:"containerNames,omitempty"`
+	Limits         *LogLimits `json:"limits,omitempty" yaml:"omitempty"`
 }
 
 type Run struct {

diff --git a/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go b/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/collect/logs.go b/pkg/collect/logs.go
@@ -36,7 +36,7 @@ func Logs(ctx *Context, logsCollector *troubleshootv1beta1.Logs) ([]byte, error)
 
 	if len(pods) > 0 {
 		for _, pod := range pods {
-			if len(logsCollector.Containers) == 0 {
+			if len(logsCollector.ContainerNames) == 0 {
 				podLogs, err := getPodLogs(client, pod, logsCollector.Name, "", logsCollector.Limits, false)
 				if err != nil {
 					key := fmt.Sprintf("%s/%s-errors.json", logsCollector.Name, pod.Name)
@@ -50,7 +50,7 @@ func Logs(ctx *Context, logsCollector *troubleshootv1beta1.Logs) ([]byte, error)
 					logsOutput[k] = v
 				}
 			} else {
-				for _, container := range logsCollector.Containers {
+				for _, container := range logsCollector.ContainerNames {
 					containerLogs, err := getPodLogs(client, pod, logsCollector.Name, container, logsCollector.Limits, false)
 					if err != nil {
 						key := fmt.Sprintf("%s/%s/%s-errors.json", logsCollector.Name, pod.Name, container)