summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdc
diff options
context:
space:
mode:
authorIlanaP <ilanap@amdocs.com>2020-03-16 14:13:45 +0200
committerIlanaP <ilanap@amdocs.com>2020-03-16 14:13:45 +0200
commitcbed68ba7105743a05232e39207f758d378515c8 (patch)
tree3b5d872578143068ce26126cf31ccec5f4237265 /kubernetes/sdc
parentb22fc258c15ac525557d4325ca2441314a23d91e (diff)
Add flag to values for disableHttp
Add a flag that can be used inside the charts and in the AUTO.json file with the http enabled status Issue-ID: OJSI-102 Signed-off-by: IlanaP <ilanap@amdocs.com> Signed-off-by: IlanaP <ilanap@amdocs.com> Change-Id: Ieee2a4b4dea49d7a55eed0811ea29145dd17556a
Diffstat (limited to 'kubernetes/sdc')
-rw-r--r--kubernetes/sdc/charts/sdc-fe/templates/service.yaml13
-rwxr-xr-xkubernetes/sdc/resources/config/environments/AUTO.json2
-rw-r--r--kubernetes/sdc/values.yaml3
3 files changed, 13 insertions, 5 deletions
diff --git a/kubernetes/sdc/charts/sdc-fe/templates/service.yaml b/kubernetes/sdc/charts/sdc-fe/templates/service.yaml
index 1b9884a232..2133990b60 100644
--- a/kubernetes/sdc/charts/sdc-fe/templates/service.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/templates/service.yaml
@@ -37,17 +37,24 @@ metadata:
spec:
type: {{ .Values.service.type }}
ports:
+ {{ if not .Values.global.security.disableHttp }}
+ # setting http port only if enabled
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
name: {{ .Values.service.portName }}
- - port: {{ .Values.service.internalPort2 }}
- nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
- name: {{ .Values.service.portName }}2
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
name: {{ .Values.service.portName }}
+ {{ end }}
+ {{ end }}
+
+ {{if eq .Values.service.type "NodePort" -}}
+ - port: {{ .Values.service.internalPort2 }}
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
+ name: {{ .Values.service.portName }}2
+ {{- else -}}
- port: {{ .Values.service.externalPort2 }}
targetPort: {{ .Values.service.internalPort2 }}
name: {{ .Values.service.portName }}2
diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index 2d99ab0c3a..57d774e59b 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -8,7 +8,7 @@
"chef_type": "environment",
"default_attributes": {
- "disableHttp": true,
+ "disableHttp": {{ .Values.global.security.disableHttp }},
"CS_VIP": "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}",
"BE_VIP": "sdc-be.{{include "common.namespace" .}}",
"ONBOARDING_BE_VIP": "sdc-onboarding-be.{{include "common.namespace" .}}",
diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml
index 3d35814f2e..dfbd8c80df 100644
--- a/kubernetes/sdc/values.yaml
+++ b/kubernetes/sdc/values.yaml
@@ -39,7 +39,8 @@ global:
replicaCount: 3
clusterName: cassandra
dataCenter: Pod
-
+ security:
+ disableHttp: true
config:
logstashServiceName: log-ls
logstashPort: 5044