flix conflicts

vre-hub · Dec 13, 2024 · 8103d41 · 8103d41
2 parents fbd9f89 + fc52aac
commit 8103d41
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -10,9 +10,11 @@ VRE links:
  - Code: https://github.com/vre-hub/vre/ 
  - User documentation: https://vre-hub.github.io/ 
  - Technical documentation: https://github.com/vre-hub/vre/wiki
+   - :construction: Ongoing migration: https://vre-hub.github.io/docs/tech-docs/home 
  - VRE file transfer monitoring: https://monit-grafana-open.cern.ch/d/PJ65OqBVz/vre-rucio-events?orgId=16
  - Live status of the VRE services: https://vre-hub.github.io/status/ 
- - VRE Slack channel: [invitation link](https://join.slack.com/t/eosc-escape/shared_invite/zt-1zd76ivit-Z2A2nszN0qfn4VF6Uk6UrQ).
+ - ESCAPE Mattermost Team: [invitation link](https://mattermost.web.cern.ch/signup_user_complete/?id=zqaa9p5fqfd9bnnc64at4b5aye&md=link&sbr=su).
+   - :exclamation: Afterwards please join the `VRE Support` channel
 
 
 [![flux check pipeline](https://github.com/vre-hub/vre/actions/workflows/merge-check-paths.yml/badge.svg)](https://github.com/vre-hub/vre/actions/workflows/merge-check-paths.yml) [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT) 
@@ -31,4 +33,4 @@ To cite us, please use the latest publication:
 
 ## Contact 
 
-Email the CERN VRE team: `escape-cern-ops'at'cern.ch`
+Email the CERN VRE team: `escape-cern-ops'at'cern.ch`
diff --git a/infrastructure/cluster/flux/jhub/jhub-configmap-profiles.yaml b/infrastructure/cluster/flux/jhub/jhub-configmap-profiles.yaml
@@ -22,6 +22,10 @@ data:
           description: "ROOT v6.26.10 as well as a ROOT C++ and a python-3.8 kernel."
           kubespawner_override:
             image: ghcr.io/vre-hub/vre-singleuser-root:sha-c94d95a
+        - display_name: "ROOT Higgs 2024 environment"
+          description: "ROOT v6.32.04, and a python-3.11 kernel."
+          kubespawner_override:
+            image: ghcr.io/vre-hub/vre-singleuser-root-base:latest
         - display_name: "VIRGO - WDF environment"
           description: "Contains the full WDF v2.2.1 environment - Python 3.9 kernel."
           kubespawner_override:
@@ -53,4 +57,4 @@ data:
         - display_name: "Python 3.11 environment"
           description: "quay.io/jupyter/scipy-notebook:python-3.11 image"
           kubespawner_override:
-            image: quay.io/jupyter/scipy-notebook:python-3.11.8
+            image: quay.io/jupyter/scipy-notebook:python-3.11.8
diff --git a/infrastructure/cluster/flux/jhub/jhub-release.yaml b/infrastructure/cluster/flux/jhub/jhub-release.yaml
@@ -122,30 +122,35 @@ spec:
       defaultUrl: "/lab"
       # The liefcycle hooks are used to create the Rucio configuration file,
       # and the token file by copying the REFRESH_TOKEN from the environment variable to the token file.
-      startTimeout: 600
+      startTimeout: 1200
       lifecycleHooks:
         postStart:
           exec:
             command:
               - "sh"
               - "-c"
-              - >
-                mkdir -p /certs /tmp;
-                echo -n $RUCIO_ACCESS_TOKEN > /tmp/rucio_oauth.token;
-                echo -n "oauth2:${EOS_ACCESS_TOKEN}:iam-escape.cloud.cnaf.infn.it/userinfo" > /tmp/eos_oauth.token;
-                chmod 0600 /tmp/eos_oauth.token;
-                mkdir -p /opt/rucio/etc;
-                echo "[client]" >> /opt/rucio/etc/rucio.cfg;
-                echo "rucio_host = https://vre-rucio.cern.ch" >> /opt/rucio/etc/rucio.cfg;
-                echo "auth_host = https://vre-rucio-auth.cern.ch" >> /opt/rucio/etc/rucio.cfg;
-                echo "ca_cert = /certs/rucio_ca.pem" >> /opt/rucio/etc/rucio.cfg;
-                echo "account = $JUPYTERHUB_USER" >> /opt/rucio/etc/rucio.cfg;
-                echo "auth_type = oidc" >> /opt/rucio/etc/rucio.cfg;
-                echo "oidc_audience = rucio" >> /opt/rucio/etc/rucio.cfg;
-                echo "oidc_polling = true" >> /opt/rucio/etc/rucio.cfg;
-                echo "oidc_issuer = escape" >> /opt/rucio/etc/rucio.cfg;
-                echo "oidc_scope = openid profile offline_access" >> /opt/rucio/etc/rucio.cfg;
-                echo "auth_token_file_path = /tmp/rucio_oauth.token" >> /opt/rucio/etc/rucio.cfg;
+              - |
+                if [ "${SKIP_POSTSTART_HOOK}" = "true" ]; then
+                  echo "hello world";
+                else
+                  mkdir -p /certs /tmp;
+                  echo -n $RUCIO_ACCESS_TOKEN > /tmp/rucio_oauth.token;
+                  echo -n "oauth2:${EOS_ACCESS_TOKEN}:iam-escape.cloud.cnaf.infn.it/userinfo" > /tmp/eos_oauth.token;
+                  chmod 0600 /tmp/eos_oauth.token;
+                  mkdir -p /opt/rucio/etc;
+                  echo "[client]" >> /opt/rucio/etc/rucio.cfg;
+                  echo "rucio_host = https://vre-rucio.cern.ch" >> /opt/rucio/etc/rucio.cfg;
+                  echo "auth_host = https://vre-rucio-auth.cern.ch" >> /opt/rucio/etc/rucio.cfg;
+                  echo "ca_cert = /certs/rucio_ca.pem" >> /opt/rucio/etc/rucio.cfg;
+                  echo "account = $JUPYTERHUB_USER" >> /opt/rucio/etc/rucio.cfg;
+                  echo "auth_type = oidc" >> /opt/rucio/etc/rucio.cfg;
+                  echo "oidc_audience = rucio" >> /opt/rucio/etc/rucio.cfg;
+                  echo "oidc_polling = true" >> /opt/rucio/etc/rucio.cfg;
+                  echo "oidc_issuer = escape" >> /opt/rucio/etc/rucio.cfg;
+                  echo "oidc_scope = openid profile offline_access" >> /opt/rucio/etc/rucio.cfg;
+                  echo "auth_token_file_path = /tmp/rucio_oauth.token" >> /opt/rucio/etc/rucio.cfg;
+                fi;
+                
       networkPolicy:
         enabled: false
       storage: