Fix issue with php service sub dicts copying into php-base for all se…

…rvices

An example of an issue with this is AUTOSTART_PHP_FPM in php-fpm environment occasionally appearing in other pods depending on the non-deterministic order of resource rendering

src/_base/helm/app/templates/_base_helper.tpl

@@ -72,3 +72,10 @@ stringData:
 {{ end }}
 {{ end }}
 {{- end }}
+
+{{- define "service.php.resolved" -}}
+{{- $service := index $.root.Values.services $.service_name -}}
+{{- $extended := index $.root.Values.services "php-base" -}}
+{{- $merged := mergeOverwrite (deepCopy $extended) (deepCopy $service) -}}
+{{ $merged | toYaml }}
+{{- end -}}

src/_base/helm/app/templates/application/app-init.yaml

@@ -1,4 +1,4 @@
-{{- with mergeOverwrite (dict) (index .Values.services "php-base") (index .Values.services "console") -}}
+{{- with (include "service.php.resolved" (dict "root" $ "service_name" "console") | fromYaml) -}}
 apiVersion: batch/v1
 kind: Job
 metadata:

src/_base/helm/app/templates/application/app-migrate.yaml

@@ -1,4 +1,4 @@
-{{- with mergeOverwrite (dict) (index .Values.services "php-base") (index .Values.services "console") -}}
+{{- with (include "service.php.resolved" (dict "root" $ "service_name" "console") | fromYaml) -}}
 apiVersion: batch/v1
 kind: Job
 metadata:

src/_base/helm/app/templates/application/console/deployment.yaml

@@ -1,4 +1,4 @@
-{{- with mergeOverwrite (dict) (index .Values.services "php-base") (index .Values.services "console") -}}
+{{- with (include "service.php.resolved" (dict "root" $ "service_name" "console") | fromYaml) -}}
 {{- if .enabled -}}
 apiVersion: apps/v1
 kind: Deployment

src/_base/helm/app/templates/application/console/secret.yaml

@@ -1,2 +1,2 @@
-{{- $service := mergeOverwrite (dict) (index .Values.services "php-base") (index .Values.services "console") -}}
+{{- $service := include "service.php.resolved" (dict "root" $ "service_name" "console") | fromYaml -}}
 {{ template "service.environment.secret" (dict "service_name" "console" "service" $service "root" $) }}

src/_base/helm/app/templates/application/cron/deployment.yaml

@@ -1,4 +1,4 @@
-{{- with mergeOverwrite (dict) (index .Values.services "php-base") (index .Values.services "cron") -}}
+{{- with (include "service.php.resolved" (dict "root" $ "service_name" "cron") | fromYaml) -}}
 {{- if .enabled -}}
 apiVersion: apps/v1
 kind: Deployment

src/_base/helm/app/templates/application/cron/secret.yaml

@@ -1,2 +1,2 @@
-{{- $service := mergeOverwrite (dict) (index .Values.services "php-base") (index .Values.services "cron") -}}
+{{- $service := include "service.php.resolved" (dict "root" $ "service_name" "cron") | fromYaml -}}
 {{ template "service.environment.secret" (dict "service_name" "cron" "service" $service "root" $) }}

src/_base/helm/app/templates/application/webapp/deployment.yaml

@@ -1,4 +1,4 @@
-{{- $service_php_fpm := mergeOverwrite (dict) (index .Values.services "php-base") (index .Values.services "php-fpm") -}}
+{{- $service_php_fpm := include "service.php.resolved" (dict "root" $ "service_name" "php-fpm") | fromYaml -}}
 {{- if .Values.services.webapp.enabled -}}
 apiVersion: apps/v1
 kind: Deployment

src/_base/helm/app/templates/application/webapp/secret-php-fpm.yaml

@@ -1,2 +1,2 @@
-{{- $service := mergeOverwrite (dict) (index .Values.services "php-base") (index .Values.services "php-fpm") -}}
+{{- $service := include "service.php.resolved" (dict "root" $ "service_name" "php-fpm") | fromYaml -}}
 {{ template "service.environment.secret" (dict "component" "webapp" "service_name" "php-fpm" "service" $service "root" $) }}

src/akeneo/helm/app/templates/application/job-queue-consumer/deployment.yaml

@@ -1,4 +1,4 @@
-{{- with mergeOverwrite (dict) (index .Values.services "php-base") (index .Values.services "job-queue-consumer") -}}
+{{- with (include "service.php.resolved" (dict "root" $ "service_name" "job-queue-consumer") | fromYaml) -}}
 {{- if .enabled }}
 apiVersion: apps/v1
 kind: Deployment

src/akeneo/helm/app/templates/application/job-queue-consumer/secret.yaml

@@ -1,2 +1,2 @@
-{{- $service := mergeOverwrite (dict) (index .Values.services "php-base") (index .Values.services "job-queue-consumer") -}}
+{{- $service := include "service.php.resolved" (dict "root" $ "service_name" "job-queue-consumer") | fromYaml -}}
 {{ template "service.environment.secret" (dict "service_name" "job-queue-consumer" "service" $service "root" $) }}

src/spryker/helm/app/templates/application/jenkins-runner/deployment.yaml

@@ -1,4 +1,4 @@
-{{- with mergeOverwrite (dict) (index .Values.services "php-base") (index .Values.services "jenkins-runner") -}}
+{{- with (include "service.php.resolved" (dict "root" $ "service_name" "jenkins-runner") | fromYaml) -}}
 {{- if .enabled -}}
 apiVersion: apps/v1
 kind: Deployment

src/spryker/helm/app/templates/application/jenkins-runner/secret.yaml

@@ -1,2 +1,2 @@
-{{- $service := mergeOverwrite (dict) (index .Values.services "php-base") (index .Values.services "jenkins-runner") -}}
+{{- $service := include "service.php.resolved" (dict "root" $ "service_name" "jenkins-runner") | fromYaml -}}
 {{ template "service.environment.secret" (dict "service_name" "jenkins-runner" "service" $service "root" $) }}