summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-12-02 06:59:00 +0000
committerGerrit Code Review <gerrit@onap.org>2021-12-02 06:59:00 +0000
commit58b7790705734e89991092c7dd2863654bc3dcb4 (patch)
tree884b0a9b07df2d6feebea1dcb82a84150088fb35 /kubernetes
parent81084d7169426b0d05710446cc23e233eae34b72 (diff)
parent5117667a9bfd9f4bc93c4a8a7c20a8514868da19 (diff)
Merge "[AAI] Service Mesh related"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml8
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml10
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml10
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml12
-rw-r--r--kubernetes/aai/components/aai-modelloader/templates/deployment.yaml8
-rw-r--r--kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/components/aai-traversal/templates/job.yaml2
7 files changed, 32 insertions, 20 deletions
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
index 6b58eaa3fd..cccc2b1e66 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
@@ -222,12 +222,14 @@ spec:
- name: config
configMap:
name: {{ include "common.fullname" . }}
- - name: properties-input
- configMap:
- name: {{ include "common.fullname" . }}-properties
- name: properties
+ {{- if .Values.global.aafEnabled }}
emptyDir:
medium: Memory
+ - name: properties-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-properties
restartPolicy: {{ .Values.restartPolicy }}
imagePullSecrets:
- name: {{ include "common.namespace" . }}-docker-registry-key
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 d1e72841bc..95c3fe2fbf 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
@@ -126,7 +126,7 @@ spec:
- -c
- |
bash docker-entrypoint.sh dataSnapshot.sh
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
@@ -174,12 +174,14 @@ spec:
- name: config
configMap:
name: {{ include "common.fullname" . }}
- - name: properties-input
- configMap:
- name: {{ include "common.fullname" . }}-properties
- name: properties
+ {{- if .Values.global.aafEnabled }}
emptyDir:
medium: Memory
+ - name: properties-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-properties
- name: migration
configMap:
name: {{ include "common.fullname" . }}-migration
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 4a7de648e7..62e27b6321 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
@@ -126,7 +126,7 @@ spec:
- -c
- |
bash docker-entrypoint.sh createDBSchema.sh
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
@@ -173,12 +173,14 @@ spec:
- name: config
configMap:
name: {{ include "common.fullname" . }}
- - name: properties-input
- configMap:
- name: {{ include "common.fullname" . }}-properties
- name: properties
+ {{- if .Values.global.aafEnabled }}
emptyDir:
medium: Memory
+ - name: properties-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-properties
restartPolicy: Never
imagePullSecrets:
- name: {{ include "common.namespace" . }}-docker-registry-key
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
index 1256e71e08..07009b2fbd 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
@@ -171,7 +171,7 @@ spec:
- -c
- |
bash docker-entrypoint.sh run_Migrations.sh -e UpdateAaiUriIndexMigration --commit --skipPreMigrationSnapShot --runDisabled RebuildAllEdges ;
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
@@ -221,12 +221,14 @@ spec:
- name: {{ include "common.fullname" . }}-snapshots
persistentVolumeClaim:
claimName: {{ include "common.fullname" . }}-migration
- - name: properties-input
- configMap:
- name: {{ include "common.fullname" . }}-properties
- name: properties
+ {{- if .Values.global.aafEnabled }}
emptyDir:
medium: Memory
+ - name: properties-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-properties
restartPolicy: Never
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
@@ -322,7 +324,7 @@ spec:
- -c
- |
bash docker-entrypoint.sh dataSnapshot.sh
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
value: {{ .Values.securityContext.user_id | quote }}
diff --git a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
index 0213d631a3..c4098b1a3b 100644
--- a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
@@ -116,12 +116,14 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: prop-config-input
- configMap:
- name: {{ include "common.fullname" . }}-prop
- name: prop-config
+ {{- if .Values.global.aafEnabled }}
emptyDir:
medium: Memory
+ - name: prop-config-input
+ {{- end }}
+ configMap:
+ name: {{ include "common.fullname" . }}-prop
- name: auth-config
secret:
secretName: {{ include "common.fullname" . }}
diff --git a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
index 48a6b04913..6e5ab8b32b 100644
--- a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
@@ -174,9 +174,11 @@ spec:
configMap:
name: {{ include "common.fullname" . }}
- name: portal-config
+ {{- if .Values.global.aafEnabled }}
emptyDir:
medium: Memory
- name: portal-config-input
+ {{- end }}
configMap:
name: {{ include "common.fullname" . }}-portal
- name: portal-config-props
diff --git a/kubernetes/aai/components/aai-traversal/templates/job.yaml b/kubernetes/aai/components/aai-traversal/templates/job.yaml
index f2e6ee61b5..ddd325d7a0 100644
--- a/kubernetes/aai/components/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/job.yaml
@@ -77,7 +77,7 @@ spec:
{{- else }}
until nc -w10 -z -v aai.{{.Release.Namespace}} 80; do echo "Retrying to reach aai on port 80"; done;
bash -x /opt/app/aai-traversal/docker-entrypoint.sh install/updateQueryData.sh ;
- {{- include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
+ {{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
{{- end }}
env:
- name: LOCAL_USER_ID