Skip to content

Commit

Permalink
Remove OCP 4.11 support (#56)
Browse files Browse the repository at this point in the history
  • Loading branch information
loganmc10 committed Jan 30, 2024
1 parent bd7e81c commit 6fd280c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.11+
* OpenShift 4.12+
* 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).
Expand Down
11 changes: 0 additions & 11 deletions common/roles/storage/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,6 @@
register: cluster_version
until: cluster_version is not failed

# before 4.12, the LVMS operator was known as ODF-LVM
- name: Use ODF-LVM Storage Class
when: cluster_version.resources[0].status.desired.version is ansible.builtin.version("4.12.0", "lt")
ansible.builtin.set_fact:
lvms_storage_class: odf-lvm-vg1

- name: Use ODF-LVM Operator
when: cluster_version.resources[0].status.desired.version is ansible.builtin.version("4.12.0", "lt")
ansible.builtin.set_fact:
lvms_operator_name: odf-lvm-operator

- name: Gather storage class info
kubernetes.core.k8s_info:
api_version: storage.k8s.io/v1
Expand Down
8 changes: 4 additions & 4 deletions provisioning/provisioning-config-example.yaml
Original file line number Diff line number Diff line change
@@ -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.11"
version: "4.11.9"
url: "https://<local_http_mirror>/rhcos-4.11.9-x86_64-live.x86_64.iso"
cpuArchitecture: "x86_64"
- 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"

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
Expand Down
4 changes: 0 additions & 4 deletions provisioning/roles/provisioning_mce/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
os_images:
- openshiftVersion: "4.11"
version: "4.11.48"
url: "https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.11/4.11.48/rhcos-4.11.48-x86_64-live.x86_64.iso"
cpuArchitecture: "x86_64"
- 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"
Expand Down

0 comments on commit 6fd280c

Please sign in to comment.