Merge branch 'env-groups-be' into beta.3.env-groups-fe

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

@@ -141,7 +141,7 @@ export default class ControllerTab extends Component<PropsType, StateType> {
 
       status?.containerStatuses?.forEach((s: any) => {
         if (s.state?.waiting) {
-          collatedStatus = "waiting";
+          collatedStatus = s.state?.waiting.reason === "CrashLoopBackOff" ? "failed" : "waiting";
         } else if (s.state?.terminated) {
           collatedStatus = "failed";
         }
@@ -195,6 +195,18 @@ export default class ControllerTab extends Component<PropsType, StateType> {
     let [available, total] = this.getAvailability(controller.kind, controller);
     let status = available == total ? "running" : "waiting";
 
+    controller?.status?.conditions?.forEach(
+      (condition: any) => {
+        if (
+          condition.type == "Progressing" &&
+          condition.status == "False" &&
+          condition.reason == "ProgressDeadlineExceeded"
+        ) {
+          status = 'failed';
+        }
+      }
+    );
+    
     if (controller.kind.toLowerCase() === "job" && this.state.raw.length == 0) {
       status = "completed";
     }

internal/kubernetes/agent.go

@@ -66,6 +66,9 @@ func (a *Agent) CreateConfigMap(name string, namespace string, configMap map[str
 			ObjectMeta: metav1.ObjectMeta{
 				Name: name,
 				Namespace: namespace,
+				Labels: map[string]string{
+					"porter": "true",
+				},
 			},
 			Data: configMap,
 		},
@@ -81,6 +84,9 @@ func (a *Agent) UpdateConfigMap(name string, namespace string, configMap map[str
 			ObjectMeta: metav1.ObjectMeta{
 				Name: name,
 				Namespace: namespace,
+				Labels: map[string]string{
+					"porter": "true",
+				},
 			},
 			Data: configMap,
 		},
@@ -110,7 +116,9 @@ func (a *Agent) GetConfigMap(name string, namespace string) (*v1.ConfigMap, erro
 func (a *Agent) ListConfigMaps(namespace string) (*v1.ConfigMapList, error) {
 	return a.Clientset.CoreV1().ConfigMaps(namespace).List(
 		context.TODO(),
-		metav1.ListOptions{},
+		metav1.ListOptions{
+			LabelSelector: "porter=true",
+		},
 	)
 }