Merge pull request #67 from nginxinc/areste-bugs

Fix hardcoded container name for nic jobs
nginxinc · Oct 15, 2024 · 32e3da6 · 32e3da6
2 parents 5da9768 + 8b5b731
commit 32e3da6
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/pkg/jobs/nic_job_list.go b/pkg/jobs/nic_job_list.go
@@ -22,6 +22,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"fmt"
 	"github.com/nginxinc/nginx-k8s-supportpkg/pkg/crds"
 	"github.com/nginxinc/nginx-k8s-supportpkg/pkg/data_collector"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -45,12 +46,16 @@ func NICJobList() []Job {
 					} else {
 						for _, pod := range pods.Items {
 							if strings.Contains(pod.Name, "ingress") {
-								res, err := dc.PodExecutor(namespace, pod.Name, "nginx-ingress", command, ctx)
-								if err != nil {
-									jobResult.Error = err
-									dc.Logger.Printf("\tCommand execution %s failed for pod %s in namespace %s: %v\n", command, pod.Name, namespace, err)
-								} else {
-									jobResult.Files[filepath.Join(dc.BaseDir, "exec", namespace, pod.Name+"__nginx-ingress-version.txt")] = res
+								for _, container := range pod.Spec.Containers {
+
+									res, err := dc.PodExecutor(namespace, pod.Name, container.Name, command, ctx)
+									if err != nil {
+										jobResult.Error = err
+										dc.Logger.Printf("\tCommand execution %s failed for pod %s in namespace %s: %v\n", command, pod.Name, namespace, err)
+									} else {
+										fileName := fmt.Sprintf("%s__%s__nginx-ingress-version.txt", pod.Name, container.Name)
+										jobResult.Files[filepath.Join(dc.BaseDir, "exec", namespace, fileName)] = res
+									}
 								}
 							}
 						}
@@ -72,12 +77,15 @@ func NICJobList() []Job {
 					} else {
 						for _, pod := range pods.Items {
 							if strings.Contains(pod.Name, "ingress") {
-								res, err := dc.PodExecutor(namespace, pod.Name, "nginx-ingress", command, ctx)
-								if err != nil {
-									jobResult.Error = err
-									dc.Logger.Printf("\tCommand execution %s failed for pod %s in namespace %s: %v\n", command, pod.Name, namespace, err)
-								} else {
-									jobResult.Files[filepath.Join(dc.BaseDir, "exec", namespace, pod.Name+"__nginx-t.txt")] = res
+								for _, container := range pod.Spec.Containers {
+									res, err := dc.PodExecutor(namespace, pod.Name, container.Name, command, ctx)
+									if err != nil {
+										jobResult.Error = err
+										dc.Logger.Printf("\tCommand execution %s failed for pod %s in namespace %s: %v\n", command, pod.Name, namespace, err)
+									} else {
+										fileName := fmt.Sprintf("%s__%s__nginx-t.txt", pod.Name, container.Name)
+										jobResult.Files[filepath.Join(dc.BaseDir, "exec", namespace, fileName)] = res
+									}
 								}
 							}
 						}