From 42c39db3aba6b3fb5c5c2a6cd6be2eac7aacd1d4 Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Tue, 9 Jul 2024 14:43:51 +0200 Subject: [PATCH 01/11] add arm runners --- .github/workflows/pull_request.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 7cc7788..900a678 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -9,6 +9,7 @@ jobs: build-and-push-arch-specifics: name: Build Rocks and Push Arch Specific Images uses: canonical/k8s-workflows/.github/workflows/build_rocks.yaml@main + runs-on: [self-hosted, linux, arm64, jammy, large] with: owner: ${{ github.repository_owner }} trivy-image-config: "trivy.yaml" From b7a95d526f1f06e30bcfd255894e40960d4549de Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Tue, 9 Jul 2024 14:46:51 +0200 Subject: [PATCH 02/11] rename file --- .../{pull_request.yaml => build_multiarch_images.yaml.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{pull_request.yaml => build_multiarch_images.yaml.yaml} (100%) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/build_multiarch_images.yaml.yaml similarity index 100% rename from .github/workflows/pull_request.yaml rename to .github/workflows/build_multiarch_images.yaml.yaml From b7f77ee477297a728260d49f3c9087d199f2ab40 Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Tue, 9 Jul 2024 14:53:11 +0200 Subject: [PATCH 03/11] sanity check --- .github/workflows/build_multiarch_images.yaml.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_multiarch_images.yaml.yaml b/.github/workflows/build_multiarch_images.yaml.yaml index 900a678..7cc7788 100644 --- a/.github/workflows/build_multiarch_images.yaml.yaml +++ b/.github/workflows/build_multiarch_images.yaml.yaml @@ -9,7 +9,6 @@ jobs: build-and-push-arch-specifics: name: Build Rocks and Push Arch Specific Images uses: canonical/k8s-workflows/.github/workflows/build_rocks.yaml@main - runs-on: [self-hosted, linux, arm64, jammy, large] with: owner: ${{ github.repository_owner }} trivy-image-config: "trivy.yaml" From 1477e4d8ecba45e8d81771b837f1c117e17c2b91 Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Tue, 9 Jul 2024 14:55:53 +0200 Subject: [PATCH 04/11] move parameter --- .github/workflows/build_multiarch_images.yaml.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_multiarch_images.yaml.yaml b/.github/workflows/build_multiarch_images.yaml.yaml index 7cc7788..f0dcdb0 100644 --- a/.github/workflows/build_multiarch_images.yaml.yaml +++ b/.github/workflows/build_multiarch_images.yaml.yaml @@ -18,6 +18,7 @@ jobs: rockcraft-revisions: '{"amd64": "1783", "arm64": "1784"}' arch-skipping-maximize-build-space: '["arm64"]' platform-labels: '{"arm64": ["Ubuntu_ARM64_4C_16G_01"]}' + runs-on: [self-hosted, linux, arm64, jammy, large] scan-images: uses: canonical/k8s-workflows/.github/workflows/scan_images.yaml@main needs: [build-and-push-arch-specifics] From 08b8d20dda472fa7b186723662502614783c61c8 Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Tue, 9 Jul 2024 15:01:55 +0200 Subject: [PATCH 05/11] add --- .github/workflows/build_multiarch_images.yaml.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiarch_images.yaml.yaml b/.github/workflows/build_multiarch_images.yaml.yaml index f0dcdb0..900a678 100644 --- a/.github/workflows/build_multiarch_images.yaml.yaml +++ b/.github/workflows/build_multiarch_images.yaml.yaml @@ -9,6 +9,7 @@ jobs: build-and-push-arch-specifics: name: Build Rocks and Push Arch Specific Images uses: canonical/k8s-workflows/.github/workflows/build_rocks.yaml@main + runs-on: [self-hosted, linux, arm64, jammy, large] with: owner: ${{ github.repository_owner }} trivy-image-config: "trivy.yaml" @@ -18,7 +19,6 @@ jobs: rockcraft-revisions: '{"amd64": "1783", "arm64": "1784"}' arch-skipping-maximize-build-space: '["arm64"]' platform-labels: '{"arm64": ["Ubuntu_ARM64_4C_16G_01"]}' - runs-on: [self-hosted, linux, arm64, jammy, large] scan-images: uses: canonical/k8s-workflows/.github/workflows/scan_images.yaml@main needs: [build-and-push-arch-specifics] From aeb02b8e766d13652b6ceab09ac982ecd034ed30 Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Tue, 9 Jul 2024 15:42:26 +0200 Subject: [PATCH 06/11] update --- .github/workflows/build_multiarch_images.yaml.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiarch_images.yaml.yaml b/.github/workflows/build_multiarch_images.yaml.yaml index 900a678..c73d43c 100644 --- a/.github/workflows/build_multiarch_images.yaml.yaml +++ b/.github/workflows/build_multiarch_images.yaml.yaml @@ -9,8 +9,8 @@ jobs: build-and-push-arch-specifics: name: Build Rocks and Push Arch Specific Images uses: canonical/k8s-workflows/.github/workflows/build_rocks.yaml@main - runs-on: [self-hosted, linux, arm64, jammy, large] with: + runs-on: [self-hosted, linux, arm64, jammy, large] owner: ${{ github.repository_owner }} trivy-image-config: "trivy.yaml" multiarch-awareness: true From 3882e636f83288dd13622ef0273b9417a80d6b1c Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Tue, 9 Jul 2024 15:45:49 +0200 Subject: [PATCH 07/11] update --- .github/workflows/build_multiarch_images.yaml.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiarch_images.yaml.yaml b/.github/workflows/build_multiarch_images.yaml.yaml index c73d43c..2f45b72 100644 --- a/.github/workflows/build_multiarch_images.yaml.yaml +++ b/.github/workflows/build_multiarch_images.yaml.yaml @@ -10,7 +10,7 @@ jobs: name: Build Rocks and Push Arch Specific Images uses: canonical/k8s-workflows/.github/workflows/build_rocks.yaml@main with: - runs-on: [self-hosted, linux, arm64, jammy, large] + runs-on: "[self-hosted, linux, arm64, jammy, large]" owner: ${{ github.repository_owner }} trivy-image-config: "trivy.yaml" multiarch-awareness: true From 2a5386526f7379f75c9df7f2be1a10cae2d7e123 Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Tue, 9 Jul 2024 16:19:06 +0200 Subject: [PATCH 08/11] update --- .github/workflows/build_multiarch_images.yaml.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiarch_images.yaml.yaml b/.github/workflows/build_multiarch_images.yaml.yaml index 2f45b72..9433a22 100644 --- a/.github/workflows/build_multiarch_images.yaml.yaml +++ b/.github/workflows/build_multiarch_images.yaml.yaml @@ -10,7 +10,7 @@ jobs: name: Build Rocks and Push Arch Specific Images uses: canonical/k8s-workflows/.github/workflows/build_rocks.yaml@main with: - runs-on: "[self-hosted, linux, arm64, jammy, large]" + runs-on: "[self-hosted, linux, ARM64, jammy, large]" owner: ${{ github.repository_owner }} trivy-image-config: "trivy.yaml" multiarch-awareness: true From a5e5ece75c33a36c2306da61126eb39d23d05e40 Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Tue, 9 Jul 2024 16:52:21 +0200 Subject: [PATCH 09/11] linux uppercase --- .github/workflows/build_multiarch_images.yaml.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiarch_images.yaml.yaml b/.github/workflows/build_multiarch_images.yaml.yaml index 9433a22..3f653bd 100644 --- a/.github/workflows/build_multiarch_images.yaml.yaml +++ b/.github/workflows/build_multiarch_images.yaml.yaml @@ -10,7 +10,7 @@ jobs: name: Build Rocks and Push Arch Specific Images uses: canonical/k8s-workflows/.github/workflows/build_rocks.yaml@main with: - runs-on: "[self-hosted, linux, ARM64, jammy, large]" + runs-on: "[self-hosted, Linux, ARM64, jammy, large]" owner: ${{ github.repository_owner }} trivy-image-config: "trivy.yaml" multiarch-awareness: true From 7d80beb4505170deea88d97bd3636b3c7ce5b3ee Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Wed, 10 Jul 2024 09:20:46 +0200 Subject: [PATCH 10/11] use platform-labels --- .github/workflows/build_multiarch_images.yaml.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiarch_images.yaml.yaml b/.github/workflows/build_multiarch_images.yaml.yaml index 3f653bd..3edaae2 100644 --- a/.github/workflows/build_multiarch_images.yaml.yaml +++ b/.github/workflows/build_multiarch_images.yaml.yaml @@ -10,7 +10,7 @@ jobs: name: Build Rocks and Push Arch Specific Images uses: canonical/k8s-workflows/.github/workflows/build_rocks.yaml@main with: - runs-on: "[self-hosted, Linux, ARM64, jammy, large]" + platform-labels: '{"arm64": ["self-hosted", "Linux", "ARM64", "jammy", "large"]}' owner: ${{ github.repository_owner }} trivy-image-config: "trivy.yaml" multiarch-awareness: true From 099e2d09017cdb4200eb7eaf3efc5f06f75d8d2e Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Wed, 10 Jul 2024 09:22:41 +0200 Subject: [PATCH 11/11] updated platform labels --- .github/workflows/build_multiarch_images.yaml.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_multiarch_images.yaml.yaml b/.github/workflows/build_multiarch_images.yaml.yaml index 3edaae2..2f5e780 100644 --- a/.github/workflows/build_multiarch_images.yaml.yaml +++ b/.github/workflows/build_multiarch_images.yaml.yaml @@ -10,7 +10,6 @@ jobs: name: Build Rocks and Push Arch Specific Images uses: canonical/k8s-workflows/.github/workflows/build_rocks.yaml@main with: - platform-labels: '{"arm64": ["self-hosted", "Linux", "ARM64", "jammy", "large"]}' owner: ${{ github.repository_owner }} trivy-image-config: "trivy.yaml" multiarch-awareness: true @@ -18,7 +17,7 @@ jobs: # pinning to use rockcraft 1.3.0 feature `entrypoint-service` rockcraft-revisions: '{"amd64": "1783", "arm64": "1784"}' arch-skipping-maximize-build-space: '["arm64"]' - platform-labels: '{"arm64": ["Ubuntu_ARM64_4C_16G_01"]}' + platform-labels: '{"arm64": ["self-hosted", "Linux", "ARM64", "jammy", "large"]}' scan-images: uses: canonical/k8s-workflows/.github/workflows/scan_images.yaml@main needs: [build-and-push-arch-specifics]