fix(docker-registry-ui): fix additionalSpec for user-interface and registry-server

Author: Joxit

charts/docker-registry-ui/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: docker-registry-ui
-version: 0.4.1
+version: 0.4.2
 appVersion: "2.3.0"
 kubeVersion: ">=1.19.0-0"
 description: The simplest and most complete UI for your private registry

charts/docker-registry-ui/templates/registry-service.yaml

@@ -7,6 +7,9 @@ metadata:
     app.kubernetes.io/component	: registry-server
     {{- include "docker-registry-ui.labels" . | nindent 4 }}
 spec:
+  selector:
+    app.kubernetes.io/component	: registry-server
+    {{- include "docker-registry-ui.labels" . | nindent 4 }}
   type: {{ .Values.registry.service.type }}
   ports:
     - port: {{ .Values.registry.service.port }}
@@ -16,10 +19,7 @@ spec:
       {{- if (and (eq .Values.registry.service.type "NodePort") .Values.registry.service.nodePort) }}
       nodePort: {{ .Values.registry.service.nodePort }}
       {{- end }}
-  selector:
-    app.kubernetes.io/component	: registry-server
-    {{- include "docker-registry-ui.labels" . | nindent 4 }}
   {{- if .Values.registry.service.additionalSpec }}
-    {{ tpl .Values.registry.service.additionalSpec . | nindent 2 | trim }}
+  {{ tpl .Values.registry.service.additionalSpec . | nindent 2 | trim }}
   {{- end }}
 {{- end }}

charts/docker-registry-ui/templates/ui-service.yaml

@@ -6,6 +6,9 @@ metadata:
     app.kubernetes.io/component	: user-interface
     {{- include "docker-registry-ui.labels" . | nindent 4 }}
 spec:
+  selector:
+    app.kubernetes.io/component	: user-interface
+    {{- include "docker-registry-ui.labels" . | nindent 4 }}
   type: {{ .Values.ui.service.type }}
   ports:
     - port: {{ .Values.ui.service.port }}
@@ -15,9 +18,6 @@ spec:
       {{- if (and (eq .Values.ui.service.type "NodePort") .Values.ui.service.nodePort) }}
       nodePort: {{ .Values.ui.service.nodePort }}
       {{- end }}
-  selector:
-    app.kubernetes.io/component	: user-interface
-    {{- include "docker-registry-ui.labels" . | nindent 4 }}
   {{- if .Values.ui.service.additionalSpec }}
-    {{ tpl .Values.ui.service.additionalSpec . | nindent 2 | trim }}
+  {{ tpl .Values.ui.service.additionalSpec . | nindent 2 | trim }}
   {{- end }}