From 3e9a1c9277b1f3a5c668b22c68da1ffc1fbf9e4b Mon Sep 17 00:00:00 2001 From: Adam Kaplan Date: Mon, 19 May 2025 12:18:35 -0400 Subject: [PATCH 1/2] fix: Use UBI Images for Bash Use the ubi-minimal image for running pure bash commands. This avoids pulling additional images from Docker Hub, which requires a pull secret to be configured. Signed-off-by: Adam Kaplan --- k8s/shipwright/clusterbuildstrategy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/k8s/shipwright/clusterbuildstrategy.yml b/k8s/shipwright/clusterbuildstrategy.yml index 9bd37589..bdc2682c 100644 --- a/k8s/shipwright/clusterbuildstrategy.yml +++ b/k8s/shipwright/clusterbuildstrategy.yml @@ -89,7 +89,8 @@ spec: default: "-Dmaven.test.skip=true --no-transfer-progress package" steps: - name: prepare - image: docker.io/library/bash:5.1.4 + image: registry.access.redhat.com/ubi9/ubi-minimal:9.6 + command: ["/bin/bash"] args: - -c - | @@ -276,7 +277,8 @@ spec: readOnly: true - name: results - image: docker.io/library/bash:5.1.4 + image: registry.access.redhat.com/ubi9/ubi-minimal:9.6 + command: ["/bin/bash"] args: - -c - | From 9599c88997ad3eca4c164cbcb8e00b4c27212657 Mon Sep 17 00:00:00 2001 From: Adam Kaplan Date: Mon, 19 May 2025 12:20:30 -0400 Subject: [PATCH 2/2] fix: Use Overridable Volumes in Shipwright Build Strategy Use overridable volumes in the cluster build strategy for buildpacks. This ensures the build strategy works "out of the box", and does not require additional configuration from developers to execute. Signed-off-by: Adam Kaplan --- .github/workflows/shipwright.yaml | 11 +++++++++-- k8s/shipwright/build.yml | 7 +++++++ k8s/shipwright/clusterbuildstrategy.yml | 8 ++++---- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/shipwright.yaml b/.github/workflows/shipwright.yaml index be7530de..b3edf1f3 100644 --- a/.github/workflows/shipwright.yaml +++ b/.github/workflows/shipwright.yaml @@ -116,6 +116,13 @@ jobs: kind: ClusterBuildStrategy output: image: $CONTAINER_IMAGE + volumes: + - name: certificate-registry + configMap: + name: certificate-registry + - name: creds-ws + secret: + secretName: dockercfg EOF kubectl create -f $GITHUB_WORKSPACE/k8s/shipwright/buildrun.yml @@ -137,11 +144,11 @@ jobs: kubectl get buildrun -A echo "BuildRun describe resource" - BUILDRUN_NAME=$(kubectl get buildrun -lbuild.shipwright.io/name=buildpack-quarkus-build -oname) + BUILDRUN_NAME=$(kubectl get buildrun -l build.shipwright.io/name=buildpack-quarkus-build -o name) kubectl describe $BUILDRUN_NAME - name: Print Log of the buildrun if: failure() run: | - POD_NAME=$(kubectl get pod -lbuild.shipwright.io/name=buildpack-quarkus-build -oname) + POD_NAME=$(kubectl get pod -l build.shipwright.io/name=buildpack-quarkus-build -o name) kubectl logs $POD_NAME --all-containers diff --git a/k8s/shipwright/build.yml b/k8s/shipwright/build.yml index d52a7101..5a639d0a 100644 --- a/k8s/shipwright/build.yml +++ b/k8s/shipwright/build.yml @@ -38,5 +38,12 @@ spec: strategy: name: buildpacks kind: ClusterBuildStrategy + volumes: + - name: certificate-registry + configMap: + name: certificate-registry + - name: creds-ws + secret: + secretName: dockercfg output: image: my-gitea-http.gitea.svc.cluster.local:3000/giteaadmin/quarkus-hello:latest diff --git a/k8s/shipwright/clusterbuildstrategy.yml b/k8s/shipwright/clusterbuildstrategy.yml index bdc2682c..7a08f040 100644 --- a/k8s/shipwright/clusterbuildstrategy.yml +++ b/k8s/shipwright/clusterbuildstrategy.yml @@ -5,11 +5,11 @@ metadata: spec: volumes: - name: certificate-registry - configMap: - name: certificate-registry + emptyDir: {} + overridable: true - name: creds-ws - secret: - secretName: dockercfg + emptyDir: {} + overridable: true - name: kaniko-dir emptyDir: {} - name: platform-env