Merge R3 into master

[it/dep.git] / ric-aux / helm / infrastructure / subcharts / kong / templates / service-kong-manager.yaml

diff --git a/ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-manager.yaml b/ric-aux/helm/infrastructure/subcharts/kong/templates/service-kong-manager.yaml
similarity index 85%
rename from ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-manager.yaml
rename to ric-aux/helm/infrastructure/subcharts/kong/templates/service-kong-manager.yaml
index f9a370c..82e4932 100755 (executable)
--- a/ric-infra/30-Kong/helm/kong/charts/kong/templates/service-kong-manager.yaml
+++ b/ric-aux/helm/infrastructure/subcharts/kong/templates/service-kong-manager.yaml
@@ -8,10 +8,7 @@ metadata:
       {{ $key }}: {{ $value | quote }}
     {{- end }}
   labels:
-    app: {{ template "kong.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- include "kong.metaLabels" . | nindent 4 }}
 spec:
   type: {{ .Values.manager.type }}
   {{- if eq .Values.manager.type "LoadBalancer" }}
@@ -48,10 +45,6 @@ spec:
   {{- end }}
     protocol: TCP
   {{- end }}
-
-
   selector:
-    app: {{ template "kong.name" . }}
-    release: {{ .Release.Name }}
-    component: app
+    {{- include "kong.selectorLabels" . | nindent 4 }}
 {{- end -}}