Bump all OCP supported versions

redhat-partner-solutions · Dec 4, 2023 · 1a73e6a · 1a73e6a
1 parent d214ccf
commit 1a73e6a
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 30 deletions.
diff --git a/inventory.yml.sample b/inventory.yml.sample
@@ -12,8 +12,8 @@ all:
     cluster_name: clustername
     base_dns_domain: example.lab
 
-    # OpenShift version (4.6.16, 4.7.52, 4.8.43, 4.9.45, 4.10.37, 4.11.24, 4.12.31, or 4.13.10)
-    openshift_full_version: 4.10.37
+    # OpenShift version (4.6.16, 4.7.52, 4.8.43, 4.9.59, 4.10.67, 4.11.53, 4.12.44, 4.13.22, 4.14.2)
+    openshift_full_version: 4.10.67
 
     # Virtual IP addresses used to access the resulting OpenShift cluster
     api_vip: 10.60.0.96 # the IP address to be used for api.clustername.example.lab and api-int.clustername.example.lab
@@ -28,7 +28,7 @@ all:
     # The IP address pool to use for service IP addresses
     service_network_cidr: 172.30.0.0/16
 
-    # Check network connection when vm_host and bastion are the same 
+    # Check network connection when vm_host and bastion are the same
     vm_network_test_ip: 8.8.8.8 # This should be an IP external to the bastion and vm_host
 
     # Cluster network settings. You are unlikely to need to change these

diff --git a/roles/get_image_hash/defaults/main.yml b/roles/get_image_hash/defaults/main.yml
@@ -83,24 +83,24 @@ release_images:
     version: 4.8.43
   - openshift_version: '4.9'
     cpu_architecture: x86_64
-    url: quay.io/openshift-release-dev/ocp-release:4.9.45-x86_64
-    version: 4.9.45
+    url: quay.io/openshift-release-dev/ocp-release:4.9.59-x86_64
+    version: 4.9.59
   - openshift_version: '4.10'
     cpu_architecture: x86_64
-    url: quay.io/openshift-release-dev/ocp-release:4.10.37-x86_64
-    version: 4.10.37
+    url: quay.io/openshift-release-dev/ocp-release:4.10.67-x86_64
+    version: 4.10.67
   - openshift_version: '4.11'
     cpu_architecture: x86_64
-    url: quay.io/openshift-release-dev/ocp-release:4.11.24-x86_64
-    version: 4.11.24
+    url: quay.io/openshift-release-dev/ocp-release:4.11.53-x86_64
+    version: 4.11.53
   - openshift_version: '4.12'
     cpu_architecture: x86_64
-    url: quay.io/openshift-release-dev/ocp-release:4.12.31-x86_64
-    version: 4.12.31
+    url: quay.io/openshift-release-dev/ocp-release:4.12.44-x86_64
+    version: 4.12.44
   - openshift_version: '4.13'
     cpu_architecture: x86_64
-    url: quay.io/openshift-release-dev/ocp-release:4.13.10-x86_64
-    version: 4.13.10
+    url: quay.io/openshift-release-dev/ocp-release:4.13.22-x86_64
+    version: 4.13.22
   - openshift_version: '4.14'
     cpu_architecture: x86_64
     url: quay.io/openshift-release-dev/ocp-release:4.14.2-x86_64

diff --git a/roles/validate_inventory/defaults/main.yml b/roles/validate_inventory/defaults/main.yml
@@ -24,14 +24,14 @@ ai_version: "{{ hostvars.assisted_installer.ai_version | default('v2.26.0') }}"
 ai_version_number: "{{ ai_version | regex_replace('v(\\d+\\.\\d+\\.\\d+)', '\\1') }}"
 
 supported_ocp_versions:
-- 4.6.16
-- 4.7.52
-- 4.8.43
-- 4.9.45
-- 4.10.37
-- 4.11.24
-- 4.12.31
-- 4.13.10
-- 4.14.2
+  - 4.6.16
+  - 4.7.52
+  - 4.8.43
+  - 4.9.59
+  - 4.10.67
+  - 4.11.53
+  - 4.12.44
+  - 4.13.22
+  - 4.14.2
 
 single_node_openshift_enabled: "{{ is_valid_single_node_openshift_config | default(false) }}"
diff --git a/roles/validate_inventory/tasks/cluster.yml b/roles/validate_inventory/tasks/cluster.yml
@@ -3,7 +3,7 @@
   assert:
     that:
       - openshift_full_version in supported_ocp_versions
-    fail_msg: "We do not support openshift version {{ openshift_full_version }}"
+    fail_msg: "We do not support openshift version {{ openshift_full_version }}, The supported versions are: {{ supported_ocp_versions | join(',') }}"
 
 - name: Assert valid master configuration (HA)
   assert:

diff --git a/tests/validate_inventory/templates/all_reachable.yml b/tests/validate_inventory/templates/all_reachable.yml
@@ -2,7 +2,7 @@ all:
   vars:
     setup_ntp_service: false
     ntp_server: localhost
-    openshift_full_version: 4.10.37
+    openshift_full_version: 4.10.67
 
   children:
     bastions:

diff --git a/tests/validate_inventory/templates/all_unreachable.yml b/tests/validate_inventory/templates/all_unreachable.yml
@@ -2,7 +2,7 @@ all:
   vars:
     setup_ntp_service: false
     ntp_server: 240.0.0.0
-    openshift_full_version: 4.10.37
+    openshift_full_version: 4.10.67
 
   children:
     bastions:

diff --git a/tests/validate_inventory/templates/invalid_empty_var.yml b/tests/validate_inventory/templates/invalid_empty_var.yml
@@ -1,6 +1,6 @@
 all:
   vars:
-    openshift_full_version: 4.10.37
+    openshift_full_version: 4.10.67
   children:
     nodes:
       vars:

diff --git a/tests/validate_inventory/templates/invalid_missing_var.yml b/tests/validate_inventory/templates/invalid_missing_var.yml
@@ -1,6 +1,6 @@
 all:
   vars:
-    openshift_full_version: 4.10.37
+    openshift_full_version: 4.10.67
   children:
     nodes:
       vars:

diff --git a/tests/validate_inventory/templates/ntp_unreachable.yml b/tests/validate_inventory/templates/ntp_unreachable.yml
@@ -2,7 +2,7 @@ all:
   vars:
     setup_ntp_service: false
     ntp_server: 240.0.0.0
-    openshift_full_version: 4.10.37
+    openshift_full_version: 4.10.67
 
   children:
     bastions:

diff --git a/tests/validate_inventory/templates/test_inv.yml.j2 b/tests/validate_inventory/templates/test_inv.yml.j2
@@ -3,7 +3,7 @@ all:
     {% if item.template.day2_discovery_iso_name is defined %}
     day2_discovery_iso_name: {{ item.template.day2_discovery_iso_name }}
     {% endif %}
-    openshift_full_version: {{ item.template.openshift_full_version | default('4.10.37') }}
+    openshift_full_version: {{ item.template.openshift_full_version | default('4.10.67') }}
     setup_dns_service: {{ item.template.setup_dns_service | default(False)}}
     {% if item.template.allow_custom_vendor is defined %}
     allow_custom_vendor: {{ item.template.allow_custom_vendor }}

diff --git a/tests/validate_inventory/templates/test_inv_secrets.yml.j2 b/tests/validate_inventory/templates/test_inv_secrets.yml.j2
@@ -1,6 +1,6 @@
 all:
   vars:
-    openshift_full_version: {{ item.template.openshift_full_version | default('4.10.37') }}
+    openshift_full_version: {{ item.template.openshift_full_version | default('4.10.67') }}
   children:
     services:
       hosts: