build: update for arm

Signed-off-by: vsoch <vsoch@users.noreply.github.com>

Author: vsoch

.github/workflows/slurm-containers.yaml

@@ -18,7 +18,7 @@ jobs:
       uses: actions/checkout@v3
     - uses: actions/setup-go@v3
       with:
-        go-version: ^1.23
+        go-version: ^1.24
     - name: GHCR Login
       if: (github.event_name != 'pull_request')
       uses: docker/login-action@v2
@@ -34,7 +34,7 @@ jobs:
        docker buildx inspect --bootstrap
 
     - name: Build and Deploy Container
-      run: docker buildx build -f docker/Dockerfile.ubuntu --platform linux/arm64 --push -t ${{ env.container }}:ubuntu-arm ./docker
+      run: docker buildx build -f docker/Dockerfile.ubuntu --build-arg ARCH=arm64 --platform linux/arm64 --push -t ${{ env.container }}:ubuntu-arm ./docker
 
   build-arm:
     env:
@@ -46,7 +46,7 @@ jobs:
       uses: actions/checkout@v3
     - uses: actions/setup-go@v3
       with:
-        go-version: ^1.23
+        go-version: ^1.24
     - name: GHCR Login
       if: (github.event_name != 'pull_request')
       uses: docker/login-action@v2
@@ -62,7 +62,7 @@ jobs:
        docker buildx inspect --bootstrap
 
     - name: Build and Deploy Container
-      run: docker buildx build -f docker/Dockerfile --platform linux/arm64 --push -t ${{ env.container }}:arm ./docker
+      run: docker buildx build -f docker/Dockerfile --build-arg ARCH=arm64 --platform linux/arm64 --push -t ${{ env.container }}:arm ./docker
 
 
   build:

Makefile

@@ -129,11 +129,11 @@ docker-build: test ## Build docker image with the manager.
 
 .PHONY: arm-build
 arm-build: test ## Build docker image with the manager.
-	docker buildx build --platform linux/arm64 -t ${ARMIMG} .
+	docker buildx build ARCH=arm64 --platform linux/arm64 -t ${ARMIMG} .
 
 .PHONY: arm-deploy
 arm-deploy: manifests kustomize
-	docker buildx build --platform linux/arm64 --push -t ${ARMIMG} .
+	docker buildx build --platform linux/arm64 --build-arg ARCH=arm64 --push -t ${ARMIMG} .
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${ARMIMG}
 	$(KUSTOMIZE) build config/default > examples/dist/slurm-operator-arm.yaml
 
@@ -218,6 +218,12 @@ test-deploy: manifests kustomize
 	$(KUSTOMIZE) build config/default > examples/dist/slurm-operator-dev.yaml
 	sed -i 's/        imagePullPolicy: IfNotPresent/        imagePullPolicy: Always/' examples/dist/slurm-operator-dev.yaml
 
+
+.PHONY: build-config-arm
+build-config-arm: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+	cd config/manager && $(KUSTOMIZE) edit set image controller=${ARMIMG}
+	$(KUSTOMIZE) build config/default > examples/dist/slurm-operator-arm.yaml
+
 .PHONY: test-deploy-recreate
 test-deploy-recreate: test-deploy
 	kubectl delete -f ./examples/dist/slurm-operator-dev.yaml || echo "Already deleted"
@@ -229,7 +235,7 @@ list:
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v3.8.7
-CONTROLLER_TOOLS_VERSION ?= v0.14.0
+CONTROLLER_TOOLS_VERSION ?= v0.19.0
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize

config/crd/bases/flux-framework.org_slurms.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: slurms.flux-framework.org
 spec:
   group: flux-framework.org

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: ghcr.io/converged-computing/slurm-operator
-  newTag: latest
+  newTag: arm

config/rbac/role.yaml

@@ -7,151 +7,18 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - events
-  verbs:
-  - create
-  - update
-  - watch
-- apiGroups:
-  - batch
-  resources:
-  - jobs
-  verbs:
-  - create
-  - delete
-  - exec
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - batch
-  resources:
-  - jobs/status
-  verbs:
-  - create
-  - delete
-  - exec
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
   - ""
-  resources:
-  - ""
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
   - batch
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
   - configmaps
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
-- apiGroups:
-  - ""
-  resources:
   - jobs
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - networks
-  verbs:
-  - create
-  - patch
-- apiGroups:
-  - ""
-  resources:
   - persistentvolumeclaims
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
   - persistentvolumes
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
   - pods
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
   - pods/exec
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
   - pods/log
+  - secrets
+  - services
+  - statefulsets
   verbs:
   - create
   - delete
@@ -163,34 +30,28 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - secrets
+  - events
   verbs:
   - create
-  - delete
-  - get
-  - list
   - patch
   - update
   - watch
 - apiGroups:
   - ""
   resources:
-  - services
+  - networks
   verbs:
   - create
-  - delete
-  - get
-  - list
   - patch
-  - update
-  - watch
 - apiGroups:
-  - ""
+  - batch
   resources:
-  - statefulsets
+  - jobs
+  - jobs/status
   verbs:
   - create
   - delete
+  - exec
   - get
   - list
   - patch

docker/Dockerfile

@@ -1,5 +1,9 @@
 FROM rockylinux:9
 
+# docker build --network=host -t ghcr.io/converged-computing/slurm:arm-hpc7g .
+ARG ARCH=amd64
+ENV ARCH=$ARCH
+
 # From https://github.com/giovtorres/slurm-docker-cluster/blob/52b5f9e5a9a7b149900404077e377e8daedf1a8c/Dockerfile
 # Moved here to have automated build
 LABEL org.opencontainers.image.source="https://github.com/converged-computing/slurm-operator" \
@@ -42,8 +46,8 @@ RUN set -ex \
 RUN pip3 install Cython nose
 
 RUN set -ex \
-    && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64" \
-    && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64.asc" \
+    && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-${ARCH}" \
+    && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-${ARCH}.asc" \
     && export GNUPGHOME="$(mktemp -d)" \
     && gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
     && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \

docker/Dockerfile.ubuntu

@@ -1,5 +1,8 @@
 FROM ubuntu:24.04
 
+# for arm, hpc7g on aws 4/22/2026
+# docker build --network=host -f Dockerfile.ubuntu -t ghcr.io/converged-computing/slurm:ubuntu-arm-hpc7g .
+
 LABEL org.opencontainers.image.source="https://github.com/converged-computing/slurm-operator" \
       org.opencontainers.image.title="slurm-operator" \
       org.opencontainers.image.description="Slurm in Kubernetes on Ubuntu" \