config seg aai data router

Change-Id: Ib49c01c7f602458a41c66eb354fa08a024bdea15
Issue-ID: OOM-659
Signed-off-by: mayankg2703 <mayank.gupta@amdocs.com>

diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/client-cert-onap.p12 b/kubernetes/aai/resources/config/data-router/appconfig/auth/client-cert-onap.p12
similarity index 100%
rename from kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/client-cert-onap.p12
rename to kubernetes/aai/resources/config/data-router/appconfig/auth/client-cert-onap.p12

diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/data-router_policy.json b/kubernetes/aai/resources/config/data-router/appconfig/auth/data-router_policy.json
similarity index 100%
rename from kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/data-router_policy.json
rename to kubernetes/aai/resources/config/data-router/appconfig/auth/data-router_policy.json

diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/tomcat_keystore b/kubernetes/aai/resources/config/data-router/appconfig/auth/tomcat_keystore
similarity index 100%
rename from kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/tomcat_keystore
rename to kubernetes/aai/resources/config/data-router/appconfig/auth/tomcat_keystore

diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/data-router.properties b/kubernetes/aai/resources/config/data-router/appconfig/data-router.properties
similarity index 100%
rename from kubernetes/config/docker/init/src/config/aai/data-router/appconfig/data-router.properties
rename to kubernetes/aai/resources/config/data-router/appconfig/data-router.properties

diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v10.xml b/kubernetes/aai/resources/config/data-router/appconfig/model/aai_oxm_v10.xml
similarity index 100%
rename from kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v10.xml
rename to kubernetes/aai/resources/config/data-router/appconfig/model/aai_oxm_v10.xml

diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v11.xml b/kubernetes/aai/resources/config/data-router/appconfig/model/aai_oxm_v11.xml
similarity index 100%
rename from kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v11.xml
rename to kubernetes/aai/resources/config/data-router/appconfig/model/aai_oxm_v11.xml

diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v8.xml b/kubernetes/aai/resources/config/data-router/appconfig/model/aai_oxm_v8.xml
similarity index 100%
rename from kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v8.xml
rename to kubernetes/aai/resources/config/data-router/appconfig/model/aai_oxm_v8.xml

diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v9.xml b/kubernetes/aai/resources/config/data-router/appconfig/model/aai_oxm_v9.xml
similarity index 100%
rename from kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v9.xml
rename to kubernetes/aai/resources/config/data-router/appconfig/model/aai_oxm_v9.xml

diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml b/kubernetes/aai/resources/config/data-router/dynamic/conf/entity-event-policy.xml
similarity index 100%
rename from kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml
rename to kubernetes/aai/resources/config/data-router/dynamic/conf/entity-event-policy.xml

diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/routes/entity-event.route b/kubernetes/aai/resources/config/data-router/dynamic/routes/entity-event.route
similarity index 100%
rename from kubernetes/config/docker/init/src/config/aai/data-router/dynamic/routes/entity-event.route
rename to kubernetes/aai/resources/config/data-router/dynamic/routes/entity-event.route

diff --git a/kubernetes/aai/templates/data-router-configmap.yaml b/kubernetes/aai/templates/data-router-configmap.yaml
new file mode 100644 (file)
index 0000000..5782213
--- /dev/null
+++ b/kubernetes/aai/templates/data-router-configmap.yaml
@@ -0,0 +1,59 @@
+#{{ if not .Values.disableAaiDataRouter }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: data-router-prop-configmap
+  namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/data-router/appconfig/data-router.properties").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: data-router-model-v8-configmap
+  namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v8.xml").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: data-router-model-v9-configmap
+  namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v9.xml").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: data-router-model-v10-configmap
+  namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v10.xml").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: data-router-model-v11-configmap
+  namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v11.xml").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: data-router-secret
+  namespace: {{ .Values.nsPrefix }}-aai
+type: Opaque
+data:
+{{ tpl (.Files.Glob "resources/config/data-router/appconfig/auth/*").AsSecrets . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: data-router-dynamic-configmap
+  namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ tpl (.Files.Glob "resources/config/data-router/dynamic/routes/entity-event.route").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/data-router/dynamic/conf/entity-event-policy.xml").AsConfig . | indent 2 }}
+#{{ end }}

diff --git a/kubernetes/aai/templates/data-router-deployment.yaml b/kubernetes/aai/templates/data-router-deployment.yaml
index 6b3c024..06dbc91 100644 (file)
--- a/kubernetes/aai/templates/data-router-deployment.yaml
+++ b/kubernetes/aai/templates/data-router-deployment.yaml
@@ -14,6 +14,28 @@ spec:
         app: data-router
       name: data-router
     spec:
+      initContainers:
+      - command:
+        - /bin/sh
+        - -c
+        - |
+          mkdir -p /logroot/data-router/logs
+          chmod -R 777 /logroot/data-router/logs
+          chown -R root:root /logroot
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        securityContext:
+          privileged: true
+        image: {{ .Values.image.es_bb }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: init-sysctl
+        volumeMounts:
+        - name: data-router-logs
+          mountPath: /logroot/
       containers:
       - name: data-router
         image: "{{ .Values.image.dataRouterImage }}:{{ .Values.image.dataRouterVersion }}"
@@ -37,10 +59,29 @@ spec:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: /opt/app/data-router/config/
-          name: data-router-config
-        - mountPath: /opt/app/data-router/dynamic/
-          name: data-router-dynamic
+        - mountPath: /opt/app/data-router/config/model/aai_oxm_v8.xml
+          subPath: aai_oxm_v8.xml
+          name: data-router-model-v8
+        - mountPath: /opt/app/data-router/config/model/aai_oxm_v9.xml
+          subPath: aai_oxm_v9.xml
+          name: data-router-model-v9
+        - mountPath: /opt/app/data-router/config/model/aai_oxm_v10.xml
+          subPath: aai_oxm_v10.xml
+          name: data-router-model-v10
+        - mountPath: /opt/app/data-router/config/model/aai_oxm_v11.xml
+          subPath: aai_oxm_v11.xml
+          name: data-router-model-v11
+        - mountPath:  /opt/app/data-router/config/auth
+          name: data-router-auth
+        - mountPath:  /opt/app/data-router/config/data-router.properties
+          name: data-router-properties
+          subPath: data-router.properties
+        - mountPath: /opt/app/data-router/dynamic/routes/entity-event.route
+          subPath: entity-event.route
+          name: data-router-dynamic-route
+        - mountPath: /opt/app/data-router/dynamic/conf/entity-event-policy.xml
+          subPath: entity-event-policy.xml
+          name: data-router-dynamic-policy
         - mountPath: /logs/
           name: data-router-logs
         ports:
@@ -54,16 +95,34 @@ spec:
       - name: localtime
         hostPath:
           path: /etc/localtime
-      - name: data-router-config
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/appconfig/"
-      - name: data-router-dynamic
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/dynamic/"
+      - name: data-router-model-v8
+        configMap:
+          name: data-router-model-v8-configmap
+      - name: data-router-model-v9
+        configMap:
+          name: data-router-model-v9-configmap
+      - name: data-router-model-v10
+        configMap:
+          name: data-router-model-v10-configmap
+      - name: data-router-model-v11
+        configMap:
+          name: data-router-model-v11-configmap
+      - name: data-router-auth
+        secret:
+          secretName: data-router-secret
+      - name: data-router-properties
+        configMap:
+          name: data-router-prop-configmap
+      - name: data-router-dynamic-route
+        configMap:
+          name: data-router-dynamic-configmap
+      - name: data-router-dynamic-policy
+        configMap:
+          name: data-router-dynamic-configmap
       - name: data-router-logs
         hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/logs/"
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/"
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}