ci: updating configs for aws to match container builds

Problem: we need to test deployment tomorrow with riken containers Solution: update aws configs to use the TBA builds Signed-off-by: vsoch <[email protected]>
flux-framework · Apr 12, 2024 · b6df63d · b6df63d
1 parent fdb072c
commit b6df63d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 76 deletions.
diff --git a/2024-RIKEN-AWS/JupyterNotebook/README.md b/2024-RIKEN-AWS/JupyterNotebook/README.md
@@ -21,9 +21,9 @@ For AWS Tutorial Day users:
 Let's build a set of images - one spawner and one hub. 
 
 ```bash
-docker build -t ghcr.io/flux-framework/flux-jupyter-hub:2023 -f docker/Dockerfile.hub .
-docker build -t ghcr.io/flux-framework/flux-jupyter-spawn:2023 -f docker/Dockerfile.spawn .
-docker build -t ghcr.io/flux-framework/flux-jupyter-init:2023 -f docker/Dockerfile.init .
+docker build -t ghcr.io/flux-framework/flux-jupyter-hub:riken-2024 -f docker/Dockerfile.hub .
+docker build -t ghcr.io/flux-framework/flux-jupyter-spawn:riken-2024 -f docker/Dockerfile.spawn .
+docker build -t ghcr.io/flux-framework/flux-jupyter-init:riken-2024 -f docker/Dockerfile.init .
 ```
 
 Note that these are available under the flux-framework organization GitHub packages, so you shouldn't need
@@ -43,9 +43,6 @@ docker network create jupyterhub
 
 # Here is how to run an entirely contained tutorial (the notebook in the container)
 docker run --rm -it --entrypoint /start.sh -v /var/run/docker.sock:/var/run/docker.sock --net jupyterhub --name jupyterhub -p 8888:8888 flux-tutorial
-
-# Here is how to bind the tutorial files locally to make enduring changes!
-docker run --rm -it --entrypoint /start.sh -v /var/run/docker.sock:/var/run/docker.sock -v ./tutorial:/home/jovyan/flux-radiuss-tutorial-2023 --net jupyterhub --name jupyterhub -p 8888:8888 flux-tutorial
 ```
 
 If you want to develop the ipynb files, you can bind the tutorials directory:

diff --git a/2024-RIKEN-AWS/JupyterNotebook/aws/config-aws-ssl.yaml b/2024-RIKEN-AWS/JupyterNotebook/aws/config-aws-ssl.yaml
@@ -23,7 +23,7 @@ hub:
   # This is the image I built based off of jupyterhub/k8s-hub, 3.0.2 at time of writing this
   image: 
     name: ghcr.io/flux-framework/flux-jupyter-hub
-    tag: "2023"
+    tag: "riken-2024"
     pullPolicy: Always
 
 # # https://z2jh.jupyter.org/en/latest/administrator/optimization.html#scaling-up-in-time-user-placeholders
@@ -46,7 +46,7 @@ proxy:
 singleuser:
   image:
     name: ghcr.io/flux-framework/flux-jupyter-spawn
-    tag: "2023"
+    tag: "riken-2024"
     pullPolicy: Always
   cpu:
     limit: 2
@@ -59,7 +59,7 @@ singleuser:
   # This runs as the root user, who clones and changes ownership to uid 1000
   initContainers:
     - name: init-myservice
-      image: ghcr.io/flux-framework/flux-jupyter-init:2023
+      image: ghcr.io/flux-framework/flux-jupyter-init:riken-2024
       command: ["/entrypoint.sh"]
       volumeMounts:
         - name: flux-tutorial

diff --git a/2024-RIKEN-AWS/JupyterNotebook/aws/config-aws.yaml b/2024-RIKEN-AWS/JupyterNotebook/aws/config-aws.yaml
@@ -17,7 +17,7 @@ hub:
   # This is the image I built based off of jupyterhub/k8s-hub, 3.0.2 at time of writing this
   image: 
     name: ghcr.io/flux-framework/flux-jupyter-hub
-    tag: "2023"
+    tag: "riken-2024"
     pullPolicy: Always
 
 # https://z2jh.jupyter.org/en/latest/administrator/optimization.html#scaling-up-in-time-user-placeholders
@@ -32,7 +32,7 @@ scheduling:
 singleuser:
   image:
     name: ghcr.io/flux-framework/flux-jupyter-spawn
-    tag: "2023"
+    tag: "riken-2024"
     pullPolicy: Always
   cpu:
     limit: 1
@@ -43,7 +43,7 @@ singleuser:
   # This runs as the root user, who clones and changes ownership to uid 1000
   initContainers:
     - name: init-myservice
-      image: ghcr.io/flux-framework/flux-jupyter-init:2023
+      image: ghcr.io/flux-framework/flux-jupyter-init:riken-2024
       command: ["/entrypoint.sh"]
       volumeMounts:
         - name: flux-tutorial

diff --git a/...ook/aws/eksctl-radiuss-tutorial-2023.yaml → ...ebook/aws/eksctl-riken-tutorial-2024.yaml b/...ook/aws/eksctl-radiuss-tutorial-2023.yaml → ...ebook/aws/eksctl-riken-tutorial-2024.yaml
diff --git a/2024-RIKEN-AWS/JupyterNotebook/config-aws.yaml b/2024-RIKEN-AWS/JupyterNotebook/config-aws.yaml
diff --git a/2024-RIKEN-AWS/JupyterNotebook/docker/init-entrypoint.sh b/2024-RIKEN-AWS/JupyterNotebook/docker/init-entrypoint.sh
@@ -7,5 +7,5 @@
 
 # We need to clone to the user home, and then change permissions to uid 1000
 # That uid is shared by jovyan here and the spawn container
-git clone https://github.com/rse-ops/flux-radiuss-tutorial-2023 /home/jovyan/flux-tutorial
+# git clone https://github.com/rse-ops/flux-radiuss-tutorial-2023 /home/jovyan/flux-tutorial
 chown -R 1000 /home/jovyan
diff --git a/2024-RIKEN-AWS/JupyterNotebook/gcp/config.yaml b/2024-RIKEN-AWS/JupyterNotebook/gcp/config.yaml
@@ -17,7 +17,7 @@ hub:
   # This is the image I built based off of jupyterhub/k8s-hub, 3.0.2 at time of writing this
   image: 
     name: ghcr.io/flux-framework/flux-jupyter-hub
-    tag: "2023"
+    tag: "riken-2024"
     pullPolicy: Always
 
 # https://z2jh.jupyter.org/en/latest/administrator/optimization.html#scaling-up-in-time-user-placeholders
@@ -40,13 +40,13 @@ singleuser:
     limit: '4G'
   cmd: /entrypoint.sh
 
-  initContainers:
-    - name: init-myservice
-      image: alpine/git
-      command: ["git", "clone", "https://github.com/rse-ops/flux-radiuss-tutorial-2023", "/home/jovyan/flux-tutorial"]
-      volumeMounts:
-        - name: flux-tutorial
-          mountPath: /home/jovyan
+#  initContainers:
+#    - name: init-myservice
+#      image: alpine/git
+#      command: ["git", "clone", "https://github.com/rse-ops/flux-radiuss-tutorial-2023", "/home/jovyan/flux-tutorial"]
+#      volumeMounts:
+#        - name: flux-tutorial
+#          mountPath: /home/jovyan
 
   # This is how we get the tutorial files added
   storage: