Skip to content

Commit ccd2de4

Browse files
committed
BZ2003724
1 parent 4e1cf41 commit ccd2de4

File tree

1 file changed

+64
-2
lines changed

1 file changed

+64
-2
lines changed

modules/installation-user-infra-generate-k8s-manifest-ignition.adoc

Lines changed: 64 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
1414
// * installing/installing_vsphere/installing-vsphere.adoc
1515
// * installing/installing_ibm_z/installing-ibm-z.adoc
16+
// * installing/installing_ibm_z/installing-ibm-z-kvm.adoc
17+
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
18+
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
19+
// * installing/installing_ibm_power/installing-ibm-power.adoc
20+
// * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
1621
// * installing/installing_openstack/installing-openstack-user.adoc
1722

1823

@@ -73,6 +78,27 @@ endif::[]
7378
ifeval::["{context}" == "installing-platform-agnostic"]
7479
:baremetal:
7580
endif::[]
81+
ifeval::["{context}" == "installing-ibm-z"]
82+
:ibm-z:
83+
endif::[]
84+
ifeval::["{context}" == "installing-ibm-z-kvm"]
85+
:ibm-z:
86+
endif::[]
87+
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
88+
:ibm-z:
89+
:restricted:
90+
endif::[]
91+
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
92+
:ibm-z:
93+
:restricted:
94+
endif::[]
95+
ifeval::["{context}" == "installing-ibm-power"]
96+
:ibm-power:
97+
endif::[]
98+
ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
99+
:ibm-power:
100+
:restricted:
101+
endif::[]
76102

77103
[id="installation-user-infra-generate-k8s-manifest-ignition_{context}"]
78104
= Creating the Kubernetes manifest and Ignition config files
@@ -86,6 +112,21 @@ The installation configuration file transforms into the Kubernetes manifests. Th
86112
The Ignition config files that the {product-title} installation program generates contain certificates that expire after 24 hours, which are then renewed at that time. If the cluster is shut down before renewing the certificates and the cluster is later restarted after the 24 hours have elapsed, the cluster automatically recovers the expired certificates. The exception is that you must manually approve the pending `node-bootstrapper` certificate signing requests (CSRs) to recover kubelet certificates. See the documentation for _Recovering from expired control plane certificates_ for more information.
87113
====
88114

115+
ifdef::ibm-z[]
116+
[NOTE]
117+
====
118+
The installation program that generates the manifest and Ignition files is architecture specific and can be obtained from the
119+
link:https://mirror.openshift.com/pub/openshift-v4/s390x/clients/ocp/latest/[client image mirror]. The Linux version of the installation program runs on s390x only. This installer program is also available as a Mac OS version.
120+
====
121+
endif::ibm-z[]
122+
ifdef::ibm-power[]
123+
[NOTE]
124+
====
125+
The installation program that generates the manifest and Ignition files is architecture specific and can be obtained from the
126+
link:https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/latest/[client image mirror]. The Linux version of the installation program runs on ppc64le only. This installer program is also available as a Mac OS version.
127+
====
128+
endif::ibm-power[]
129+
89130
.Prerequisites
90131

91132
* You obtained the {product-title} installation program.
@@ -157,13 +198,13 @@ to initialize them.
157198
+
158199
* You can preserve the machine set files to create compute machines by using the machine API, but you must update references to them to match your environment.
159200
endif::osp,vsphere,vmc[]
160-
ifdef::baremetal,baremetal-restricted[]
201+
ifdef::baremetal,baremetal-restricted,ibm-z,ibm-power[]
161202
+
162203
[WARNING]
163204
====
164205
If you are installing a three-node cluster, skip the following step to allow the control plane nodes to be schedulable.
165206
====
166-
endif::baremetal,baremetal-restricted[]
207+
endif::baremetal,baremetal-restricted,ibm-z,ibm-power[]
167208

168209
. Check that the `mastersSchedulable` parameter in the `<installation_directory>/manifests/cluster-scheduler-02-config.yml` Kubernetes manifest file is set to `false`. This setting prevents pods from being scheduled on the control plane machines:
169210
+
@@ -371,3 +412,24 @@ endif::[]
371412
ifeval::["{context}" == "installing-platform-agnostic"]
372413
:!baremetal:
373414
endif::[]
415+
ifeval::["{context}" == "installing-ibm-z"]
416+
:!ibm-z:
417+
endif::[]
418+
ifeval::["{context}" == "installing-ibm-z-kvm"]
419+
:!ibm-z-kvm:
420+
endif::[]
421+
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
422+
:!ibm-z:
423+
:!restricted:
424+
endif::[]
425+
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
426+
:!ibm-z-kvm:
427+
:!restricted:
428+
endif::[]
429+
ifeval::["{context}" == "installing-ibm-power"]
430+
:!ibm-power:
431+
endif::[]
432+
ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
433+
:!ibm-power:
434+
:!restricted:
435+
endif::[]

0 commit comments

Comments
 (0)