aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/vfc/components/vfc-vnfmgr
diff options
context:
space:
mode:
authorAndrewLamb <andrew.a.lamb@est.tech>2022-07-14 12:51:55 +0100
committerAndrewLamb <andrew.a.lamb@est.tech>2022-07-25 09:52:10 +0100
commitce8a39cd431e251d3effedbca07063fe25ce45c1 (patch)
tree973524ea676a55339c9cd3d618249df120910689 /kubernetes/vfc/components/vfc-vnfmgr
parentcce2287bfff11ada8507f28509e45656e2ab1094 (diff)
[VFC] Service Mesh Compatibility
Adding basic requirements for Service Mesh compatibility for VFC Issue-ID: OOM-2991 Change-Id: I2c5d83772a13d9657858ae959c5ed336eccea89e Signed-off-by: AndrewLamb <andrew.a.lamb@est.tech>
Diffstat (limited to 'kubernetes/vfc/components/vfc-vnfmgr')
-rw-r--r--kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml9
-rw-r--r--kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml4
-rw-r--r--kubernetes/vfc/components/vfc-vnfmgr/values.yaml2
3 files changed, 10 insertions, 5 deletions
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
index 0ee0b931b2..9fcf9b923d 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
@@ -79,9 +79,14 @@ spec:
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: MSB_HOST
- value: "{{ .Values.global.config.msbprotocol }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ value: "{{ .Values.global.config.msbprotocol }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ {{- if and (include "common.needTLS" .) (eq .Values.global.config.ssl_enabled true) }}
- name: SSL_ENABLED
- value: "{{ .Values.global.config.ssl_enabled }}"
+ value: "true"
+ {{- else }}
+ - name: SSL_ENABLED
+ value: "false"
+ {{- end }}
- name: MYSQL_ADDR
value: '{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}'
- name: REDIS_HOST
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml
index 97ef463977..9daf4e0e26 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml
@@ -43,11 +43,11 @@ spec:
- 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/vfc/components/vfc-vnfmgr/values.yaml b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
index cc2becc576..528bbe0c01 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
@@ -78,7 +78,7 @@ readiness:
service:
type: ClusterIP
name: vfc-vnfmgr
- portName: vfc-vnfmgr
+ portName: http
externalPort: 8803
internalPort: 8803
# nodePort: 30803