Remove old charts and update CI workflows for unified fma-controllers chart

Update 142pm EST: Resolved conflicts on CI for OpenShift.

Delete charts/dual-pods-controller/ and charts/launcher-populator/ directories.
Update CI workflows to use the new chart path, deployment names, and label selectors.

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Signed-off-by: Gloire Rubambiza <gloire@ibm.com>

Author: rubambiza

.github/workflows/ci-e2e-openshift.yaml

@@ -476,35 +476,37 @@ jobs:
           echo "  Image: $CONTROLLER_IMAGE"
           echo "  EnableValidationPolicy: $POLICIES_ENABLED"
 
-          helm upgrade --install "$FMA_RELEASE_NAME" charts/dual-pods-controller \
+          helm upgrade --install "$FMA_RELEASE_NAME" charts/fma-controllers \
             -n "$FMA_NAMESPACE" \
-            --set Image="$CONTROLLER_IMAGE" \
-            --set NodeViewClusterRole=fma-node-viewer \
-            --set SleeperLimit=2 \
-            --set Local=false \
-            --set DebugAcceleratorMemory=false \
-            --set EnableValidationPolicy="$POLICIES_ENABLED"
+            --set dualPodsController.image.repository="${CONTROLLER_IMAGE%:*}" \
+            --set dualPodsController.image.tag="${CONTROLLER_IMAGE##*:}" \
+            --set global.nodeViewClusterRole=fma-node-viewer \
+            --set dualPodsController.sleeperLimit=2 \
+            --set global.local=false \
+            --set dualPodsController.debugAcceleratorMemory=false \
+            --set global.enableValidationPolicy="$POLICIES_ENABLED" \
+            --set launcherPopulator.enabled=false
 
       - name: Wait for controller to be ready
         run: |
           echo "Waiting for FMA controller deployment to be ready..."
           kubectl wait --for=condition=available --timeout=120s \
-            deployment "$FMA_RELEASE_NAME" -n "$FMA_NAMESPACE"
+            deployment "$FMA_RELEASE_NAME-dual-pods-controller" -n "$FMA_NAMESPACE"
 
           echo ""
           echo "=== Controller Pod Status ==="
-          kubectl get pods -n "$FMA_NAMESPACE" -l app.kubernetes.io/name=dual-pods
+          kubectl get pods -n "$FMA_NAMESPACE" -l app.kubernetes.io/name=fma-controllers
           echo ""
           echo "=== Controller Deployment ==="
-          kubectl get deployment "$FMA_RELEASE_NAME" -n "$FMA_NAMESPACE"
+          kubectl get deployment "$FMA_RELEASE_NAME-dual-pods-controller" -n "$FMA_NAMESPACE"
 
       - name: Verify controller health
         run: |
           echo "Checking controller pod for issues..."
 
           # Get the controller pod name
           POD_NAME=$(kubectl get pods -n "$FMA_NAMESPACE" \
-            -l app.kubernetes.io/name=dual-pods,app.kubernetes.io/component=controller \
+            -l app.kubernetes.io/name=fma-controllers,app.kubernetes.io/component=dual-pods-controller \
             -o jsonpath='{.items[0].metadata.name}')
 
           if [ -z "$POD_NAME" ]; then
@@ -910,7 +912,7 @@ jobs:
         if: failure()
         run: |
           echo "Test failed - scaling down controller to free resources while preserving for debugging..."
-          kubectl scale deployment "$FMA_RELEASE_NAME" -n "$FMA_NAMESPACE" --replicas=0 || true
+          kubectl scale deployment "$FMA_RELEASE_NAME-dual-pods-controller" -n "$FMA_NAMESPACE" --replicas=0 || true
 
           echo ""
           echo "=== Remaining resources for debugging ==="
@@ -923,13 +925,13 @@ jobs:
           echo "=== Events ==="
           kubectl get events -n "$FMA_NAMESPACE" --sort-by='.lastTimestamp' 2>/dev/null | tail -30 || true
           echo ""
-          echo "=== Full controller logs ==="
-          kubectl logs deployment/"$FMA_RELEASE_NAME" -n "$FMA_NAMESPACE" --previous 2>/dev/null || true
-          kubectl logs deployment/"$FMA_RELEASE_NAME" -n "$FMA_NAMESPACE" 2>/dev/null || true
+          echo "=== Dual Pods controller logs ==="
+          kubectl logs deployment/"$FMA_RELEASE_NAME-dual-pods-controller" -n "$FMA_NAMESPACE" --previous 2>/dev/null || true
+          kubectl logs deployment/"$FMA_RELEASE_NAME-dual-pods-controller" -n "$FMA_NAMESPACE" 2>/dev/null || true
           echo ""
-          echo "=== Launcher-populator logs ==="
-          kubectl logs deployment/launcher-populator -n "$FMA_NAMESPACE" --previous 2>/dev/null || true
-          kubectl logs deployment/launcher-populator -n "$FMA_NAMESPACE" 2>/dev/null || true
+          echo "=== Launcher-populator controller logs ==="
+          kubectl logs deployment/"$FMA_RELEASE_NAME-launcher-populator" -n "$FMA_NAMESPACE" --previous 2>/dev/null || true
+          kubectl logs deployment/"$FMA_RELEASE_NAME-launcher-populator" -n "$FMA_NAMESPACE" 2>/dev/null || true
 
   # Report status back to PR for issue_comment triggered runs
   # This ensures fork PRs show the correct status after /ok-to-test runs complete

.github/workflows/launcher-based-e2e-test.yml

@@ -70,11 +70,11 @@ jobs:
 
       - name: show dual-pods controller log
         if: always()
-        run: kubectl logs deploy/dpctlr
+        run: kubectl logs deploy/dpctlr-dual-pods-controller
 
       - name: show launcher-populator log
         if: always()
-        run: kubectl logs deploy/launcher-populator || echo "launcher-populator not deployed"
+        run: kubectl logs deploy/dpctlr-launcher-populator || echo "launcher-populator not deployed"
 
       - name: show GPU allocations
         if: always()

.github/workflows/pr-test-in-kind.yml

@@ -61,7 +61,7 @@ jobs:
 
       - name: show dual-pods controller log
         if: always()
-        run: kubectl logs deploy/dpctlr
+        run: kubectl logs deploy/dpctlr-dual-pods-controller
 
       - name: show GPU allocations
         if: always()

.github/workflows/publish-release.yaml

@@ -130,20 +130,21 @@ jobs:
           TAG="${{ steps.version.outputs.tag }}"
           reg="${{ github.repository }}"
 
-          # Update dual-pods-controller chart values
-          DPCTLR_CHART="charts/dual-pods-controller"
-          yq eval -i ".Image = \"ghcr.io/${reg@L}/dual-pods-controller:${TAG}\"" $DPCTLR_CHART/values.yaml
+          CHART="charts/fma-controllers"
 
-          echo "Updated $DPCTLR_CHART/values.yaml:"
-          yq eval '.Image' $DPCTLR_CHART/values.yaml
+          # Update dual-pods-controller image
+          yq eval -i ".dualPodsController.image.repository = \"ghcr.io/${reg@L}/dual-pods-controller\"" $CHART/values.yaml
+          yq eval -i ".dualPodsController.image.tag = \"${TAG}\"" $CHART/values.yaml
 
-          # Update launcher-populator chart values
-          POPULATOR_CHART="charts/launcher-populator"
-          yq eval -i ".image.repository = \"ghcr.io/${reg@L}/launcher-populator\"" $POPULATOR_CHART/values.yaml
-          yq eval -i ".image.tag = \"${TAG}\"" $POPULATOR_CHART/values.yaml
+          echo "Updated dual-pods-controller image:"
+          yq eval '.dualPodsController.image' $CHART/values.yaml
 
-          echo "Updated $POPULATOR_CHART/values.yaml:"
-          yq eval '.image' $POPULATOR_CHART/values.yaml
+          # Update launcher-populator image
+          yq eval -i ".launcherPopulator.image.repository = \"ghcr.io/${reg@L}/launcher-populator\"" $CHART/values.yaml
+          yq eval -i ".launcherPopulator.image.tag = \"${TAG}\"" $CHART/values.yaml
+
+          echo "Updated launcher-populator image:"
+          yq eval '.launcherPopulator.image' $CHART/values.yaml
 
       # -----------------------------------------
       # 10. Login to GHCR for Helm
@@ -198,10 +199,8 @@ jobs:
           echo "  • ghcr.io/${reg@L}/requester:$TAG"
           echo ""
           echo "Helm Charts (version $VERSION):"
-          echo "  • oci://ghcr.io/${reg@L}/charts/dual-pods-controller"
-          echo "  • oci://ghcr.io/${reg@L}/charts/launcher-populator"
+          echo "  • oci://ghcr.io/${reg@L}/charts/fma-controllers"
           echo ""
           echo "Install with:"
-          echo "  helm install dpctlr oci://ghcr.io/${reg@L}/charts/dual-pods-controller --version $VERSION"
-          echo "  helm install launcher-populator oci://ghcr.io/${reg@L}/charts/launcher-populator --version $VERSION"
+          echo "  helm install dpctlr oci://ghcr.io/${reg@L}/charts/fma-controllers --version $VERSION"
           echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"