aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-02-06 17:20:15 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-06 17:20:15 +0000
commit64778b2d08d7ccf4141a8beba5f2782f7c551f3f (patch)
treea04f144cca4a30cf8927616c33373327462a48ca
parent68e6115eb446e0a7993a2d8765a7d05c5345d1d3 (diff)
parent9f44dc231c305e8d60f72ab4e2b47a429dba03be (diff)
Merge "config seg aai sparky be"
-rw-r--r--kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties (renamed from kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/aai.properties)0
-rw-r--r--kubernetes/aai/resources/config/sparky-be/appconfig/auth/aai-os-cert.p12 (renamed from kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/aai-os-cert.p12)bin4357 -> 4357 bytes
-rw-r--r--kubernetes/aai/resources/config/sparky-be/appconfig/auth/client-cert-onap.p12 (renamed from kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/client-cert-onap.p12)bin2556 -> 2556 bytes
-rw-r--r--kubernetes/aai/resources/config/sparky-be/appconfig/auth/inventory-ui-keystore (renamed from kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/inventory-ui-keystore)bin7201 -> 7201 bytes
-rw-r--r--kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties (renamed from kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/elasticsearch.properties)0
-rw-r--r--kubernetes/aai/resources/config/sparky-be/appconfig/model/aai_oxm_v9.xml (renamed from kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/model/aai_oxm_v9.xml)0
-rw-r--r--kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal-authentication.properties (renamed from kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal-authentication.properties)0
-rw-r--r--kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties (renamed from kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal.properties)0
-rw-r--r--kubernetes/aai/resources/config/sparky-be/appconfig/roles.config (renamed from kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/roles.config)0
-rw-r--r--kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties (renamed from kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/search-service.properties)0
-rw-r--r--kubernetes/aai/resources/config/sparky-be/appconfig/suggestive-search.properties (renamed from kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/suggestive-search.properties)0
-rw-r--r--kubernetes/aai/resources/config/sparky-be/appconfig/synchronizer.properties (renamed from kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/synchronizer.properties)0
-rw-r--r--kubernetes/aai/templates/sparky-be-deployment-configmap.yaml34
-rw-r--r--kubernetes/aai/templates/sparky-be-deployment.yaml42
14 files changed, 71 insertions, 5 deletions
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/aai.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties
index 3b4542889e..3b4542889e 100644
--- a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/aai.properties
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/aai-os-cert.p12 b/kubernetes/aai/resources/config/sparky-be/appconfig/auth/aai-os-cert.p12
index ee57120fa0..ee57120fa0 100644
--- a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/aai-os-cert.p12
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/auth/aai-os-cert.p12
Binary files differ
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/client-cert-onap.p12 b/kubernetes/aai/resources/config/sparky-be/appconfig/auth/client-cert-onap.p12
index dbf4fcacec..dbf4fcacec 100644
--- a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/client-cert-onap.p12
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/auth/client-cert-onap.p12
Binary files differ
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/inventory-ui-keystore b/kubernetes/aai/resources/config/sparky-be/appconfig/auth/inventory-ui-keystore
index efa01f8d79..efa01f8d79 100644
--- a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/inventory-ui-keystore
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/auth/inventory-ui-keystore
Binary files differ
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/elasticsearch.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties
index 82b5af39ab..82b5af39ab 100644
--- a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/elasticsearch.properties
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/model/aai_oxm_v9.xml b/kubernetes/aai/resources/config/sparky-be/appconfig/model/aai_oxm_v9.xml
index 6337c32edc..6337c32edc 100644
--- a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/model/aai_oxm_v9.xml
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/model/aai_oxm_v9.xml
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal-authentication.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal-authentication.properties
index 0873fc1c61..0873fc1c61 100644
--- a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal-authentication.properties
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal-authentication.properties
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties
index 33d91cf88a..33d91cf88a 100644
--- a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal.properties
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/roles.config b/kubernetes/aai/resources/config/sparky-be/appconfig/roles.config
index b8313bd378..b8313bd378 100644
--- a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/roles.config
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/roles.config
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/search-service.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties
index 5f4985a5f2..5f4985a5f2 100644
--- a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/search-service.properties
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/suggestive-search.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/suggestive-search.properties
index b82baffc14..b82baffc14 100644
--- a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/suggestive-search.properties
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/suggestive-search.properties
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/synchronizer.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/synchronizer.properties
index 0b84f06abe..0b84f06abe 100644
--- a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/synchronizer.properties
+++ b/kubernetes/aai/resources/config/sparky-be/appconfig/synchronizer.properties
diff --git a/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml b/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml
new file mode 100644
index 0000000000..55dea653cd
--- /dev/null
+++ b/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml
@@ -0,0 +1,34 @@
+#{{ if not .Values.disableAaiSparkyBe }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: sparky-be-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: sparky-be-model-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/model/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: sparky-be-portal-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/portal/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+ name: sparky-be-secret
+ namespace: {{ .Values.nsPrefix }}-aai
+type: Opaque
+data:
+{{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/auth/*").AsSecrets . | indent 2 }}
+#{{ end }}
diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml
index 484a87f5be..dfeab6a394 100644
--- a/kubernetes/aai/templates/sparky-be-deployment.yaml
+++ b/kubernetes/aai/templates/sparky-be-deployment.yaml
@@ -29,8 +29,30 @@ spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
- - mountPath: /opt/app/sparky/config/
+ - mountPath: /opt/app/sparky/config/auth/
+ name: aai-sparky-be-auth-config
+ - mountPath: /opt/app/sparky/config/synchronizer.properties
+ subPath: synchronizer.properties
name: aai-sparky-be-config
+ - mountPath: /opt/app/sparky/config/suggestive-search.properties
+ subPath: suggestive-search.properties
+ name: aai-sparky-be-config
+ - mountPath: /opt/app/sparky/config/search-service.properties
+ subPath: search-service.properties
+ name: aai-sparky-be-config
+ - mountPath: /opt/app/sparky/config/roles.config
+ subPath: roles.config
+ name: aai-sparky-be-config
+ - mountPath: /opt/app/sparky/config/elasticsearch.properties
+ subPath: elasticsearch.properties
+ name: aai-sparky-be-config
+ - mountPath: /opt/app/sparky/config/aai.properties
+ subPath: aai.properties
+ name: aai-sparky-be-config
+ - mountPath: /opt/app/sparky/config/model/
+ name: aai-sparky-be-model-config
+ - mountPath: /opt/app/sparky/config/portal/
+ name: aai-sparky-be-portal-config
- mountPath: /var/log/onap
name: aai-sparky-be-logs
- mountPath: /opt/app/sparky/bundleconfig/etc/logback.xml
@@ -48,6 +70,7 @@ spec:
imagePullPolicy: {{ .Values.pullPolicy }}
volumeMounts:
- mountPath: /usr/share/filebeat/filebeat.yml
+ subPath: filebeat.yml
name: filebeat-conf
- mountPath: /var/log/onap
name: aai-sparky-be-logs
@@ -58,11 +81,20 @@ spec:
hostPath:
path: /etc/localtime
- name: aai-sparky-be-config
- hostPath:
- path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/sparky-be/appconfig/"
+ configMap:
+ name: sparky-be-configmap
+ - name: aai-sparky-be-model-config
+ configMap:
+ name: sparky-be-model-configmap
+ - name: aai-sparky-be-portal-config
+ configMap:
+ name: sparky-be-portal-configmap
+ - name: aai-sparky-be-auth-config
+ secret:
+ secretName: sparky-be-secret
- name: filebeat-conf
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+ configMap:
+ name: aai-filebeat-configmap
- name: aai-sparky-be-logs
emptyDir: {}
- name: aai-sparky-filebeat