From df5b9483716ab9e9d55d21d7c987c30efec44a22 Mon Sep 17 00:00:00 2001 From: Antonin Bas Date: Wed, 24 Mar 2021 17:46:05 -0700 Subject: [PATCH 1/2] Update ARM installation instructions for v1.0 release Now that antrea/antrea-ubuntu is a manifest list / multi-arch image, there is no longer a need for different installation instructions for clusters which include ARM Nodes. --- docs/arm-support.md | 29 ----------------------------- docs/getting-started.md | 11 +++++++++-- 2 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 docs/arm-support.md diff --git a/docs/arm-support.md b/docs/arm-support.md deleted file mode 100644 index a61763725d3..00000000000 --- a/docs/arm-support.md +++ /dev/null @@ -1,29 +0,0 @@ -# Antrea ARM support - -Starting with Antrea v0.13, we provide Antrea Docker images for both the arm/v7 -and arm64 architectures. At the moment, the standard Antrea Docker manifest -(`projects.registry.vmware.com/antrea/antrea-ubuntu`) does not include support -for ARM, and the image name needs to be updated manually in the Antrea -Kubernetes YAML manifest when deploying Antrea on a cluster which includes ARM -Nodes. - -To download the manifest for Antrea v0.13.0, substitute the image name, and -deploy Antrea, you can use the following command: - -```bash -curl -sL https://github.com/vmware-tanzu/antrea/releases/download/v0.13.0/antrea.yml | sed 's/antrea\/antrea-ubuntu/antrea\/antrea-ubuntu-march/' | kubectl apply -f - -``` - -Or to deploy the latest version of Antrea (built from the main branch), use: - -```bash -curl -sL https://raw.githubusercontent.com/vmware-tanzu/antrea/main/build/yamls/antrea.yml | sed 's/antrea\/antrea-ubuntu/antrea\/antrea-ubuntu-march/' | kubectl apply -f - -``` - -In a future release, we will update the standard Docker manifest for Antrea to -support ARM architectures, and this manual edit will not longer be required. - -Note that while we do run a subset of the Kubernetes conformance tests on both -the arm/v7 and arm64 images (using [k3s](https://k3s.io/) as the Kubernetes -distribution), our testing is not as thorough as for the amd64 image. However, -we do not anticipate any issue. diff --git a/docs/getting-started.md b/docs/getting-started.md index f1376676ecf..0e77b4f1d73 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -77,8 +77,15 @@ If you want to add Windows Nodes to your cluster, please refer to these ### ARM support -Starting with v0.13, Antrea supports arm64 and arm/v7 Nodes. Please refer to -these [installation instructions](arm-support.md). +Starting with v1.0, Antrea supports arm64 and arm/v7 Nodes. The installation +instructions do not change when some (or all) Linux Nodes in a cluster use an +ARM architecture: the `antrea/antrea-ubuntu` Docker image is actually a manifest +list with support for the amd64, arm64 and arm/v7 architectures. + +Note that while we do run a subset of the Kubernetes conformance tests on both +the arm/v7 and arm64 Docker images (using [k3s](https://k3s.io/) as the +Kubernetes distribution), our testing is not as thorough as for the amd64 +image. However, we do not anticipate any issue. ### Deploying Antrea on a Cluster with Existing CNI From b96e29ff65677effe8ea3d548fe6c6ec909817ee Mon Sep 17 00:00:00 2001 From: Antonin Bas Date: Mon, 29 Mar 2021 13:01:45 -0700 Subject: [PATCH 2/2] Address review comments --- docs/getting-started.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/getting-started.md b/docs/getting-started.md index 0e77b4f1d73..717699ceace 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -79,8 +79,9 @@ If you want to add Windows Nodes to your cluster, please refer to these Starting with v1.0, Antrea supports arm64 and arm/v7 Nodes. The installation instructions do not change when some (or all) Linux Nodes in a cluster use an -ARM architecture: the `antrea/antrea-ubuntu` Docker image is actually a manifest -list with support for the amd64, arm64 and arm/v7 architectures. +ARM architecture: the same deployment YAML can be used, as the +`antrea/antrea-ubuntu` Docker image is actually a manifest list with support for +the amd64, arm64 and arm/v7 architectures. Note that while we do run a subset of the Kubernetes conformance tests on both the arm/v7 and arm64 Docker images (using [k3s](https://k3s.io/) as the