summaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/templates
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/aai/templates')
-rw-r--r--kubernetes/aai/templates/aai-deployment-configmap.yaml2
-rw-r--r--kubernetes/aai/templates/aai-deployment.yaml2
-rw-r--r--kubernetes/aai/templates/aai-filebeat-configmap.yaml2
-rw-r--r--kubernetes/aai/templates/aai-resources-deployment.yaml2
-rw-r--r--kubernetes/aai/templates/aai-resources-traversal-configmap.yaml8
-rw-r--r--kubernetes/aai/templates/aai-traversal-deployment.yaml4
-rw-r--r--kubernetes/aai/templates/all-services.yaml28
-rw-r--r--kubernetes/aai/templates/data-router-configmap.yaml28
-rw-r--r--kubernetes/aai/templates/data-router-deployment.yaml66
-rw-r--r--kubernetes/aai/templates/elasticsearch-configmap.yaml2
-rw-r--r--kubernetes/aai/templates/elasticsearch-deployment.yaml14
-rw-r--r--kubernetes/aai/templates/hbase-deployment.yaml6
-rw-r--r--kubernetes/aai/templates/modelloader-deployment-configmap.yaml10
-rw-r--r--kubernetes/aai/templates/modelloader-deployment.yaml10
-rw-r--r--kubernetes/aai/templates/search-data-service-configmap.yaml12
-rw-r--r--kubernetes/aai/templates/search-data-service-deployment.yaml10
-rw-r--r--kubernetes/aai/templates/sparky-be-deployment-configmap.yaml18
-rw-r--r--kubernetes/aai/templates/sparky-be-deployment.yaml14
18 files changed, 119 insertions, 119 deletions
diff --git a/kubernetes/aai/templates/aai-deployment-configmap.yaml b/kubernetes/aai/templates/aai-deployment-configmap.yaml
index 40d4909ebf..6684555bd0 100644
--- a/kubernetes/aai/templates/aai-deployment-configmap.yaml
+++ b/kubernetes/aai/templates/aai-deployment-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: aai-deployment-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/haproxy/*").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml
index 4e8d82f42f..db6da6403c 100644
--- a/kubernetes/aai/templates/aai-deployment.yaml
+++ b/kubernetes/aai/templates/aai-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: aai-service
- namespace: "{{ .Values.nsPrefix }}-aai"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.aaiServiceReplicas }}
selector:
diff --git a/kubernetes/aai/templates/aai-filebeat-configmap.yaml b/kubernetes/aai/templates/aai-filebeat-configmap.yaml
index 5a123a54a0..2ca1ac2df5 100644
--- a/kubernetes/aai/templates/aai-filebeat-configmap.yaml
+++ b/kubernetes/aai/templates/aai-filebeat-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: aai-filebeat-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index dd7d7cc9d9..c07214d958 100644
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/templates/aai-resources-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: aai-resources
- namespace: "{{ .Values.nsPrefix }}-aai"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.aaiResourceReplicas }}
selector:
diff --git a/kubernetes/aai/templates/aai-resources-traversal-configmap.yaml b/kubernetes/aai/templates/aai-resources-traversal-configmap.yaml
index ebd69132a2..cdcaae6f64 100644
--- a/kubernetes/aai/templates/aai-resources-traversal-configmap.yaml
+++ b/kubernetes/aai/templates/aai-resources-traversal-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: aai-chef-config-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/aai-data/chef-config/dev/.knife/solo.rb").AsConfig . | indent 2 }}
---
@@ -11,7 +11,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: aai-resources-environments-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/aai-data/environments/*").AsConfig . | indent 2 }}
---
@@ -19,7 +19,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: aai-resources-log-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/log/resources/logback.xml").AsConfig . | indent 2 }}
---
@@ -27,7 +27,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: aai-traversal-log-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/log/traversal/logback.xml").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
index 38e7fb0847..84a0d0f289 100644
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: aai-traversal
- namespace: "{{ .Values.nsPrefix }}-aai"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.aaiTraversalReplicas }}
selector:
@@ -48,7 +48,7 @@ spec:
- name: CHEF_GIT_URL
value: http://gerrit.onap.org/r/aai
- name: RESOURCES_HOSTNAME
- value: aai-resources.{{ .Values.nsPrefix }}-aai
+ value: aai-resources.{{ .Values.nsPrefix }}
volumeMounts:
- mountPath: /etc/localtime
name: localtime
diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml
index 77f7dc1f9b..01f24a7dd2 100644
--- a/kubernetes/aai/templates/all-services.yaml
+++ b/kubernetes/aai/templates/all-services.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: hbase
- namespace: "{{ .Values.nsPrefix }}-aai"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: hbase
spec:
@@ -32,7 +32,7 @@ apiVersion: v1
kind: Service
metadata:
name: aai-service
- namespace: "{{ .Values.nsPrefix }}-aai"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: aai-service
annotations:
@@ -192,7 +192,7 @@ apiVersion: v1
kind: Service
metadata:
name: model-loader-service
- namespace: "{{ .Values.nsPrefix }}-aai"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: model-loader-service
spec:
@@ -212,7 +212,7 @@ apiVersion: v1
kind: Service
metadata:
name: gremlin
- namespace: "{{ .Values.nsPrefix }}-aai"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: gremlin
spec:
@@ -227,16 +227,16 @@ spec:
apiVersion: v1
kind: Service
metadata:
- name: elasticsearch
- namespace: "{{ .Values.nsPrefix }}-aai"
+ name: aai-elasticsearch
+ namespace: "{{ .Values.nsPrefix }}"
labels:
- app: elasticsearch
+ app: aai-elasticsearch
spec:
ports:
- - name: "elasticsearch-port"
+ - name: "aai-elasticsearch-port"
port: 9200
selector:
- app: elasticsearch
+ app: aai-elasticsearch
clusterIP: None
#{{ end }}
#{{ if not .Values.disableAaiSearchDataService }}
@@ -245,7 +245,7 @@ apiVersion: v1
kind: Service
metadata:
name: search-data-service
- namespace: "{{ .Values.nsPrefix }}-aai"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: search-data-service
spec:
@@ -262,7 +262,7 @@ apiVersion: v1
kind: Service
metadata:
name: aai-traversal
- namespace: "{{ .Values.nsPrefix }}-aai"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: aai-traversal
spec:
@@ -281,7 +281,7 @@ apiVersion: v1
kind: Service
metadata:
name: aai-resources
- namespace: "{{ .Values.nsPrefix }}-aai"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: aai-resources
spec:
@@ -300,7 +300,7 @@ apiVersion: v1
kind: Service
metadata:
name: sparky-be
- namespace: "{{ .Values.nsPrefix }}-aai"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
app: sparky-be
spec:
@@ -310,4 +310,4 @@ spec:
selector:
app: sparky-be
clusterIP: None
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/aai/templates/data-router-configmap.yaml b/kubernetes/aai/templates/data-router-configmap.yaml
index 57822135b2..3de38a740a 100644
--- a/kubernetes/aai/templates/data-router-configmap.yaml
+++ b/kubernetes/aai/templates/data-router-configmap.yaml
@@ -2,48 +2,48 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: data-router-prop-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ name: aai-data-router-prop-configmap
+ namespace: {{ .Values.nsPrefix }}
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
+ name: aai-data-router-model-v8-configmap
+ namespace: {{ .Values.nsPrefix }}
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
+ name: aai-data-router-model-v9-configmap
+ namespace: {{ .Values.nsPrefix }}
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
+ name: aai-data-router-model-v10-configmap
+ namespace: {{ .Values.nsPrefix }}
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
+ name: aai-data-router-model-v11-configmap
+ namespace: {{ .Values.nsPrefix }}
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
+ name: aai-data-router-secret
+ namespace: {{ .Values.nsPrefix }}
type: Opaque
data:
{{ tpl (.Files.Glob "resources/config/data-router/appconfig/auth/*").AsSecrets . | indent 2 }}
@@ -51,8 +51,8 @@ data:
apiVersion: v1
kind: ConfigMap
metadata:
- name: data-router-dynamic-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ name: aai-data-router-dynamic-configmap
+ namespace: {{ .Values.nsPrefix }}
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 }}
diff --git a/kubernetes/aai/templates/data-router-deployment.yaml b/kubernetes/aai/templates/data-router-deployment.yaml
index 6fb1751f1d..610ecb6e39 100644
--- a/kubernetes/aai/templates/data-router-deployment.yaml
+++ b/kubernetes/aai/templates/data-router-deployment.yaml
@@ -2,18 +2,18 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: data-router
- namespace: "{{ .Values.nsPrefix }}-aai"
+ name: aai-data-router
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.dataRouterReplicas }}
selector:
matchLabels:
- app: data-router
+ app: aai-data-router
template:
metadata:
labels:
- app: data-router
- name: data-router
+ app: aai-data-router
+ name: aai-data-router
spec:
initContainers:
- command:
@@ -35,10 +35,10 @@ spec:
imagePullPolicy: {{ .Values.pullPolicy }}
name: init-sysctl
volumeMounts:
- - name: data-router-logs
+ - name: aai-data-router-logs
mountPath: /logroot/
containers:
- - name: data-router
+ - name: aai-data-router
image: "{{ .Values.image.dataRouterImage }}:{{ .Values.image.dataRouterVersion }}"
imagePullPolicy: {{ .Values.pullPolicy }}
env:
@@ -62,29 +62,29 @@ spec:
readOnly: true
- mountPath: /opt/app/data-router/config/model/aai_oxm_v8.xml
subPath: aai_oxm_v8.xml
- name: data-router-model-v8
+ name: aai-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
+ name: aai-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
+ name: aai-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
+ name: aai-data-router-model-v11
- mountPath: /opt/app/data-router/config/auth
- name: data-router-auth
+ name: aai-data-router-auth
- mountPath: /opt/app/data-router/config/data-router.properties
- name: data-router-properties
+ name: aai-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
+ name: aai-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
+ name: aai-data-router-dynamic-policy
- mountPath: /logs/
- name: data-router-logs
+ name: aai-data-router-logs
ports:
- containerPort: 9502
readinessProbe:
@@ -96,31 +96,31 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: data-router-model-v8
+ - name: aai-data-router-model-v8
configMap:
- name: data-router-model-v8-configmap
- - name: data-router-model-v9
+ name: aai-data-router-model-v8-configmap
+ - name: aai-data-router-model-v9
configMap:
- name: data-router-model-v9-configmap
- - name: data-router-model-v10
+ name: aai-data-router-model-v9-configmap
+ - name: aai-data-router-model-v10
configMap:
- name: data-router-model-v10-configmap
- - name: data-router-model-v11
+ name: aai-data-router-model-v10-configmap
+ - name: aai-data-router-model-v11
configMap:
- name: data-router-model-v11-configmap
- - name: data-router-auth
+ name: aai-data-router-model-v11-configmap
+ - name: aai-data-router-auth
secret:
- secretName: data-router-secret
- - name: data-router-properties
+ secretName: aai-data-router-secret
+ - name: aai-data-router-properties
configMap:
- name: data-router-prop-configmap
- - name: data-router-dynamic-route
+ name: aai-data-router-prop-configmap
+ - name: aai-data-router-dynamic-route
configMap:
- name: data-router-dynamic-configmap
- - name: data-router-dynamic-policy
+ name: aai-data-router-dynamic-configmap
+ - name: aai-data-router-dynamic-policy
configMap:
- name: data-router-dynamic-configmap
- - name: data-router-logs
+ name: aai-data-router-dynamic-configmap
+ - name: aai-data-router-logs
hostPath:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/logs"
restartPolicy: Always
diff --git a/kubernetes/aai/templates/elasticsearch-configmap.yaml b/kubernetes/aai/templates/elasticsearch-configmap.yaml
index 4a02346d9a..56b02529bc 100644
--- a/kubernetes/aai/templates/elasticsearch-configmap.yaml
+++ b/kubernetes/aai/templates/elasticsearch-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: aai-elasticsearch-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/elasticsearch/config/elasticsearch.yml").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/aai/templates/elasticsearch-deployment.yaml b/kubernetes/aai/templates/elasticsearch-deployment.yaml
index 7eae172c3b..1babb05897 100644
--- a/kubernetes/aai/templates/elasticsearch-deployment.yaml
+++ b/kubernetes/aai/templates/elasticsearch-deployment.yaml
@@ -2,18 +2,18 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: elasticsearch
- namespace: "{{ .Values.nsPrefix }}-aai"
+ name: aai-elasticsearch
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.elasticsearchReplicas }}
selector:
matchLabels:
- app: elasticsearch
+ app: aai-elasticsearch
template:
metadata:
labels:
- app: elasticsearch
- name: elasticsearch
+ app: aai-elasticsearch
+ name: aai-elasticsearch
spec:
initContainers:
- command:
@@ -37,9 +37,9 @@ spec:
volumeMounts:
- name: elasticsearch-data
mountPath: /logroot/
- hostname: elasticsearch
+ hostname: aai-elasticsearch
containers:
- - name: elasticsearch
+ - name: aai-elasticsearch
image: "{{ .Values.image.elasticsearchImage }}:{{ .Values.image.elasticsearchVersion }}"
imagePullPolicy: {{ .Values.pullPolicy }}
ports:
diff --git a/kubernetes/aai/templates/hbase-deployment.yaml b/kubernetes/aai/templates/hbase-deployment.yaml
index 5b2a98cc89..f8ef61353c 100644
--- a/kubernetes/aai/templates/hbase-deployment.yaml
+++ b/kubernetes/aai/templates/hbase-deployment.yaml
@@ -2,8 +2,8 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: hbase
- namespace: "{{ .Values.nsPrefix }}-aai"
+ name: aai-hbase
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.hbaseReplicas }}
selector:
@@ -13,7 +13,7 @@ spec:
metadata:
labels:
app: hbase
- name: hbase
+ name: aai-hbase
spec:
hostname: hbase
containers:
diff --git a/kubernetes/aai/templates/modelloader-deployment-configmap.yaml b/kubernetes/aai/templates/modelloader-deployment-configmap.yaml
index e5a59a124d..9337f551b8 100644
--- a/kubernetes/aai/templates/modelloader-deployment-configmap.yaml
+++ b/kubernetes/aai/templates/modelloader-deployment-configmap.yaml
@@ -2,16 +2,16 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: model-loader-prop-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ name: aai-model-loader-prop-configmap
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/model-loader/appconfig/model-loader.properties").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: Secret
metadata:
- name: model-loader-secret
- namespace: {{ .Values.nsPrefix }}-aai
+ name: aai-model-loader-secret
+ namespace: {{ .Values.nsPrefix }}
type: Opaque
data:
{{ tpl (.Files.Glob "resources/config/model-loader/appconfig/auth/*").AsSecrets . | indent 2 }}
@@ -20,7 +20,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: aai-model-loader-log-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/log/model-loader/logback.xml").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml
index c5a788c287..e11df7c878 100644
--- a/kubernetes/aai/templates/modelloader-deployment.yaml
+++ b/kubernetes/aai/templates/modelloader-deployment.yaml
@@ -2,8 +2,8 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: model-loader-service
- namespace: "{{ .Values.nsPrefix }}-aai"
+ name: aai-model-loader-service
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.modelLoaderReplicas }}
selector:
@@ -13,7 +13,7 @@ spec:
metadata:
labels:
app: model-loader-service
- name: model-loader-service
+ name: aai-model-loader-service
spec:
containers:
- name: model-loader-service
@@ -56,10 +56,10 @@ spec:
path: /etc/localtime
- name: aai-model-loader-prop-config
configMap:
- name: model-loader-prop-configmap
+ name: aai-model-loader-prop-configmap
- name: aai-model-loader-auth-config
secret:
- secretName: model-loader-secret
+ secretName: aai-model-loader-secret
- name: filebeat-conf
configMap:
name: aai-filebeat-configmap
diff --git a/kubernetes/aai/templates/search-data-service-configmap.yaml b/kubernetes/aai/templates/search-data-service-configmap.yaml
index 8f707d4ca3..43d9da02e2 100644
--- a/kubernetes/aai/templates/search-data-service-configmap.yaml
+++ b/kubernetes/aai/templates/search-data-service-configmap.yaml
@@ -2,16 +2,16 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: search-data-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ name: aai-search-data-configmap
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/*").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: Secret
metadata:
- name: search-data-keystone-secret
- namespace: {{ .Values.nsPrefix }}-aai
+ name: aai-search-data-keystone-secret
+ namespace: {{ .Values.nsPrefix }}
type: Opaque
data:
{{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/auth/tomcat_keystore").AsSecrets . | indent 2 }}
@@ -20,7 +20,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: aai-search-policy-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/auth/search_policy.json").AsSecrets . | indent 2 }}
---
@@ -28,7 +28,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: aai-search-data-service-log-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/log/search-data-service/logback.xml").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml
index 7202e0d39c..fc5a0d2fe2 100644
--- a/kubernetes/aai/templates/search-data-service-deployment.yaml
+++ b/kubernetes/aai/templates/search-data-service-deployment.yaml
@@ -2,8 +2,8 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: search-data-service
- namespace: "{{ .Values.nsPrefix }}-aai"
+ name: aai-search-data-service
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.searchDataServiceReplicas }}
selector:
@@ -13,7 +13,7 @@ spec:
metadata:
labels:
app: search-data-service
- name: search-data-service
+ name: aai-search-data-service
spec:
containers:
- name: search-data-service
@@ -74,10 +74,10 @@ spec:
path: /etc/localtime
- name: aai-search-data-service-config
configMap:
- name: search-data-configmap
+ name: aai-search-data-configmap
- name: aai-search-data-service-auth-config
secret:
- secretName: search-data-keystone-secret
+ secretName: aai-search-data-keystone-secret
- name: aai-search-data-search-policy-config
configMap:
name: aai-search-policy-configmap
diff --git a/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml b/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml
index 590608b566..3a0c7fb556 100644
--- a/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml
+++ b/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml
@@ -2,32 +2,32 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: sparky-be-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ name: aai-sparky-be-configmap
+ namespace: {{ .Values.nsPrefix }}
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
+ name: aai-sparky-be-model-configmap
+ namespace: {{ .Values.nsPrefix }}
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
+ name: aai-sparky-be-portal-configmap
+ namespace: {{ .Values.nsPrefix }}
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
+ name: aai-sparky-be-secret
+ namespace: {{ .Values.nsPrefix }}
type: Opaque
data:
{{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/auth/*").AsSecrets . | indent 2 }}
@@ -36,7 +36,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: aai-sparky-be-log-configmap
- namespace: {{ .Values.nsPrefix }}-aai
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/log/sparky-be/logback.xml").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml
index e5339283ab..e73c7b393b 100644
--- a/kubernetes/aai/templates/sparky-be-deployment.yaml
+++ b/kubernetes/aai/templates/sparky-be-deployment.yaml
@@ -2,8 +2,8 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: sparky-be
- namespace: "{{ .Values.nsPrefix }}-aai"
+ name: aai-sparky-be
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.sparkyReplicas }}
selector:
@@ -13,7 +13,7 @@ spec:
metadata:
labels:
app: sparky-be
- name: sparky-be
+ name: aai-sparky-be
spec:
containers:
- name: sparky-be
@@ -83,16 +83,16 @@ spec:
path: /etc/localtime
- name: aai-sparky-be-config
configMap:
- name: sparky-be-configmap
+ name: aai-sparky-be-configmap
- name: aai-sparky-be-model-config
configMap:
- name: sparky-be-model-configmap
+ name: aai-sparky-be-model-configmap
- name: aai-sparky-be-portal-config
configMap:
- name: sparky-be-portal-configmap
+ name: aai-sparky-be-portal-configmap
- name: aai-sparky-be-auth-config
secret:
- secretName: sparky-be-secret
+ secretName: aai-sparky-be-secret
- name: filebeat-conf
configMap:
name: aai-filebeat-configmap