aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/charts
diff options
context:
space:
mode:
authorBorislavG <Borislav.Glozman@amdocs.com>2018-05-22 11:31:39 +0000
committerBorislavG <Borislav.Glozman@amdocs.com>2018-05-22 11:31:39 +0000
commit2d4426e022588345d2f1eea6aa609f236dd6b595 (patch)
treeba49ccd8ccc2a38f4586aabedfc1620ba2d17954 /kubernetes/aai/charts
parent2dc8dad2f91485a44218a37f331bc4d8aa1bacd2 (diff)
Fix Incorrect AAI services
Change-Id: If4b17c3525a75530aa6b149a6901cb0d8737a8d0 Issue-ID: OOM-1102 Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/aai/charts')
-rw-r--r--kubernetes/aai/charts/aai-babel/values.yaml2
-rw-r--r--kubernetes/aai/charts/aai-champ/values.yaml3
-rw-r--r--kubernetes/aai/charts/aai-gizmo/values.yaml4
-rw-r--r--kubernetes/aai/charts/aai-hbase/templates/service.yaml2
-rw-r--r--kubernetes/aai/charts/aai-modelloader/templates/service.yaml10
-rw-r--r--kubernetes/aai/charts/aai-modelloader/values.yaml3
-rw-r--r--kubernetes/aai/charts/aai-search-data/templates/service.yaml6
-rw-r--r--kubernetes/aai/charts/aai-search-data/values.yaml2
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/templates/service.yaml4
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/values.yaml4
10 files changed, 20 insertions, 20 deletions
diff --git a/kubernetes/aai/charts/aai-babel/values.yaml b/kubernetes/aai/charts/aai-babel/values.yaml
index 1e74e35cf9..7118d1669b 100644
--- a/kubernetes/aai/charts/aai-babel/values.yaml
+++ b/kubernetes/aai/charts/aai-babel/values.yaml
@@ -53,7 +53,7 @@ readiness:
service:
type: NodePort
portName: babel
- externalPort: 79
+ externalPort: 9516
internalPort: 9516
nodePort: 79
diff --git a/kubernetes/aai/charts/aai-champ/values.yaml b/kubernetes/aai/charts/aai-champ/values.yaml
index 7849418ccd..13cc9e77c0 100644
--- a/kubernetes/aai/charts/aai-champ/values.yaml
+++ b/kubernetes/aai/charts/aai-champ/values.yaml
@@ -52,8 +52,7 @@ readiness:
service:
type: NodePort
- name: champ
- portName: champ
+ portName: aai-champ
internalPort: 9522
nodePort: 78
diff --git a/kubernetes/aai/charts/aai-gizmo/values.yaml b/kubernetes/aai/charts/aai-gizmo/values.yaml
index 0e982d8fc6..1ea924fc13 100644
--- a/kubernetes/aai/charts/aai-gizmo/values.yaml
+++ b/kubernetes/aai/charts/aai-gizmo/values.yaml
@@ -50,8 +50,8 @@ readiness:
service:
type: NodePort
- name: crud-service
- portName: crud-service
+ name: aai-crud-service
+ portName: aai-crud-service
internalPort: 9520
nodePort: 68
diff --git a/kubernetes/aai/charts/aai-hbase/templates/service.yaml b/kubernetes/aai/charts/aai-hbase/templates/service.yaml
index c503e6ca6a..53c5e5f979 100644
--- a/kubernetes/aai/charts/aai-hbase/templates/service.yaml
+++ b/kubernetes/aai/charts/aai-hbase/templates/service.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.name" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
diff --git a/kubernetes/aai/charts/aai-modelloader/templates/service.yaml b/kubernetes/aai/charts/aai-modelloader/templates/service.yaml
index bd59edb94f..4bfe7879e7 100644
--- a/kubernetes/aai/charts/aai-modelloader/templates/service.yaml
+++ b/kubernetes/aai/charts/aai-modelloader/templates/service.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.name" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -14,15 +14,15 @@ spec:
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
- port: {{ .Values.service.internalPort2 }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
- name: {{ .Values.service.name }}2
+ name: {{ .Values.service.portName2 }}
{{- else -}}
- port: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
- port: {{ .Values.service.internalPort2 }}
- name: {{ .Values.service.name }}2
+ name: {{ .Values.service.portName2 }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/aai/charts/aai-modelloader/values.yaml b/kubernetes/aai/charts/aai-modelloader/values.yaml
index a5095ade51..676fc6fdfc 100644
--- a/kubernetes/aai/charts/aai-modelloader/values.yaml
+++ b/kubernetes/aai/charts/aai-modelloader/values.yaml
@@ -35,10 +35,11 @@ readiness:
service:
type: NodePort
- name: aai-modelloader
+ portName: aai-modelloader
externalPort: 8080
internalPort: 8080
nodePort: 10
+ portName2: aai-modelloader-ssl
externalPort2: 8443
internalPort2: 8443
nodePort2: 29
diff --git a/kubernetes/aai/charts/aai-search-data/templates/service.yaml b/kubernetes/aai/charts/aai-search-data/templates/service.yaml
index 41bc163696..e342a9a688 100644
--- a/kubernetes/aai/charts/aai-search-data/templates/service.yaml
+++ b/kubernetes/aai/charts/aai-search-data/templates/service.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.name" . }}
+ name: {{ include "common.servicename" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -14,10 +14,10 @@ spec:
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/aai/charts/aai-search-data/values.yaml b/kubernetes/aai/charts/aai-search-data/values.yaml
index 4e47d37134..c6f42bd38b 100644
--- a/kubernetes/aai/charts/aai-search-data/values.yaml
+++ b/kubernetes/aai/charts/aai-search-data/values.yaml
@@ -41,7 +41,7 @@ readiness:
service:
type: ClusterIP
- name: aai-search-data
+ portName: aai-search-data
internalPort: 9509
ingress:
diff --git a/kubernetes/aai/charts/aai-sparky-be/templates/service.yaml b/kubernetes/aai/charts/aai-sparky-be/templates/service.yaml
index e97935aedd..e342a9a688 100644
--- a/kubernetes/aai/charts/aai-sparky-be/templates/service.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/templates/service.yaml
@@ -14,10 +14,10 @@ spec:
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/aai/charts/aai-sparky-be/values.yaml b/kubernetes/aai/charts/aai-sparky-be/values.yaml
index 91c4026381..b9ef4ca85d 100644
--- a/kubernetes/aai/charts/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/values.yaml
@@ -4,7 +4,7 @@
global: # global defaults
nodePortPrefix: 302
aai:
- serviceName: aai-aai
+ serviceName: aai
aaiElasticsearch:
serviceName: aai-elasticsearch
gizmo:
@@ -62,7 +62,7 @@ readiness:
service:
type: ClusterIP
- name: aai-sparky-be
+ portName: aai-sparky-be
internalPort: 9517
internalPort2: 8000