From 572e4e05e34ba2b134144cc1fc1dfb80cafe63d9 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Wed, 12 Jun 2024 12:46:29 -0400
Subject: [PATCH 1/2] Build multiarch thick images

---
 .github/workflows/image-build.yml        |  9 ++++++---
 .github/workflows/image-push-master.yml  | 10 ++++++----
 .github/workflows/image-push-release.yml | 10 ++++++----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/image-build.yml b/.github/workflows/image-build.yml
index c6318c68d..3ba8d608e 100644
--- a/.github/workflows/image-build.yml
+++ b/.github/workflows/image-build.yml
@@ -35,8 +35,8 @@ jobs:
           sbom: false
           provenance: false
 
-  build-amd64-thick:
-    name: Image build/amd64 thick plugin
+  build-thick:
+    name: Image thick plugin
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
@@ -50,8 +50,11 @@ jobs:
         with:
           context: .
           push: false
-          tags: ghcr.io/${{ github.repository }}:latest-amd64-thick
+          tags: ghcr.io/${{ github.repository }}:latest-thick
           file: images/Dockerfile.thick
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8,linux/ppc64le,linux/s390x
+          sbom: false
+          provenance: false
 
   build-origin:
     name: Image build/origin
diff --git a/.github/workflows/image-push-master.yml b/.github/workflows/image-push-master.yml
index bfa8b4b2f..8706fca90 100644
--- a/.github/workflows/image-push-master.yml
+++ b/.github/workflows/image-push-master.yml
@@ -1,13 +1,13 @@
 name: Image push for master
-on: 
+on:
   push:
     branches:
       - master
 env:
   image-push-owner: 'k8snetworkplumbingwg'
 jobs:
-  push-thick-amd64:
-    name: Image push thick image/amd64
+  push-thick:
+    name: Image push thick image
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
@@ -34,7 +34,9 @@ jobs:
             ghcr.io/${{ github.repository }}:latest-thick
             ghcr.io/${{ github.repository }}:snapshot-thick
           file: images/Dockerfile.thick
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8,linux/ppc64le,linux/s390x
+          sbom: false
+          provenance: false
 
   push-thin:
     name: Image push thin image
diff --git a/.github/workflows/image-push-release.yml b/.github/workflows/image-push-release.yml
index 868aa97f8..5a778f093 100644
--- a/.github/workflows/image-push-release.yml
+++ b/.github/workflows/image-push-release.yml
@@ -1,13 +1,13 @@
 name: Image push release
-on: 
+on:
   push:
     tags:
       - v*
 env:
   image-push-owner: 'k8snetworkplumbingwg'
 jobs:
-  push-thick-amd64:
-    name: Image push thick image/amd64
+  push-thick:
+    name: Image push thick image
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
@@ -42,7 +42,9 @@ jobs:
             ghcr.io/${{ github.repository }}:stable-thick
             ${{ steps.docker_meta.outputs.tags }}-thick
           file: images/Dockerfile.thick
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8,linux/ppc64le,linux/s390x
+          sbom: false
+          provenance: false
 
   push-thin:
     name: Image push thin image/amd64

From cd81346c1aea8d3ac66b09bb980ec2b5ac15a65c Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Tue, 25 Jun 2024 11:39:21 -0400
Subject: [PATCH 2/2] Add a note about multi-arch support

---
 docs/development.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/development.md b/docs/development.md
index 25218eb96..c688bd719 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -59,3 +59,7 @@ The following are the best practices for multus logging:
 ## Multus release schedule
 
 On the first maintainer's meeting, twice yearly, after January 1st and July 1st, if a new version has not been tagged, a new version will tagged.
+
+## Multi-arch builds
+
+Multus is currently built for a number of architectures, however, our testing and validation is only performed against x86 architectures. Our x86 architecture has end to end testing, however, for other architectures, only supported via best effort community contributions.