Merge "Fix a typo in chart name"

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 7e94ae4..e3128b8 100644 (file)
--- a/kubernetes/aai/charts/aai-resources/resources/config/janusgraph-cached.properties
+++ b/kubernetes/aai/charts/aai-resources/resources/config/janusgraph-cached.properties
@@ -24,10 +24,10 @@ query.fast-property=true
 query.smart-limit=false
 
 {{- $seed_size := default 1 .Values.global.cassandra.replicas | int -}}
+{{- $global := . }}
 
-# the following parameters are not reloaded automatically and require a manual bounce
 storage.backend=cassandra
-storage.hostname={{- range $i, $e := until $seed_size }}aai-cassandra-{{ $i }},{{- end }}
+storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-aai-cassandra-{{ $i }},{{- end }}
 
 storage.cassandra.keyspace=aaigraph
 

diff --git a/kubernetes/aai/charts/aai-traversal/resources/config/janusgraph-cached.properties b/kubernetes/aai/charts/aai-traversal/resources/config/janusgraph-cached.properties
index 7e94ae4..e3128b8 100644 (file)
--- a/kubernetes/aai/charts/aai-traversal/resources/config/janusgraph-cached.properties
+++ b/kubernetes/aai/charts/aai-traversal/resources/config/janusgraph-cached.properties
@@ -24,10 +24,10 @@ query.fast-property=true
 query.smart-limit=false
 
 {{- $seed_size := default 1 .Values.global.cassandra.replicas | int -}}
+{{- $global := . }}
 
-# the following parameters are not reloaded automatically and require a manual bounce
 storage.backend=cassandra
-storage.hostname={{- range $i, $e := until $seed_size }}aai-cassandra-{{ $i }},{{- end }}
+storage.hostname={{- range $i, $e := until $seed_size }}{{ $global.Release.Name }}-aai-cassandra-{{ $i }},{{- end }}
 
 storage.cassandra.keyspace=aaigraph
 

diff --git a/kubernetes/aai/charts/aai-traversal/templates/job.yaml b/kubernetes/aai/charts/aai-traversal/templates/job.yaml
index c15c053..b9b2501 100644 (file)
--- a/kubernetes/aai/charts/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/charts/aai-traversal/templates/job.yaml
@@ -90,14 +90,6 @@ spec:
           subPath: aai_keystore
         # disable liveness probe when breakpoints set in debugger
         # so K8s doesn't restart unresponsive container
-        volumeMounts:
-        - mountPath: /usr/share/filebeat/filebeat.yml
-          subPath: filebeat.yml
-          name: filebeat-conf
-        - mountPath: /opt/aai/logroot/AAI-GQ
-          name: {{ include "common.fullname" . }}-logs
-        - mountPath: /usr/share/filebeat/data
-          name: {{ include "common.fullname" . }}-filebeat
       volumes:
       - name: localtime
         hostPath: