X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=helm%2Finfrastructure%2Fsubcharts%2Fkong%2Ftemplates%2Fservice-kong-proxy.yaml;h=58a255ea224cdb96ae308619da400356fe19d5dc;hb=75c0de3cae4b58e001f7ec715f13f82ded10e678;hp=1102eb4a5510e21759e1c54bd741db1331176563;hpb=f1bf45955876f9ed5779b65d0be49af7bd68d04f;p=ric-plt%2Fric-dep.git

diff --git a/helm/infrastructure/subcharts/kong/templates/service-kong-proxy.yaml b/helm/infrastructure/subcharts/kong/templates/service-kong-proxy.yaml
index 1102eb4..58a255e 100644
--- a/helm/infrastructure/subcharts/kong/templates/service-kong-proxy.yaml
+++ b/helm/infrastructure/subcharts/kong/templates/service-kong-proxy.yaml
@@ -1,54 +1,16 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "kong.fullname" . }}-proxy
-  annotations:
-    {{- range $key, $value := .Values.proxy.annotations }}
-      {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  labels:
-    {{- include "kong.metaLabels" . | nindent 4 }}
-spec:
-  type: {{ .Values.proxy.type }}
-  {{- if eq .Values.proxy.type "LoadBalancer" }}
-  {{- if .Values.proxy.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.proxy.loadBalancerIP }}
-  {{- end }}
-  {{- if .Values.proxy.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-  {{- range $cidr := .Values.proxy.loadBalancerSourceRanges }}
-  - {{ $cidr }}
-  {{- end }}
-  {{- end }}
-  {{- end }}
-  externalIPs:
-  {{- range $ip := .Values.proxy.externalIPs }}
-  - {{ $ip }}
-  {{- end }}
-  ports:
-  {{- if .Values.proxy.http.enabled }}
-  - name: kong-proxy
-    port: {{ .Values.proxy.http.servicePort }}
-    targetPort: {{ .Values.proxy.http.containerPort }}
-  {{- if (and (eq .Values.proxy.type "NodePort") (not (empty .Values.proxy.http.nodePort))) }}
-    nodePort: {{ .Values.proxy.http.nodePort }}
-  {{- end }}
-    protocol: TCP
-  {{- end }}
-  {{- if or .Values.proxy.tls.enabled }}
-  - name: kong-proxy-tls
-    port: {{ .Values.proxy.tls.servicePort }}
-    targetPort: {{ .Values.proxy.tls.overrideServiceTargetPort | default .Values.proxy.tls.containerPort }}
-  {{- if (and (eq .Values.proxy.type "NodePort") (not (empty .Values.proxy.tls.nodePort))) }}
-    nodePort: {{ .Values.proxy.tls.nodePort }}
-  {{- end }}
-    protocol: TCP
-  {{- end }}
-  {{- if .Values.proxy.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.proxy.externalTrafficPolicy }}
-  {{- end }}
-  {{- if .Values.proxy.clusterIP }}
-  clusterIP: {{ .Values.proxy.clusterIP }}
-  {{- end }}
-  selector:
-    {{- include "kong.selectorLabels" . | nindent 4 }}
+{{- if .Values.deployment.kong.enabled }}
+{{- if and .Values.proxy.enabled (or .Values.proxy.http.enabled .Values.proxy.tls.enabled) -}}
+{{- $serviceConfig := dict -}}
+{{- $serviceConfig := merge $serviceConfig .Values.proxy -}}
+{{- $_ := set $serviceConfig "fullName" (include "kong.fullname" .) -}}
+{{- $_ := set $serviceConfig "namespace" (include "kong.namespace" .) -}}
+{{- $_ := set $serviceConfig "metaLabels" (include "kong.metaLabels" .) -}}
+{{- $_ := set $serviceConfig "selectorLabels" (include "kong.selectorLabels" .) -}}
+{{- $_ := set $serviceConfig "serviceName" "proxy" -}}
+{{- include "kong.service" $serviceConfig }}
+{{ if .Values.proxy.ingress.enabled }}
+---
+{{ include "kong.ingress" $serviceConfig }}
+{{- end -}}
+{{- end -}}
+{{- end -}}