Skip to content

Commit c59f089

Browse files
Generated commit to update templated files based on rev f949c48 in stackabletech/operator-templating repo. (#409)
Triggered by: Manual run triggered by: adwk67 with message [add arch for preflight]
1 parent 2e5cfd7 commit c59f089

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,11 @@ jobs:
373373
steps:
374374
- name: Install preflight
375375
run: |
376-
wget https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/1.7.2/preflight-linux-amd64
376+
wget https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/1.9.1/preflight-linux-amd64
377377
chmod +x preflight-linux-amd64
378378
- name: Check container
379-
run: ./preflight-linux-amd64 check container "$IMAGE_TAG" > preflight.out
379+
run: |
380+
ARCH_FOR_PREFLIGHT="$(arch | sed -e 's#x86_64#amd64#' | sed -e 's#aarch64#arm64#')"
381+
./preflight-linux-amd64 check container "$IMAGE_TAG" --platform "${ARCH_FOR_PREFLIGHT}" > preflight.out
380382
- name: "Passed?"
381-
run: '[ "$(./preflight-linux-amd64 check container "$IMAGE_TAG" | jq -r .passed)" == true ]'
383+
run: '[ "$(./preflight-linux-amd64 check container "$IMAGE_TAG" --platform "${ARCH_FOR_PREFLIGHT}" | jq -r .passed)" == true ]'

Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,15 @@ build: regenerate-charts regenerate-nix helm-package docker-build
150150

151151
publish: docker-publish helm-publish
152152

153-
run-dev:
153+
check-nix:
154+
@which nix || (echo "Error: 'nix' is not installed. Please install it to proceed."; exit 1)
155+
156+
check-kubernetes:
157+
@kubectl cluster-info > /dev/null 2>&1 || (echo "Error: Kubernetes is not running or kubectl is not properly configured."; exit 1)
158+
159+
run-dev: check-nix check-kubernetes
154160
kubectl apply -f deploy/stackable-operators-ns.yaml
155161
nix run -f. tilt -- up --port 5430 --namespace stackable-operators
156162

157-
stop-dev:
163+
stop-dev: check-nix check-kubernetes
158164
nix run -f. tilt -- down

0 commit comments

Comments
 (0)