From 976a445c6c4560a9fbfbc8d176cc4516a441b46d Mon Sep 17 00:00:00 2001
From: jstranig <jstrani@capgemini.com>
Date: Tue, 8 Feb 2022 17:02:39 +0100
Subject: [PATCH] BIOMASS-2309 Sar training stack : Enable a startup script to
 use maap-configmap and s3-credential

---
 devfiles/sar-training/devfile.yaml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/devfiles/sar-training/devfile.yaml b/devfiles/sar-training/devfile.yaml
index d9636fd..774af2f 100644
--- a/devfiles/sar-training/devfile.yaml
+++ b/devfiles/sar-training/devfile.yaml
@@ -24,8 +24,11 @@ components:
           spec:
            containers: 
             - name: jupyter
-              image: 'registry.eu-west-0.prod-cloud-ocb.orange-business.com/cloud-biomass-maap/saar-training-jupyterlab:0.0.5'
+              image: 'registry.eu-west-0.prod-cloud-ocb.orange-business.com/cloud-biomass-maap/saar-training-jupyterlab:0.0.6'
               imagePullPolicy: IfNotPresent
+              envFrom:
+                - configMapRef:
+                    name: maap-configmap
               mountSources: true
               resources:
                 requests:
@@ -34,8 +37,16 @@ components:
                   memory: 5000Mi
               securityContext:
                 privileged: true
+              volumeMounts:
+              - name: s3fs
+                mountPath: "/etc/s3fs"
+                readOnly: true
            imagePullSecrets:
-             - name: secret-docker-bimaap                
+             - name: secret-docker-bimaap
+           volumes:
+             - name: s3fs
+               secret:
+                 secretName: s3-credential
     type: kubernetes
     volumes:
         - name: projects
@@ -45,10 +56,6 @@ components:
       - value: WS_JUPYTER
         name: MACHINE_NAME     
       - value: /projects
-        name: JUPYTER_NOTEBOOK_DIR           
-      - value: "97262f0b-d3ca-4492-bcf8-9a0e12bdede8"
-        name: CLIENT_ID
-      - value: "VAL"
-        name: MAAP_ENV_TYPE             
+        name: JUPYTER_NOTEBOOK_DIR
 apiVersion: 1.0.0
 
-- 
GitLab