From b344de2d6771c56ca363450f1c3e422ee5336c23 Mon Sep 17 00:00:00 2001
From: Denilson Nastacio <dnastaci@us.ibm.com>
Date: Wed, 29 Nov 2023 14:52:32 -0500
Subject: [PATCH] chore: RHACM 2.9 updates

---
 config/argocd/templates/0200-argocd.yaml                   | 2 +-
 config/rhacm/seeds/templates/0150-multi-cluster-hub.yaml   | 7 -------
 .../templates/0302-gitops-cluster-placement-binding.yaml   | 2 --
 .../seeds/templates/9000-post-multi-cluster-engine.yaml    | 2 +-
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/config/argocd/templates/0200-argocd.yaml b/config/argocd/templates/0200-argocd.yaml
index 9902c148..a22f62ff 100644
--- a/config/argocd/templates/0200-argocd.yaml
+++ b/config/argocd/templates/0200-argocd.yaml
@@ -219,7 +219,7 @@ spec:
           if obj.status.phase ~= nil then
             if obj.status.phase == "Running" then
               hs.status = "Healthy"
-            elseif obj.status.phase == "Installing" then
+            elseif obj.status.phase == "Installing" or obj.status.phase == "Pending" then
               hs.status = "Progressing"
             else
               hs.status = "Degraded"
diff --git a/config/rhacm/seeds/templates/0150-multi-cluster-hub.yaml b/config/rhacm/seeds/templates/0150-multi-cluster-hub.yaml
index 6769195d..773c9eb8 100644
--- a/config/rhacm/seeds/templates/0150-multi-cluster-hub.yaml
+++ b/config/rhacm/seeds/templates/0150-multi-cluster-hub.yaml
@@ -13,11 +13,4 @@ metadata:
 spec:
   availabilityConfig: High
   ingress:
-    sslCiphers:
-      - ECDHE-ECDSA-AES256-GCM-SHA384
-      - ECDHE-RSA-AES256-GCM-SHA384
-      - ECDHE-ECDSA-CHACHA20-POLY1305
-      - ECDHE-RSA-CHACHA20-POLY1305
-      - ECDHE-ECDSA-AES128-GCM-SHA256
-      - ECDHE-RSA-AES128-GCM-SHA256
   separateCertificateManagement: false
diff --git a/config/rhacm/seeds/templates/0302-gitops-cluster-placement-binding.yaml b/config/rhacm/seeds/templates/0302-gitops-cluster-placement-binding.yaml
index d07e4758..2e2edc65 100644
--- a/config/rhacm/seeds/templates/0302-gitops-cluster-placement-binding.yaml
+++ b/config/rhacm/seeds/templates/0302-gitops-cluster-placement-binding.yaml
@@ -11,8 +11,6 @@ spec:
   tolerations:
     - key: cluster.open-cluster-management.io/unreachable
       operator: Exists
-    - key: cluster.open-cluster-management.io/unavailable
-      operator: Exists
   predicates:
     - requiredClusterSelector:
         labelSelector:
diff --git a/config/rhacm/seeds/templates/9000-post-multi-cluster-engine.yaml b/config/rhacm/seeds/templates/9000-post-multi-cluster-engine.yaml
index 82042a6d..aca39235 100644
--- a/config/rhacm/seeds/templates/9000-post-multi-cluster-engine.yaml
+++ b/config/rhacm/seeds/templates/9000-post-multi-cluster-engine.yaml
@@ -25,7 +25,7 @@ spec:
               set -eo pipefail
               set -x
 
-              oc patch mce multiclusterengine --type=merge -p "{\"spec\":{\"overrides\":{\"components\":[{\"name\":\"hypershift-preview\",\"enabled\": ${HYPERSHIFT_PREVIEW}}]}}}"
+              oc patch mce multiclusterengine --type=merge -p "{\"spec\":{\"overrides\":{\"components\":[{\"name\":\"hypershift\",\"enabled\": ${HYPERSHIFT_PREVIEW}},{\"name\":\"hypershift-local-hosting\",\"enabled\": ${HYPERSHIFT_PREVIEW}}]}}}"
 
       restartPolicy: Never
       serviceAccountName: {{.Values.serviceaccount.argocd_application_controller}}