Fix issue with php service sub dicts copying into php-base (#659)

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

Author: andytson-inviqa

harness/attributes/docker.yml

@@ -28,6 +28,8 @@ attributes:
         APP_DATABASE_PASSWORD: = @('database.pass')
         APP_SECRET: = @('akeneo.secret')
     job-queue-consumer:
+      extends:
+        - php-base
       enabled: "= 'job-queue-consumer' in @('app.services')"
       image: = @('docker.repository') ~ ':' ~ @('app.version') ~ '-job-queue-consumer'
       publish: = @('services.job-queue-consumer.enabled')

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.resolved" (dict "root" $ "service_name" "job-queue-consumer") | fromYaml) -}}
 {{- if .enabled }}
 apiVersion: apps/v1
 kind: Deployment

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.resolved" (dict "root" $ "service_name" "job-queue-consumer") | fromYaml -}}
 {{ template "service.environment.secret" (dict "service_name" "job-queue-consumer" "service" $service "root" $) }}