Merge branch 'RESTAPI-fix-null-values-helm' into 'master'

Fix null and default values in helm charts See merge request firecrest/firecrest!304
eth-cscs · Jun 5, 2024 · ee65502 · ee65502
2 parents caf1821 + 5bba81c
commit ee65502
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 31 deletions.
diff --git a/deploy/k8s/certificator/templates/cm.certificator.yaml b/deploy/k8s/certificator/templates/cm.certificator.yaml
@@ -6,6 +6,7 @@ data:
   F7T_OPA_POLICY_PATH: {{ .Values.F7T_OPA_POLICY_PATH | default "v1/data/f7t/authz" | quote }}
   F7T_CA_KEY_PATH: {{ .Values.F7T_CA_KEY_PATH | default "/ca-key" | quote }}
   F7T_PUB_USER_KEY_PATH: {{ .Values.F7T_PUB_USER_KEY_PATH | default "/user-key" | quote }}
+  F7T_GUNICORN_LOG: {{ .Values.global.F7T_GUNICORN_LOG | default "--error-logfile /var/log/certificator.gunicorn.log" | quote }}
 kind: ConfigMap
 metadata:
   name: certificator-env-file

diff --git a/deploy/k8s/compute/templates/cm.compute.yaml b/deploy/k8s/compute/templates/cm.compute.yaml
@@ -4,6 +4,7 @@ data:
   F7T_COMPUTE_PORT: {{ .Values.F7T_COMPUTE_PORT | default "5006" | quote }}
   F7T_SPANK_PLUGIN_OPTION: {{ .Values.F7T_SPANK_PLUGIN_OPTION | default "--nohome" | quote }}
   F7T_SPANK_PLUGIN_ENABLED: {{ .Values.F7T_SPANK_PLUGIN_ENABLED | default "False" | quote }}
+  F7T_GUNICORN_LOG: {{ .Values.global.F7T_GUNICORN_LOG | default "--error-logfile /var/log/compute.gunicorn.log" | quote }}
 kind: ConfigMap
 metadata:
   name: compute-env-file

diff --git a/deploy/k8s/config/templates/cm.common.yaml b/deploy/k8s/config/templates/cm.common.yaml
@@ -2,10 +2,10 @@ apiVersion: v1
 data:
   F7T_DEBUG_MODE: {{ .Values.global.F7T_DEBUG_MODE | default "False" | quote }}
   F7T_AUTH_HEADER_NAME: {{ .Values.F7T_AUTH_HEADER_NAME | default "Authorization" | quote }}
-  F7T_AUTH_REQUIRED_SCOPE: {{ .Values.F7T_AUTH_REQUIRED_SCOPE | quote }}
-  F7T_AUTH_ROLE: {{ .Values.F7T_AUTH_ROLE | quote }}
-  F7T_AUTH_TOKEN_AUD: {{ .Values.F7T_AUTH_TOKEN_AUD | quote }}
-  F7T_GATEWAY_URL: "{{ .Values.global.F7T_GATEWAY_HOST }}:{{ .Values.global.F7T_GATEWAY_PORT }}"
+  F7T_AUTH_REQUIRED_SCOPE: {{ .Values.F7T_AUTH_REQUIRED_SCOPE | default "" | quote }}
+  F7T_AUTH_ROLE: {{ .Values.F7T_AUTH_ROLE | default "" | quote }}
+  F7T_AUTH_TOKEN_AUD: {{ .Values.F7T_AUTH_TOKEN_AUD | default "" | quote }}
+  F7T_GATEWAY_URL: {{ .Values.global.F7T_GATEWAY_HOST | default "localhost" }}:{{ .Values.global.F7T_GATEWAY_PORT | default "8000" }}
   F7T_CERTIFICATOR_HOST: {{ .Values.global.F7T_CERTIFICATOR_HOST | default "127.0.0.1" | quote }}
   F7T_CERTIFICATOR_PORT: {{ .Values.global.F7T_CERTIFICATOR_PORT | default "5000" | quote }}
   F7T_COMPUTE_HOST: {{ .Values.global.F7T_COMPUTE_HOST | default "127.0.0.1" | quote }}
@@ -21,22 +21,22 @@ data:
   F7T_UTILITIES_HOST: {{ .Values.global.F7T_UTILITIES_HOST | default "127.0.0.1" | quote }}
   F7T_UTILITIES_PORT: {{ .Values.global.F7T_UTILITIES_PORT | default "5004" | quote }}
   F7T_FILESYSTEMS: {{ .Values.F7T_FILESYSTEMS | default dict | quote }}
-  F7T_GUNICORN_SSL: {{ .Values.F7T_GUNICORN_SSL | quote }}
-  F7T_JAEGER_AGENT: {{ .Values.F7T_JAEGER_AGENT | quote }}
+  F7T_GUNICORN_SSL: {{ .Values.F7T_GUNICORN_SSL | default "--ciphers TLS_AES_256_GCM_SHA384,TLS_CHACHA20_POLY1305_SHA256,TLS_AES_128_GCM_SHA256,DHE-RSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-GCM-SHA384,ECDHE-RSA-AES128-GCM-SHA256 --ssl-version TLSv1_2 --keyfile $F7T_SSL_KEY --certfile $F7T_SSL_CRT" | quote }}
+  F7T_JAEGER_AGENT: {{ .Values.F7T_JAEGER_AGENT | default "" | quote }}
   F7T_LOG_TYPE: {{ .Values.global.F7T_LOG_TYPE | default "file" | quote }}
-  F7T_GUNICORN_LOG: ""
+  F7T_LOG_PATH: {{ .Values.global.F7T_LOG_PATH | default "/var/log" | quote }}
   F7T_OBJECT_STORAGE: {{ .Values.F7T_OBJECT_STORAGE | default "s3v4" | quote }}
   F7T_AUTH_PUBLIC_KEYS: {{ include "list.listPubKeys" . | default "" | quote }}
   F7T_AUTH_ALGORITHMS: {{ include "list.listPubKeyTypes" . | default "RS256" | quote }}
   F7T_SSH_CERTIFICATE_WRAPPER_ENABLED: {{ .Values.F7T_SSH_CERTIFICATE_WRAPPER_ENABLED | default "false" | quote }}
   F7T_SSL_ENABLED: {{ .Values.F7T_SSL_ENABLED | default "true" | quote }}
-  F7T_SSL_CRT: {{ .Values.F7T_SSL_CRT | quote }}
-  F7T_SSL_KEY: {{ .Values.F7T_SSL_KEY | quote }}
-  F7T_SYSTEMS_INTERNAL_ADDR: {{ .Values.F7T_SYSTEMS_INTERNAL_ADDR | default "" | quote }}
+  F7T_SSL_CRT: {{ .Values.F7T_SSL_CRT | default "" | quote }}
+  F7T_SSL_KEY: {{ .Values.F7T_SSL_KEY | default "" | quote }}
+  F7T_SYSTEMS_INTERNAL_ADDR: {{ .Values.F7T_SYSTEMS_INTERNAL_ADDR | quote }}
   F7T_SYSTEMS_INTERNAL_STATUS_ADDR: {{ .Values.F7T_SYSTEMS_INTERNAL_STATUS_ADDR | default .Values.F7T_SYSTEMS_INTERNAL_ADDR | quote  }}
-  F7T_SYSTEMS_INTERNAL_COMPUTE_ADDR: "{{ .Values.F7T_SYSTEMS_INTERNAL_COMPUTE_ADDR }}"
-  F7T_SYSTEMS_INTERNAL_UTILITIES_ADDR: "{{ .Values.F7T_SYSTEMS_INTERNAL_UTILITIES_ADDR }}"
-  F7T_SYSTEMS_PUBLIC_NAME: "{{ .Values.F7T_SYSTEMS_PUBLIC_NAME }}"
+  F7T_SYSTEMS_INTERNAL_COMPUTE_ADDR: {{ .Values.F7T_SYSTEMS_INTERNAL_COMPUTE_ADDR | default .Values.F7T_SYSTEMS_INTERNAL_ADDR | quote }}
+  F7T_SYSTEMS_INTERNAL_UTILITIES_ADDR: {{ .Values.F7T_SYSTEMS_INTERNAL_UTILITIES_ADDR | default .Values.F7T_SYSTEMS_INTERNAL_ADDR | quote }}
+  F7T_SYSTEMS_PUBLIC_NAME: {{ .Values.F7T_SYSTEMS_PUBLIC_NAME | quote }}
   F7T_UTILITIES_MAX_FILE_SIZE: {{ .Values.F7T_UTILITIES_MAX_FILE_SIZE | default "5" | quote }}
   F7T_UTILITIES_TIMEOUT: {{ .Values.F7T_UTILITIES_TIMEOUT | default "5" | quote }}
 kind: ConfigMap

diff --git a/deploy/k8s/status/templates/cm.status.yaml b/deploy/k8s/status/templates/cm.status.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 data:
   F7T_STATUS_PORT: {{ .Values.F7T_STATUS_PORT | default "5001" | quote }}
-  F7T_STATUS_SERVICES: {{ .Values.F7T_STATUS_SERVICES | default "" | quote }}
-  F7T_SYSTEMS_INTERNAL_STATUS_ADDR: "{{ .Values.F7T_SYSTEMS_INTERNAL_STATUS_ADDR }}"
+  F7T_STATUS_SERVICES: {{ .Values.F7T_STATUS_SERVICES | default "" | quote }}  
+  F7T_GUNICORN_LOG: {{ .Values.global.F7T_GUNICORN_LOG | default "--error-logfile /var/log/status.gunicorn.log" | quote }}
 kind: ConfigMap
 metadata:
   name: status-env-file

diff --git a/deploy/k8s/storage/templates/cm.storage.yaml b/deploy/k8s/storage/templates/cm.storage.yaml
@@ -12,19 +12,19 @@ data:
   F7T_STORAGE_POLLING_INTERVAL: {{ .Values.F7T_STORAGE_POLLING_INTERVAL | default "60" | quote }}
   F7T_STORAGE_PORT: {{ .Values.F7T_STORAGE_PORT | default "5002" | quote }}
   F7T_STORAGE_TEMPURL_EXP_TIME: {{ .Values.F7T_STORAGE_TEMPURL_EXP_TIME | default "604800" | quote }}
-  F7T_SYSTEMS_INTERNAL_STORAGE_ADDR: "{{ .Values.F7T_SYSTEMS_INTERNAL_STORAGE_ADDR }}"
-  F7T_S3_PRIVATE_URL: "{{ .Values.F7T_S3_PRIVATE_URL }}"
-  F7T_S3_PUBLIC_URL: "{{ .Values.F7T_S3_PUBLIC_URL }}"
+  F7T_S3_PRIVATE_URL: {{ .Values.F7T_S3_PRIVATE_URL | quote }}
+  F7T_S3_PUBLIC_URL: {{ .Values.F7T_S3_PRIVATE_URL | quote }}
   F7T_S3_REGION: {{ .Values.F7T_S3_REGION | default "us-east-1" | quote }}
-  F7T_S3_TENANT: "{{ .Values.F7T_S3_TENANT }}"
-  F7T_SWIFT_SECRET_KEY: "{{ .Values.F7T_SWIFT_SECRET_KEY }}"
-  F7T_SWIFT_PRIVATE_URL: "{{ .Values.F7T_SWIFT_PRIVATE_URL }}"
-  F7T_SWIFT_PUBLIC_URL: "{{ .Values.F7T_SWIFT_PUBLIC_URL }}"
+  F7T_S3_TENANT: {{ .Values.F7T_S3_TENANT | default "null" | quote }}
+  F7T_SWIFT_SECRET_KEY: {{ .Values.F7T_SWIFT_SECRET_KEY | default "null" | quote }}
+  F7T_SWIFT_PRIVATE_URL: {{ .Values.F7T_SWIFT_PRIVATE_URL | default "null" | quote }}
+  F7T_SWIFT_PUBLIC_URL: {{ .Values.F7T_SWIFT_PUBLIC_URL | default "null" | quote }}
   F7T_SWIFT_API_VERSION: {{ .Values.F7T_SWIFT_API_VERSION | default "v1" | quote }}
-  F7T_SWIFT_USER: {{ .Values.F7T_SWIFT_USER | default "" | quote }}
-  F7T_SWIFT_PASS: {{ .Values.F7T_SWIFT_PASS | default "" | quote }}
+  F7T_SWIFT_USER: {{ .Values.F7T_SWIFT_USER | default "null" | quote }}
+  F7T_SWIFT_PASS: {{ .Values.F7T_SWIFT_PASS | default "null" | quote }}
   F7T_XFER_CONSTRAINT: {{ .Values.F7T_XFER_CONSTRAINT | default "" | quote }}
   F7T_XFER_PARTITION: {{ .Values.F7T_XFER_PARTITION | default "" | quote }}
+  F7T_GUNICORN_LOG: {{ .Values.global.F7T_GUNICORN_LOG | default "--error-logfile /var/log/storage.gunicorn.log" | quote }}
 kind: ConfigMap
 metadata:
   name: storage-env-file

diff --git a/deploy/k8s/tasks/templates/cm.tasks.yaml b/deploy/k8s/tasks/templates/cm.tasks.yaml
@@ -5,6 +5,7 @@ data:
   F7T_PERSIST_PORT: {{ .Values.F7T_PERSIST_PORT | default "6379" | quote }}
   F7T_COMPUTE_TASK_EXP_TIME: {{ .Values.F7T_COMPUTE_TASK_EXP_TIME | toString | default "86400" | quote }}
   F7T_STORAGE_TASK_EXP_TIME: {{ .Values.F7T_STORAGE_TASK_EXP_TIME | toString | default "604800" | quote }}
+  F7T_GUNICORN_LOG: {{ .Values.global.F7T_GUNICORN_LOG | default "--error-logfile /var/log/tasks.gunicorn.log" | quote }}
 kind: ConfigMap
 metadata:
   name: tasks-env-file

diff --git a/deploy/k8s/utilities/templates/cm.utilities.yaml b/deploy/k8s/utilities/templates/cm.utilities.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 data:
   F7T_UTILITIES_PORT: {{ .Values.F7T_UTILITIES_PORT | default "5004" | quote }}
+  F7T_GUNICORN_LOG: {{ .Values.global.F7T_GUNICORN_LOG | default "--error-logfile /var/log/utilities.gunicorn.log" | quote }}
 kind: ConfigMap
 metadata:
   name: utilities-env-file

diff --git a/deploy/k8s/values-dev.yaml b/deploy/k8s/values-dev.yaml
@@ -30,9 +30,6 @@ F7T_STATUS_HOST: svc-status
 F7T_STORAGE_MAX_FILE_SIZE: 512000
 F7T_STORAGE_HOST: svc-storage
 F7T_SYSTEMS_INTERNAL_ADDR: 'svc-cluster:22'
-F7T_SYSTEMS_INTERNAL_STATUS_ADDR: 'svc-cluster:22'
-F7T_SYSTEMS_INTERNAL_COMPUTE_ADDR: 'svc-cluster:22'
-F7T_SYSTEMS_INTERNAL_UTILITIES_ADDR: 'svc-cluster:22'
 F7T_SYSTEMS_PUBLIC_NAME: 'cluster'
 F7T_TASKS_HOST: svc-tasks
 F7T_UTILITIES_MAX_FILE_SIZE: 5
@@ -53,14 +50,12 @@ F7T_STATUS_SERVICES: 'certificator;utilities;compute;tasks;storage;reservations'
 F7T_CERT_CIPHER_KEY: Df6UZuoPoJ2u5yRwxNfFQ46Nwy8eW1OGTcuhlqn4ONo=
 F7T_STORAGE_JOBS_MACHINE: "cluster"
 F7T_STORAGE_PORT: "5002"
-F7T_SYSTEMS_INTERNAL_STORAGE_ADDR: 'svc-cluster:22'
 F7T_STORAGE_TEMPURL_EXP_TIME: "604800"
 F7T_S3_SECRET_KEY: storage_secret_key
 F7T_S3_ACCESS_KEY: storage_access_key
 F7T_S3_PRIVATE_URL: "http://svc-minio.firecrest-dev:9000"
 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: ""

diff --git a/doc/openapi/firecrest-api.yaml b/doc/openapi/firecrest-api.yaml
@@ -8,7 +8,7 @@ openapi: 3.0.0
 servers:
   - url: "/"
 info:
-  version: 1.15.0
+  version: 1.16.1
   title: FirecREST API
   description: >
     FirecREST platform, a RESTful Services Gateway to HPC resources, is a

diff --git a/doc/openapi/firecrest-developers-api.yaml b/doc/openapi/firecrest-developers-api.yaml
@@ -8,7 +8,7 @@ openapi: 3.0.0
 servers:
   - url: "/"
 info:
-  version: 1.15.0
+  version: 1.16.1
   title: FirecREST Developers API
   description: >
     This API specification is intended for FirecREST developers only. There're some endpoints that are not available in the public version for client developers.