diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-03-30 17:26:14 +0200 |
|---|---|---|
| committer | Andreas Geissler <andreas-geissler@telekom.de> | 2023-03-31 11:37:50 +0000 |
| commit | 5846a6e2d0faa43d5abf23d79bd556508bb87d2d (patch) | |
| tree | ff025a2c19491869614ec4497277e5760ad7b3cc /kubernetes/aai/templates | |
| parent | 38525b9ce0e8ff2dd9289220c098c00da8219d60 (diff) | |
[AAI] Update Service definitions to support Ingress case
Fix the service definitions to automatically change NodePorts to
ClusterIPs in case of Ingress enabled
Issue-ID: OOM-3111
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I27fbcc917190f1df3d39f1bfc789664bb55809a2
Diffstat (limited to 'kubernetes/aai/templates')
| -rw-r--r-- | kubernetes/aai/templates/deployment.yaml | 5 | ||||
| -rw-r--r-- | kubernetes/aai/templates/service.yaml | 15 |
2 files changed, 10 insertions, 10 deletions
diff --git a/kubernetes/aai/templates/deployment.yaml b/kubernetes/aai/templates/deployment.yaml index dc0dad8701..2722412bb6 100644 --- a/kubernetes/aai/templates/deployment.yaml +++ b/kubernetes/aai/templates/deployment.yaml @@ -93,21 +93,20 @@ spec: name: haproxy-cfg ports: - containerPort: {{ .Values.service.internalPort }} - - containerPort: {{ .Values.service.internalPlainPort }} - containerPort: {{ .Values.metricsService.internalPort }} # disable liveness probe when breakpoints set in debugger # so K8s doesn't restart unresponsive container {{- if eq .Values.liveness.enabled true }} livenessProbe: tcpSocket: - port: {{ .Values.service.internalPlainPort }} + port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} {{ end -}} readinessProbe: httpGet: path: /aai/util/echo - port: {{ .Values.service.internalPlainPort }} + port: {{ .Values.service.internalPort }} scheme: HTTP httpHeaders: - name: X-FromAppId diff --git a/kubernetes/aai/templates/service.yaml b/kubernetes/aai/templates/service.yaml index a8c3c3957e..5bb5c8bf28 100644 --- a/kubernetes/aai/templates/service.yaml +++ b/kubernetes/aai/templates/service.yaml @@ -26,16 +26,17 @@ metadata: heritage: {{ .Release.Service }} spec: ports: - - name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }} - port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.externalPort .Values.service.externalPlainPort }} - targetPort: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort .Values.service.internalPlainPort }} + - name: {{ .Values.service.portName }} + port: {{ .Values.service.externalPort }} + targetPort: {{ .Values.service.internalPort }} {{- if eq .Values.service.type "NodePort" }} + {{ if not (include "common.ingressEnabled" .) }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} + {{ end }} {{- end }} - type: {{ .Values.service.type }} + type: {{ if (include "common.ingressEnabled" .) }}ClusterIP{{ else }}{{ .Values.service.type }}{{ end }} selector: app: {{ include "common.name" . }} - clusterIP: {{ .Values.service.aaiServiceClusterIp }} sessionAffinity: {{ .Values.service.sessionAffinity }} --- apiVersion: v1 @@ -51,8 +52,8 @@ metadata: spec: ports: - name: {{ .Values.service.portName }} - port: {{ .Values.service.externalPlainPort }} - targetPort: {{ .Values.service.internalPlainPort }} + port: {{ .Values.service.externalPort }} + targetPort: {{ .Values.service.internalPort }} type: ClusterIP selector: app: {{ include "common.name" . }} |