feat: make the initial delay seconds configurable

trustification · Nov 18, 2024 · dc02384 · dc02384
1 parent 9fa31a1
commit dc02384
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/charts/trustify/templates/helpers/_infrastructure.tpl b/charts/trustify/templates/helpers/_infrastructure.tpl
@@ -10,6 +10,18 @@ Arguments: (dict)
 {{- $infra.port | default 9010 -}}
 {{- end }}
 
+{{/*
+Evaluate the infrastructure initial delay seconds.
+
+Arguments: (dict)
+  * root - .
+  * module - module object
+*/}}
+{{- define "trustification.application.infrastructure.initialDelaySeconds"}}
+{{- $infra := merge (deepCopy .module.infrastructure ) .root.Values.infrastructure }}
+{{- $infra.initialDelaySeconds | default 2 -}}
+{{- end }}
+
 {{/*
 Additional env-vars for configuring the infrastructure endpoint.
 
@@ -58,13 +70,13 @@ Arguments (dict):
 */}}
 {{ define "trustification.application.infrastructure.probes" }}
 livenessProbe:
-  initialDelaySeconds: 2
+  initialDelaySeconds: {{ include "trustification.application.infrastructure.initialDelaySeconds" . }}
   httpGet:
     path: /health/live
     port: {{ include "trustification.application.infrastructure.port" . }}
 
 readinessProbe:
-  initialDelaySeconds: 2
+  initialDelaySeconds: {{ include "trustification.application.infrastructure.initialDelaySeconds" . }}
   httpGet:
     path: /health/ready
     port: {{ include "trustification.application.infrastructure.port" . }}

diff --git a/charts/trustify/templates/helpers/_oidc.tpl b/charts/trustify/templates/helpers/_oidc.tpl
@@ -116,6 +116,8 @@ Arguments (dict):
 {{- if not .module.disableSwaggerOidc }}
 - name: SWAGGER_UI_OIDC_ISSUER_URL
   value: {{ include "trustification.oidc.frontendIssuerUrl" .root | quote }}
+- name: SWAGGER_UI_OIDC_CLIENT_ID
+  value: {{ include "trustification.oidc.frontendClientId" .root }}
 
 {{- $client := required "Unable to find client for 'frontend'" (get .root.Values.oidc.clients "frontend" ) -}}
 

diff --git a/charts/trustify/values.schema.yaml b/charts/trustify/values.schema.yaml
@@ -97,6 +97,12 @@ properties:
         description: |
           Port on which infrastructure services are exposed.
 
+      initialDelaySeconds:
+        type: integer
+        minimum: 0
+        description: |
+          The initial delay seconds for the infrastructure probes.
+
   metrics:
     type: object
     additionalProperties: false