[MODELING] Service Mesh Compatibility
Adding basic requirements for Service Mesh compatibility for Modeling
and made the MSB readiness probe optional
Issue-ID: OOM-2992
Change-Id: Ib2353898811014e01f8c8a9553c6477ce7bc16bd
Signed-off-by: AndrewLamb <andrew.a.lamb@est.tech>
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
index d9cbbef..72eced7 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
@@ -52,7 +52,9 @@
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-job-readiness
+ {{ if .Values.config.msb_enabled }}
{{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for.msb ) | indent 6 | trim }}
+ {{ end }}
- command:
- /bin/sh
- -c
@@ -84,18 +86,30 @@
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
+ {{- if and (include "common.needTLS" .) (eq .Values.config.ssl_enabled true) }}
- name: SSL_ENABLED
- value: "{{ .Values.config.ssl_enabled }}"
+ value: "true"
+ {{- else }}
+ - name: SSL_ENABLED
+ value: "false"
+ {{- end }}
- name: MSB_ENABLED
value: "{{ .Values.config.msb_enabled }}"
+ {{- if (include "common.needTLS" .) }}
- name: MSB_ADDR
- value: "{{ .Values.config.msbProtocol }}://{{ .Values.config.msbServiceName }}:{{ .Values.config.msbPort }}"
+ value: "{{ .Values.config.msbProtocol }}s://{{ .Values.config.msbServiceName }}:{{ .Values.config.msbPort }}"
- name: SDC_ADDR
- value: "{{ .Values.config.sdcProtocol }}://{{ .Values.config.sdcServiceName }}:{{ .Values.config.sdcPort }}"
+ value: "{{ .Values.config.sdcProtocol }}s://{{ .Values.config.sdcServiceName }}:{{ .Values.config.sdcPort }}"
+ {{- else }}
+ - name: MSB_ADDR
+ value: "{{ .Values.config.msbProtocol }}://{{ .Values.config.msbServiceName }}:{{ .Values.config.msbPlainPort }}"
+ - name: SDC_ADDR
+ value: "{{ .Values.config.sdcProtocol }}://{{ .Values.config.sdcServiceName }}:{{ .Values.config.sdcPlainPort }}"
+ {{- end }}
- name: DMAAP_ENABLED
value: "{{ .Values.config.dmaap_enabled }}"
- name: DMAAP_ADDR
- value: "{{ .Values.config.dmaapProtocol }}://{{ .Values.config.dmaapServiceName }}:{{ .Values.config.dmaapPort }}"
+ value: "{{ .Values.config.dmaapProtocol }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}://{{ .Values.config.dmaapServiceName }}:{{ .Values.config.dmaapPort }}"
- name: DB_IP
value: "{{ include "common.mariadbService" . }}"
- name: DB_PORT
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/service.yaml b/kubernetes/modeling/components/modeling-etsicatalog/templates/service.yaml
index 20d3fd2..688c04b 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/templates/service.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/templates/service.yaml
@@ -70,11 +70,11 @@
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
index 61df057..21abce3 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
@@ -82,14 +82,16 @@
#application configuration about msb
ssl_enabled: false
msb_enabled: false
- msbProtocol: https
+ msbProtocol: http
msbServiceName: msb-iag
msbPort: 443
- sdcProtocol: https
+ msbPlainPort: 80
+ sdcProtocol: http
sdcServiceName: sdc-be
sdcPort: 8443
+ sdcPlainPort: 8080
dmaap_enabled: false
- dmaapProtocol: https
+ dmaapProtocol: http
dmaapServiceName: message-router-external
dmaapPort: 3905
@@ -154,7 +156,7 @@
service:
type: ClusterIP
name: modeling-etsicatalog
- portName: modeling-etsicatalog
+ portName: http
externalPort: 8806
internalPort: 8806
# nodePort: 30806