diff --git a/base/job.yml b/base/job.yml index f27e15bd6f23ce2569308e77b2749148aa451541..3cae119c26218074bc75542d431b80837b98ffc2 100644 --- a/base/job.yml +++ b/base/job.yml @@ -105,10 +105,10 @@ spec: mountPath: /.cache - name: data mountPath: /streamflow/results - subPathExpr: $(JOB_ID)/output + subPath: JOB_ID/output - name: data mountPath: /streamflow/project/input - subPathExpr: $(JOB_ID)/input + subPath: JOB_ID/input readOnly: true resources: limits: diff --git a/compile-java/1/kustomization.yml b/compile-java/1/kustomization.yml index acc3053f104df638f1a0a3e0b17b1831e5b898b7..28853b692d0ca421cdd378333f7baab1ffe360e2 100644 --- a/compile-java/1/kustomization.yml +++ b/compile-java/1/kustomization.yml @@ -11,3 +11,20 @@ configMapGenerator: - streamflow.yml envs: - env + +replacements: +# NOTE this is a workaround for K8s<1.17 that dont support subPathExpr +- source: + kind: ConfigMap + name: streamflow-config + fieldPath: data.JOB_ID + targets: + - select: + kind: Job + name: streamflow + fieldPaths: + - 'spec.template.spec.containers.[name=streamflow].volumeMounts.[name=data].subPath' + options: + index: 0 + delimiter: '/' + create: true diff --git a/compile-java/2/kustomization.yml b/compile-java/2/kustomization.yml index e816221ad9e47fdf9b71d35c8dae358ee536c624..6e7096e3fb70c46e0bbec23efdb4bc6aa4601a2a 100644 --- a/compile-java/2/kustomization.yml +++ b/compile-java/2/kustomization.yml @@ -11,3 +11,21 @@ configMapGenerator: - streamflow.yml envs: - env + +replacements: +# NOTE this is a workaround for K8s<1.17 that dont support subPathExpr +- source: + kind: ConfigMap + name: streamflow-config + fieldPath: data.JOB_ID + targets: + - select: + kind: Job + name: streamflow + fieldPaths: + - 'spec.template.spec.containers.[name=streamflow].volumeMounts.[name=data].subPath' + options: + index: 0 + delimiter: '/' + create: true + diff --git a/echo/1/kustomization.yml b/echo/1/kustomization.yml index 814642dac7984311cdc509df3591afcabe850601..a17679b9fc7612eeb06cf45484c6449c00a8faed 100644 --- a/echo/1/kustomization.yml +++ b/echo/1/kustomization.yml @@ -11,3 +11,20 @@ configMapGenerator: - streamflow.yml envs: - env + +replacements: +# NOTE this is a workaround for K8s<1.17 that dont support subPathExpr +- source: + kind: ConfigMap + name: streamflow-config + fieldPath: data.JOB_ID + targets: + - select: + kind: Job + name: streamflow + fieldPaths: + - 'spec.template.spec.containers.[name=streamflow].volumeMounts.[name=data].subPath' + options: + index: 0 + delimiter: '/' + create: true diff --git a/echo/2/kustomization.yml b/echo/2/kustomization.yml index 5d15cfb1f07e1926706f417375f8a5c7a8cabd1a..3a3a9b2a9178a32bea5261e9395e5d3a1be2fe16 100644 --- a/echo/2/kustomization.yml +++ b/echo/2/kustomization.yml @@ -11,3 +11,20 @@ configMapGenerator: - streamflow.yml envs: - env + +replacements: +# NOTE this is a workaround for K8s<1.17 that dont support subPathExpr +- source: + kind: ConfigMap + name: streamflow-config + fieldPath: data.JOB_ID + targets: + - select: + kind: Job + name: streamflow + fieldPaths: + - 'spec.template.spec.containers.[name=streamflow].volumeMounts.[name=data].subPath' + options: + index: 0 + delimiter: '/' + create: true diff --git a/echo/3/kustomization.yml b/echo/3/kustomization.yml index 2ef008045aace5780a2d54a0ffd44ee16250e6f6..ef045d9dbe8191304ac0c4596d2d46ec72181d8d 100644 --- a/echo/3/kustomization.yml +++ b/echo/3/kustomization.yml @@ -11,3 +11,21 @@ configMapGenerator: - streamflow.yml envs: - env + +replacements: +# NOTE this is a workaround for K8s<1.17 that dont support subPathExpr +- source: + kind: ConfigMap + name: streamflow-config + fieldPath: data.JOB_ID + targets: + - select: + kind: Job + name: streamflow + fieldPaths: + - 'spec.template.spec.containers.[name=streamflow].volumeMounts.[name=data].subPath' + options: + index: 0 + delimiter: '/' + create: true + diff --git a/echo/4/kustomization.yml b/echo/4/kustomization.yml index d5825e9079732afeda052914cc6e457b58a2936f..9a9a374e778bc497d29c6d0c41e647997e3a48b6 100644 --- a/echo/4/kustomization.yml +++ b/echo/4/kustomization.yml @@ -11,3 +11,20 @@ configMapGenerator: - streamflow.yml envs: - env + +replacements: +# NOTE this is a workaround for K8s<1.17 that dont support subPathExpr +- source: + kind: ConfigMap + name: streamflow-config + fieldPath: data.JOB_ID + targets: + - select: + kind: Job + name: streamflow + fieldPaths: + - 'spec.template.spec.containers.[name=streamflow].volumeMounts.[name=data].subPath' + options: + index: 0 + delimiter: '/' + create: true diff --git a/psd/1/input.yml b/psd/1/input.yml index 5f9ce0fc5959cf73e50570fad5d594962535ddc2..68d1a39ec805664cd48606b82e971190312c443c 100644 --- a/psd/1/input.yml +++ b/psd/1/input.yml @@ -1,7 +1,7 @@ input_file: class: File - #location: 'https://data-proxy.ebrains.eu/api/v1/permalinks/06b0b2c8-31cb-4108-b6a7-0d275e118339' - path: 'input/1.mat' + location: 'https://data-proxy.ebrains.eu/api/v1/permalinks/06b0b2c8-31cb-4108-b6a7-0d275e118339' + #path: 'input/1.mat' channels: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] psd_output_file_name: 'psd.json' output_file_name: 'output.png' diff --git a/psd/1/kustomization.yml b/psd/1/kustomization.yml index 3f9c11dabc3915241e2bda4a4b5643ae05f916dc..e9cfcb9e22157d98c0e2716f6e4e46455af52c00 100644 --- a/psd/1/kustomization.yml +++ b/psd/1/kustomization.yml @@ -15,3 +15,20 @@ configMapGenerator: - streamflow.yml envs: - env + +replacements: +# NOTE this is a workaround for K8s<1.17 that dont support subPathExpr +- source: + kind: ConfigMap + name: streamflow-config + fieldPath: data.JOB_ID + targets: + - select: + kind: Job + name: streamflow + fieldPaths: + - 'spec.template.spec.containers.[name=streamflow].volumeMounts.[name=data].subPath' + options: + index: 0 + delimiter: '/' + create: true