diff options
| -rw-r--r-- | templates/aai-resources-deployment.yaml | 3 | ||||
| -rw-r--r-- | templates/aai-traversal-deployment.yaml | 3 | ||||
| -rw-r--r-- | templates/data-router-deployment.yaml | 3 | ||||
| -rw-r--r-- | templates/elasticsearch-deployment.yaml | 3 | ||||
| -rw-r--r-- | templates/hbase-deployment.yaml | 3 | ||||
| -rw-r--r-- | values.yaml | 23 |
6 files changed, 33 insertions, 5 deletions
diff --git a/templates/aai-resources-deployment.yaml b/templates/aai-resources-deployment.yaml index cd4412d..332b890 100644 --- a/templates/aai-resources-deployment.yaml +++ b/templates/aai-resources-deployment.yaml @@ -435,7 +435,7 @@ spec: - name: AAI_CHEF_ENV value: simpledemo - name: AAI_CORE_VERSION - value: 1.1.0-SNAPSHOT + value: {{ .Values.aaicoreversion }} - name: AAI_CHEF_LOC value: /var/chef/aai-data/environments - name: CHEF_GIT_URL @@ -498,3 +498,4 @@ spec: imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/templates/aai-traversal-deployment.yaml b/templates/aai-traversal-deployment.yaml index 2445e1e..f039d0f 100644 --- a/templates/aai-traversal-deployment.yaml +++ b/templates/aai-traversal-deployment.yaml @@ -267,7 +267,7 @@ spec: - name: AAI_CHEF_ENV value: simpledemo - name: AAI_CORE_VERSION - value: 1.1.0-SNAPSHOT + value: {{ .Values.aaicoreversion }} - name: AAI_CHEF_LOC value: /var/chef/aai-data/environments - name: CHEF_GIT_URL @@ -330,3 +330,4 @@ spec: imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/templates/data-router-deployment.yaml b/templates/data-router-deployment.yaml index 37b9fb4..b1cb834 100644 --- a/templates/data-router-deployment.yaml +++ b/templates/data-router-deployment.yaml @@ -136,8 +136,9 @@ spec: name: aai-data-router-dynamic-configmap - name: aai-data-router-logs hostPath: - path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/logs" + path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/aai/data-router/logs restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/templates/elasticsearch-deployment.yaml b/templates/elasticsearch-deployment.yaml index 902f31e..a07db04 100644 --- a/templates/elasticsearch-deployment.yaml +++ b/templates/elasticsearch-deployment.yaml @@ -81,7 +81,8 @@ spec: name: aai-elasticsearch-configmap - name: elasticsearch-data hostPath: - path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/data" + path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/aai/elasticsearch/data imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/templates/hbase-deployment.yaml b/templates/hbase-deployment.yaml index 08c2ee3..62b017d 100644 --- a/templates/hbase-deployment.yaml +++ b/templates/hbase-deployment.yaml @@ -56,10 +56,11 @@ spec: volumes: - name: hbase-data hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/hbase + path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/aai/hbase - name: localtime hostPath: path: /etc/localtime imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/values.yaml b/values.yaml index 93a0c3e..e283cb6 100644 --- a/values.yaml +++ b/values.yaml @@ -51,3 +51,26 @@ image: gremlinServerImage: aaionap/gremlin-server filebeat: docker.elastic.co/beats/filebeat:5.5.0 es_bb: busybox +aaicoreversion: 1.1.0-SNAPSHOT +persistence: + enabled: true + + ## A manually managed Persistent Volume and Claim + ## Requires persistence.enabled: true + ## If defined, PVC must be created manually before volume will be bound + # existingClaim: + volumeReclaimPolicy: Retain + + ## database data Persistent Volume Storage Class + ## If defined, storageClassName: <storageClass> + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is + ## set, choosing the default provisioner. (gp2 on AWS, standard on + ## GKE, AWS & OpenStack) + ## + # storageClass: "-" + accessMode: ReadWriteMany + size: 2Gi + mountPath: /dockerdata-nfs + mountSubPath: aai/data-router/logs + |