Merge pull request #1111 from IBM/fk-misc

fketelaars · web-flow · commit a1a6fc8f582d · 2026-04-09T21:37:11.000+02:00
Miscellaneous changes
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-apply-entitlement/templates/apply-entitlement.j2 b/automation-roles/50-install-cloud-pak/cp4d/cp4d-apply-entitlement/templates/apply-entitlement.j2
@@ -1,4 +1,4 @@
 apply-entitlement \
     --cpd_instance_ns={{ current_cp4d_cluster.project }} \
     --entitlement={{ _p_entitlement }} \
-    --production={{ _p_cp4d_production_license }} {% if _p_cp4d_version < '5.3.0' %}--apply_branding=true{% endif %}
+    --production={{ _p_cp4d_production_license | string | lower }} {% if _p_cp4d_version < '5.3.0' %}--apply_branding=true{% endif %}
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-cartridge-install/tasks/cp4d-install-separate-cr.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-cartridge-install/tasks/cp4d-install-separate-cr.yml
@@ -14,6 +14,7 @@
 - include_tasks: cp4d-install-cartridges-install-components.yml
   vars:
     _p_apply_cartridges_list: "{{ _current_cp4d_cartridge.olm_utils_name }}"
+    _p_cp4d_upgrade: "{{ _current_cp4d_cartridge.upgrade_cartridge | default(False) }}"
   when: 
   - not _install_cr_script.stat.exists
   - _p_cp4d_version >= '5.3.0'
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-cartridge-install/tasks/main.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-cartridge-install/tasks/main.yml
@@ -43,11 +43,22 @@
   - _apply_cr_cartridges_list != ''
   - _p_cp4d_version < '5.3.0'
 
-- include_tasks: cp4d-install-cartridges-install-components.yml
+- name: Install cartridges that do not require upgrade
+  include_tasks: cp4d-install-cartridges-install-components.yml
   vars:
-    _p_apply_cartridges_list: "{{ _apply_cr_cartridges_list }}"
+    _p_apply_cartridges_list: "{{ _apply_cr_cartridges_no_upgrade_list }}"
+    _p_cp4d_upgrade: False
   when: 
-  - _apply_cr_cartridges_list != ''
+  - _apply_cr_cartridges_no_upgrade_list != ''
+  - _p_cp4d_version >= '5.3.0'
+
+- name: Install cartridges that DO require upgrade
+  include_tasks: cp4d-install-cartridges-install-components.yml
+  vars:
+    _p_apply_cartridges_list: "{{ _apply_cr_cartridges_upgrade_list }}"
+    _p_cp4d_upgrade: True
+  when: 
+  - _apply_cr_cartridges_upgrade_list != ''
   - _p_cp4d_version >= '5.3.0'
 
 - name: Install separate cartridges
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-cartridge-install/templates/install-components-cartridges.j2 b/automation-roles/50-install-cloud-pak/cp4d/cp4d-cartridge-install/templates/install-components-cartridges.j2
@@ -2,7 +2,7 @@ install-components \
     --release={{ _p_cp4d_version }} \
     --license_acceptance={{ _cpd_accept_licenses | default(False) | string | lower }} \
     --preview={{ _p_preview_script | default(False) | string | lower }} \
-    --upgrade={{ _upgrade_cp4d | default(False) | string | lower }} \
+    --upgrade={{ _p_cp4d_upgrade | default(False) | string | lower }} \
     --operator_ns={{ _p_current_cp4d_cluster.operators_project }} \
     --instance_ns={{ _p_current_cp4d_cluster.project }} \
 {% if _installation_options_set %}
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-case-save/tasks/main.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-case-save/tasks/main.yml
@@ -2,6 +2,21 @@
 - include_role:
     name: cp4d-variables
 
+# Get preview of case-download to ensure the patch files are downloaded when --dry-run was selected
+- block:
+  - set_fact:
+      _case_download_command: "{{ lookup('template', 'case-download.j2') }}"
+    vars:
+      _p_preview: True
+
+  - name: Run preview of download case files to obtain patch files
+    shell: |
+      {{ _case_download_command }}
+    failed_when: False
+    environment:
+      OLM_UTILS_IMAGE: "{{ _olm_utils_image_full }}"
+  when: cpd_dry_run | bool
+    
 - name: Generate case-download command to download case files
   set_fact:
     _case_download_command: "{{ lookup('template', 'case-download.j2') }}" 
@@ -21,8 +36,12 @@
     path: "{{ status_dir }}/work/offline"
     state: absent
 
-- name: Copy case files to {{ status_dir }}/work/offline/{{ _p_cp4d_version }}
+- name: Copy case files and patch info to {{ status_dir }}/work
   copy:
     src: "/tmp/work/"
     dest: "{{ status_dir }}/work/"
-    remote_src: True
+    remote_src: True
+
+# Update cartridge versions in cartridges_to_install fact
+- include_role:
+    name: cp4d-variables
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-case-save/templates/case-download.j2 b/automation-roles/50-install-cloud-pak/cp4d/cp4d-case-save/templates/case-download.j2
@@ -8,4 +8,7 @@ case-download \
     --scheduler_ns={{ scheduling_service_project }} \
     --cluster_resources=true \
 {% endif -%}   
+{% if _p_preview | default(False) %}
+    --preview=true \
+{% endif %}
     --components=ibm-cert-manager,ibm-licensing,{{ _cartridges_to_install_list }}
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-cluster/tasks/apply-cluster-scoped-resources.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-cluster/tasks/apply-cluster-scoped-resources.yml
@@ -0,0 +1,7 @@
+---
+- include_role:
+    name: run-command
+  vars:
+    _p_command_description: Install cluster-scoped resources using file {{ status_dir }}/work/cluster_scoped_resources.yaml
+    _p_command: "{{ lookup('template','apply_cluster_scoped_forced.j2') }}"
+    _p_command_log_file: "{{ status_dir }}/log/{{ current_cp4d_cluster.project }}-apply-cluster-scoped-resources.log"
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-cluster/tasks/install-cp4d.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-cluster/tasks/install-cp4d.yml
@@ -40,6 +40,9 @@
     _p_current_cp4d_cluster: "{{ current_cp4d_cluster }}"
   when: not (cpd_airgap | bool)
 
+- include_tasks: apply-cluster-scoped-resources.yml
+  when: _p_cp4d_version >= "5.3.0"
+
 - name: Prepare OpenShift project {{ current_cp4d_cluster.project }} for Cloud Pak for Data
   include_tasks: openshift-prepare-project.yml
 
@@ -49,6 +52,12 @@
   vars:
     _p_current_cp4d_cluster: "{{ current_cp4d_cluster }}"
 
+- name: Obtain control plane
+  set_fact:
+    _cpd_control_plane: "{{ _cartridges_to_install | json_query(jmes_query) | first }}"
+  vars:
+    jmes_query: "[?olm_utils_name=='cpd_platform']"
+
 - include_tasks: install-control-plane-olm-utils.yml
   when: _p_cp4d_version < "5.1.0"
 
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-cluster/tasks/install-software-hub-component.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-cluster/tasks/install-software-hub-component.yml
@@ -1,11 +1,4 @@
 ---
-- include_role:
-    name: run-command
-  vars:
-    _p_command_description: Install cluster-scoped resources using file {{ status_dir }}/work/cluster_scoped_resources.yaml
-    _p_command: "{{ lookup('template','apply_cluster_scoped_forced.j2') }}"
-    _p_command_log_file: "{{ status_dir }}/log/{{ current_cp4d_cluster.project }}-apply-cluster-scoped-resources.log"
-
 - block:
   - name: Generate install-components command for project {{ current_cp4d_cluster.project }} to install Software Hub
     set_fact:
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-cluster/templates/apply-cr-cpd-platform.j2 b/automation-roles/50-install-cloud-pak/cp4d/cp4d-cluster/templates/apply-cr-cpd-platform.j2
@@ -2,7 +2,7 @@ apply-cr \
     --release={{ _p_cp4d_version }} \
     --license_acceptance={{ _cpd_accept_licenses | default(False) | string | lower }} \
     --preview={%- if _p_preview_script -%}true{%- else -%}false{%- endif %} \
-    --upgrade={{ _upgrade_cp4d | default(False) | string | lower }} \
+    --upgrade={{ _cpd_control_plane.upgrade_cartridge | default(False) | string | lower }} \
     -v \
     --cpd_instance_ns={{ current_cp4d_cluster.project }} \
     --file_storage_class={{ ocp_storage_class_file }} \
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-cluster/templates/install-components.j2 b/automation-roles/50-install-cloud-pak/cp4d/cp4d-cluster/templates/install-components.j2
@@ -2,7 +2,7 @@ install-components \
     --release={{ _p_cp4d_version }} \
     --license_acceptance={{ _cpd_accept_licenses | default(False) | string | lower }} \
     --preview={{ _p_preview_script | default(False) | string | lower }} \
-    --upgrade={{ _upgrade_cp4d | default(False) | string | lower }} \
+    --upgrade={{ _cpd_control_plane.upgrade_cartridge | default(False) | string | lower }} \
     --operator_ns={{ current_cp4d_cluster.operators_project }} \
     --instance_ns={{ current_cp4d_cluster.project }} \
 {% if _installation_options_set %}
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-scheduling-service/tasks/install-scheduler.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-scheduling-service/tasks/install-scheduler.yml
@@ -9,6 +9,7 @@
   include_role:
     name: cp4d-set-pull-secret
   vars:
+    _p_current_cp4d_cluster: "{{ current_cp4d_cluster }}"
     _p_pull_secret_namespace: "{{ scheduling_service_project }}"
 
 - name: Generate scheduler command
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-set-pull-secret/tasks/main.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-set-pull-secret/tasks/main.yml
@@ -11,4 +11,5 @@
 
 - include_tasks: set-alt-registries-pull-secret.yml
   when: 
-  - (all_config.cp_alt_repo | default({})) != {}
+  - (all_config.cp_alt_repo | default({})) != {}
+  - (_p_current_cp4d_cluster.use_cp_alt_repo | default(True) | bool)
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/add-patch-info.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/add-patch-info.yml
@@ -0,0 +1,13 @@
+---
+- ansible.builtin.include_vars:
+    file: "{{ status_dir }}/work/offline/patch/patch-{{ _p_cp4d_version }}.yaml"
+
+- set_fact:
+    _patched_cartridges_to_install: []
+
+- set_fact:
+    _patched_cartridges_to_install: "{{ _patched_cartridges_to_install + [item | combine(patch_components_meta[item.Component_name] | default({}), {'Patch_CR_Version': patch_components_meta[item.Component_name].cr_version | default(item.CR_Version)}) ] }}"
+  loop: "{{ _cartridges_to_install }}"
+
+- set_fact:
+    _cartridges_to_install: "{{ _patched_cartridges_to_install }}"
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/check-cp4d-upgrade.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/check-cp4d-upgrade.yml
@@ -1,27 +1,31 @@
 ---
+- set_fact:
+    _current_cartridge_upgrade: False
+
 - set_fact:
     _get_current_cr_version: {}
 
 - name: Retrieve current {{ _current_cartridge_details.CR_Kind }} in OpenShift project {{ _p_current_cp4d_cluster.project }}
-  shell: |
-    oc get {{ _current_cartridge_details.CR_Kind }} \
-      -n {{ _p_current_cp4d_cluster.project }} \
-      {{ _current_cartridge_details.CR_Name }} \
-      -o jsonpath='{.spec.version}'
-  failed_when: False
-  register: _get_current_cr_version
+  kubernetes.core.k8s_info:
+    kind: "{{ _current_cartridge_details.CR_Kind }}"
+    name: "{{ _current_cartridge_details.CR_Name }}"
+    namespace: "{{ _p_current_cp4d_cluster.project }}"
+  register: _get_current_cr
   when:
   - (_current_cartridge_details.CR_Kind | default('')) != ''
+  - (_current_cartridge_details.CR_Kind | default('')) != '--'
   - (_current_cartridge_details.CR_Name | default('')) != ''
 
-- name: Determine if CP4D must be upgraded based on cartridge {{ _current_cartridge_details.CR_Kind }}
+- name: Determine if cartridge {{ _current_cartridge_details.CR_Kind }} must be upgraded
   set_fact:
-    _upgrade_cp4d: True
+    _current_cartridge_upgrade: True
   when:
-  - (_get_current_cr_version.rc | default(0)) == 0
-  - (_get_current_cr_version.stdout | default('')) != ''
-  - (_get_current_cr_version.stdout | default('')) < _current_cartridge_details.CR_Version
+  - (_get_current_cr.resources | default([])) != []
+  - (_get_current_cr.resources[0].spec.version | default('')) != (_current_cartridge_details.Patch_CR_Version | default(_current_cartridge_details.CR_Version))
 
 - set_fact:
-    _installed_ibmcpd_version: "{{ (_get_current_cr_version.stdout | default('')) }}"
-  when: _current_cartridge_details.CR_Kind == 'Ibmcpd'
+    _cartridges_with_upgrade_info: "{{ _cartridges_with_upgrade_info + [_current_cartridge_details | combine({'upgrade_cartridge': _current_cartridge_upgrade}) ] }}"
+
+- set_fact:
+    _upgrade_cp4d: True
+  when: _current_cartridge_upgrade
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/check-cp4d-upgrades.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/check-cp4d-upgrades.yml
@@ -0,0 +1,22 @@
+---
+- set_fact:
+    _upgrade_cp4d: False
+
+- set_fact:
+    _cartridges_with_upgrade_info: []
+
+- name: Determine if CP4D must be upgraded
+  include_tasks: check-cp4d-upgrade.yml
+  loop_control:
+    loop_var: _current_cartridge_details
+  when: 
+  - (_current_cartridge_details.CR_Kind | default('')) != ''
+  - (_current_cartridge_details.CR_Kind | default('')) != '--'
+  loop: "{{ _cartridges_to_install }}"
+
+- set_fact:
+    _cartridges_to_install: "{{ _cartridges_with_upgrade_info }}"
+
+- name: Show if upgrade of CP4D in project {{ _p_current_cp4d_cluster.project }} must be done
+  debug:
+    var: _upgrade_cp4d
diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/main.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/main.yml
@@ -116,12 +116,17 @@
             selectattr('state','undefined') | 
             union(_all_cartridges | selectattr('state','defined') | selectattr('state','==','installed')) }}
 
+- include_tasks: add-patch-info.yml
+  when: (status_dir + '/work/offline/patch/patch-' + _p_cp4d_version + '.yaml') is exists
+
 - set_fact:
     _cartridges_to_install_list: >-
       {{  _cartridges_to_install | 
             map(attribute='olm_utils_name') | 
             join(',')}}
 
+- include_tasks: check-cp4d-upgrades.yml
+
 # Check if control plane must be installed
 - include_tasks: optimize-control-plane.yml
   when: cpd_action=='apply'
@@ -177,13 +182,41 @@
     _apply_cr_cartridges: >-
       {{  _apply_cartridges | 
             selectattr('separate_install','undefined') |
-            union(_apply_cartridges | selectattr('separate_install','defined') | selectattr('separate_install','!=',True)) }}
+            union(_apply_cartridges | selectattr('separate_install','defined') | selectattr('separate_install','!=',True)) |
+            rejectattr('olm_utils_name','in',_v_cp4d_control_plane_cartridges) }}
 
 - set_fact:
     _apply_cr_cartridges_list: >-
       {{  _apply_cr_cartridges 
         | map(attribute='olm_utils_name')
-        | difference(_v_cp4d_control_plane_cartridges)
+        | list
+        | join(',')}}
+
+- set_fact:
+    _apply_cr_cartridges_no_upgrade: >-
+      {{  _apply_cr_cartridges
+          | selectattr('upgrade_cartridge','defined')
+          | selectattr('upgrade_cartridge','==',False) |
+          rejectattr('olm_utils_name','in',_v_cp4d_control_plane_cartridges) }}
+
+- set_fact:
+    _apply_cr_cartridges_no_upgrade_list: >-
+      {{  _apply_cr_cartridges_no_upgrade 
+        | map(attribute='olm_utils_name')
+        | list
+        | join(',')}}
+
+- set_fact:
+    _apply_cr_cartridges_upgrade: >-
+      {{  _apply_cr_cartridges
+          | selectattr('upgrade_cartridge','defined')
+          | selectattr('upgrade_cartridge','==',True) |
+          rejectattr('olm_utils_name','in',_v_cp4d_control_plane_cartridges) }}
+
+- set_fact:
+    _apply_cr_cartridges_upgrade_list: >-
+      {{  _apply_cr_cartridges_upgrade 
+        | map(attribute='olm_utils_name')
         | list
         | join(',')}}
 
@@ -203,6 +236,9 @@
 - debug:
     var: _cartridges_to_install
 
+- debug:
+    var: _apply_cartridges
+
 - debug:
     var: _apply_cartridges_list
 
@@ -213,42 +249,22 @@
     var: _apply_cr_cartridges_list
 
 - debug:
-    var: _apply_cr_cartridges_separate
+    var: _apply_cr_cartridges_no_upgrade
 
 - debug:
-    var: _apply_cr_cartridges_separate_list
+    var: _apply_cr_cartridges_no_upgrade_list
 
-- set_fact:
-    _upgrade_cp4d: False
-
-- name: Determine if CP4D must be upgraded
-  include_tasks: check-cp4d-upgrade.yml
-  loop_control:
-    loop_var: _current_cartridge_details
-  when: 
-  - (_current_cartridge_details.CR_Kind | default('')) != ''
-  - (_current_cartridge_details.CR_Kind | default('')) != '--'
-  loop: "{{ _cartridges_to_install }}"
+- debug:
+    var: _apply_cr_cartridges_upgrade
 
-- name: Show if upgrade of CP4D in project {{ _p_current_cp4d_cluster.project }} must be done
-  debug:
-    var: _upgrade_cp4d
+- debug:
+    var: _apply_cr_cartridges_upgrade_list
 
-- block:
+- debug:
+    var: _apply_cr_cartridges_separate
 
-  - name: Generate migrate-private-topology scripts
-    include_role:
-      name: cp4d-migrate-private-topology
-    vars:
-      _p_preview: True
-      
-  - name: Fail if trying to upgrade to {{ _p_cp4d_version }} from a release that is lower than 4.6.5
-    fail:
-      msg: "Cloud Pak Deployer does not support upgrading CP4D from any release earlier than 4.6.5. The currently installed release of CP4D is {{ _installed_ibmcpd_version }}. If you want to upgrade, please first upgrade to CP4D 4.6.5 or 4.6.6 and then upgrade to CP4D {{ _p_cp4d_version }}"
-  when:
-    - _upgrade_cp4d
-    - _installed_ibmcpd_version < "4.6.5"
-    - not allow_cp4d_upgrade | default(False) | bool
+- debug:
+    var: _apply_cr_cartridges_separate_list
 
 # check if any of the cartridges have a db2u dependency
 - include_tasks: check-db2u-dependency.yml
diff --git a/automation-roles/60-configure-cloud-pak/cp4d/cp4d-instance-db2oltp/tasks/patch_db2_instance.yml b/automation-roles/60-configure-cloud-pak/cp4d/cp4d-instance-db2oltp/tasks/patch_db2_instance.yml
diff --git a/automation-roles/60-configure-cloud-pak/cp4d/cp4d-instance-db2oltp/tasks/wait_db2_instance.yml b/automation-roles/60-configure-cloud-pak/cp4d/cp4d-instance-db2oltp/tasks/wait_db2_instance.yml
diff --git a/automation-roles/80-smoke-tests/openshift-redhat-sso-show/tasks/get-keycloak-user-password.yml b/automation-roles/80-smoke-tests/openshift-redhat-sso-show/tasks/get-keycloak-user-password.yml
diff --git a/docs/src/10-use-deployer/5-post-run/keycloak-add-users.md b/docs/src/10-use-deployer/5-post-run/keycloak-add-users.md
diff --git a/sample-configurations/sample-dynamic/config-samples/cp4d-530.yaml b/sample-configurations/sample-dynamic/config-samples/cp4d-530.yaml
diff --git a/sample-configurations/sample-dynamic/config-samples/cp4d-531.yaml b/sample-configurations/sample-dynamic/config-samples/cp4d-531.yaml
diff --git a/sample-configurations/sample-dynamic/config-samples/cp4d-latest.yaml b/sample-configurations/sample-dynamic/config-samples/cp4d-latest.yaml
diff --git a/scripts/cp4d/cp4d-delete-instance.sh b/scripts/cp4d/cp4d-delete-instance.sh
