Remove OCP 4.12 support (#74)

loganmc10 · Dec 13, 2024 · b10ac95 · b10ac95
1 parent 545b8d0
commit b10ac95
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 77 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ After the installation of an edge cluster is complete, the edge cluster does not
   * Pre-existing OpenShift cluster (SNO, compact, or standard).
   * If there is not an existing default StorageClass, ODF will be installed. ODF requires each node to have 2 disks (one for the OS, and one for ODF).
 * Edge Cluster:
-  * OpenShift 4.12+
+  * OpenShift 4.14+
   * Provisioning cluster needs to be configured first.
   * Target must be a bare metal cluster (SNO, compact, or standard).
   * If ODF is being installed, each node needs to have 2 disks (one for the OS, and one for ODF).

diff --git a/edge/README.md b/edge/README.md
@@ -7,7 +7,7 @@ The install config uses the same format as an IPI install, except that it also r
 
 If you are not using a mirror registry, the clusterImageSet would look something like this:
 ```
-clusterImageSet: quay.io/openshift-release-dev/ocp-release:4.12.0-x86_64
+clusterImageSet: quay.io/openshift-release-dev/ocp-release:4.16.0-x86_64
 ```
 You can also optionally set a path to a folder containing extra manifests (YAML) to be applied early in the installation process:
 ```

diff --git a/edge/install-config-sno-example.yaml b/edge/install-config-sno-example.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 
 # Additional parameters for openshift-edge-installer
 edgeCluster:
-  clusterImageSet: <mirror_hostname>:8443/openshift-release-dev/ocp-release:4.12.0-x86_64 # Required
+  clusterImageSet: <mirror_hostname>:8443/openshift-release-dev/ocp-release:4.16.0-x86_64 # Required
   additionalNTPSources: # Optional
     - pool.ntp.org
   installManifestsFolder: install_manifests # Optional, see README.md
@@ -26,10 +26,9 @@ edgeCluster:
     enabled: true
     catalogSource: redhat-operators # Optional, defaults to redhat-operators
     noobaa: false # Install NooBaa (S3 compatible storage), defaults to false
-  reservedCpuSet: <reserved_set> # Optional, used to enable workload partitioning, example: "0-1,32-33" (there should be no spaces). For OCP 4.13+, cpuPartitioningMode should be used instead, see https://docs.openshift.com/container-platform/latest/scalability_and_performance/enabling-workload-partitioning.html
   duProfileManifests: # Optional
     # Applies install-time DU Profile manifests from https://github.com/openshift-kni/cnf-features-deploy/tree/master/ztp/source-crs/extra-manifest
-    # Manifests will be included from the git branch related to your cluster version (for example, a 4.12.15 cluster will get manifests from the release-4.12 branch)
+    # Manifests will be included from the git branch related to your cluster version (for example, a 4.16.15 cluster will get manifests from the release-4.16 branch)
     # See here for more detail: https://docs.openshift.com/container-platform/latest/scalability_and_performance/ztp_far_edge/ztp-reference-cluster-configuration-for-vdu.html#ztp-sno-install-time-cluster-config
     enabled: true
     exclude: # Optional, a list of manifests to exclude

diff --git a/edge/install-config-standard-example.yaml b/edge/install-config-standard-example.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 
 # Additional parameters for openshift-edge-installer
 edgeCluster:
-  clusterImageSet: <mirror_hostname>:8443/openshift-release-dev/ocp-release:4.12.0-x86_64 # Required
+  clusterImageSet: <mirror_hostname>:8443/openshift-release-dev/ocp-release:4.16.0-x86_64 # Required
   additionalNTPSources: # Optional
     - pool.ntp.org
   installManifestsFolder: install_manifests # Optional, see README.md
@@ -25,10 +25,9 @@ edgeCluster:
     # See the install_manifests_mirror_example folder for an example of how to do this
     enabled: true
     catalogSource: redhat-operators # Optional, defaults to redhat-operators
-  reservedCpuSet: <reserved_set> # Optional, used to enable workload partitioning, example: "0-1,32-33" (there should be no spaces). For OCP 4.13+, cpuPartitioningMode should be used instead, see https://docs.openshift.com/container-platform/latest/scalability_and_performance/enabling-workload-partitioning.html
   duProfileManifests: # Optional
     # Applies install-time DU Profile manifests from https://github.com/openshift-kni/cnf-features-deploy/tree/master/ztp/source-crs/extra-manifest
-    # Manifests will be included from the git branch related to your cluster version (for example, a 4.12.15 cluster will get manifests from the release-4.12 branch)
+    # Manifests will be included from the git branch related to your cluster version (for example, a 4.16.15 cluster will get manifests from the release-4.16 branch)
     # See here for more detail: https://docs.openshift.com/container-platform/latest/scalability_and_performance/ztp_far_edge/ztp-reference-cluster-configuration-for-vdu.html#ztp-sno-install-time-cluster-config
     enabled: true
     exclude: # Optional, a list of manifests to exclude

diff --git a/edge/roles/edge_install/tasks/main.yaml b/edge/roles/edge_install/tasks/main.yaml
@@ -49,10 +49,6 @@
       ansible.builtin.set_fact:
         worker_count: "{{ (worker_count | int) + item.replicas }}"
 
-    - name: Setup workload partitioning
-      when: edgeCluster.reservedCpuSet is defined
-      ansible.builtin.include_tasks: workload_partitioning.yaml
-
     - name: Cluster install
       ansible.builtin.include_tasks: install.yaml
   rescue:

diff --git a/edge/roles/edge_install/tasks/workload_partitioning.yaml b/edge/roles/edge_install/tasks/workload_partitioning.yaml
diff --git a/edge/roles/edge_install/templates/AgentClusterInstall.yaml.j2 b/edge/roles/edge_install/templates/AgentClusterInstall.yaml.j2
@@ -20,9 +20,6 @@ spec:
 {% for file in lookup('ansible.builtin.fileglob', edgeCluster.installManifestsFolder + '/*', wantlist=True) %}
     - name: "manifest-{{ loop.index0 }}"
 {% endfor %}
-{% endif %}
-{% if edgeCluster.reservedCpuSet is defined %}
-    - name: "workload-partitioning"
 {% endif %}
     - name: "crio-wipe"
     - name: "routing-via-host"

diff --git a/edge/roles/edge_install/templates/WorkloadPartitioning.yaml.j2 b/edge/roles/edge_install/templates/WorkloadPartitioning.yaml.j2
diff --git a/provisioning/provisioning-config-example.yaml b/provisioning/provisioning-config-example.yaml
@@ -1,13 +1,13 @@
 os_images: # Optional, you can specify a location for MCE to get OS ISOs from
   # they do not need to match exactly the version of OpenShift you are installing on the edge clusters, they are just used to bootstrap the nodes
-  - openshiftVersion: "4.12"
-    version: "4.12.0"
-    url: "https://<local_http_mirror>/rhcos-4.12.0-x86_64-live.x86_64.iso"
-    cpuArchitecture: "x86_64"
   - openshiftVersion: "4.14"
     version: "4.14.0"
     url: "https://<local_http_mirror>/rhcos-4.14.0-x86_64-live.x86_64.iso"
     cpuArchitecture: "x86_64"
+  - openshiftVersion: "4.16"
+    version: "4.16.0"
+    url: "https://<local_http_mirror>/rhcos-4.16.0-x86_64-live.x86_64.iso"
+    cpuArchitecture: "x86_64"
 
 provisioning_network_config: # Optional, see https://docs.openshift.com/container-platform/latest/rest_api/provisioning_apis/provisioning-metal3-io-v1alpha1.html#spec
   # below is an example of a possible provisioning network configuration

diff --git a/provisioning/roles/provisioning_mce/defaults/main.yaml b/provisioning/roles/provisioning_mce/defaults/main.yaml
@@ -1,8 +1,4 @@
 os_images:
-  - openshiftVersion: "4.12"
-    version: "4.12.30"
-    url: "https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.12/4.12.30/rhcos-4.12.30-x86_64-live.x86_64.iso"
-    cpuArchitecture: "x86_64"
   - openshiftVersion: "4.14"
     version: "4.14.34"
     url: "https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.14/4.14.34/rhcos-4.14.34-x86_64-live.x86_64.iso"