Skip to content

Commit 1c28e19

Browse files
committed
add manager arm build
Signed-off-by: vsoch <[email protected]>
1 parent cd05b04 commit 1c28e19

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

.github/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -eEu -o pipefail
55
# Show logs for the manager (need to do this while it exists)
66
sleep 15
77
kubectl get pods --all-namespaces
8-
manager=$(kubectl get pods -n state-machine-operator-system -o json | jq -r .items[0].metadata.name)
8+
manager=$(kubectl get pods -l component=state-machine-manager -o json | jq -r .items[0].metadata.name)
99
echo "Manager pod is $manager"
1010
kubectl logs $manager
1111

.github/workflows/build-deploy.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ jobs:
3737
- name: Deploy Container
3838
run: make arm-deploy
3939

40+
- name: Deploy ARM Container
41+
run: |
42+
make manager-arm
43+
docker push ghcr.io/converged-computing/state-machine-operator:manager-arm
44+
4045
build-manager:
4146
permissions:
4247
packages: write

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ IMG ?= ghcr.io/converged-computing/state-machine-operator:latest
4444
ARMIMG ?= ghcr.io/converged-computing/state-machine-operator:arm
4545
DEVIMG ?= ghcr.io/converged-computing/state-machine-operator:test
4646
MANAGER_IMG ?= ghcr.io/converged-computing/state-machine-operator:manager
47+
MANAGER_ARMIMG ?= ghcr.io/converged-computing/state-machine-operator:manager-arm
4748

4849
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
4950
ENVTEST_K8S_VERSION = 1.30.0
@@ -146,6 +147,11 @@ docker-push: ## Push docker image with the manager.
146147
manager:
147148
$(CONTAINER_TOOL) build -f docker/manager/Dockerfile -t ${MANAGER_IMG} .
148149

150+
.PHONY: manager-arm
151+
manager-arm:
152+
# $(CONTAINER_TOOL) build -f docker/manager/Dockerfile -t ${MANAGER_ARMIMG} .
153+
docker buildx build --platform linux/arm64 -t ${MANAGER_ARMIMG} .
154+
149155
.PHONY: pre-push
150156
pre-push: generate api build-config-arm build-config helm
151157
git status
@@ -226,7 +232,7 @@ test-deploy-ci: manifests kustomize manager helm
226232
docker build --no-cache -t ${DEVIMG} .
227233
kind load docker-image ${MANAGER_IMG}
228234
kind load docker-image ${DEVIMG}
229-
helm install --set controllerManager.manager.imagePullPolicy=Never --set controllerManager.manager.tag=test smo ./chart
235+
helm install --set controllerManager.manager.imagePullPolicy=Never --set controllerManager.manager.image.tag=test smo ./chart
230236

231237
.PHONY: test-deploy-kind
232238
test-deploy-kind: test-deploy manager

0 commit comments

Comments
 (0)