summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorJerome Doucerain <jerome.doucerain@bell.ca>2018-03-17 14:18:41 -0400
committerJerome Doucerain <jerome.doucerain@bell.ca>2018-03-17 14:18:41 -0400
commit7c0f04b760da0d724f365175a0046e9568541012 (patch)
tree7f44004c8571bea324b331da6e28706785a41eea /kubernetes
parentd2b495234d54612e1cddcd709ffcf3620275fddf (diff)
AAI parameterization
added parameter for the AAI_CORE version added parameterized persisted storage location Issue-ID: OOM-734 Change-Id: Iefe3d89ae6d001754251e0f5ce2735c9a920bcd5 Signed-off-by: Jerome Doucerain <jerome.doucerain@bell.ca>
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/aai/templates/aai-resources-deployment.yaml3
-rw-r--r--kubernetes/aai/templates/aai-traversal-deployment.yaml3
-rw-r--r--kubernetes/aai/templates/data-router-deployment.yaml3
-rw-r--r--kubernetes/aai/templates/elasticsearch-deployment.yaml3
-rw-r--r--kubernetes/aai/templates/hbase-deployment.yaml3
-rw-r--r--kubernetes/aai/values.yaml23
6 files changed, 33 insertions, 5 deletions
diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index cd4412dbfc..332b89045b 100644
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/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/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
index 2445e1e716..f039d0f332 100644
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/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/kubernetes/aai/templates/data-router-deployment.yaml b/kubernetes/aai/templates/data-router-deployment.yaml
index 37b9fb411c..b1cb834eeb 100644
--- a/kubernetes/aai/templates/data-router-deployment.yaml
+++ b/kubernetes/aai/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/kubernetes/aai/templates/elasticsearch-deployment.yaml b/kubernetes/aai/templates/elasticsearch-deployment.yaml
index 902f31ef60..a07db04566 100644
--- a/kubernetes/aai/templates/elasticsearch-deployment.yaml
+++ b/kubernetes/aai/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/kubernetes/aai/templates/hbase-deployment.yaml b/kubernetes/aai/templates/hbase-deployment.yaml
index 08c2ee3734..62b017db29 100644
--- a/kubernetes/aai/templates/hbase-deployment.yaml
+++ b/kubernetes/aai/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/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 93a0c3ee65..e283cb6f2e 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/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
+