summaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/charts/aai-resources
diff options
context:
space:
mode:
authorBorislavG <Borislav.Glozman@amdocs.com>2018-05-13 17:11:01 +0000
committerBorislavG <Borislav.Glozman@amdocs.com>2018-05-14 15:40:49 +0300
commit26b650faf9e28c3d9c93250dca8d0d3c19c65dfe (patch)
tree1d753f6336e9da451427b774cf95b6b5c34643e9 /kubernetes/aai/charts/aai-resources
parenta6cc26fc0b64b55af0733efd780d40d204bf7e82 (diff)
Fix aai-cassandra service
Make resources and traversal run on non-rancher k8s Change-Id: I01bd0537bf183ee59f35b272a7a53dffbc5b1d26 Cange-Id: I925964bcc2e0378d947dff33dd2b8870f3acd362 Issue-ID: OOM-1077 Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/aai/charts/aai-resources')
-rw-r--r--kubernetes/aai/charts/aai-resources/resources/config/janusgraph-cached.properties2
-rw-r--r--kubernetes/aai/charts/aai-resources/resources/config/janusgraph-realtime.properties3
-rw-r--r--kubernetes/aai/charts/aai-resources/templates/service.yaml10
-rw-r--r--kubernetes/aai/charts/aai-resources/values.yaml3
4 files changed, 9 insertions, 9 deletions
diff --git a/kubernetes/aai/charts/aai-resources/resources/config/janusgraph-cached.properties b/kubernetes/aai/charts/aai-resources/resources/config/janusgraph-cached.properties
index e3128b8fa5..b9216bf8e0 100644
--- a/kubernetes/aai/charts/aai-resources/resources/config/janusgraph-cached.properties
+++ b/kubernetes/aai/charts/aai-resources/resources/config/janusgraph-cached.properties
@@ -27,7 +27,7 @@ query.smart-limit=false
{{- $global := . }}
storage.backend=cassandra
-storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-aai-cassandra-{{ $i }},{{- end }}
+storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-{{$global.Values.global.cassandra.serviceName}}-{{ $i }}.{{$global.Values.global.cassandra.serviceName}},{{- end }}
storage.cassandra.keyspace=aaigraph
diff --git a/kubernetes/aai/charts/aai-resources/resources/config/janusgraph-realtime.properties b/kubernetes/aai/charts/aai-resources/resources/config/janusgraph-realtime.properties
index 875a8a5977..d8f6f71f80 100644
--- a/kubernetes/aai/charts/aai-resources/resources/config/janusgraph-realtime.properties
+++ b/kubernetes/aai/charts/aai-resources/resources/config/janusgraph-realtime.properties
@@ -26,8 +26,7 @@ query.smart-limit=false
# the following parameters are not reloaded automatically and require a manual bounce
storage.backend=cassandra
-storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-aai-cassandra-{{ $i }},{{- end }}
-
+storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-{{$global.Values.global.cassandra.serviceName}}-{{ $i }}.{{$global.Values.global.cassandra.serviceName}},{{- end }}
storage.cassandra.keyspace=aaigraph
storage.cassandra.read-consistency-level=LOCAL_QUORUM
diff --git a/kubernetes/aai/charts/aai-resources/templates/service.yaml b/kubernetes/aai/charts/aai-resources/templates/service.yaml
index 8cea86cf54..9ba61fa00c 100644
--- a/kubernetes/aai/charts/aai-resources/templates/service.yaml
+++ b/kubernetes/aai/charts/aai-resources/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-resources/values.yaml b/kubernetes/aai/charts/aai-resources/values.yaml
index e7c75036f1..7b55aa75e2 100644
--- a/kubernetes/aai/charts/aai-resources/values.yaml
+++ b/kubernetes/aai/charts/aai-resources/values.yaml
@@ -40,8 +40,9 @@ readiness:
service:
type: ClusterIP
- name: aai-resources
+ portName: aai-resources-8447
internalPort: 8447
+ portName2: aai-resources-5005
internalPort2: 5005