Skip to content

Commit 2469c17

Browse files
authored
add support mixed archictecture (#841)
1 parent fe43f58 commit 2469c17

File tree

3 files changed

+8
-26
lines changed

3 files changed

+8
-26
lines changed

asciidoc/product/atip-automated-provision.adoc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ Much of the configuration via Edge Image Builder is possible, but in this guide,
7272

7373
* A container runtime such as https://podman.io[Podman] or https://rancherdesktop.io[Rancher Desktop] is required to run Edge Image Builder.
7474
* The base image will be built using the following guide <<guides-kiwi-builder-images>> with the profile `Base-SelfInstall` (or `Base-RT-SelfInstall` for the Real-Time kernel). The process is the same for both architectures (x86-64 and aarch64).
75-
* To deploy aarch64 downstream clusters, you must set before the management cluster deployment the `deployArchitecture: arm64` parameter in the `metal3.yaml` file explained in <<arm64-mgmt-cluster,Management Cluster Documentation>>. This is required to ensure that the correct architecture is used for the downstream cluster.
7675

7776
[NOTE]
7877
====
@@ -342,7 +341,6 @@ Much of the configuration is possible with Edge Image Builder, but in this guide
342341

343342
* A container runtime such as https://podman.io[Podman] or https://rancherdesktop.io[Rancher Desktop] is required to run Edge Image Builder.
344343
* The base image will be built using the following guide <<guides-kiwi-builder-images>> with the profile `Base-SelfInstall` (or `Base-RT-SelfInstall` for the Real-Time kernel). The process is the same for both architectures (x86-64 and aarch64).
345-
* To deploy aarch64 downstream clusters, you must set before the management cluster deployment the `deployArchitecture: arm64` parameter in the `metal3.yaml` file explained in <<arm64-mgmt-cluster,Management Cluster Documentation>>. This is required to ensure that the correct architecture is used for the downstream cluster.
346344
* If you want to use SR-IOV or any other workload which require a container image, a local private registry must be deployed and already configured (with/without TLS and/or authentication). This registry will be used to store the images and the helm chart OCI images.
347345

348346
[NOTE]
@@ -639,6 +637,7 @@ metadata:
639637
labels:
640638
cluster-role: control-plane
641639
spec:
640+
architecture: x86_64
642641
online: true
643642
bootMACAddress: ${BMC_MAC}
644643
rootDeviceHints:
@@ -657,7 +656,8 @@ where:
657656

658657
[NOTE]
659658
====
660-
If no network configuration for the host has been specified, either at image build time or through the `BareMetalHost` definition, an autoconfiguration mechanism (DHCP, DHCPv6, SLAAC) will be used. For more details or complex configurations, check the xref:advanced-network-configuration[].
659+
* Architecture must be either `x86_64` or `aarch64`, depending on the architecture of the bare-metal host to be enrolled.
660+
* If no network configuration for the host has been specified, either at image build time or through the `BareMetalHost` definition, an autoconfiguration mechanism (DHCP, DHCPv6, SLAAC) will be used. For more details or complex configurations, check the xref:advanced-network-configuration[].
661661
====
662662

663663
Once the file is created, the following command has to be executed in the management cluster to start enrolling the new bare-metal host in the management cluster:
@@ -953,6 +953,7 @@ metadata:
953953
labels:
954954
cluster-role: control-plane
955955
spec:
956+
architecture: x86_64
956957
online: true
957958
bootMACAddress: ${BMC_NODE1_MAC}
958959
bmc:
@@ -972,6 +973,7 @@ Where:
972973
====
973974
* If no network configuration for the host has been specified, either at image build time or through the `BareMetalHost` definition, an autoconfiguration mechanism (DHCP, DHCPv6, SLAAC) will be used. For more details or complex configurations, check the xref:advanced-network-configuration[].
974975
* Multi-node dual-stack or IPv6 only clusters are not yet supported.
976+
* Architecture must be either `x86_64` or `aarch64`, depending on the architecture of the bare-metal host to be enrolled.
975977
====
976978

977979
Once the file is created, the following command must be executed in the management cluster to start enrolling the bare-metal hosts in the management cluster:
@@ -1555,6 +1557,7 @@ metadata:
15551557
labels:
15561558
cluster-role: control-plane
15571559
spec:
1560+
architecture: x86_64
15581561
online: true
15591562
bootMACAddress: ${BMC_MAC}
15601563
rootDeviceHints:
@@ -1570,6 +1573,7 @@ spec:
15701573
====
15711574
* If you need to deploy a multi-node cluster, the same process must be done for each node.
15721575
* The `Metal3DataTemplate`, `networkData` and `Metal3 IPAM` are currently not supported; only the configuration via static secrets is fully supported.
1576+
* Architecture must be either `x86_64` or `aarch64`, depending on the architecture of the bare-metal host to be enrolled.
15731577
====
15741578

15751579
[#add-telco]

asciidoc/product/atip-management-cluster.adoc

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -878,29 +878,6 @@ metal3-ironic:
878878
size: "5Gi"
879879
880880
----
881-
[#arm64-mgmt-cluster]
882-
In case you want to deploy arm64 downstream clusters using this x86_64 management cluster, you need to add the following `deployArchitecture: arm64` to the `global` section of the `metal3.yaml` file:
883-
+
884-
[,yaml]
885-
----
886-
global:
887-
ironicIP: ${METAL3_VIP}
888-
enable_vmedia_tls: false
889-
additionalTrustedCAs: false
890-
deployArchitecture: arm64
891-
metal3-ironic:
892-
global:
893-
predictableNicNames: "true"
894-
persistence:
895-
ironic:
896-
size: "5Gi"
897-
----
898-
899-
[NOTE]
900-
====
901-
In the current version, a limitation exists regarding the use of `deployArchitecture: arm64`. Specifically, if you enable the deployment of downstream arm64 clusters using this directive, the management cluster will subsequently only be able to deploy this architecture.
902-
To deploy clusters on both architectures (x86_64 and arm64), you will need to provision two separate management clusters. This limitation will be removed in a future version.
903-
====
904881

905882
[#metal3-media-server]
906883
[NOTE]

asciidoc/quickstart/metal3.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@ metadata:
353353
labels:
354354
cluster-role: control-plane
355355
spec:
356+
architecture: x86_64
356357
online: true
357358
bootMACAddress: "00:f3:65:8a:a3:b0"
358359
bmc:

0 commit comments

Comments
 (0)