aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-01-24 17:11:19 +0000
committerGerrit Code Review <gerrit@onap.org>2018-01-24 17:11:19 +0000
commit744bad32171df0e6f8fc0ef28be86c2bd99dbaf1 (patch)
tree85abb7e71b3efe566846f35b0bb1224b1c93778a /kubernetes
parent2e533498b23e25d7e5fa31862f0f73e9c2329b11 (diff)
parentc8f632c052751e4ec61c6f9841010d1a8b1e869d (diff)
Merge "portal config seg"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/portal/resources/config/log/filebeat/filebeat.yml41
-rw-r--r--kubernetes/portal/resources/config/log/portal/onapportal/logback.xml (renamed from kubernetes/config/docker/init/src/config/log/portal/onapportal/logback.xml)0
-rw-r--r--kubernetes/portal/resources/config/log/portal/onapportalsdk/logback.xml (renamed from kubernetes/config/docker/init/src/config/log/portal/onapportalsdk/logback.xml)0
-rw-r--r--kubernetes/portal/resources/config/mariadb/oom_updates.sql (renamed from kubernetes/config/docker/init/src/config/portal/mariadb/oom_updates.sql)0
-rwxr-xr-xkubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/fusion.properties (renamed from kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/fusion.properties)0
-rwxr-xr-xkubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/openid-connect.properties (renamed from kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/openid-connect.properties)0
-rwxr-xr-xkubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties (renamed from kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/portal.properties)0
-rwxr-xr-xkubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties (renamed from kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/system.properties)0
-rw-r--r--kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/fusion.properties (renamed from kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/fusion.properties)0
-rwxr-xr-xkubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties (renamed from kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties)0
-rwxr-xr-xkubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties (renamed from kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties)0
-rw-r--r--kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties (renamed from kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties)0
-rw-r--r--kubernetes/portal/templates/portal-apps-configmap.yaml35
-rwxr-xr-xkubernetes/portal/templates/portal-apps-deployment.yaml77
-rw-r--r--kubernetes/portal/templates/portal-logs-configmap.yaml26
-rw-r--r--kubernetes/portal/templates/portal-widgets-deployment.yaml7
-rw-r--r--kubernetes/portal/values.yaml1
17 files changed, 148 insertions, 39 deletions
diff --git a/kubernetes/portal/resources/config/log/filebeat/filebeat.yml b/kubernetes/portal/resources/config/log/filebeat/filebeat.yml
new file mode 100644
index 0000000000..f316b866af
--- /dev/null
+++ b/kubernetes/portal/resources/config/log/filebeat/filebeat.yml
@@ -0,0 +1,41 @@
+filebeat.prospectors:
+#it is mandatory, in our case it's log
+- input_type: log
+ #This is the canolical path as mentioned in logback.xml, *.* means it will monitor all files in the directory.
+ paths:
+ - /var/log/onap/*/*/*/*.log
+ - /var/log/onap/*/*/*.log
+ - /var/log/onap/*/*.log
+ #Files older than this should be ignored.In our case it will be 48 hours i.e. 2 days. It is a helping flag for clean_inactive
+ ignore_older: 48h
+ # Remove the registry entry for a file that is more than the specified time. In our case it will be 96 hours, i.e. 4 days. It will help to keep registry records with in limit
+ clean_inactive: 96h
+
+
+# Name of the registry file. If a relative path is used, it is considered relative to the
+# data path. Else full qualified file name.
+#filebeat.registry_file: ${path.data}/registry
+
+
+output.logstash:
+ #List of logstash server ip addresses with port number.
+ #But, in our case, this will be the loadbalancer IP address.
+ #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately.
+ hosts: ["logstash.onap-log:5044"]
+ #If enable will do load balancing among availabe Logstash, automatically.
+ loadbalance: true
+
+ #The list of root certificates for server verifications.
+ #If certificate_authorities is empty or not set, the trusted
+ #certificate authorities of the host system are used.
+ #ssl.certificate_authorities: $ssl.certificate_authorities
+
+ #The path to the certificate for SSL client authentication. If the certificate is not specified,
+ #client authentication is not available.
+ #ssl.certificate: $ssl.certificate
+
+ #The client certificate key used for client authentication.
+ #ssl.key: $ssl.key
+
+ #The passphrase used to decrypt an encrypted key stored in the configured key file
+ #ssl.key_passphrase: $ssl.key_passphrase
diff --git a/kubernetes/config/docker/init/src/config/log/portal/onapportal/logback.xml b/kubernetes/portal/resources/config/log/portal/onapportal/logback.xml
index be55dc9cff..be55dc9cff 100644
--- a/kubernetes/config/docker/init/src/config/log/portal/onapportal/logback.xml
+++ b/kubernetes/portal/resources/config/log/portal/onapportal/logback.xml
diff --git a/kubernetes/config/docker/init/src/config/log/portal/onapportalsdk/logback.xml b/kubernetes/portal/resources/config/log/portal/onapportalsdk/logback.xml
index 32a790c6a3..32a790c6a3 100644
--- a/kubernetes/config/docker/init/src/config/log/portal/onapportalsdk/logback.xml
+++ b/kubernetes/portal/resources/config/log/portal/onapportalsdk/logback.xml
diff --git a/kubernetes/config/docker/init/src/config/portal/mariadb/oom_updates.sql b/kubernetes/portal/resources/config/mariadb/oom_updates.sql
index 781b04626c..781b04626c 100644
--- a/kubernetes/config/docker/init/src/config/portal/mariadb/oom_updates.sql
+++ b/kubernetes/portal/resources/config/mariadb/oom_updates.sql
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/fusion.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/fusion.properties
index 876c5c7b9a..876c5c7b9a 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/fusion.properties
+++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/fusion.properties
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/openid-connect.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/openid-connect.properties
index 2a33551933..2a33551933 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/openid-connect.properties
+++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/openid-connect.properties
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/portal.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties
index 4871b42288..4871b42288 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/portal.properties
+++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/system.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties
index 9085cee47f..9085cee47f 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTAL/system.properties
+++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/fusion.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/fusion.properties
index 8ee0a95f74..8ee0a95f74 100644
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/fusion.properties
+++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/fusion.properties
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties
index e77a701798..e77a701798 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties
+++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties
index d638abcca3..d638abcca3 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties
+++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties
index a5e55dc6d8..a5e55dc6d8 100644
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties
+++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties
diff --git a/kubernetes/portal/templates/portal-apps-configmap.yaml b/kubernetes/portal/templates/portal-apps-configmap.yaml
new file mode 100644
index 0000000000..044e0d8a4d
--- /dev/null
+++ b/kubernetes/portal/templates/portal-apps-configmap.yaml
@@ -0,0 +1,35 @@
+#{{ if not .Values.disablePortalPortalapps }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: portal-onap-portal-sdk-configmap
+ namespace: {{ .Values.nsPrefix }}-portal
+data:
+{{ tpl (.Files.Glob "resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: portal-onap-portal-configmap
+ namespace: {{ .Values.nsPrefix }}-portal
+data:
+{{ tpl (.Files.Glob "resources/config/portal-fe/webapps/etc/ONAPPORTAL/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: portal-mariadb-configmap
+ namespace: {{ .Values.nsPrefix }}-portal
+data:
+{{ tpl (.Files.Glob "resources/config/mariadb/oom_updates.sql").AsConfig . | indent 2 }}
+#{{ end }}
+---
+#{{ if not .Values.disablePortalPortalwidgets }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: portal-onapwidgetms-configmap
+ namespace: {{ .Values.nsPrefix }}-portal
+data:
+{{ tpl (.Files.Glob "resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties").AsConfig . | indent 2 }}
+#{{ end }}
diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
index 761441acc3..b45cec4946 100755
--- a/kubernetes/portal/templates/portal-apps-deployment.yaml
+++ b/kubernetes/portal/templates/portal-apps-deployment.yaml
@@ -33,11 +33,19 @@ spec:
volumeMounts:
- mountPath: /portal-mysql/oom_updates.sql
name: portal-mariadb-onboarding-sql
+ subPath: oom_updates.sql
- mountPath: /portal_root/
name: portal-root
image: {{ .Values.image.mariadbClient }}
imagePullPolicy: {{ .Values.pullPolicy }}
name: provision-portaldb-users
+ - command: ["/bin/bash", "-c", "mkdir -p /ubuntu-init/ && chmod -R 777 /ubuntu-init/"]
+ volumeMounts:
+ - name: portal-logs
+ mountPath: /ubuntu-init/
+ image: {{ .Values.image.ubuntuInit }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: portal-app-logs-init
containers:
- image: {{ .Values.image.portalapps }}
imagePullPolicy: {{ .Values.pullPolicy }}
@@ -51,23 +59,32 @@ spec:
name: localtime
readOnly: true
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/fusion/conf/fusion.properties"
- name: portal-fusion-properties
+ name: onap-portal-properties
+ subPath: fusion.properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/classes/openid-connect.properties"
- name: portal-openid-connect-properties
+ name: onap-portal-properties
+ subPath: openid-connect.properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/conf/system.properties"
- name: portal-system-properties
+ name: onap-portal-properties
+ subPath: system.properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/classes/portal.properties"
- name: portal-portal-properties
+ name: onap-portal-properties
+ subPath: portal.properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTAL/WEB-INF/classes/logback.xml"
name: portal-logback
+ subPath: logback.xml
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTALSDK/WEB-INF/conf/system.properties"
- name: sdkapp-system-properties
+ name: portal-sdkapp-properties
+ subPath: system.properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTALSDK/WEB-INF/classes/portal.properties"
- name: sdkapp-portal-properties
+ name: portal-sdkapp-properties
+ subPath: portal.properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTALSDK/WEB-INF/fusion/conf/fusion.properties"
- name: sdkapp-fusion-properties
+ name: portal-sdkapp-properties
+ subPath: fusion.properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ONAPPORTALSDK/WEB-INF/classes/logback.xml"
name: sdkapp-logback
+ subPath: logback.xml
- mountPath: /portal_root/
name: portal-root
- mountPath: "{{ .Values.onapPortal.webappsDir }}/logs"
@@ -89,6 +106,7 @@ spec:
volumeMounts:
- mountPath: /usr/share/filebeat/filebeat.yml
name: filebeat-conf
+ subPath: filebeat.yml
- mountPath: /var/log/onap
name: portal-logs2
- mountPath: /usr/share/filebeat/data
@@ -98,42 +116,29 @@ spec:
hostPath:
path: /etc/localtime
- name: filebeat-conf
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+ configMap:
+ name: portal-filebeat-configmap
- name: portal-logs2
emptyDir: {}
- name: portal-data-filebeat
emptyDir: {}
- - name: portal-fusion-properties
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTAL/fusion.properties
- - name: portal-openid-connect-properties
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTAL/openid-connect.properties
- - name: portal-system-properties
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTAL/system.properties
- - name: portal-portal-properties
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTAL/portal.properties
+ - name: onap-portal-properties
+ configMap:
+ defaultMode: 0755
+ name: portal-onap-portal-configmap
+ - name: portal-sdkapp-properties
+ configMap:
+ defaultMode: 0755
+ name: portal-onap-portal-sdk-configmap
- name: portal-logback
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/onapportal/logback.xml
- - name: sdkapp-system-properties
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties
- - name: sdkapp-portal-properties
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties
- - name: sdkapp-fusion-properties
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPPORTALSDK/fusion.properties
+ configMap:
+ name: portal-onapportal-log-configmap
- name: sdkapp-logback
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/onapportalsdk/logback.xml
+ configMap:
+ name: portal-onapportalsdk-log-configmap
- name: portal-mariadb-onboarding-sql
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/oom_updates.sql
+ configMap:
+ name: portal-mariadb-configmap
- name: portal-root
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal
diff --git a/kubernetes/portal/templates/portal-logs-configmap.yaml b/kubernetes/portal/templates/portal-logs-configmap.yaml
new file mode 100644
index 0000000000..c5735ba722
--- /dev/null
+++ b/kubernetes/portal/templates/portal-logs-configmap.yaml
@@ -0,0 +1,26 @@
+#{{ if not .Values.disablePortalPortalapps }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: portal-filebeat-configmap
+ namespace: {{ .Values.nsPrefix }}-portal
+data:
+{{ tpl (.Files.Glob "resources/config/log/filebeat/filebeat.yml").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: portal-onapportal-log-configmap
+ namespace: {{ .Values.nsPrefix }}-portal
+data:
+{{ tpl (.Files.Glob "resources/config/log/portal/onapportal/logback.xml").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: portal-onapportalsdk-log-configmap
+ namespace: {{ .Values.nsPrefix }}-portal
+data:
+{{ tpl (.Files.Glob "resources/config/log/portal/onapportalsdk/logback.xml").AsConfig . | indent 2 }}
+#{{ end }}
+
diff --git a/kubernetes/portal/templates/portal-widgets-deployment.yaml b/kubernetes/portal/templates/portal-widgets-deployment.yaml
index 600419399e..0dd92027df 100644
--- a/kubernetes/portal/templates/portal-widgets-deployment.yaml
+++ b/kubernetes/portal/templates/portal-widgets-deployment.yaml
@@ -31,7 +31,7 @@ spec:
name: portalapps-readiness
containers:
- image: {{ .Values.image.portalwms }}
- imagePullPolicy: {{ .Values.pullPolicy }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
name: portalwidgets
volumeMounts:
- mountPath: /etc/localtime
@@ -39,6 +39,7 @@ spec:
readOnly: true
- mountPath: /application.properties
name: portalwidgets-application-properties
+ subPath: application.properties
ports:
- containerPort: 8082
readinessProbe:
@@ -51,8 +52,8 @@ spec:
hostPath:
path: /etc/localtime
- name: portalwidgets-application-properties
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties
+ configMap:
+ name: portal-onapwidgetms-configmap
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
#{{ end }}
diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index 6e2e83d215..34f5cc444b 100644
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -9,5 +9,6 @@ image:
portalwms: nexus3.onap.org:10001/onap/portal-wms:v1.3.0
ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc
filebeat: docker.elastic.co/beats/filebeat:5.5.0
+ ubuntuInit: oomk8s/ubuntu-init:1.0.0
onapPortal:
webappsDir: "/opt/apache-tomcat-8.0.37/webapps"