Updated values, fixed hostport and removed reverse proxy host regex c…

…hecking
stackhpc · Aug 18, 2023 · 1b75227 · 1b75227
1 parent 6a1af7b
commit 1b75227
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/slurm-cluster-chart/files/ood_portal.yml b/slurm-cluster-chart/files/ood_portal.yml
@@ -150,7 +150,7 @@ ssl:
 #     host_regex: '[\w.-]+\.example\.com'
 # Default: '[^/]+' (allow reverse proxying to all hosts, this allows external
 # hosts as well)
-host_regex: 'slurmd-[0-1]'
+#host_regex: 'slurmd-[0-1]'
 
 # Sub-uri used to reverse proxy to backend web server running on node that
 # knows the full URI path

diff --git a/slurm-cluster-chart/templates/slurmd.yaml b/slurm-cluster-chart/templates/slurmd.yaml
@@ -36,7 +36,8 @@ spec:
           name: slurmd
           ports:
             - containerPort: 8888
-            - hostPort: 6818
+            - containerPort: 6818
+              hostPort: 6818
           resources: {}
           volumeMounts:
             - mountPath: /etc/slurm/

diff --git a/slurm-cluster-chart/values.yaml b/slurm-cluster-chart/values.yaml
@@ -1,4 +1,4 @@
-sdcImage: ghcr.io/stackhpc/slurm-docker-cluster:c0b2f69 #OUTDATED, DON'T USE THIS COMMIT!
+slurmImage: ghcr.io/stackhpc/slurm-docker-cluster:6a1af7b
 
 login:
   # Deployment resource name
@@ -73,14 +73,11 @@ sshPublicKey:
 # Secret resource names
 secrets:
   mungeKey: munge-key-secret
-<<<<<<< HEAD
 
 jupyterApp:
   repoURL: "https://github.com/stackhpc/OOD-containerised-jupyter.git"
   repoTag: "v0.1"
-=======
 
 openOnDemand:
   #Password for default Open OnDemand user 'rocky'
   password: password
->>>>>>> main