chore: RHACM 2.9 updates

config/argocd-rhacm/Chart.yaml

@@ -16,9 +16,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.0
+version: 0.6.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: "0.18.0"
+appVersion: "0.18.1"

config/argocd-rhacm/templates/0100-rhacm-app.yaml

@@ -27,8 +27,8 @@ spec:
           value: ${ARGOCD_APP_SOURCE_REPO_URL}
         - name: serviceaccount.argocd_application_controller
           value: {{.Values.serviceaccount.argocd_application_controller}}
-        - name: spec.components.hypershift_preview
-          value: "{{.Values.spec.components.hypershift_preview}}"
+        - name: spec.components.hypershift
+          value: "{{.Values.spec.components.hypershift}}"
         - name: targetRevision
           value: {{.Values.targetRevision}}
     path: config/argocd-rhacm

config/argocd-rhacm/templates/0100-rhacm-seeds-app.yaml

@@ -29,8 +29,8 @@ spec:
           value: ${ARGOCD_APP_SOURCE_REPO_URL}
         - name: serviceaccount.argocd_application_controller
           value: {{.Values.serviceaccount.argocd_application_controller}}
-        - name: spec.components.hypershift_preview
-          value: "{{.Values.spec.components.hypershift_preview}}"
+        - name: spec.components.hypershift
+          value: "{{.Values.spec.components.hypershift}}"
         - name: targetRevision
           value: {{.Values.targetRevision}}
     path: config/rhacm/seeds

config/argocd-rhacm/values.yaml

@@ -8,4 +8,4 @@ serviceaccount:
   argocd_application_controller: openshift-gitops-argocd-application-controller
 spec:
   components:
-    hypershift_preview: false
+    hypershift: false

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"

config/rhacm/seeds/Chart.yaml

@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.15.0
+version: 0.15.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

config/rhacm/seeds/templates/0150-multi-cluster-hub.yaml

@@ -8,16 +8,6 @@ metadata:
   creationTimestamp: null
   name: multiclusterhub
   namespace: open-cluster-management
-  finalizers:
-    - finalizer.operator.open-cluster-management.io
 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

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:

config/rhacm/seeds/templates/9000-post-multi-cluster-engine.yaml

@@ -16,16 +16,18 @@ spec:
           image: quay.io/openshift/origin-cli:latest
           imagePullPolicy: IfNotPresent
           env:
-            - name: HYPERSHIFT_PREVIEW
-              value: "{{.Values.spec.components.hypershift_preview}}"
+            - name: HYPERSHIFT
+              value: "{{.Values.spec.components.hypershift}}"
           command:
             - /bin/sh
             - -c
             - |
               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}},{\"name\":\"hypershift-local-hosting\",\"enabled\": ${HYPERSHIFT}}]}}}"
 
       restartPolicy: Never
       serviceAccountName: {{.Values.serviceaccount.argocd_application_controller}}

config/rhacm/seeds/values.yaml

@@ -10,4 +10,4 @@ metadata:
 rhacm_users_group: rhacm-users
 spec:
   components:
-    hypershift_preview: false
+    hypershift: false

tests/prebuild/yamllint-config.yaml

@@ -17,7 +17,6 @@ ignore: |
   config/rhacm/cloudpaks/templates/placement-cloudpaks.yaml
   config/rhacm/cloudpaks/templates/placement-cp-shared.yaml
   config/rhacm/cloudpaks/templates/placement-gitops-policy.yaml
-  config/rhacm/seeds/templates/0020-rhacm-hypershift-preview-roles.yaml
 
 rules:
   braces: