Merge pull request #698 from porter-dev/master

Stage cronjob websocket logging

dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedJobChart.tsx

@@ -206,16 +206,18 @@ export default class ExpandedJobChart extends Component<PropsType, StateType> {
         let chartLabel = event.Object?.metadata?.labels["helm.sh/chart"];
         let releaseLabel =
           event.Object?.metadata?.labels["meta.helm.sh/release-name"];
-
+        console.log("filtering job belonging to chart");
         if (
           chartLabel &&
           releaseLabel &&
           chartLabel == chartVersion &&
           releaseLabel == chart.name
         ) {
+          console.log("belonged to chart");
           let newestImage =
             event.Object?.spec?.jobTemplate?.spec?.template?.spec?.containers[0]
               ?.image;
+          console.log("newest image", newestImage)
           if (
             newestImage &&
             newestImage !== "porterdev/hello-porter-job" &&
@@ -223,6 +225,7 @@ export default class ExpandedJobChart extends Component<PropsType, StateType> {
             newestImage !== "public.ecr.aws/o1j4x7p4/hello-porter-job" &&
             newestImage !== "public.ecr.aws/o1j4x7p4/hello-porter-job:latest"
           ) {
+            console.log("setting image placeholder to false");
             this.setState({ newestImage, imageIsPlaceholder: false });
           }
         }

dashboard/src/main/home/cluster-dashboard/expanded-chart/metrics/MetricsSection.tsx

@@ -369,6 +369,7 @@ export default class MetricsSection extends Component<PropsType, StateType> {
         "<token>",
         {
           cluster_id: currentCluster.id,
+          namespace: selectedController?.metadata?.namespace,
           selectors,
         },
         {

dashboard/src/main/home/cluster-dashboard/expanded-chart/status/ControllerTab.tsx

@@ -59,6 +59,7 @@ export default class ControllerTab extends Component<PropsType, StateType> {
         "<token>",
         {
           cluster_id: currentCluster.id,
+          namespace: controller?.metadata?.namespace,
           selectors,
         },
         {

dashboard/src/shared/api.tsx

@@ -472,6 +472,7 @@ const getJobPods = baseApi<
 const getMatchingPods = baseApi<
   {
     cluster_id: number;
+    namespace: string;
     selectors: string[];
   },
   { id: number }

internal/kubernetes/agent.go

@@ -340,9 +340,9 @@ func (a *Agent) GetCronJob(c grapher.Object) (*batchv1beta1.CronJob, error) {
 }
 
 // GetPodsByLabel retrieves pods with matching labels
-func (a *Agent) GetPodsByLabel(selector string) (*v1.PodList, error) {
+func (a *Agent) GetPodsByLabel(selector string, namespace string) (*v1.PodList, error) {
 	// Search in all namespaces for matching pods
-	return a.Clientset.CoreV1().Pods("").List(
+	return a.Clientset.CoreV1().Pods(namespace).List(
 		context.TODO(),
 		metav1.ListOptions{
 			LabelSelector: selector,

server/api/k8s_handler.go

@@ -664,9 +664,10 @@ func (app *App) HandleListPods(w http.ResponseWriter, r *http.Request) {
 		agent, err = kubernetes.GetAgentOutOfClusterConfig(form.OutOfClusterConfig)
 	}
 
+	namespace := vals.Get("namespace")
 	pods := []v1.Pod{}
 	for _, selector := range vals["selectors"] {
-		podsList, err := agent.GetPodsByLabel(selector)
+		podsList, err := agent.GetPodsByLabel(selector, namespace)
 
 		if err != nil {
 			app.handleErrorFormValidation(err, ErrK8sValidate, w)

server/api/release_handler.go

@@ -549,7 +549,8 @@ func (app *App) HandleGetReleaseAllPods(w http.ResponseWriter, r *http.Request)
 			selectors = append(selectors, key+"="+val)
 		}
 
-		podList, err := k8sAgent.GetPodsByLabel(strings.Join(selectors, ","))
+		namespace := vals.Get("namespace")
+		podList, err := k8sAgent.GetPodsByLabel(strings.Join(selectors, ","), namespace)
 
 		if err != nil {
 			app.handleErrorDataRead(err, w)