summaryrefslogtreecommitdiffstats
path: root/kubernetes/aai
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/aai')
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml2
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml2
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml4
-rw-r--r--kubernetes/aai/components/aai-resources/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/components/aai-traversal/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/values.yaml12
7 files changed, 16 insertions, 10 deletions
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
index 536fc9d1aa..c3e36c2be6 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
@@ -81,7 +81,7 @@ spec:
{{ else }}
- /app/ready.py
args:
- - --container-name
+ - --app-name
{{- if .Values.global.cassandra.localCluster }}
- aai-cassandra
{{- else }}
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
index 407c9fb1da..865dfe3eeb 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
@@ -64,7 +64,7 @@ spec:
- command:
- /bin/bash
- -c
- - /app/ready.py --container-name aai-cassandra --timeout 1 || /app/ready.py --container-name cassandra
+ - /app/ready.py --app-name aai-cassandra --timeout 1 || /app/ready.py --app-name cassandra
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
index 31669dd7e8..1a8124929f 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
@@ -58,7 +58,7 @@ spec:
- command:
- /app/ready.py
args:
- - --container-name
+ - --app-name
{{- if .Values.global.cassandra.localCluster }}
- aai-cassandra
{{- else }}
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
index d5854918b5..bf3279fde7 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
@@ -63,7 +63,7 @@ spec:
- command:
- /app/ready.py
args:
- - --container-name
+ - --app-name
{{- if .Values.global.cassandra.localCluster }}
- aai-cassandra
{{- else }}
@@ -218,7 +218,7 @@ spec:
- command:
- /bin/bash
- -c
- - /app/ready.py --container-name aai-cassandra --timeout 1 || /app/ready.py --container-name cassandra
+ - /app/ready.py --app-name aai-cassandra --timeout 1 || /app/ready.py --app-name cassandra
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
index 2f60811331..5b9e9d222f 100644
--- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
@@ -105,7 +105,7 @@ spec:
- --job-name
- {{ include "common.release" . }}-aai-graphadmin-create-db-schema
{{- else }}
- - --container-name
+ - --app-name
{{- if .Values.global.cassandra.localCluster }}
- aai-cassandra
{{- else }}
diff --git a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
index a2c81cf673..6d12f08755 100644
--- a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
@@ -123,7 +123,7 @@ spec:
- --job-name
- {{ include "common.release" . }}-aai-graphadmin-create-db-schema
{{- else }}
- - --container-name
+ - --app-name
{{- if .Values.global.cassandra.localCluster }}
- aai-cassandra
{{- else }}
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index fbd3438c1c..b9223b1a9a 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -25,7 +25,7 @@ global: # global defaults
dockerhubRepository: docker.io
busyboxImage: busybox
- readinessImage: onap/oom/readiness:3.0.1
+ readinessImage: onap/oom/readiness:5.0.1
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
@@ -39,6 +39,13 @@ global: # global defaults
#This will instantiate AAI cassandra cluster, default:shared cassandra.
localCluster: false
+ # in case of a local cassandra cluster
+ # flag to enable the DB creation via k8ssandra-operator
+ useOperator: true
+ # if useOperator set to "true", set "enableServiceAccount to "false"
+ # as the SA is created by the Operator
+ enableServiceAccount: false
+
#Service Name of the cassandra cluster to connect to.
#Override it to aai-cassandra if localCluster is enabled.
#in case of using k8ssandra-operator in the common cassandra installation
@@ -53,7 +60,7 @@ global: # global defaults
#then it should be same as aai-cassandra replicaCount
replicas: 3
- #Cassanara login details
+ #Cassandra login details
username: cassandra
password: cassandra
@@ -357,7 +364,6 @@ cassandra:
mountSubPath: aai/cassandra
enabled: true
k8ssandraOperator:
- enabled: false
config:
clusterName: aai-cassandra