update containers and cronjobs

containers/rucio-client/Dockerfile

@@ -4,7 +4,7 @@ ARG BUILD_DATE
 
 FROM $BASEIMAGE:$BASETAG
 LABEL maintainer="VRE Team - DEV image"
-LABEL org.opencontainers.image.source https://github.com/vre-hub/vre
+LABEL org.opencontainers.image.source https://github.com/vre-hub/vre-dev
 LABEL org.label-schema.build-date=$BUILD_DATE
 
 USER root
@@ -30,11 +30,12 @@ RUN mkdir -p /etc/vomses \
 RUN mkdir -p /etc/grid-security/vomsdir/escape \
     && wget https://indigo-iam.github.io/escape-docs/voms-config/voms-escape.cloud.cnaf.infn.it.lsc -O /etc/grid-security/vomsdir/escape/voms-escape.cloud.cnaf.infn.it.lsc
 
+# This is kept here just for testing from inside the container. To be removed when moved to v32 to the vre
+ADD --chown=user:user rucio.cfg.escape.j2 /opt/user/rucio.cfg.j2  
 # ESCAPE Rucio setup
-ADD --chown=user:user rucio.cfg.escape.j2 /opt/user/rucio.cfg.j2
+ADD --chown=user:user rucio.default.cfg /opt/user/rucio.default.cfg
 
 # install reana-client 
-#ENV LC_ALL=en_US.UTF-8
 # Reana needs a gcc compiler
 RUN yum install -y gcc pip python-devel \
     && pip install --upgrade pip

containers/rucio-client-testing/rucio.default.cfg → containers/rucio-client/rucio.default.cfg

@@ -1,3 +1,5 @@
+# Please note that this config is just for the DEV VRE cluster
+
 [client]
 rucio_host = localhost
 auth_host = localhost
@@ -6,9 +8,9 @@ auth_type =
 username =
 password =
 account =
-client_cert =
-client_key =
-client_x509_proxy =
+# client_cert =
+# client_key =
+# client_x509_proxy =
 request_retries = 3
 
 [policy]
@@ -17,3 +19,8 @@ schema = generic
 lfn2pfn_algorithm_default = hash
 support = https://github.com/rucio/rucio/issues/
 support_rucio = https://github.com/rucio/rucio/issues/
+
+[credentials]
+gcs = /opt/rucio/etc/rse-accounts.cfg
+# signature_lifetime = 3600
+

infrastructure/cluster/flux/rucio-dev/rucio-dev-cronjobs.yaml

@@ -6,28 +6,32 @@ metadata:
 spec:
   containers:
   - name: rucio-client-dev
-    image: ghcr.io/vre-hub/rucio-client:sha-ae6ac2c
+    image: ghcr.io/vre-hub/vre-dev/rucio-client:latest
     # To make this pod run, ssh into it and run `j2 /opt/user/rucio.cfg.j2 > /opt/rucio/etc/rucio.cfg` if `rucio whoami` is not working
     imagePullPolicy: Always
     env:
     - name: RUCIO_CFG_RUCIO_HOST
       value: "https://vre-dev-rucio.cern.ch"
     - name: RUCIO_CFG_AUTH_HOST
       value: "https://vre-dev-auth-rucio.cern.ch"
+    - name: RUCIO_CFG_CLIENT_CA_CERT
+      value: "/etc/pki/tls/certs/CERN-bundle.pem"
     - name: RUCIO_CFG_ACCOUNT
       value: "root"
     - name: RUCIO_CFG_AUTH_TYPE
       value: "userpass"
-    - name: RUCIO_CFG_USERNAME
+    - name: RUCIO_CFG_CLIENT_USERNAME
       valueFrom:
         secretKeyRef:
           name: rucio-root-account
           key: root-username
-    - name: RUCIO_CFG_PASSWORD
+    - name: RUCIO_CFG_CLIENT_PASSWORD
       valueFrom:
         secretKeyRef:
           name: rucio-root-account
           key: root-password 
+    - name: RUCIO_CFG_CREDENTIALS_GCS
+      value: "/opt/rucio/etc/rse-accounts.cfg"
     command: ["sleep","3600"]
     resources:
       limits:
@@ -95,73 +99,6 @@ spec:
 #           #     secret:
 #           #       secretName: prod-rucio-x509up
 # ---
-#
-#  This container is missing all the packaged installed in the escape one - to be done when RUCIO creates the corresponding release.
-#
-# apiVersion: v1
-# kind: Pod
-# metadata:
-#   name: rucio-client-test-root-user
-#   namespace: rucio-dev
-# spec:
-#   containers:
-#   - name: rucio-client-test-root-user
-#     image: ghcr.io/vre-hub/rucio-client-testing:latest
-#     env:
-#     - name: RUCIO_CFG_CLIENT_RUCIO_HOST
-#       value: "https://vre-dev-rucio.cern.ch"
-#     - name: RUCIO_CFG_CLIENT_AUTH_HOST
-#       value: "https://vre-dev-auth-rucio.cern.ch"
-#     - name: RUCIO_CFG_CLIENT_ACCOUNT
-#       value: "root"
-#     - name: RUCIO_CFG_CLIENT_AUTH_TYPE
-#       value: "userpass"
-#     - name: RUCIO_CFG_CLIENT_USERNAME
-#       valueFrom:
-#         secretKeyRef:
-#           name: rucio-root-account
-#           key: root-username
-#     - name: RUCIO_CFG_CLIENT_PASSWORD
-#       valueFrom:
-#         secretKeyRef:
-#           name: rucio-root-account
-#           key: root-password 
-      # From here i'm just testing that the VARs are acorreclty passed to the image.
-    # - name: RUCIO_CFG_CLIENT_CA_CERT
-    #   value: "/etc/pki/tls/certs/CERN-bundle.pem"
-    # - name: RUCIO_CFG_CLIENT_CLIENT_CERT
-    #   value: "/opt/rucio/etc/usercert.pem"
-    # - name: RUCIO_CFG_CLIENT_CLIENT_KEY
-    #   value: "/opt/rucio/etc/userkey.pem"
-    # - name: RUCIO_CFG_CLIENT_REQUEST_RETRIES
-    #   value: "3"
-    # - name: RUCIO_CFG_CLIENT_VO
-    #   value: "escape"
-    # - name: RUCIO_CFG_CLIENT_X509_PROXY
-    #   value: "/tmp/x509up_u0"
-    # - name: RUCIO_CFG_COMMON_MULTI_VO
-    #   value: "test_value"
-    # - name: RUCIO_CFG_POLICY_LFN2PFN_ALGORITHM_DEFAULT
-    #   value: "hash"
-    # - name: RUCIO_CFG_POLICY_PACKAGE
-    #   value: "escape"
-    # - name: RUCIO_CFG_POLICY_PERMISSION
-    #   value: "escape"
-    # - name: RUCIO_CFG_POLICY_SCHEMA
-    #   value: "escape"
-    # - name: RUCIO_CFG_POLICY_SUPPORT
-    #   value: "https://github.com/rucio/rucio/issues/"
-    # - name: RUCIO_CFG_POLICY_SUPPORT_RUCIO
-    #   value: "https://github.com/rucio/rucio/issues/"
-#     command: ["sleep","3600"]
-#     resources:
-#       limits:
-#         cpu: 100m
-#         memory: 50Mi
-#       requests:
-#         cpu: 100m
-#         memory: 50Mi
----
 apiVersion: v1
 kind: Pod
 metadata:
@@ -170,14 +107,14 @@ metadata:
 spec:
   containers:
     - name: rucio-client-test-root-user
-      #image: ghcr.io/vre-hub/rucio-noise:sha-e101d52
-      image: ghcr.io/vre-hub/rucio-noise:sha-61c1178
+      image: ghcr.io/vre-hub/vre-de/rucio-noise:latest
+      # Need to run `python3 /usr/local/rucio/tools/merge_rucio_configs.py --use-env -d /opt/rucio/etc/rucio.cfg`
       env:            
       - name: RUCIO_CFG_CLIENT_RUCIO_HOST
         value: "https://vre-dev-rucio.cern.ch"
       - name: RUCIO_CFG_CLIENT_AUTH_HOST
         value: "https://vre-dev-auth-rucio.cern.ch"
-      - name: RUCIO_CFG_CA_CERT
+      - name: RUCIO_CFG_CLIENT_CA_CERT
         value: "/etc/pki/tls/certs/CERN-bundle.pem"
       - name: RUCIO_CFG_CLIENT_ACCOUNT
         value: "root"
@@ -195,8 +132,6 @@ spec:
             key: root-password
       - name: RUCIO_CFG_CREDENTIALS_GCS
         value: "/opt/rucio/etc/rse-accounts.cfg"
-      - name: RUCIO_CFG_CREDENTIALS_SIGNATURE_LIFETIME
-        value: "3600"
       command: ["sleep","3600"]
       resources:
         limits: