From eeb525f5f938e7cc8a475e182ede6bfc02be7ac7 Mon Sep 17 00:00:00 2001
From: jdorsch <jdorsch@cscs.ch>
Date: Thu, 11 Jan 2024 15:34:36 +0100
Subject: [PATCH] refactores F7T_XFER_CONSTRAINT and PARTITION

---
 deploy/k8s/config/templates/cm.common.yaml   | 3 +--
 deploy/k8s/storage/templates/cm.storage.yaml | 2 ++
 deploy/k8s/values-dev.yaml                   | 3 ++-
 src/common/common.env.template               | 3 ---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/deploy/k8s/config/templates/cm.common.yaml b/deploy/k8s/config/templates/cm.common.yaml
index b218c5db..55ff80e3 100644
--- a/deploy/k8s/config/templates/cm.common.yaml
+++ b/deploy/k8s/config/templates/cm.common.yaml
@@ -27,8 +27,7 @@ data:
   F7T_SYSTEMS_INTERNAL_UTILITIES: "{{ .Values.F7T_SYSTEMS_INTERNAL_UTILITIES }}"
   F7T_SYSTEMS_PUBLIC: "{{ .Values.F7T_SYSTEMS_PUBLIC }}"
   F7T_UTILITIES_MAX_FILE_SIZE: "{{ .Values.F7T_UTILITIES_MAX_FILE_SIZE }}"
-  F7T_UTILITIES_TIMEOUT: "{{ .Values.F7T_UTILITIES_TIMEOUT }}"
-  F7T_XFER_PARTITION: "{{ .Values.F7T_XFER_PARTITION }}"
+  F7T_UTILITIES_TIMEOUT: "{{ .Values.F7T_UTILITIES_TIMEOUT }}"  
 kind: ConfigMap
 metadata:
   name: common-env-file
diff --git a/deploy/k8s/storage/templates/cm.storage.yaml b/deploy/k8s/storage/templates/cm.storage.yaml
index ae4fb9dc..45457946 100644
--- a/deploy/k8s/storage/templates/cm.storage.yaml
+++ b/deploy/k8s/storage/templates/cm.storage.yaml
@@ -24,6 +24,8 @@ data:
   F7T_SWIFT_ACCOUNT: "{{ .Values.F7T_SWIFT_ACCOUNT }}"
   F7T_SWIFT_USER: "{{ .Values.F7T_SWIFT_USER }}"
   F7T_SWIFT_PASS: "{{ .Values.F7T_SWIFT_PASS }}"
+  F7T_XFER_CONSTRAINT: "{{ .Values.F7T_XFER_CONSTRAINT }}"
+  F7T_XFER_PARTITION: "{{ .Values.F7T_XFER_PARTITION }}"
 kind: ConfigMap
 metadata:
   name: storage-env-file
diff --git a/deploy/k8s/values-dev.yaml b/deploy/k8s/values-dev.yaml
index a8e3930a..d2ca008c 100644
--- a/deploy/k8s/values-dev.yaml
+++ b/deploy/k8s/values-dev.yaml
@@ -33,7 +33,6 @@ F7T_TASKS_URL: https://svc-tasks:5003
 F7T_UTILITIES_MAX_FILE_SIZE: 5
 F7T_UTILITIES_TIMEOUT: 5
 F7T_UTILITIES_URL: https://svc-utilities:5004
-F7T_XFER_PARTITION: "xfer"
 # compute
 F7T_COMPUTE_BASE_FS: "/home;/home"
 F7T_COMPUTE_PORT: "5006"
@@ -59,6 +58,8 @@ F7T_S3_PUBLIC_URL: "http://svc-minio.firecrest-dev:9000"
 F7T_S3_REGION: "us-east-1"
 F7T_S3_TENANT: null
 F7T_STORAGE_POLLING_INTERVAL: 60
+F7T_XFER_PARTITION: "xfer"
+F7T_XFER_CONSTRAINT: ""
 # tasks
 F7T_TASKS_PORT: "5003"
 F7T_PERSISTENCE_IP: localhost
diff --git a/src/common/common.env.template b/src/common/common.env.template
index ca2ffa50..b6504148 100644
--- a/src/common/common.env.template
+++ b/src/common/common.env.template
@@ -79,9 +79,6 @@ F7T_STORAGE_TEMPURL_EXP_TIME=604800
 F7T_STORAGE_MAX_FILE_SIZE=5368709120
 # Storage technology used for staging area (swift or s3v2 or s3v4, unset to disable)
 F7T_OBJECT_STORAGE='s3v4'
-# partition for internal transfer
-F7T_XFER_PARTITION=xfer
-F7T_XFER_CONSTRAINT=''
 #-------
 # STATUS: microservices & systems to pool:
 F7T_STATUS_SERVICES='certificator;utilities;compute;tasks;storage'