aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Glozman <Borislav.Glozman@amdocs.com>2018-05-08 12:41:33 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-08 12:41:33 +0000
commit69488f16e417fb9a6392b17af09690a5df068731 (patch)
tree1cb3a75a0c454759db6b1a85076aef69437c226c
parent4121cae170b40fe3319974d2bcebc2d3ca507672 (diff)
parent13f060703dd9c2fbf26752b7851db2a2564ea83a (diff)
Merge "expose nexus and swagger api ports externally"
-rw-r--r--kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml6
-rw-r--r--kubernetes/policy/charts/drools/charts/nexus/templates/service.yaml11
-rw-r--r--kubernetes/policy/charts/drools/charts/nexus/values.yaml3
-rw-r--r--kubernetes/policy/charts/pdp/templates/service.yaml1
-rw-r--r--kubernetes/policy/charts/pdp/values.yaml4
5 files changed, 16 insertions, 9 deletions
diff --git a/kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml b/kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml
index 348b3645f5..1734952b63 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml
@@ -43,18 +43,18 @@ spec:
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- - containerPort: {{ .Values.service.internalPort }}
+ - containerPort: {{ .Values.service.externalPort }}
{{- if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
- port: {{ .Values.service.internalPort }}
+ port: {{ .Values.service.externalPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end -}}
readinessProbe:
httpGet:
path: {{ .Values.readiness.path }}
- port: {{ .Values.service.internalPort }}
+ port: {{ .Values.service.externalPort }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
volumeMounts:
diff --git a/kubernetes/policy/charts/drools/charts/nexus/templates/service.yaml b/kubernetes/policy/charts/drools/charts/nexus/templates/service.yaml
index ded46572a1..594950e647 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/templates/service.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/templates/service.yaml
@@ -23,10 +23,17 @@ metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
+ type: {{ .Values.service.type }}
ports:
- - port: {{ .Values.service.internalPort }}
+ {{if eq .Values.service.type "NodePort" -}}
+ - port: {{ .Values.service.externalPort }}
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
name: {{ .Values.service.portName }}
+ {{- else -}}
+ - port: {{ .Values.service.externalPort }}
+ targetPort: {{ .Values.service.internalPort }}
+ name: {{ .Values.service.portName }}
+ {{- end}}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
- clusterIP: None
diff --git a/kubernetes/policy/charts/drools/charts/nexus/values.yaml b/kubernetes/policy/charts/drools/charts/nexus/values.yaml
index 667987640b..55b231a091 100644
--- a/kubernetes/policy/charts/drools/charts/nexus/values.yaml
+++ b/kubernetes/policy/charts/drools/charts/nexus/values.yaml
@@ -62,7 +62,8 @@ service:
type: NodePort
name: nexus
portName: nexus
- internalPort: 8081
+ externalPort: 8081
+ nodePort: 36
ingress:
enabled: false
diff --git a/kubernetes/policy/charts/pdp/templates/service.yaml b/kubernetes/policy/charts/pdp/templates/service.yaml
index d44fbb9f28..fc608d5ab8 100644
--- a/kubernetes/policy/charts/pdp/templates/service.yaml
+++ b/kubernetes/policy/charts/pdp/templates/service.yaml
@@ -49,4 +49,3 @@ spec:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
sessionAffinity: None
- clusterIP: None
diff --git a/kubernetes/policy/charts/pdp/values.yaml b/kubernetes/policy/charts/pdp/values.yaml
index 3287c9f321..959bb8e0b8 100644
--- a/kubernetes/policy/charts/pdp/values.yaml
+++ b/kubernetes/policy/charts/pdp/values.yaml
@@ -58,11 +58,11 @@ readiness:
periodSeconds: 10
service:
- type: ClusterIP
+ type: NodePort
name: pdp
portName: pdp
- internalPort: 8081
externalPort: 8081
+ nodePort: 37
ingress:
enabled: false