From abc8f79e0e245f424ae577c2fd17fea3d58a11f6 Mon Sep 17 00:00:00 2001 From: Frank Ketelaars Date: Fri, 9 Aug 2024 19:05:09 +0000 Subject: [PATCH 1/4] #756 Allow ROKS 4.15 deployment --- .../ibm-cloud/openshift/templates/main.tf.j2 | 3 +++ .../tasks/ibm-cloud-enable-outbound-traffic.yml | 15 +++++++++++++++ .../configure-openshift/tasks/main.yml | 4 ++++ 3 files changed, 22 insertions(+) create mode 100644 automation-roles/40-configure-infra/configure-openshift/tasks/ibm-cloud-enable-outbound-traffic.yml diff --git a/automation-generators/ibm-cloud/openshift/templates/main.tf.j2 b/automation-generators/ibm-cloud/openshift/templates/main.tf.j2 index 22a557f6c..1e52972c5 100644 --- a/automation-generators/ibm-cloud/openshift/templates/main.tf.j2 +++ b/automation-generators/ibm-cloud/openshift/templates/main.tf.j2 @@ -104,6 +104,9 @@ data "ibm_container_vpc_cluster" "{{generator.attributes.name | replace("-", "_" count = local.enable ? 1 : 0 name = local.cluster_id resource_group_id = data.ibm_resource_group.thisresourcegroup.id +{% if generator.attributes.ocp_version >= "4.15" %} + disable_outbound_traffic_protection = false +{% endif %} } data "ibm_container_vpc_cluster_worker" "{{generator.attributes.name | replace("-", "_") }}" { diff --git a/automation-roles/40-configure-infra/configure-openshift/tasks/ibm-cloud-enable-outbound-traffic.yml b/automation-roles/40-configure-infra/configure-openshift/tasks/ibm-cloud-enable-outbound-traffic.yml new file mode 100644 index 000000000..dbd942654 --- /dev/null +++ b/automation-roles/40-configure-infra/configure-openshift/tasks/ibm-cloud-enable-outbound-traffic.yml @@ -0,0 +1,15 @@ +--- +- name: Disable outbound traffic protection for ROKS cluster + shell: | + ibmcloud oc vpc outbound-traffic-protection disable --cluster {{ current_openshift_cluster.name }} -f + +- name: Get current state of OperatorHub disableAllDefaultSources + shell: + oc get operatorhub cluster -o jsonpath='{.spec.disableAllDefaultSources}' + register: _disableAllDefaultSources + +- name: Patch OperatorHub to enable default sources in marketplace for ROKS clusters + shell: | + oc patch OperatorHub cluster --type json -p '[{"op": "remove", "path": "/spec/disableAllDefaultSources"}]' + when: _disableAllDefaultSources.stdout != '' + diff --git a/automation-roles/40-configure-infra/configure-openshift/tasks/main.yml b/automation-roles/40-configure-infra/configure-openshift/tasks/main.yml index 9e52c424f..14fbdb7cc 100644 --- a/automation-roles/40-configure-infra/configure-openshift/tasks/main.yml +++ b/automation-roles/40-configure-infra/configure-openshift/tasks/main.yml @@ -21,6 +21,10 @@ vars: _p_openshift_cluster_name: "{{ current_openshift_cluster.name }}" +# Patch OperatorHub to enable default sources in marketplace for ROKS clusters +- include_tasks: ibm-cloud-enable-outbound-traffic.yml + when: cloud_platform == 'ibm-cloud' + - name: Prepare storage for OpenShift cluster {{ current_openshift_cluster.name }} include_role: name: prepare-openshift-storage From ff0f345a9471ce27e4cb40e2677c9df149e2c172 Mon Sep 17 00:00:00 2001 From: Frank Ketelaars Date: Sat, 10 Aug 2024 11:03:30 +0000 Subject: [PATCH 2/4] #647 Use OVNKubernetes network for new clusters --- automation-generators/aws/openshift/templates/main.tf.j2 | 2 +- automation-generators/azure/openshift/templates/main.tf.j2 | 2 +- automation-generators/vsphere/openshift/templates/main.tf.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/automation-generators/aws/openshift/templates/main.tf.j2 b/automation-generators/aws/openshift/templates/main.tf.j2 index c70a72a76..f8d55d854 100644 --- a/automation-generators/aws/openshift/templates/main.tf.j2 +++ b/automation-generators/aws/openshift/templates/main.tf.j2 @@ -43,7 +43,7 @@ networking: machineNetwork: - cidr: {{ generator.attributes.infrastructure.machine_cidr }} {% endif %} - networkType: OpenShiftSDN + networkType: OVNKubernetes serviceNetwork: - 172.30.0.0/16 diff --git a/automation-generators/azure/openshift/templates/main.tf.j2 b/automation-generators/azure/openshift/templates/main.tf.j2 index 1afc61bb4..dd3448a5a 100644 --- a/automation-generators/azure/openshift/templates/main.tf.j2 +++ b/automation-generators/azure/openshift/templates/main.tf.j2 @@ -44,7 +44,7 @@ networking: {% endif %} machineNetwork: - cidr: {{ generator.attributes.network.machine_cidr | default('10.0.0.0/16') }} - networkType: OpenShiftSDN + networkType: OVNKubernetes serviceNetwork: - 172.30.0.0/16 diff --git a/automation-generators/vsphere/openshift/templates/main.tf.j2 b/automation-generators/vsphere/openshift/templates/main.tf.j2 index d827fa73b..af177ad11 100644 --- a/automation-generators/vsphere/openshift/templates/main.tf.j2 +++ b/automation-generators/vsphere/openshift/templates/main.tf.j2 @@ -54,7 +54,7 @@ networking: - cidr: 10.128.0.0/14 hostPrefix: 23 {% endif %} - networkType: OpenShiftSDN + networkType: OVNKubernetes serviceNetwork: - 172.30.0.0/16 From 21f249d036f6a24b23986ee04a2670cc0e7282b2 Mon Sep 17 00:00:00 2001 From: Frank Ketelaars Date: Sat, 10 Aug 2024 11:09:52 +0000 Subject: [PATCH 3/4] #757 Update OpenShift sample configs --- .../sample-dynamic/config-samples/ocp-aws-rosa-elastic.yaml | 4 ++-- .../config-samples/ocp-aws-rosa-existing-vpc.yaml | 4 ++-- .../sample-dynamic/config-samples/ocp-aws-rosa-ocs.yaml | 4 ++-- .../config-samples/ocp-aws-self-managed-elastic-manual.yaml | 4 ++-- .../config-samples/ocp-aws-self-managed-elastic-sno.yaml | 4 ++-- .../config-samples/ocp-aws-self-managed-elastic.yaml | 4 ++-- .../config-samples/ocp-aws-self-managed-existing-vpc.yaml | 4 ++-- .../config-samples/ocp-aws-self-managed-ocs.yaml | 4 ++-- .../sample-dynamic/config-samples/ocp-azure-aro.yaml | 4 ++-- .../config-samples/ocp-azure-self-managed.yaml | 4 ++-- .../config-samples/ocp-existing-ocp-auto.yaml | 4 ++-- .../config-samples/ocp-existing-ocp-satellite-ocs.yaml | 4 ++-- .../sample-dynamic/config-samples/ocp-existing-ocp.yaml | 4 ++-- .../config-samples/ocp-existing-roks-classic.yaml | 4 ++-- .../config-samples/ocp-ibm-cloud-roks-cp4waiops.yaml | 4 ++-- .../config-samples/ocp-ibm-cloud-roks-nfs.yaml | 4 ++-- .../config-samples/ocp-ibm-cloud-roks-ocs.yaml | 6 +++--- .../config-samples/ocp-ibm-cloud-roks-portworx.yaml | 4 ++-- .../sample-dynamic/config-samples/ocp-vsphere-ocs-nfs.yaml | 6 +++--- 19 files changed, 40 insertions(+), 40 deletions(-) diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-aws-rosa-elastic.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-aws-rosa-elastic.yaml index f9e3561e0..eae488fc4 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-aws-rosa-elastic.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-aws-rosa-elastic.yaml @@ -13,7 +13,7 @@ nfs_server: openshift: - name: "{{ env_id }}" - ocp_version: 4.10.34 + ocp_version: 4.15.22 compute_flavour: m5.4xlarge compute_nodes: 3 infrastructure: @@ -25,7 +25,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: True storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-aws-rosa-existing-vpc.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-aws-rosa-existing-vpc.yaml index fd0792fbe..b3d3243b3 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-aws-rosa-existing-vpc.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-aws-rosa-existing-vpc.yaml @@ -13,7 +13,7 @@ nfs_server: openshift: - name: "{{ env_id }}" - ocp_version: 4.10.34 + ocp_version: 4.15.22 compute_flavour: m5.4xlarge compute_nodes: 3 infrastructure: @@ -29,7 +29,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: True storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-aws-rosa-ocs.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-aws-rosa-ocs.yaml index 177da7967..3f162cf92 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-aws-rosa-ocs.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-aws-rosa-ocs.yaml @@ -8,7 +8,7 @@ global_config: openshift: - name: "{{ env_id }}" - ocp_version: 4.12.3 + ocp_version: 4.15.22 compute_flavour: m5.4xlarge compute_nodes: 3 infrastructure: @@ -20,7 +20,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: False storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-elastic-manual.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-elastic-manual.yaml index ec4dba11e..165d50e3f 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-elastic-manual.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-elastic-manual.yaml @@ -13,7 +13,7 @@ nfs_server: openshift: - name: "{{ env_id }}" - ocp_version: 4.10.47 + ocp_version: 4.15.22 domain_name: example.com control_plane_flavour: m4.xlarge control_plane_nodes: 3 @@ -33,7 +33,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: True storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-elastic-sno.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-elastic-sno.yaml index ef305d4a9..668962dd3 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-elastic-sno.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-elastic-sno.yaml @@ -13,7 +13,7 @@ nfs_server: openshift: - name: "{{ env_id }}" - ocp_version: 4.10.54 + ocp_version: 4.15.22 domain_name: example.com control_plane_flavour: m4.xlarge control_plane_nodes: 1 @@ -27,7 +27,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: False storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-elastic.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-elastic.yaml index eb29636a1..d4dbf07a7 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-elastic.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-elastic.yaml @@ -13,7 +13,7 @@ nfs_server: openshift: - name: "{{ env_id }}" - ocp_version: 4.10.34 + ocp_version: 4.15.22 domain_name: example.com control_plane_flavour: m4.xlarge control_plane_nodes: 3 @@ -27,7 +27,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.82.8 mcg: install: True storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-existing-vpc.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-existing-vpc.yaml index 2a798c2c0..92f1f55ec 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-existing-vpc.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-existing-vpc.yaml @@ -13,7 +13,7 @@ nfs_server: openshift: - name: "{{ env_id }}" - ocp_version: 4.10.34 + ocp_version: 4.15.22 domain_name: example.com control_plane_flavour: m4.xlarge control_plane_nodes: 3 @@ -37,7 +37,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: True storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-ocs.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-ocs.yaml index 530fc91e0..55bf1df8e 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-ocs.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-aws-self-managed-ocs.yaml @@ -8,7 +8,7 @@ global_config: openshift: - name: "{{ env_id }}" - ocp_version: 4.12.3 + ocp_version: 4.15.22 domain_name: example.com control_plane_flavour: m4.xlarge control_plane_nodes: 3 @@ -22,7 +22,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: False storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-azure-aro.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-azure-aro.yaml index 2cf0b6043..e5931f80d 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-azure-aro.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-azure-aro.yaml @@ -28,7 +28,7 @@ openshift: azure_name: "{{ env_id }}-infra" domain_name: "{{ env_id }}.eu" domain_resource_group: "{{ env_id }}-domain-rg" - ocp_version: 4.10.54 + ocp_version: 4.15.22 control_plane_flavour: Standard_D8s_v3 compute_flavour: Standard_D16s_v3 compute_disk_size_gb: 300 @@ -42,7 +42,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: False storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-azure-self-managed.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-azure-self-managed.yaml index 137920d93..ea91b3d7f 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-azure-self-managed.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-azure-self-managed.yaml @@ -29,7 +29,7 @@ openshift: azure_name: "{{ env_id }}-infra" domain_name: "{{ env_id }}.eu" domain_resource_group: "{{ env_id }}-domain-rg" - ocp_version: 4.10.54 + ocp_version: 4.15.22 control_plane_flavour: Standard_D8s_v3 compute_flavour: Standard_D16s_v3 compute_disk_size_gb: 300 @@ -43,7 +43,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: False storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-existing-ocp-auto.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-existing-ocp-auto.yaml index c5bda0cec..d1059da56 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-existing-ocp-auto.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-existing-ocp-auto.yaml @@ -7,7 +7,7 @@ global_config: openshift: - name: "{{ env_id }}" - ocp_version: "4.10" + ocp_version: "4.15" cluster_name: "{{ env_id }}" domain_name: example.com mcg: @@ -18,7 +18,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 openshift_storage: - storage_name: auto-storage storage_type: auto diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-existing-ocp-satellite-ocs.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-existing-ocp-satellite-ocs.yaml index 8812c21ba..dc6a2deeb 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-existing-ocp-satellite-ocs.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-existing-ocp-satellite-ocs.yaml @@ -13,7 +13,7 @@ global_config: # openshift: - name: "{{ env_id }}" - ocp_version: "4.10" + ocp_version: "4.15" cluster_name: "{{ env_id }}" domain_name: example.com infrastructure: @@ -22,7 +22,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: False storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-existing-ocp.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-existing-ocp.yaml index 507474b95..cfba94d46 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-existing-ocp.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-existing-ocp.yaml @@ -7,14 +7,14 @@ global_config: openshift: - name: "{{ env_id }}" - ocp_version: 4.8 + ocp_version: 4.15 cluster_name: "{{ env_id }}" domain_name: example.com gpu: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: False storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-existing-roks-classic.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-existing-roks-classic.yaml index c3eb43892..a7bffcebc 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-existing-roks-classic.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-existing-roks-classic.yaml @@ -7,14 +7,14 @@ global_config: openshift: - name: "{{ env_id }}" - ocp_version: 4.8 + ocp_version: 4.15 cluster_name: "{{ env_id }}" domain_name: example.com gpu: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: True storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-cp4waiops.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-cp4waiops.yaml index 151a59e2f..b64a00820 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-cp4waiops.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-cp4waiops.yaml @@ -39,14 +39,14 @@ global_config: openshift: - name: "mycluster" - ocp_version: "4.10" + ocp_version: "4.15" cluster_name: "mycluster" domain_name: example.com gpu: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 openshift_storage: - storage_name: auto-storage storage_type: auto diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-nfs.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-nfs.yaml index f99c166a9..60ffa1a1f 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-nfs.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-nfs.yaml @@ -73,7 +73,7 @@ cos: openshift: - name: "{{ env_id }}" - ocp_version: 4.8 + ocp_version: 4.15 compute_flavour: bx2.16x64 compute_nodes: 5 infrastructure: @@ -86,7 +86,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: True storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-ocs.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-ocs.yaml index 2cd372f6e..b6596d5df 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-ocs.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-ocs.yaml @@ -53,7 +53,7 @@ cos: openshift: - name: "{{ env_id }}" - ocp_version: 4.8 + ocp_version: 4.15 compute_flavour: bx2.16x64 compute_nodes: 3 infrastructure: @@ -68,7 +68,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: False storage_type: storage-class @@ -78,4 +78,4 @@ openshift: storage_type: ocs ocs_storage_label: ocs ocs_storage_size_gb: 500 - ocs_version: 4.8.0 + ocs_version: 4.15.0 diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-portworx.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-portworx.yaml index dfd1f1c41..94244bfe4 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-portworx.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-ibm-cloud-roks-portworx.yaml @@ -53,7 +53,7 @@ cos: openshift: - name: "{{ env_id }}" - ocp_version: 4.8 + ocp_version: 4.15 compute_flavour: bx2.16x64 compute_nodes: 3 infrastructure: @@ -68,7 +68,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: True storage_type: storage-class diff --git a/sample-configurations/sample-dynamic/config-samples/ocp-vsphere-ocs-nfs.yaml b/sample-configurations/sample-dynamic/config-samples/ocp-vsphere-ocs-nfs.yaml index 69fb67da5..c0feac7f2 100644 --- a/sample-configurations/sample-dynamic/config-samples/ocp-vsphere-ocs-nfs.yaml +++ b/sample-configurations/sample-dynamic/config-samples/ocp-vsphere-ocs-nfs.yaml @@ -42,7 +42,7 @@ openshift: - name: "{{ env_id }}" domain_name: example.com vsphere_name: "{{ env_id }}" - ocp_version: 4.8 + ocp_version: 4.15 control_plane_nodes: 3 control_plane_vm_definition: control-plane compute_nodes: 3 @@ -53,7 +53,7 @@ openshift: install: False openshift_ai: install: False - channel: fast + channel: eus-2.8 mcg: install: True storage_type: storage-class @@ -64,7 +64,7 @@ openshift: # nfs_server_name: sample-nfs - storage_name: ocs-storage storage_type: ocs - ocs_version: 4.8 + ocs_version: 4.15 ocs_storage_label: ocs ocs_storage_size_gb: 512 ocs_dynamic_storage_class: thin From de64ccb16d2ff0f503c1ecc8d73c1add82aac487 Mon Sep 17 00:00:00 2001 From: Frank Ketelaars Date: Sun, 11 Aug 2024 19:37:00 +0000 Subject: [PATCH 4/4] #754 Use special image for NFD on OpenShift 4.15 --- .../40-configure-infra/nfd-operator/templates/nfd-cr.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/automation-roles/40-configure-infra/nfd-operator/templates/nfd-cr.j2 b/automation-roles/40-configure-infra/nfd-operator/templates/nfd-cr.j2 index 021cf77fd..fa95ee2df 100644 --- a/automation-roles/40-configure-infra/nfd-operator/templates/nfd-cr.j2 +++ b/automation-roles/40-configure-infra/nfd-operator/templates/nfd-cr.j2 @@ -8,7 +8,11 @@ spec: instance: "" # instance is empty by default topologyupdater: false # False by default operand: +{% if _p_current_ocp_version == '4.15' %} + image: registry.redhat.io/openshift4/ose-node-feature-discovery-rhel9:v{{ _p_current_ocp_version }} +{% else %} image: registry.redhat.io/openshift4/ose-node-feature-discovery:v{{ _p_current_ocp_version }} +{% endif %} servicePort: 12000 workerConfig: configData: |