summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <adetalhouet89@gmail.com>2019-05-07 13:36:56 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-07 13:36:56 +0000
commit2be3dc9cbd2f12a5165316cec48a1a33768d62c6 (patch)
treeb4ef53e846e274ff311710d51815f5c687e859ee
parent5c4f4309462a6c83d4a64f59c84a06a1e908b444 (diff)
parent0197bf16e1c842ab793399caf5e783d5503cd763 (diff)
Merge "Default value for nodePort for blueprints processor"
-rwxr-xr-xkubernetes/cds/charts/cds-blueprints-processor/templates/service.yaml31
-rwxr-xr-xkubernetes/cds/charts/cds-blueprints-processor/values.yaml6
2 files changed, 27 insertions, 10 deletions
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/templates/service.yaml b/kubernetes/cds/charts/cds-blueprints-processor/templates/service.yaml
index 5c8bc8cc0d..8985424576 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/templates/service.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.servicename" . }}
+ name: {{ include "common.servicename" . }}-http
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -24,20 +24,35 @@ metadata:
heritage: {{ .Release.Service }}
annotations:
spec:
- type: {{ .Values.service.type }}
+ type: {{ .Values.service.http.type }}
ports:
- port: {{ .Values.service.http.externalPort }}
targetPort: {{ .Values.service.http.internalPort }}
- {{- if eq .Values.service.type "NodePort"}}
- nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+ {{- if eq .Values.service.http.type "NodePort"}}
+ nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.http.nodePort }}
{{- end}}
name: {{ .Values.service.http.portName | default "http" }}
+ selector:
+ app: {{ include "common.name" . }}
+ release: {{ .Release.Name }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ include "common.servicename" . }}-grpc
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+ annotations:
+spec:
+ type: {{ .Values.service.grpc.type }}
+ ports:
- port: {{ .Values.service.grpc.externalPort }}
targetPort: {{ .Values.service.grpc.internalPort }}
- {{- if eq .Values.service.type "NodePort"}}
- nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- {{- end}}
name: {{ .Values.service.grpc.portName | default "grpc" }}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
index 2d96021046..6b88f841f4 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
@@ -20,7 +20,7 @@
global:
# Change to an unused port prefix range to prevent port conflicts
# with other instances running within the same k8s cluster
- nodePortPrefix: 302
+ nodePortPrefixExt: 304
# image repositories
repository: nexus3.onap.org:10001
@@ -70,12 +70,14 @@ readiness:
periodSeconds: 10
service:
- type: ClusterIP
http:
+ type: NodePort
portName: blueprints-processor-http
internalPort: 8080
externalPort: 8080
+ nodePort: 99
grpc:
+ type: ClusterIP
portName: blueprints-processor-grpc
internalPort: 9111
externalPort: 9111