feat: Updated hcp.yaml with CatalogSource image parameter for MCE installation (#421)

Updated hcp.yaml with catalogsource image parameter for MCE
installation.
So the automation can take care of MCE installations other than the
stable versions also by applying the the catalogsource image ID in
hcp.yaml.

---------

Signed-off-by: root <[email protected]>
Co-authored-by: root <[email protected]>
Co-authored-by: Veerabhadrarao Damisetti <[email protected]>

Author: 3 people

docs/set-variables-group-vars.md

@@ -290,7 +290,7 @@
 **hcp.pkgs** | list of packages for different hosts | 
 **hcp.mce.version** | version for multicluster-engine Operator | 2.4
 **hcp.mce.instance_name** | name of the MultiClusterEngine instance | engine
-**hcp.mce.catalogsource_name** | Name of the catalogsource for operatorhub | redhat-operators
+**hcp.mce.catalogsource_image** | Image ID for installing MCE | 970287
 **hcp.mce.delete** | true or false - deletes mce and related resources while running deletion playbook | true
 **hcp.asc.url_for_ocp_release_file** | Add URL for OCP release.txt File | https://...  ..../release.txt
 **hcp.asc.db_volume_size** | DatabaseStorage Volume Size | 10Gi

inventories/default/group_vars/hcp.yaml.template

@@ -17,7 +17,7 @@ hcp:
     version:
     instance_name: engine
     delete: false
-    catalogsource_name: redhat-operators 
+    catalogsource_image:    # Required only if we need to create the Catalogsource for installing MCE
 
   # AgentServiceConfig Parameters
 

roles/install_mce_operator/tasks/main.yaml

@@ -1,80 +1,104 @@
 ---
-- name: Check if multicluster-engine Namespace exists 
-  k8s_info:
+- name: Create CatalogSource.yaml from template
+  ansible.builtin.template:
+    src: CatalogSource.yaml.j2
+    dest: /root/ansible_workdir/CatalogSource.yaml
+    mode: '0644'
+  when: hcp.mce.catalogsource_image is defined and hcp.mce.catalogsource_image | length > 0
+
+- name: Deploy CatalogSource
+  ansible.builtin.command: oc apply -f /root/ansible_workdir/CatalogSource.yaml
+  when: hcp.mce.catalogsource_image is defined and hcp.mce.catalogsource_image | length > 0
+
+- name: Check if multicluster-engine Namespace exists
+  kubernetes.core.k8s:
     api_version: v1
     kind: Namespace
     name: "{{ hcp.asc.mce_namespace }}"
   register: namespace_check
-  ignore_errors: yes
+  ignore_errors: true
 
-- name: Create multicluster-engine  Namespace 
-  k8s:
+- name: Create multicluster-engine Namespace
+  kubernetes.core.k8s:
     api_version: v1
     kind: Namespace
     name: "{{ hcp.asc.mce_namespace }}"
     state: present
-  when: namespace_check.resources | length == 0 
+  when: namespace_check.resources | length == 0
 
 - name: Create OperatorGroup.yaml
-  template: 
+  ansible.builtin.template:
     src: OperatorGroup.yaml.j2
     dest: /root/ansible_workdir/OperatorGroup.yaml
+    mode: '0644'
 
 - name: Deploy OperatorGroup
-  command: oc apply -f /root/ansible_workdir/OperatorGroup.yaml
+  ansible.builtin.command: oc apply -f /root/ansible_workdir/OperatorGroup.yaml
 
 - name: Create Subscription.yaml
-  template:
+  ansible.builtin.template:
     src: Subscription.yaml.j2
     dest: /root/ansible_workdir/Subscription.yaml
+    mode: '0644'
 
 - name: Deploy Subscription for MCE
-  command: oc apply -f /root/ansible_workdir/Subscription.yaml
+  ansible.builtin.command: oc apply -f /root/ansible_workdir/Subscription.yaml
 
 - name: Wait for MCE deployment to be created
-  shell: oc get all -n {{ hcp.asc.mce_namespace }} | grep -i  deployment | grep -i multicluster-engine | wc -l
-  register: mce_deploy
+  ansible.builtin.shell: |
+    set -o pipefail
+    oc get all -n {{ hcp.asc.mce_namespace }} | grep -i deployment | grep -i multicluster-engine | wc -l
   until: mce_deploy.stdout == '1'
   retries: 20
   delay: 5
 
 - name: Wait for MCE deployment to be available
-  shell: oc get deployment multicluster-engine-operator -n {{ hcp.asc.mce_namespace }} -o=jsonpath='{.status.replicas}{" "}{.status.availableReplicas}'
+  ansible.builtin.shell: >
+    oc get deployment multicluster-engine-operator -n {{ hcp.asc.mce_namespace }}
+    -o=jsonpath='{.status.replicas}{" "}{.status.availableReplicas}'
   register: mce_pod_status
   until: mce_pod_status.stdout.split(' ')[0] == mce_pod_status.stdout.split(' ')[1]
   retries: 20
   delay: 5
 
 - name: Create MultiClusterEngine.yaml
-  template:
+  ansible.builtin.template:
     src: MultiClusterEngine.yaml.j2
     dest: /root/ansible_workdir/MultiClusterEngine.yaml
+    mode: '0644'
 
 - name: Deploy MCE Instance
-  command: oc apply -f /root/ansible_workdir/MultiClusterEngine.yaml
+  ansible.builtin.command: oc apply -f /root/ansible_workdir/MultiClusterEngine.yaml
 
 - name: Wait for MCE to be Available
-  shell: oc get mce --no-headers | awk  '{print $2}' 
+  ansible.builtin.shell: |
+    set -o pipefail
+    oc get mce --no-headers | awk '{print $2}'
   register: mce_status
   until: mce_status.stdout == "Available"
   retries: 40
-  delay: 10 
+  delay: 10
 
 - name: Enable hypershift-preview component in MCE
-  command: oc patch mce {{ hcp.mce.instance_name }} -p '{"spec":{"overrides":{"components":[{"name":"hypershift-preview","enabled":true}]}}}' --type merge
+  ansible.builtin.command: >
+    oc patch mce {{ hcp.mce.instance_name }}
+    -p '{"spec":{"overrides":{"components":[{"name":"hypershift-preview","enabled":true}]}}}'
+    --type merge
 
 - name: Create ClusterImageSet.yaml
-  template:
+  ansible.builtin.template:
     src: ClusterImageSet.yaml.j2
     dest: /root/ansible_workdir/ClusterImageSet.yaml
+    mode: '0644'
 
-- name: Deploy ClusterImageSet 
-  command: oc apply -f /root/ansible_workdir/ClusterImageSet.yaml
+- name: Deploy ClusterImageSet
+  ansible.builtin.command: oc apply -f /root/ansible_workdir/ClusterImageSet.yaml
 
 - name: Create Provisioning.yaml
-  template:
+  ansible.builtin.template:
     src: Provisioning.yaml.j2
     dest: /root/ansible_workdir/Provisioning.yaml
+    mode: '0644'
 
-- name: Deploy Provisioning 
-  command: oc apply -f /root/ansible_workdir/Provisioning.yaml
+- name: Deploy Provisioning
+  ansible.builtin.command: oc apply -f /root/ansible_workdir/Provisioning.yaml

roles/install_mce_operator/templates/CatalogSource.yaml.j2

@@ -0,0 +1,10 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: redhat-operators
+  namespace: openshift-marketplace
+spec:
+  sourceType: grpc
+  publisher: redhat
+  displayName: Red Hat Operators v4.18 Stage
+  image: {{ hcp.mce.catalogsource_image }}

roles/install_mce_operator/templates/Subscription.yaml.j2

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ hcp.asc.mce_namespace }}"
 spec:
   sourceNamespace: openshift-marketplace
-  source: {{ hcp.mce.catalogsource_name }}
+  source: redhat-operators
   channel: stable-{{ hcp.mce.version }}
   installPlanApproval: Automatic
   name: multicluster-engine