summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdc/charts
diff options
context:
space:
mode:
authorBorislav Glozman <Borislav.Glozman@amdocs.com>2019-07-10 07:08:15 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-10 07:08:15 +0000
commitc8903883380e58ea25bfbfaac3014c9aa84068e4 (patch)
tree50bc59739f3ece4fc0c813857d062b7d659aa535 /kubernetes/sdc/charts
parent4ef2ed55feb2a03522fc80b427345359fa34a455 (diff)
parent41d503e90e9aa92616749d3a85c4eaeb5505a58a (diff)
Merge "Ingress support for list of FQDNs in SDC WF"
Diffstat (limited to 'kubernetes/sdc/charts')
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-fe/templates/ingress.yaml34
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-fe/values.yaml1
2 files changed, 28 insertions, 7 deletions
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/templates/ingress.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/templates/ingress.yaml
index d051eafead..e10de6df20 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/templates/ingress.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/ingress.yaml
@@ -12,7 +12,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+{{- define "rules.wf" -}}
+- http:
+ paths:
+ - path: /workflows/
+ backend:
+ serviceName: {{.Values.service.name}}
+ servicePort: {{.Values.service.internalPort}}
+{{- end -}}
+
{{- if .Values.ingress.enabled }}
+
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
@@ -29,11 +39,21 @@ metadata:
{{- end }}
spec:
rules:
- - http:
- paths:
- - path: /workflows/
- backend:
- serviceName: {{.Values.service.name}}
- servicePort: {{.Values.service.internalPort}}
+{{- if .Values.ingress.hosts}}
+{{- range .Values.ingress.hosts}}
+{{- include "rules.wf" $ | nindent 2}}
+{{- if .}}
+ host: {{. | quote}}
+{{- end}}
+{{- end}}
+ tls:
+ - hosts:
+{{- range .Values.ingress.hosts}}
+{{- if .}}
+ - {{ . | quote }}
+{{- end}}
+{{- end }}
+{{- else}}
+{{- include "rules.wf" . | nindent 2}}
+{{- end}}
{{ end }}
-
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
index d26c9279f0..639c811b08 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
@@ -80,6 +80,7 @@ service:
ingress:
enabled: false
+ hosts: ~
annotations:
ingress.kubernetes.io/secure-backends: "false"
nginx.ingress.kubernetes.io/secure-backends: "false"