summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorBorislav Glozman <Borislav.Glozman@amdocs.com>2018-11-08 07:01:24 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-08 07:01:24 +0000
commitf9727258f22aead0832ec1adfef62bb9d83a5d15 (patch)
tree44dfec379e014533bb3edca50d923c0f448bf034 /kubernetes
parent5f4eb96502885c8adcd9ff5ee43ae536672963ab (diff)
parent829a7b393e2ba2806a9164e5dd47716b191a93d3 (diff)
Merge "Wait for aaf if enabled"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/aai/charts/aai-traversal/templates/job.yaml4
-rw-r--r--kubernetes/aai/values.yaml1
2 files changed, 5 insertions, 0 deletions
diff --git a/kubernetes/aai/charts/aai-traversal/templates/job.yaml b/kubernetes/aai/charts/aai-traversal/templates/job.yaml
index c8efed74ae..e2fe395b95 100644
--- a/kubernetes/aai/charts/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/charts/aai-traversal/templates/job.yaml
@@ -39,6 +39,10 @@ spec:
args:
- --container-name
- aai
+ {{ if eq .Values.global.aafEnabled true }}
+ - --container-name
+ - aaf-locate
+ {{ end }}
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index e216b35cf6..d5a5db0494 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -31,6 +31,7 @@ global: # global defaults
restartPolicy: Always
installSidecarSecurity: false
+ aafEnabled: true
fproxy:
name: forward-proxy