From 7e9ae4240141b9956a64e5baf71daeae5839fb71 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@ibm.com>
Date: Thu, 28 Nov 2024 09:09:58 +0100
Subject: [PATCH] ci: drop linux/arm/v7 from the platforms for building
 container-images

There is not need for `secrets.BUILD_PLATFORMS`, as the platforms are
not confidential. Instead a variable has been created in the GitHub
repository settings for it now.

The `secrets.BUILD_PLATFORMS` includes linux/arm/v7, which is a slow and
phased out architecture. All reasonable ARM platforms are linux/arm64
now. Dropping the linux/arm/v7 platform makes building the container
images much faster.

Closes: #719
Signed-off-by: Niels de Vos <ndevos@ibm.com>
---
 .github/workflows/build-push.yaml | 4 ++--
 .github/workflows/test-build.yaml | 4 ++--
 docs/ci.md                        | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-push.yaml b/.github/workflows/build-push.yaml
index 857719c35..000512c08 100644
--- a/.github/workflows/build-push.yaml
+++ b/.github/workflows/build-push.yaml
@@ -65,7 +65,7 @@ jobs:
         with:
           context: .
           file: Dockerfile
-          platforms: ${{ secrets.BUILD_PLATFORMS }}
+          platforms: ${{ vars.BUILD_PLATFORMS }}
           push: true
           tags: quay.io/csiaddons/k8s-controller:latest
 
@@ -95,6 +95,6 @@ jobs:
         with:
           context: .
           file: build/Containerfile.sidecar
-          platforms: ${{ secrets.BUILD_PLATFORMS }}
+          platforms: ${{ vars.BUILD_PLATFORMS }}
           push: true
           tags: quay.io/csiaddons/k8s-sidecar:latest
diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml
index 472b3ab6e..1a1087464 100644
--- a/.github/workflows/test-build.yaml
+++ b/.github/workflows/test-build.yaml
@@ -52,7 +52,7 @@ jobs:
         with:
           context: .
           file: Dockerfile
-          platforms: ${{ secrets.BUILD_PLATFORMS }}
+          platforms: ${{ vars.BUILD_PLATFORMS }}
           push: false
           tags: quay.io/csiaddons/k8s-controller:latest
 
@@ -74,6 +74,6 @@ jobs:
         with:
           context: .
           file: build/Containerfile.sidecar
-          platforms: ${{ secrets.BUILD_PLATFORMS }}
+          platforms: ${{ vars.BUILD_PLATFORMS }}
           push: false
           tags: quay.io/csiaddons/k8s-sidecar:latest
diff --git a/docs/ci.md b/docs/ci.md
index a3ad4cf1c..6fc79db5f 100644
--- a/docs/ci.md
+++ b/docs/ci.md
@@ -12,10 +12,10 @@ supports.
 For this configuration, a new Secret should be created in the GitHub
 Settings of the repository. 'Normal' environment variables seem not possible.
 
-An example of the GitHub Secret that will build the container-images on AMD64,
-and both 32-bit and 64-bit Arm platforms:
+An example of the GitHub Variable that will build the container-images on
+AMD64, and both 32-bit and 64-bit Arm platforms:
 
-- `BUILD_PLATFORMS`: `linux/amd64,linux/arm64,linux/arm/v7`
+- `BUILD_PLATFORMS`: `linux/amd64,linux/arm64`
 
 Detailed steps on creating the GitHub Secret can be found in [the GitHub
 Documentation][gh_doc_secret].