summaryrefslogtreecommitdiffstats
path: root/kubernetes/aai
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/aai')
-rw-r--r--kubernetes/aai/resources/sparky-be/conf/logback.xml2
-rw-r--r--kubernetes/aai/templates/aai-deployment.yaml43
-rw-r--r--kubernetes/aai/templates/aai-resources-deployment.yaml45
-rw-r--r--kubernetes/aai/templates/aai-traversal-deployment.yaml49
-rw-r--r--kubernetes/aai/templates/search-data-service-deployment.yaml4
-rw-r--r--kubernetes/aai/templates/sparky-be-deployment.yaml4
-rw-r--r--kubernetes/aai/values.yaml20
7 files changed, 70 insertions, 97 deletions
diff --git a/kubernetes/aai/resources/sparky-be/conf/logback.xml b/kubernetes/aai/resources/sparky-be/conf/logback.xml
index b822662050..c1b99c183f 100644
--- a/kubernetes/aai/resources/sparky-be/conf/logback.xml
+++ b/kubernetes/aai/resources/sparky-be/conf/logback.xml
@@ -15,7 +15,7 @@
<property name="maxFileSize" value="50MB" />
<property name="maxHistory" value="30" />
<property name="totalSizeCap" value="10GB" />
- <property name="pattern" value="%d{&amp;quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&amp;quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />
+ <property name="pattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />
<!-- Example evaluator filter applied against console appender -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml
index 3f714f3e64..a65cf44cba 100644
--- a/kubernetes/aai/templates/aai-deployment.yaml
+++ b/kubernetes/aai/templates/aai-deployment.yaml
@@ -13,29 +13,24 @@ spec:
labels:
app: aai-service
name: aai-service
- annotations:
- pod.beta.kubernetes.io/init-containers: '[{
- "args": [
- "--container-name", "aai-resources",
- "--container-name", "aai-traversal"
- ],
- "command": [
- "/root/ready.py"
- ],
- "env": [{
- "name": "NAMESPACE",
- "valueFrom": {
- "fieldRef": {
- "apiVersion": "v1",
- "fieldPath": "metadata.namespace"
- }
- }
- }],
- "image": "{{ .Values.image.readiness }}",
- "imagePullPolicy": "{{ .Values.pullPolicy }}",
- "name": "aai-service-readiness"
- }]'
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - aai-resources
+ - --container-name
+ - aai-traversal
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ .Values.image.readiness }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: aai-service-readiness
containers:
- name: aai-service
image: "{{ .Values.image.aaiProxy }}:{{ .Values.image.aaiProxyVersion}}"
@@ -62,11 +57,11 @@ spec:
path: /etc/localtime
- name: aai-service-log
hostPath:
- path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/log/"
+ path: "/dev/log"
- name: haproxy-cfg
hostPath:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/haproxy.cfg"
restartPolicy: Always
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index ebf447f3ca..7ff5e66ee2 100644
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/templates/aai-resources-deployment.yaml
@@ -13,33 +13,22 @@ spec:
labels:
app: aai-resources
name: aai-resources
- annotations:
- pod.beta.kubernetes.io/init-containers: '[
- {
- "args": [
- "--container-name",
- "hbase"
- ],
- "command": [
- "/root/ready.py"
- ],
- "env": [
- {
- "name": "NAMESPACE",
- "valueFrom": {
- "fieldRef": {
- "apiVersion": "v1",
- "fieldPath": "metadata.namespace"
- }
- }
- }
- ],
- "image": "{{ .Values.image.readiness }}",
- "imagePullPolicy": "{{ .Values.pullPolicy }}",
- "name": "aai-resources-readiness"
- }
- ]'
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - hbase
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ .Values.image.readiness }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: aai-resources-readiness
containers:
- name: aai-resources
image: "{{ .Values.image.aaiResourcesImage }}:{{ .Values.image.aaiResourcesVersion}}"
@@ -94,7 +83,7 @@ spec:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
- name: filebeat-conf
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
- name: aai-resources-logs
emptyDir: {}
- name: aai-resources-filebeat
@@ -113,4 +102,4 @@ metadata:
namespace: {{ .Values.nsPrefix }}-aai
data:
{{ (.Files.Glob "resources/resources/conf/logback.xml").AsConfig | indent 2 }}
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
index a54c49a59d..f659392935 100644
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml
@@ -13,35 +13,24 @@ spec:
labels:
app: aai-traversal
name: aai-traversal
- annotations:
- pod.beta.kubernetes.io/init-containers: '[
- {
- "args": [
- "--container-name",
- "hbase",
- "--container-name",
- "aai-resources"
- ],
- "command": [
- "/root/ready.py"
- ],
- "env": [
- {
- "name": "NAMESPACE",
- "valueFrom": {
- "fieldRef": {
- "apiVersion": "v1",
- "fieldPath": "metadata.namespace"
- }
- }
- }
- ],
- "image": "{{ .Values.image.readiness }}",
- "imagePullPolicy": "{{ .Values.pullPolicy }}",
- "name": "aai-traversal-readiness"
- }
- ]'
spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - hbase
+ - --container-name
+ - aai-resources
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: {{ .Values.image.readiness }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: aai-traversal-readiness
containers:
- name: aai-traversal
image: "{{ .Values.image.aaiTraversalImage }}:{{ .Values.image.aaiTraversalVersion }}"
@@ -96,7 +85,7 @@ spec:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
- name: filebeat-conf
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
- name: aai-traversal-logs
emptyDir: {}
- name: aai-traversal-filebeat
@@ -115,4 +104,4 @@ metadata:
namespace: {{ .Values.nsPrefix }}-aai
data:
{{ (.Files.Glob "resources/traversal/conf/logback.xml").AsConfig | indent 2 }}
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml
index 60fdbb50cd..e1668456ba 100644
--- a/kubernetes/aai/templates/search-data-service-deployment.yaml
+++ b/kubernetes/aai/templates/search-data-service-deployment.yaml
@@ -62,7 +62,7 @@ spec:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/search-data-service/appconfig/"
- name: filebeat-conf
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
- name: aai-search-data-service-logs
emptyDir: {}
- name: aai-search-data-service-filebeat
@@ -81,4 +81,4 @@ metadata:
namespace: {{ .Values.nsPrefix }}-aai
data:
{{ (.Files.Glob "resources/search-data-service/conf/logback.xml").AsConfig | indent 2 }}
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml
index c60725ee15..484a87f5be 100644
--- a/kubernetes/aai/templates/sparky-be-deployment.yaml
+++ b/kubernetes/aai/templates/sparky-be-deployment.yaml
@@ -62,7 +62,7 @@ spec:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/sparky-be/appconfig/"
- name: filebeat-conf
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
- name: aai-sparky-be-logs
emptyDir: {}
- name: aai-sparky-filebeat
@@ -81,4 +81,4 @@ metadata:
namespace: {{ .Values.nsPrefix }}-aai
data:
{{ (.Files.Glob "resources/sparky-be/conf/logback.xml").AsConfig | indent 2 }}
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index d9d0867c35..ce625b7ab3 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -7,19 +7,19 @@ image:
aaiProxyVersion: 1.1.0
aaiHbaseImage: aaionap/hbase
aaiHbaseVersion: 1.2.0
- modelLoaderImage: nexus3.onap.org:10001/openecomp/model-loader
- modelLoaderVersion: 1.1-STAGING-latest
+ modelLoaderImage: nexus3.onap.org:10001/onap/model-loader
+ modelLoaderVersion: v1.1.0
aaiResourcesImage: nexus3.onap.org:10001/openecomp/aai-resources
- aaiResourcesVersion: 1.1-STAGING-latest
+ aaiResourcesVersion: v1.1.0
aaiTraversalImage: nexus3.onap.org:10001/openecomp/aai-traversal
- aaiTraversalVersion: 1.1-STAGING-latest
- dataRouterImage: nexus3.onap.org:10001/openecomp/data-router
- dataRouterVersion: 1.1-STAGING-latest
+ aaiTraversalVersion: v1.1.0
+ dataRouterImage: nexus3.onap.org:10001/onap/data-router
+ dataRouterVersion: v1.1.0
elasticsearchImage: elasticsearch
elasticsearchVersion: 2.4.1
- searchDataImage: nexus3.onap.org:10001/openecomp/search-data-service
- searchDataVersion: 1.1-STAGING-latest
- sparkyBeImage: nexus3.onap.org:10001/openecomp/sparky-be
- sparkyBeVersion: 1.1-STAGING-latest
+ searchDataImage: nexus3.onap.org:10001/onap/search-data-service
+ searchDataVersion: v1.1.0
+ sparkyBeImage: nexus3.onap.org:10001/onap/sparky-be
+ sparkyBeVersion: v1.1.0
gremlinServerImage: aaionap/gremlin-server
filebeat: docker.elastic.co/beats/filebeat:5.5.0