From 0335da0dae98769204bd81e3c39f07bffb12a5ec Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Wed, 19 Jun 2024 15:43:37 +0200 Subject: [PATCH 1/6] Testing ubicloud on operators --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c6fb88e..e6b97058 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -308,7 +308,7 @@ jobs: - select_helm_repo strategy: matrix: - runner: ["ubuntu-latest", "buildjet-2vcpu-ubuntu-2204-arm"] + runner: ["ubuntu-latest", "ubicloud-standard-8-arm"] runs-on: ${{ matrix.runner }} permissions: id-token: write @@ -356,7 +356,7 @@ jobs: uses: anchore/sbom-action/download-syft@e8d2a6937ecead383dfe75190d104edd1f9c5751 # v0.16.0 - name: Build Docker image and Helm chart run: | - # Installing helm on BuildJet only + # Installing helm on ubicloud-standard-8-arm only if [ "$(arch)" = "aarch64" ]; then curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg > /dev/null sudo apt-get -y install apt-transport-https --yes From 3c7b9da3b9981aed6da6ba8845294a2875baf3dd Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Wed, 19 Jun 2024 17:11:20 +0200 Subject: [PATCH 2/6] Adding yq to install step --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e6b97058..d1ca823c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -363,6 +363,7 @@ jobs: echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list sudo apt-get -y update sudo apt-get -y install helm + sudo apt-get -y install yq fi make -e build From 5b42b462ef141d4f51e97d0b14cc188022fb3542 Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Wed, 19 Jun 2024 17:18:28 +0200 Subject: [PATCH 3/6] Adding yq repo to apt-get --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d1ca823c..6c1d5560 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -361,6 +361,7 @@ jobs: curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg > /dev/null sudo apt-get -y install apt-transport-https --yes echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list + sudo add-apt-repository ppa:rmescandon/yq sudo apt-get -y update sudo apt-get -y install helm sudo apt-get -y install yq From 173b766fa41fb66a9e6a8c734bdff1405d5cc245 Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Thu, 20 Jun 2024 12:44:10 +0200 Subject: [PATCH 4/6] Debugging yq --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c1d5560..b20dbfa1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -365,6 +365,7 @@ jobs: sudo apt-get -y update sudo apt-get -y install helm sudo apt-get -y install yq + yq --help fi make -e build From 648e254bb48303d3236f15e8b9964742a2a4b6ec Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Thu, 20 Jun 2024 12:57:27 +0200 Subject: [PATCH 5/6] Installing yq via gh download rather then apt-get --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b20dbfa1..2f42bf5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -359,12 +359,13 @@ jobs: # Installing helm on ubicloud-standard-8-arm only if [ "$(arch)" = "aarch64" ]; then curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg > /dev/null - sudo apt-get -y install apt-transport-https --yes + sudo apt-get -y install apt-transport-https echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list - sudo add-apt-repository ppa:rmescandon/yq + # sudo add-apt-repository ppa:rmescandon/yq sudo apt-get -y update sudo apt-get -y install helm - sudo apt-get -y install yq + # sudo apt-get -y install yq + wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 -O /usr/bin/yq && chmod +x /usr/bin/yq yq --help fi From 882331d9c8cb9b5ef2810e140228e7250acc221a Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Thu, 20 Jun 2024 13:02:54 +0200 Subject: [PATCH 6/6] Adding sudo to installation --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f42bf5e..44ee175a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -365,7 +365,7 @@ jobs: sudo apt-get -y update sudo apt-get -y install helm # sudo apt-get -y install yq - wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 -O /usr/bin/yq && chmod +x /usr/bin/yq + sudo wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq yq --help fi