Merge branch 'RESTAPI-fixing-ssl-on-kong-helm' into 'master'

Fixing SSL option on Kong helm template See merge request firecrest/firecrest!303
eth-cscs · Jun 3, 2024 · caf1821 · caf1821
2 parents 5514c45 + 36ebab2
commit caf1821
Show file tree

Hide file tree

Showing 31 changed files with 144 additions and 136 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Variable `F7T_REALM_RSA_PUBLIC_KEYS` changed to `F7T_AUTH_PUBLIC_KEYS` 
 - Variable `F7T_REALM_RSA_TYPE_` changed to `F7T_AUTH_ALGORITHMS` 
+- Added default values on helm charts
 
 
 ### Fixed

diff --git a/deploy/k8s/certificator/templates/cm.certificator.yaml b/deploy/k8s/certificator/templates/cm.certificator.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 data:
-  F7T_CERTIFICATOR_PORT: "{{ .Values.F7T_CERTIFICATOR_PORT }}"
-  F7T_OPA_URL: "{{ .Values.F7T_OPA_URL }}"
-  F7T_OPA_ENABLED: "{{ .Values.F7T_OPA_ENABLED }}"
-  F7T_OPA_POLICY_PATH: "{{ .Values.F7T_OPA_POLICY_PATH }}"
-  F7T_CA_KEY_PATH: "{{ .Values.F7T_CA_KEY_PATH }}"
-  F7T_PUB_USER_KEY_PATH: "{{ .Values.F7T_PUB_USER_KEY_PATH }}"
+  F7T_CERTIFICATOR_PORT: {{ .Values.F7T_CERTIFICATOR_PORT | default "5000" | quote }}
+  F7T_OPA_URL: {{ .Values.F7T_OPA_URL | default "http://localhost:8181" | quote }}
+  F7T_OPA_ENABLED: {{ .Values.F7T_OPA_ENABLED | default "False" | quote }}
+  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 }}
 kind: ConfigMap
 metadata:
   name: certificator-env-file

diff --git a/deploy/k8s/certificator/templates/deploy.certificator.yaml b/deploy/k8s/certificator/templates/deploy.certificator.yaml
@@ -24,20 +24,20 @@ items:
           image: openpolicyagent/opa:0.22.0
           args: ["run", "--server", "--log-level=debug", "--log-format=json-pretty", "--skip-version-check", "/opa-files/data.json", "/opa-files/policy.rego"]
           ports:
-          - containerPort: {{ .Values.F7T_OPA_PORT | atoi }}
+          - containerPort: {{ .Values.F7T_OPA_PORT | default 8181 | atoi }}
           volumeMounts:
           - mountPath: /opa-files/
             name: f7t-opa-vol
           startupProbe:
             tcpSocket:
-              port: {{ .Values.F7T_OPA_PORT | atoi }}
+              port: {{ .Values.F7T_OPA_PORT | default 8181 | atoi }}
             initialDelaySeconds: 5
             failureThreshold: 1
         - name: f7t-certificator
           image: "{{ .Values.global.registry }}/certificator:{{ .Values.global.tag }}"
           imagePullPolicy: Always
           ports:
-          - containerPort: {{ .Values.F7T_CERTIFICATOR_PORT | atoi }}
+          - containerPort: {{ .Values.F7T_CERTIFICATOR_PORT | default 5000 | atoi }}
           envFrom:
             - configMapRef:
                 name: common-env-file
@@ -46,10 +46,10 @@ items:
           command: ["sh"]
           args: ["-c", "/usr/local/bin/gunicorn --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 --workers=2 --bind :5010 --error-logfile /var/log/certificator.gunicorn.log certificator:app"]
           volumeMounts:
-          - mountPath: "{{ .Values.F7T_CA_KEY_PATH }}"
+          - mountPath: {{ .Values.F7T_CA_KEY_PATH | default "/ca-key" | quote }}
             name: f7t-cert-vol
             subPath: ca-key        
-          - mountPath: "{{ .Values.F7T_PUB_USER_KEY_PATH }}"
+          - mountPath: {{ .Values.F7T_PUB_USER_KEY_PATH | default "/user-key.pub" | quote }}
             name: f7t-cert-user-pub-vol
             subPath: user-key.pub
           - mountPath: /f7t-ssl.crt
@@ -60,7 +60,7 @@ items:
             subPath: f7t-ssl.key
           startupProbe:
             tcpSocket:
-              port: {{ .Values.F7T_CERTIFICATOR_PORT | atoi }}
+              port: {{ .Values.F7T_CERTIFICATOR_PORT | default 5000 | atoi }}
             initialDelaySeconds: 5
             failureThreshold: 1
         volumes:

diff --git a/deploy/k8s/certificator/templates/svc.certificator.yaml b/deploy/k8s/certificator/templates/svc.certificator.yaml
@@ -10,12 +10,12 @@ items:
     selector:
       app: certificator
     ports:
-    - name: "{{ .Values.F7T_OPA_PORT }}"
+    - name: opa
       protocol: TCP
-      port: {{ .Values.F7T_OPA_PORT | atoi }}
-      targetPort: {{ .Values.F7T_OPA_PORT | atoi }}
-    - name: "{{ .Values.F7T_CERTIFICATOR_PORT }}"
+      port: {{ .Values.F7T_OPA_PORT | default 8181 | atoi }}
+      targetPort: {{ .Values.F7T_OPA_PORT | default 8181 | atoi }}
+    - name: certificator
       protocol: TCP
-      port: {{ .Values.F7T_CERTIFICATOR_PORT | atoi }}
-      targetPort: {{ .Values.F7T_CERTIFICATOR_PORT | atoi }}
+      port: {{ .Values.F7T_CERTIFICATOR_PORT | default 5000 | atoi }}
+      targetPort: {{ .Values.F7T_CERTIFICATOR_PORT | default 5000 | atoi }}
 kind: List
diff --git a/deploy/k8s/cluster/templates/srv.cluster.yaml b/deploy/k8s/cluster/templates/srv.cluster.yaml
@@ -10,7 +10,7 @@ items:
     selector:
       app: cluster
     ports:
-    - name: "22"
+    - name: ssh
       protocol: TCP
       port: 22
       targetPort: 22

diff --git a/deploy/k8s/compute/templates/cm.compute.yaml b/deploy/k8s/compute/templates/cm.compute.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 data:
-  F7T_COMPUTE_BASE_FS: "{{ .Values.F7T_COMPUTE_BASE_FS }}"
-  F7T_COMPUTE_PORT: "{{ .Values.F7T_COMPUTE_PORT }}"
-  F7T_SPANK_PLUGIN_OPTION: "{{ .Values.F7T_SPANK_PLUGIN_OPTION }}"
-  F7T_SPANK_PLUGIN_ENABLED: "{{ .Values.F7T_SPANK_PLUGIN_ENABLED }}"
+  F7T_COMPUTE_BASE_FS: {{ .Values.F7T_COMPUTE_BASE_FS | default "/home" | quote }}
+  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 }}
 kind: ConfigMap
 metadata:
   name: compute-env-file

diff --git a/deploy/k8s/compute/templates/deploy.compute.yaml b/deploy/k8s/compute/templates/deploy.compute.yaml
@@ -22,7 +22,7 @@ spec:
         imagePullPolicy: Always
         name: compute
         ports:
-        - containerPort: {{ .Values.F7T_COMPUTE_PORT | atoi }}
+        - containerPort: {{ .Values.F7T_COMPUTE_PORT | default 5006 | atoi }}
         envFrom:
         - configMapRef:
             name: common-env-file
@@ -42,7 +42,7 @@ spec:
           subPath: f7t-ssl.key
         startupProbe:
           tcpSocket:
-            port: {{ .Values.F7T_COMPUTE_PORT | atoi }}
+            port: {{ .Values.F7T_COMPUTE_PORT | default 5006 | atoi }}
           initialDelaySeconds: 5
           failureThreshold: 1
       restartPolicy: Always

diff --git a/deploy/k8s/compute/templates/svc.compute.yaml b/deploy/k8s/compute/templates/svc.compute.yaml
@@ -7,5 +7,6 @@ spec:
   selector:
     app: compute # will match pods with this label
   ports:
-  - port: {{ .Values.F7T_COMPUTE_PORT | atoi }} # the service listen on
-    targetPort: {{ .Values.F7T_COMPUTE_PORT | atoi }} # the pods listen on
+  - name: compute
+    port: {{ .Values.F7T_COMPUTE_PORT | default 5006 | atoi }} # the service listen on
+    targetPort: {{ .Values.F7T_COMPUTE_PORT | default 5006 | atoi }} # the pods listen on
diff --git a/deploy/k8s/config/templates/cm.common.yaml b/deploy/k8s/config/templates/cm.common.yaml
@@ -1,44 +1,44 @@
 apiVersion: v1
 data:
-  F7T_DEBUG_MODE: "{{ .Values.global.F7T_DEBUG_MODE  }}"
-  F7T_AUTH_HEADER_NAME: "{{ .Values.F7T_AUTH_HEADER_NAME }}"
-  F7T_AUTH_REQUIRED_SCOPE: "{{ .Values.F7T_AUTH_REQUIRED_SCOPE }}"
-  F7T_AUTH_ROLE: "{{ .Values.F7T_AUTH_ROLE }}"
-  F7T_AUTH_TOKEN_AUD: "{{ .Values.F7T_AUTH_TOKEN_AUD }}"
+  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_CERTIFICATOR_HOST: "{{ .Values.global.F7T_CERTIFICATOR_HOST }}"
-  F7T_CERTIFICATOR_PORT: "{{ .Values.global.F7T_CERTIFICATOR_PORT }}"
-  F7T_COMPUTE_HOST: "{{ .Values.global.F7T_COMPUTE_HOST }}"
-  F7T_COMPUTE_PORT: "{{ .Values.global.F7T_COMPUTE_PORT }}"
-  F7T_RESERVATIONS_HOST: "{{ .Values.F7T_RESERVATIONS_HOST }}"
-  F7T_RESERVATIONS_PORT: "{{ .Values.F7T_RESERVATIONS_PORT }}"
-  F7T_STATUS_HOST: "{{ .Values.global.F7T_STATUS_HOST }}"
-  F7T_STATUS_PORT: "{{ .Values.global.F7T_STATUS_PORT }}"
-  F7T_STORAGE_HOST: "{{ .Values.global.F7T_STORAGE_HOST }}" 
-  F7T_STORAGE_PORT: "{{ .Values.global.F7T_STORAGE_PORT }}"
-  F7T_TASKS_HOST: "{{ .Values.global.F7T_TASKS_HOST }}"
-  F7T_TASKS_PORT: "{{ .Values.global.F7T_TASKS_PORT }}"
-  F7T_UTILITIES_HOST: "{{ .Values.global.F7T_UTILITIES_HOST }}"
-  F7T_UTILITIES_PORT: "{{ .Values.global.F7T_UTILITIES_PORT }}"
-  F7T_FILESYSTEMS: "{{ .Values.F7T_FILESYSTEMS }}"
-  F7T_GUNICORN_SSL: "{{ .Values.F7T_GUNICORN_SSL }}"
-  F7T_JAEGER_AGENT: "{{ .Values.F7T_JAEGER_AGENT }}"
-  F7T_LOG_TYPE: "stdout"
+  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 }}
+  F7T_COMPUTE_PORT: {{ .Values.global.F7T_COMPUTE_PORT | default "5006" | quote }}
+  F7T_RESERVATIONS_HOST: {{ .Values.F7T_RESERVATIONS_HOST | default "127.0.0.1" | quote }}
+  F7T_RESERVATIONS_PORT: {{ .Values.F7T_RESERVATIONS_PORT | default "5005" | quote }}
+  F7T_STATUS_HOST: {{ .Values.global.F7T_STATUS_HOST | default "127.0.0.1" | quote }}
+  F7T_STATUS_PORT: {{ .Values.global.F7T_STATUS_PORT | default "5001" | quote }}
+  F7T_STORAGE_HOST: {{ .Values.global.F7T_STORAGE_HOST | default "127.0.0.1" | quote }}
+  F7T_STORAGE_PORT: {{ .Values.global.F7T_STORAGE_PORT | default "5002" | quote }}
+  F7T_TASKS_HOST: {{ .Values.global.F7T_TASKS_HOST | default "127.0.0.1" | quote }}
+  F7T_TASKS_PORT: {{ .Values.global.F7T_TASKS_PORT | default "5003" | quote }}
+  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_LOG_TYPE: {{ .Values.global.F7T_LOG_TYPE | default "file" | quote }}
   F7T_GUNICORN_LOG: ""
-  F7T_OBJECT_STORAGE: "{{ .Values.F7T_OBJECT_STORAGE }}"
-  F7T_AUTH_PUBLIC_KEYS: '{{ include "list.listPubKeys" . }}'
-  F7T_AUTH_ALGORITHMS: '{{ include "list.listPubKeyTypes" . }}'
-  F7T_SSH_CERTIFICATE_WRAPPER_ENABLED: "{{ .Values.F7T_SSH_CERTIFICATE_WRAPPER_ENABLED }}"
-  F7T_SSL_ENABLED: "{{ .Values.F7T_SSL_ENABLED }}"
-  F7T_SSL_CRT: "{{ .Values.F7T_SSL_CRT }}"
-  F7T_SSL_KEY: "{{ .Values.F7T_SSL_KEY }}"
-  F7T_SYSTEMS_INTERNAL_ADDR: "{{ .Values.F7T_SYSTEMS_INTERNAL_ADDR }}"
-  F7T_SYSTEMS_INTERNAL_STATUS_ADDR: "{{ .Values.F7T_SYSTEMS_INTERNAL_STATUS_ADDR }}"
+  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_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_UTILITIES_MAX_FILE_SIZE: "{{ .Values.F7T_UTILITIES_MAX_FILE_SIZE }}"
-  F7T_UTILITIES_TIMEOUT: "{{ .Values.F7T_UTILITIES_TIMEOUT }}"  
+  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
 metadata:
   name: common-env-file

diff --git a/deploy/k8s/keycloak/templates/srv.keycloak.yaml b/deploy/k8s/keycloak/templates/srv.keycloak.yaml
@@ -10,10 +10,10 @@ items:
     selector:
       app: keycloak
     ports:
-    - name: "8080"
+    - name: kc-api
       port: 8080
       targetPort: 8080
-    - name: "9990"
+    - name: kc-admin
       port: 9990
       targetPort: 9990
   status:

diff --git a/deploy/k8s/kong/templates/cm.kong.yaml b/deploy/k8s/kong/templates/cm.kong.yaml
@@ -67,7 +67,7 @@ items:
         - /tasks/tasklist
       services:
       - name: compute
-        url: "{{if .Values.F7T_SSL_ENABLED}}https{{else}}http{{end}}://{{ .Values.global.F7T_COMPUTE_HOST }}:{{ .Values.global.F7T_COMPUTE_PORT }}"
+        url: "{{if .Values.global.F7T_SSL_ENABLED}}https{{else}}http{{end}}://{{ .Values.global.F7T_COMPUTE_HOST }}:{{ .Values.global.F7T_COMPUTE_PORT }}"
         routes:
         - name: compute
           methods: [DELETE,GET,POST]
@@ -86,36 +86,36 @@ items:
             config:
               anonymous: docs
       - name: status
-        url: "{{if .Values.F7T_SSL_ENABLED}}https{{else}}http{{end}}://{{ .Values.global.F7T_STATUS_HOST }}:{{ .Values.global.F7T_STATUS_PORT }}"
+        url: "{{if .Values.global.F7T_SSL_ENABLED}}https{{else}}http{{end}}://{{ .Values.global.F7T_STATUS_HOST }}:{{ .Values.global.F7T_STATUS_PORT }}"
         routes:
         - name: status
           methods: [GET]
           paths:
           - /status/
       - name: storage
-        url: "{{if .Values.F7T_SSL_ENABLED}}https{{else}}http{{end}}://{{ .Values.global.F7T_STORAGE_HOST }}:{{ .Values.global.F7T_STORAGE_PORT }}"
+        url: "{{if .Values.global.F7T_SSL_ENABLED}}https{{else}}http{{end}}://{{ .Values.global.F7T_STORAGE_HOST }}:{{ .Values.global.F7T_STORAGE_PORT }}"
         routes:
         - name: storage
           methods: [GET,POST]
           paths:
           - /storage/
       - name: tasks
-        url: "{{if .Values.F7T_SSL_ENABLED}}https{{else}}http{{end}}://{{ .Values.global.F7T_TASKS_HOST }}:{{ .Values.global.F7T_TASKS_PORT }}"
+        url: "{{if .Values.global.F7T_SSL_ENABLED}}https{{else}}http{{end}}://{{ .Values.global.F7T_TASKS_HOST }}:{{ .Values.global.F7T_TASKS_PORT }}"
         routes:
         - name: tasks
           methods: [GET]
           paths:
           - /tasks
       - name: utilities
-        url: "{{if .Values.F7T_SSL_ENABLED}}https{{else}}http{{end}}://{{ .Values.global.F7T_UTILITIES_HOST }}:{{ .Values.global.F7T_UTILITIES_PORT }}"
+        url: "{{if .Values.global.F7T_SSL_ENABLED}}https{{else}}http{{end}}://{{ .Values.global.F7T_UTILITIES_HOST }}:{{ .Values.global.F7T_UTILITIES_PORT }}"
         routes:
         - name: utilities
           methods: [DELETE,GET,POST,PUT]
           paths:
           - /utilities/
       {{ if .Values.global.include_reservations }}
       - name: reservations
-        url: "{{if .Values.F7T_SSL_ENABLED}}https{{else}}http{{end}}://{{ .Values.global.F7T_RESERVATIONS_HOST }}:{{ .Values.global.F7T_RESERVATIONS_PORT }}"
+        url: "{{if .Values.global.F7T_SSL_ENABLED}}https{{else}}http{{end}}://{{ .Values.global.F7T_RESERVATIONS_HOST }}:{{ .Values.global.F7T_RESERVATIONS_PORT }}"
         routes:
         - name: reservations
           methods: [DELETE,GET,POST,PUT]

diff --git a/deploy/k8s/kong/templates/svc.kong.yaml b/deploy/k8s/kong/templates/svc.kong.yaml
@@ -10,7 +10,7 @@ items:
     selector:
       app: kong
     ports:
-    - name: "{{ .Values.global.F7T_GATEWAY_PORT }}"
+    - name: "kong"
       port: {{ .Values.global.F7T_GATEWAY_PORT | atoi }}
       targetPort: {{ .Values.global.F7T_GATEWAY_PORT | atoi }}
   status:

diff --git a/deploy/k8s/minio/templates/svc.minio.yaml b/deploy/k8s/minio/templates/svc.minio.yaml
@@ -7,7 +7,7 @@ items:
     namespace: {{ .Values.namespace }}
   spec:
     ports:
-    - name: "9000"
+    - name: minio
       port: 9000
       targetPort: 9000
     selector:

diff --git a/deploy/k8s/openapi/templates/svc.openapi.yaml b/deploy/k8s/openapi/templates/svc.openapi.yaml
@@ -7,9 +7,9 @@ items:
     namespace: {{ .Values.global.namespace }}
   spec:
     ports:
-    - name: "{{ .Values.global.F7T_SWAGGER_PORT }}"
-      port: {{ .Values.global.F7T_SWAGGER_PORT | atoi }}
-      targetPort: {{ .Values.global.F7T_SWAGGER_PORT | atoi }}
+    - name: swagger
+      port: {{ .Values.global.F7T_SWAGGER_PORT | default 8080 | atoi }}
+      targetPort: {{ .Values.global.F7T_SWAGGER_PORT | default 8080 | atoi }}
     selector:
       app: openapi
   status:

diff --git a/deploy/k8s/reservations/templates/cm.reservations.yaml b/deploy/k8s/reservations/templates/cm.reservations.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
-  F7T_RESERVATIONS_PORT: "{{ .Values.F7T_RESERVATIONS_PORT }}"
-  F7T_RESERVATIONS_TIMEOUT: "{{ .Values.F7T_RESERVATIONS_TIMEOUT }}"
+  F7T_RESERVATIONS_PORT: {{ .Values.F7T_RESERVATIONS_PORT | default "5005" | quote }}
+  F7T_RESERVATIONS_TIMEOUT: {{ .Values.F7T_RESERVATIONS_TIMEOUT | default "30" | quote }}
 kind: ConfigMap
 metadata:
   name: reservations-env-file

diff --git a/deploy/k8s/reservations/templates/deploy.reservations.yaml b/deploy/k8s/reservations/templates/deploy.reservations.yaml
@@ -18,7 +18,7 @@ spec:
         imagePullPolicy: Always
         name: reservations
         ports:
-        - containerPort: {{ .Values.F7T_RESERVATIONS_PORT | atoi }}
+        - containerPort: {{ .Values.F7T_RESERVATIONS_PORT | default 5005 | atoi }}
         envFrom:
         - configMapRef:
             name: common-env-file
@@ -38,7 +38,7 @@ spec:
           subPath: f7t-ssl.key
         startupProbe:
           tcpSocket:
-            port: {{ .Values.F7T_RESERVATIONS_PORT | atoi }}
+            port: {{ .Values.F7T_RESERVATIONS_PORT | default 5005 | atoi }}
           initialDelaySeconds: 5
           failureThreshold: 1
       volumes:

diff --git a/deploy/k8s/reservations/templates/svc.reservations.yaml b/deploy/k8s/reservations/templates/svc.reservations.yaml
@@ -7,5 +7,6 @@ spec:
   selector:
     app: reservations # will match pods with this label
   ports:
-  - port: {{ .Values.F7T_RESERVATIONS_PORT | atoi }} # the service listen on
-    targetPort: {{ .Values.F7T_RESERVATIONS_PORT | atoi }} # the pods listen on
+  - name: reservations
+    port: {{ .Values.F7T_RESERVATIONS_PORT | default 5005 | atoi }} # the service listen on
+    targetPort: {{ .Values.F7T_RESERVATIONS_PORT | default 5005 | atoi }} # the pods listen on
diff --git a/deploy/k8s/status/templates/cm.status.yaml b/deploy/k8s/status/templates/cm.status.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
-  F7T_STATUS_PORT: "{{ .Values.F7T_STATUS_PORT }}"
-  F7T_STATUS_SERVICES: "{{ .Values.F7T_STATUS_SERVICES }}"
+  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 }}"
 kind: ConfigMap
 metadata:

diff --git a/deploy/k8s/status/templates/deploy.status.yaml b/deploy/k8s/status/templates/deploy.status.yaml
@@ -23,7 +23,7 @@ spec:
         imagePullPolicy: Always
         name: status
         ports:
-        - containerPort: {{ .Values.F7T_STATUS_PORT | atoi }}
+        - containerPort: {{ .Values.F7T_STATUS_PORT | default 5001 | atoi }}
         envFrom:
         - configMapRef:
             name: common-env-file
@@ -40,7 +40,7 @@ spec:
           subPath: f7t-ssl.key
         startupProbe:
           tcpSocket:
-            port: {{ .Values.F7T_STATUS_PORT | atoi }}
+            port: {{ .Values.F7T_STATUS_PORT | default 5001 | atoi }}
           initialDelaySeconds: 5
           failureThreshold: 1
       volumes:

diff --git a/deploy/k8s/status/templates/svc.status.yaml b/deploy/k8s/status/templates/svc.status.yaml
@@ -7,5 +7,6 @@ spec:
   selector:
     app: status # will match pods with this label
   ports:
-  - port: {{ .Values.F7T_STATUS_PORT | atoi }} # the service listen on
-    targetPort: {{ .Values.F7T_STATUS_PORT | atoi }} # the pods listen on
+  - name: status
+    port: {{ .Values.F7T_STATUS_PORT | default 5001 | atoi }} # the service listen on
+    targetPort: {{ .Values.F7T_STATUS_PORT | default 5001 | atoi }} # the pods listen on