From d313e5ee7608283534efb6308ae25d7c0700fcff Mon Sep 17 00:00:00 2001
From: Jason Kincl <jkincl@redhat.com>
Date: Wed, 6 Sep 2023 09:44:34 -0400
Subject: [PATCH] updating path for libjwt install

---
 slurm/images/slurm/Dockerfile            | 4 ++--
 slurm/manifests/configs/slurm.conf       | 2 ++
 slurm/manifests/statefulset-compute.yaml | 6 +++---
 slurm/manifests/statefulset-head.yaml    | 6 +++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/slurm/images/slurm/Dockerfile b/slurm/images/slurm/Dockerfile
index ccb2d51..4988b5b 100644
--- a/slurm/images/slurm/Dockerfile
+++ b/slurm/images/slurm/Dockerfile
@@ -19,7 +19,7 @@ WORKDIR /tmp/src
 RUN git clone --depth 1 --single-branch -b v1.12.0 https://github.com/benmcollins/libjwt.git libjwt && \
     cd libjwt && \
     autoreconf -v --install && \
-    ./configure --prefix=/usr/local && \
+    ./configure --prefix=/usr && \
     make -j && \
     make install
 
@@ -29,7 +29,7 @@ RUN curl -LO https://download.schedmd.com/slurm/slurm-${SLURM_VERSION}.tar.bz2 &
     ./configure \
      --prefix=/usr \
      --sysconfdir=/etc \
-     --with-jwt=/usr/local/ && \
+     --with-jwt=/usr && \
     make && \
     make install
 
diff --git a/slurm/manifests/configs/slurm.conf b/slurm/manifests/configs/slurm.conf
index 2378989..110c5c5 100644
--- a/slurm/manifests/configs/slurm.conf
+++ b/slurm/manifests/configs/slurm.conf
@@ -59,6 +59,8 @@ TaskPlugin=task/none
 TreeWidth=65533
 #UnkillableStepProgram=
 #UsePAM=0
+AuthAltTypes=auth/jwt
+AuthAltParameters=jwks=/var/spool/slurm/statesave/jwks.json,userclaimfield=uid
 #
 #
 # TIMERS
diff --git a/slurm/manifests/statefulset-compute.yaml b/slurm/manifests/statefulset-compute.yaml
index d228308..12ebc77 100644
--- a/slurm/manifests/statefulset-compute.yaml
+++ b/slurm/manifests/statefulset-compute.yaml
@@ -31,7 +31,7 @@ spec:
       serviceAccountName: slurm
       initContainers:
       - name: fix-munge-paths
-        image: quay.io/jkincl/munge:latest
+        image: ghcr.io/naps-product-sa/openshift-batch:munge-latest
         command:
         - sh
         - -c
@@ -46,7 +46,7 @@ spec:
           mountPath: /run/munge
       containers:
       - name: munge
-        image: quay.io/jkincl/munge:latest
+        image: ghcr.io/naps-product-sa/openshift-batch:munge-latest
         command:
         - /sbin/munged
         - -F
@@ -60,7 +60,7 @@ spec:
         - name: munge-key
           mountPath: /etc/munge
       - name: slurm
-        image: quay.io/jkincl/slurm:latest
+        image: ghcr.io/naps-product-sa/openshift-batch:slurm-latest
         command:
         - /sbin/slurmd
         - -D
diff --git a/slurm/manifests/statefulset-head.yaml b/slurm/manifests/statefulset-head.yaml
index 0b47a76..361d7f9 100644
--- a/slurm/manifests/statefulset-head.yaml
+++ b/slurm/manifests/statefulset-head.yaml
@@ -30,7 +30,7 @@ spec:
       serviceAccountName: slurm
       initContainers:
       - name: fix-munge-paths
-        image: quay.io/jkincl/munge:latest
+        image: ghcr.io/naps-product-sa/openshift-batch:munge-latest
         command:
         - sh
         - -c
@@ -45,7 +45,7 @@ spec:
           mountPath: /run/munge
       containers:
       - name: munge
-        image: quay.io/jkincl/munge:latest
+        image: ghcr.io/naps-product-sa/openshift-batch:munge-latest
         command:
         - /sbin/munged
         - -F
@@ -59,7 +59,7 @@ spec:
         - name: munge-key
           mountPath: /etc/munge
       - name: slurm
-        image: quay.io/jkincl/slurm:latest
+        image: ghcr.io/naps-product-sa/openshift-batch:slurm-latest
         command:
         - /sbin/slurmctld
         - -D