diff --git a/README.md b/README.md index efc7540..a8e1c28 100644 --- 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 index 0384340..177be79 100644 --- 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 index 791ca0e..78aac39 100644 --- 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: :8443/openshift-release-dev/ocp-release:4.12.0-x86_64 # Required + clusterImageSet: :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: # 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 index 18805d4..a243f40 100644 --- 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: :8443/openshift-release-dev/ocp-release:4.12.0-x86_64 # Required + clusterImageSet: :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: # 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 index 499f9ac..b8a12f4 100644 --- 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 deleted file mode 100644 index 58b15e8..0000000 --- a/edge/roles/edge_install/tasks/workload_partitioning.yaml +++ /dev/null @@ -1,21 +0,0 @@ -- name: Create config files for workload partitioning - ansible.builtin.set_fact: - workload_partitioning: | - [crio.runtime.workloads.management] - activation_annotation = "target.workload.openshift.io/management" - annotation_prefix = "resources.workload.openshift.io" - resources = { "cpushares" = 0, "cpuset" = "{{ edgeCluster.reservedCpuSet }}" } - openshift_workload_pinning: | - { - "management": { - "cpuset": "{{ edgeCluster.reservedCpuSet }}" - } - } - -- name: Create workload partitioning config map - kubernetes.core.k8s: - template: WorkloadPartitioning.yaml.j2 - apply: true - state: present - register: k8s_result - until: k8s_result is not failed diff --git a/edge/roles/edge_install/templates/AgentClusterInstall.yaml.j2 b/edge/roles/edge_install/templates/AgentClusterInstall.yaml.j2 index ff12f56..6c23adf 100644 --- 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 deleted file mode 100644 index bd885a8..0000000 --- a/edge/roles/edge_install/templates/WorkloadPartitioning.yaml.j2 +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "workload-partitioning" - namespace: "{{ metadata.name }}" -data: - 01_workload_partitioning.yaml: | - apiVersion: machineconfiguration.openshift.io/v1 - kind: MachineConfig - metadata: - labels: - machineconfiguration.openshift.io/role: "{{ 'master' if (worker_count | int) == 0 else 'worker' }}" - name: 02-workload-partitioning - spec: - config: - ignition: - version: 3.2.0 - storage: - files: - - contents: - source: data:text/plain;charset=utf-8;base64,{{ workload_partitioning | b64encode }} - mode: 420 - overwrite: true - path: /etc/crio/crio.conf.d/01-workload-partitioning - user: - name: root - - contents: - source: data:text/plain;charset=utf-8;base64,{{ openshift_workload_pinning | to_nice_json | b64encode }} - mode: 420 - overwrite: true - path: /etc/kubernetes/openshift-workload-pinning - user: - name: root diff --git a/provisioning/provisioning-config-example.yaml b/provisioning/provisioning-config-example.yaml index bf2e958..21ce776 100644 --- 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:///rhcos-4.12.0-x86_64-live.x86_64.iso" - cpuArchitecture: "x86_64" - openshiftVersion: "4.14" version: "4.14.0" url: "https:///rhcos-4.14.0-x86_64-live.x86_64.iso" cpuArchitecture: "x86_64" + - openshiftVersion: "4.16" + version: "4.16.0" + url: "https:///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 index 91fa87b..cae56f5 100644 --- 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"