Modify templates and makefile

jorge-romero · jorge-romero · commit e332ef48658d · 2026-04-17T08:37:23.000+02:00
diff --git a/Makefile b/Makefile
@@ -233,9 +233,9 @@ configure-ods-api-service:
 .PHONY: configure-ods-api-service
 
 ##### HELM CHART MANAGEMENT
-.PHONY: helm-encrypt-secrets helm-decrypt-secrets helm-diff helm-render-ods-api-service helm-render-ods-api-service-application-yaml
+.PHONY: helm-encrypt-secrets helm-decrypt-secrets helm-diff ods-api-service-render-helm-chart helm-render-ods-api-service-application-yaml
 ## Render ODS API Service Helm chart with all configurations (values and secrets).
-helm-render-ods-api-service:
+ods-api-service-render-helm-chart:
 	@cd ods-api-service/chart && \
 	helm secrets template ods-api-service . \
 		-f $(ODS_CONFIGURATION_FULL_PATH)/ods-core.values.yaml \
@@ -258,8 +258,31 @@ helm-render-ods-api-service:
 		--set global.imageTag=$(ODS_IMAGE_TAG) \
 		--set ODS_OPENSHIFT_APP_DOMAIN=$(OPENSHIFT_APPS_BASEDOMAIN)
 
+ods-api-service-render-application-yaml-debug:
+	@cd ods-api-service/chart && \
+	helm secrets lint ods-api-service . \
+		-f $(ODS_CONFIGURATION_FULL_PATH)/ods-core.values.yaml \
+		-f $(ODS_CONFIGURATION_FULL_PATH)/ods-core.secrets.enc.yaml \
+		-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service.values.yaml \
+		-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service.secrets.enc.yaml \
+		-f $(ODS_CONFIGURATION_FULL_PATH)/$(env)/ods-api-service.values.$(env).yaml \
+		-f $(ODS_CONFIGURATION_FULL_PATH)/$(env)/ods-api-service.secrets.$(env).enc.yaml \
+		--set projectId=$(ODS_NAMESPACE) \
+		--set appSelector=app=ods-api-service \
+		--set registry=$(DOCKER_REGISTRY) \
+		--set componentId=ods-api-service \
+		--set global.projectId=$(ODS_NAMESPACE) \
+		--set global.appSelector=app=ods-api-service \
+		--set global.registry=$(DOCKER_REGISTRY) \
+		--set global.componentId=ods-api-service \
+		--set imageNamespace=$(ODS_NAMESPACE) \
+		--set imageTag=$(ODS_IMAGE_TAG) \
+		--set global.imageNamespace=$(ODS_NAMESPACE) \
+		--set global.imageTag=$(ODS_IMAGE_TAG) \
+		--set ODS_OPENSHIFT_APP_DOMAIN=$(OPENSHIFT_APPS_BASEDOMAIN)
+
 ## Render the generated application.yaml from Helm templates to a local file.
-helm-render-ods-api-service-application-yaml:
+ods-api-service-render-application-yaml:
 	@cd ods-api-service/chart && \
 	helm secrets template ods-api-service . \
 		-f $(ODS_CONFIGURATION_FULL_PATH)/ods-core.values.yaml \
@@ -286,7 +309,7 @@ helm-render-ods-api-service-application-yaml:
 		
 
 ## Render the generated .env file from Helm templates to a local file.
-helm-render-ods-api-service-dot-env:
+ods-api-service-renderdot-env:
 	@cd ods-api-service/chart && \
 	 helm secrets template ods-api-service . \
 		-f $(ODS_CONFIGURATION_FULL_PATH)/ods-core.values.yaml \
@@ -309,9 +332,6 @@ helm-render-ods-api-service-dot-env:
 		--set global.imageTag=$(ODS_IMAGE_TAG) \
 		--set ODS_OPENSHIFT_APP_DOMAIN=$(OPENSHIFT_APPS_BASEDOMAIN) 2>/dev/null | ../../scripts/extract-config-env-from-template.sh
 
-
-
-
 helm-encrypt-secrets:
 	@echo "Usage: make helm-encrypt-secrets ENV=all|environment. It use ENV=dev by default if ENV is not set. It will encrypt secrets in the root of the configuration directory and in the environment-specific subdirectory (if it exists)."
 	@echo "       make helm-encrypt-secrets ODS_CONFIGURATION_DIR=path/to/config to specify a different configuration directory (default: ../ods-configuration)."
diff --git a/ods-api-service/chart/templates/core/deployment.yaml b/ods-api-service/chart/templates/core/deployment.yaml
@@ -30,7 +30,6 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          # Priority is on Values from CICD jenkins injected Helm values, if not then use values from values.yaml
           image: {{ include "image.fullname" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
@@ -52,69 +51,67 @@ spec:
               value: {{ .Values.env.OAUTH2_JWK_SET_URI | quote }}
             - name: JAVA_OPTS
               value: {{ .Values.env.JAVA_OPTS | quote }}
+
+          # Injecting all configmaps and secrets as environment variables
           envFrom:
             - configMapRef:
                 name: {{ .Release.Name }}-config-db
             - secretRef:
                 name: {{ .Release.Name }}-config-db-secret
-          {{- if .Values.externalServices.aap.enabled }}
+            - configMapRef:
+                name: {{ .Release.Name }}-service-project
+
             - configMapRef:
                 name: {{ include "chart.fullname" . }}-aap-config
             - secretRef:
                 name: {{ include "chart.fullname" . }}-aap-credentials
-          {{- end }}
-          {{- if .Values.apis.projectUsers.enabled }}
+
             - configMapRef:
                 name: {{ include "chart.fullname" . }}-project-users-config
             - secretRef:
                 name: {{ include "chart.fullname" . }}-project-users-credentials
-          {{- end }}
-          {{- if .Values.apis.projects.enabled }}
+
             - configMapRef:
                 name: {{ include "chart.fullname" . }}-projects-config
-          {{- end }}
-          {{- if .Values.externalServices.uipath.enabled }}
+
             - configMapRef:
                 name: {{ include "chart.fullname" . }}-uipath-config
             - secretRef:
                 name: {{ include "chart.fullname" . }}-uipath-credentials
-          {{- end }}
-          {{- if .Values.externalServices.projectsInfoService.enabled }}
+
             - configMapRef:
                 name: {{ include "chart.fullname" . }}-projects-info-service-config
-          {{- end }}
-          {{- if gt (len .Values.externalServices.openshift.instances) 0 }}
+
             - configMapRef:
                 name: {{ include "chart.fullname" . }}-openshift-config
             - secretRef:
                 name: {{ include "chart.fullname" . }}-openshift-credentials
-          {{- end }}
-          {{- if gt (len .Values.externalServices.bitbucket.instances) 0 }}
+
             - configMapRef:
                 name: {{ include "chart.fullname" . }}-bitbucket-config
             - secretRef:
                 name: {{ include "chart.fullname" . }}-bitbucket-credentials
-          {{- end }}
-          {{- if gt (len .Values.externalServices.webhookProxy.clusters) 0 }}
+
             - configMapRef:
                 name: {{ include "chart.fullname" . }}-webhook-proxy-config
-          {{- end }}
-          {{- if gt (len .Values.externalServices.jenkins.environments) 0 }}
+
             - secretRef:
                 name: {{ include "chart.fullname" . }}-jenkins-credentials
-          {{- end }}
-          {{- if gt (len .Values.externalServices.jira.instances) 0 }}
+
             - configMapRef:
                 name: {{ include "chart.fullname" . }}-jira-config
             - secretRef:
                 name: {{ include "chart.fullname" . }}-jira-credentials
-          {{- end }}
+
           livenessProbe:
             {{- toYaml .Values.probes.livenessProbe | nindent 12 }}
+
           readinessProbe:
             {{- toYaml .Values.probes.readinessProbe | nindent 12 }}
+
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+
           volumeMounts:
             - name: spring-config
               mountPath: /home/default/config/
diff --git a/ods-api-service/chart/templates/external-service-aap/external-service-aap-configmap.yaml b/ods-api-service/chart/templates/external-service-aap/external-service-aap-configmap.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.externalServices.aap.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,6 +6,7 @@ metadata:
     {{- include "chart.labels" . | nindent 4 }}
     app.kubernetes.io/component: aap-config
 data:
+{{- if .Values.externalServices.aap.enabled }}
   ANSIBLE_BASE_URL: {{ .Values.externalServices.aap.baseUrl | quote }}
   ANSIBLE_TIMEOUT: {{ .Values.externalServices.aap.timeout | quote }}
   ANSIBLE_SSL_VERIFY: {{ .Values.externalServices.aap.ssl.verifyCertificates | quote }}
diff --git a/ods-api-service/chart/templates/external-service-aap/external-service-aap-secret.yaml b/ods-api-service/chart/templates/external-service-aap/external-service-aap-secret.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.externalServices.aap.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,6 +7,7 @@ metadata:
     app.kubernetes.io/component: aap-credentials
 type: Opaque
 data:
+{{- if .Values.externalServices.aap.enabled }}
   ANSIBLE_USERNAME: {{ .Values.externalServices.aap.username | b64enc | quote }}
   ANSIBLE_PASSWORD: {{ .Values.externalServices.aap.password | b64enc | quote }}
   {{- if .Values.externalServices.aap.ssl.trustStorePassword }}
diff --git a/ods-api-service/chart/templates/external-service-bitbucket/external-service-bitbucket-configmap.yaml b/ods-api-service/chart/templates/external-service-bitbucket/external-service-bitbucket-configmap.yaml
@@ -1,4 +1,3 @@
-{{- if gt (len .Values.externalServices.bitbucket.instances) 0 }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,6 +6,7 @@ metadata:
     {{- include "chart.labels" . | nindent 4 }}
     app.kubernetes.io/component: bitbucket-config
 data:
+{{- if gt (len .Values.externalServices.bitbucket.instances) 0 }}
   {{- range $name, $instance := .Values.externalServices.bitbucket.instances }}
   BITBUCKET_{{ $name | upper | replace "-" "_" }}_BASE_REST_URL: {{ $instance.baseUrl | quote }}
   BITBUCKET_{{ $name | upper | replace "-" "_" }}_CONNECTION_TIMEOUT: {{ $instance.connectionTimeout | quote }}
diff --git a/ods-api-service/chart/templates/external-service-bitbucket/external-service-bitbucket-secret.yaml b/ods-api-service/chart/templates/external-service-bitbucket/external-service-bitbucket-secret.yaml
@@ -1,4 +1,3 @@
-{{- if gt (len .Values.externalServices.bitbucket.instances) 0 }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,6 +7,7 @@ metadata:
     app.kubernetes.io/component: bitbucket-credentials
 type: Opaque
 data:
+{{- if gt (len .Values.externalServices.bitbucket.instances) 0 }}
   {{- range $name, $instance := .Values.externalServices.bitbucket.instances }}
   {{- if $instance.bearerToken }}
   BITBUCKET_{{ $name | upper | replace "-" "_" }}_BEARER_TOKEN: {{ $instance.bearerToken | b64enc | quote }}
diff --git a/ods-api-service/chart/templates/external-service-jenkins/external-service-jenkins-secret.yaml b/ods-api-service/chart/templates/external-service-jenkins/external-service-jenkins-secret.yaml
@@ -1,4 +1,3 @@
-{{- if gt (len .Values.externalServices.jenkins.environments) 0 }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,6 +7,7 @@ metadata:
     app.kubernetes.io/component: jenkins-credentials
 type: Opaque
 data:
+{{- if gt (len .Values.externalServices.jenkins.environments) 0 }}
   {{- range $index, $env := .Values.externalServices.jenkins.environments }}
   JENKINS_{{ $env.name | upper | replace "-" "_" }}_API_TOKEN: {{ $env.apiToken | b64enc | quote }}
   {{- end }}
diff --git a/ods-api-service/chart/templates/external-service-jira/external-service-jira-configmap.yaml b/ods-api-service/chart/templates/external-service-jira/external-service-jira-configmap.yaml
@@ -1,4 +1,3 @@
-{{- if gt (len .Values.externalServices.jira.instances) 0 }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,6 +6,7 @@ metadata:
     {{- include "chart.labels" . | nindent 4 }}
     app.kubernetes.io/component: jira-config
 data:
+{{- if gt (len .Values.externalServices.jira.instances) 0 }}
   JIRA_DEFAULT_INSTANCE: {{ .Values.externalServices.jira.defaultInstance | quote }}
   {{- range $name, $instance := .Values.externalServices.jira.instances }}
   JIRA_{{ $name | upper | replace "-" "_" }}_BASE_URL: {{ $instance.baseUrl | quote }}
diff --git a/ods-api-service/chart/templates/external-service-jira/external-service-jira-secret.yaml b/ods-api-service/chart/templates/external-service-jira/external-service-jira-secret.yaml
@@ -1,4 +1,3 @@
-{{- if gt (len .Values.externalServices.jira.instances) 0 }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,6 +7,7 @@ metadata:
     app.kubernetes.io/component: jira-credentials
 type: Opaque
 data:
+{{- if gt (len .Values.externalServices.jira.instances) 0 }}
   {{- range $name, $instance := .Values.externalServices.jira.instances }}
   {{- if $instance.bearerToken }}
   JIRA_{{ $name | upper | replace "-" "_" }}_BEARER_TOKEN: {{ $instance.bearerToken | b64enc | quote }}
diff --git a/ods-api-service/chart/templates/external-service-openshift/external-service-openshift-configmap.yaml b/ods-api-service/chart/templates/external-service-openshift/external-service-openshift-configmap.yaml
@@ -1,4 +1,3 @@
-{{- if gt (len .Values.externalServices.openshift.instances) 0 }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,6 +6,7 @@ metadata:
     {{- include "chart.labels" . | nindent 4 }}
     app.kubernetes.io/component: openshift-config
 data:
+{{- if gt (len .Values.externalServices.openshift.instances) 0 }}
   {{- range $name, $instance := .Values.externalServices.openshift.instances }}
   OPENSHIFT_{{ $name | upper | replace "-" "_" }}_API_URL: {{ $instance.apiUrl | quote }}
   OPENSHIFT_{{ $name | upper | replace "-" "_" }}_NAMESPACE: {{ $instance.namespace | quote }}
diff --git a/ods-api-service/chart/templates/external-service-openshift/external-service-openshift-secret.yaml b/ods-api-service/chart/templates/external-service-openshift/external-service-openshift-secret.yaml
@@ -1,4 +1,3 @@
-{{- if gt (len .Values.externalServices.openshift.instances) 0 }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,6 +7,7 @@ metadata:
     app.kubernetes.io/component: openshift-credentials
 type: Opaque
 data:
+{{- if gt (len .Values.externalServices.openshift.instances) 0 }}
   {{- range $name, $instance := .Values.externalServices.openshift.instances }}
   OPENSHIFT_{{ $name | upper | replace "-" "_" }}_TOKEN: {{ $instance.token | b64enc | quote }}
   {{- end }}
diff --git a/ods-api-service/chart/templates/external-service-projects-info-service/external-service-projects-info-service-configmap.yaml b/ods-api-service/chart/templates/external-service-projects-info-service/external-service-projects-info-service-configmap.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.externalServices.projectsInfoService.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,5 +6,6 @@ metadata:
     {{- include "chart.labels" . | nindent 4 }}
     app.kubernetes.io/component: projects-info-service-config
 data:
+{{- if .Values.externalServices.projectsInfoService.enabled }}
   PROJECTS_INFO_SERVICE_BASE_URL: {{ .Values.externalServices.projectsInfoService.baseUrl | quote }}
 {{- end }}
diff --git a/ods-api-service/chart/templates/external-service-uipath/external-service-uipath-configmap.yaml b/ods-api-service/chart/templates/external-service-uipath/external-service-uipath-configmap.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.externalServices.uipath.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,6 +6,7 @@ metadata:
     {{- include "chart.labels" . | nindent 4 }}
     app.kubernetes.io/component: uipath-config
 data:
+{{- if .Values.externalServices.uipath.enabled }}
   UIPATH_HOST: {{ .Values.externalServices.uipath.host | quote }}
   UIPATH_TENANCY_NAME: {{ .Values.externalServices.uipath.tenancyName | quote }}
   UIPATH_ORGANIZATION_UNIT_ID: {{ .Values.externalServices.uipath.organizationUnitId | quote }}
diff --git a/ods-api-service/chart/templates/external-service-uipath/external-service-uipath-secret.yaml b/ods-api-service/chart/templates/external-service-uipath/external-service-uipath-secret.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.externalServices.uipath.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,6 +7,7 @@ metadata:
     app.kubernetes.io/component: uipath-credentials
 type: Opaque
 data:
+{{- if .Values.externalServices.uipath.enabled }}
   UIPATH_CLIENT_ID: {{ .Values.externalServices.uipath.clientId | b64enc | quote }}
   UIPATH_CLIENT_SECRET: {{ .Values.externalServices.uipath.clientSecret | b64enc | quote }}
   {{- if .Values.externalServices.uipath.ssl.trustStorePassword }}
diff --git a/ods-api-service/chart/templates/external-service-webhook-proxy/external-service-webhook-proxy-configmap.yaml b/ods-api-service/chart/templates/external-service-webhook-proxy/external-service-webhook-proxy-configmap.yaml
@@ -1,4 +1,3 @@
-{{- if gt (len .Values.externalServices.webhookProxy.clusters) 0 }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,11 +6,12 @@ metadata:
     {{- include "chart.labels" . | nindent 4 }}
     app.kubernetes.io/component: webhook-proxy-config
 data:
-  {{- range $index, $cluster := .Values.externalServices.webhookProxy.clusters }}
-  WEBHOOK_PROXY_{{ $cluster.name | upper | replace "-" "_" }}_CLUSTER_BASE: {{ $cluster.clusterBase | quote }}
-  WEBHOOK_PROXY_{{ $cluster.name | upper | replace "-" "_" }}_CONNECTION_TIMEOUT: {{ $cluster.connectionTimeout | quote }}
-  WEBHOOK_PROXY_{{ $cluster.name | upper | replace "-" "_" }}_READ_TIMEOUT: {{ $cluster.readTimeout | quote }}
-  WEBHOOK_PROXY_{{ $cluster.name | upper | replace "-" "_" }}_TRUST_ALL: {{ $cluster.trustAllCertificates | quote }}
-  WEBHOOK_PROXY_{{ $cluster.name | upper | replace "-" "_" }}_JENKINSFILE_PATH: {{ $cluster.defaultJenkinsfilePath | quote }}
+{{- if gt (len .Values.externalServices.webhookProxy.clusters) 0 }}
+  {{- range $name, $cluster := .Values.externalServices.webhookProxy.clusters }}
+  WEBHOOK_PROXY_{{ $name | upper | replace "-" "_" }}_CLUSTER_BASE: {{ $cluster.clusterBase | quote }}
+  WEBHOOK_PROXY_{{ $name | upper | replace "-" "_" }}_CONNECTION_TIMEOUT: {{ $cluster.connectionTimeout | quote }}
+  WEBHOOK_PROXY_{{ $name | upper | replace "-" "_" }}_READ_TIMEOUT: {{ $cluster.readTimeout | quote }}
+  WEBHOOK_PROXY_{{ $name | upper | replace "-" "_" }}_TRUST_ALL: {{ $cluster.trustAllCertificates | quote }}
+  WEBHOOK_PROXY_{{ $name | upper | replace "-" "_" }}_JENKINSFILE_PATH: {{ $cluster.defaultJenkinsfilePath | quote }}
   {{- end }}
 {{- end }}
diff --git a/ods-api-service/chart/templates/service-project/service-project-configmap.yaml b/ods-api-service/chart/templates/service-project/service-project-configmap.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-service-project
+  labels:
+    {{- include "chart.labels" . | nindent 4 }}
+data:
+  SERVICE_PROJECT_LDAP_GROUP_PATTERN: {{ .Values.services.project.ldap.group.pattern }}
diff --git a/ods-api-service/chart/templates/tpl/_application.tpl b/ods-api-service/chart/templates/tpl/_application.tpl
