From 7d604453c1451c71136ae42cb8daa5568fa0dd3e Mon Sep 17 00:00:00 2001 From: dyh Date: Mon, 23 Sep 2019 15:54:48 +0800 Subject: [PATCH] update OOM configuration for modeling/etsicatalog Change-Id: Ie6f18487961bc7de723f5dc69e37abfd5006f550 Issue-ID: MODELING-222 Signed-off-by: dyh --- .../.helmignore | 0 .../Chart.yaml | 4 ++-- .../resources/config/logging/log.yml | 16 ++++++++++------ .../templates/configmap.yaml | 0 .../templates/deployment.yaml | 8 ++++---- .../templates/pv.yaml | 0 .../templates/pvc.yaml | 0 .../templates/service.yaml | 8 ++++++++ .../values.yaml | 8 ++++---- 9 files changed, 28 insertions(+), 16 deletions(-) rename kubernetes/modeling/charts/{modeling-genericparser => modeling-etsicatalog}/.helmignore (100%) rename kubernetes/modeling/charts/{modeling-genericparser => modeling-etsicatalog}/Chart.yaml (87%) rename kubernetes/modeling/charts/{modeling-genericparser => modeling-etsicatalog}/resources/config/logging/log.yml (77%) rename kubernetes/modeling/charts/{modeling-genericparser => modeling-etsicatalog}/templates/configmap.yaml (100%) rename kubernetes/modeling/charts/{modeling-genericparser => modeling-etsicatalog}/templates/deployment.yaml (95%) rename kubernetes/modeling/charts/{modeling-genericparser => modeling-etsicatalog}/templates/pv.yaml (100%) rename kubernetes/modeling/charts/{modeling-genericparser => modeling-etsicatalog}/templates/pvc.yaml (100%) rename kubernetes/modeling/charts/{modeling-genericparser => modeling-etsicatalog}/templates/service.yaml (90%) rename kubernetes/modeling/charts/{modeling-genericparser => modeling-etsicatalog}/values.yaml (95%) diff --git a/kubernetes/modeling/charts/modeling-genericparser/.helmignore b/kubernetes/modeling/charts/modeling-etsicatalog/.helmignore similarity index 100% rename from kubernetes/modeling/charts/modeling-genericparser/.helmignore rename to kubernetes/modeling/charts/modeling-etsicatalog/.helmignore diff --git a/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/Chart.yaml similarity index 87% rename from kubernetes/modeling/charts/modeling-genericparser/Chart.yaml rename to kubernetes/modeling/charts/modeling-etsicatalog/Chart.yaml index d5f20be640..58173cfb97 100644 --- a/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml +++ b/kubernetes/modeling/charts/modeling-etsicatalog/Chart.yaml @@ -13,6 +13,6 @@ # limitations under the License. apiVersion: v1 -description: ONAP Modeling - Genericparser -name: modeling-genericparser +description: ONAP Modeling - Etsicatalog +name: modeling-etsicatalog version: 5.0.0 \ No newline at end of file diff --git a/kubernetes/modeling/charts/modeling-genericparser/resources/config/logging/log.yml b/kubernetes/modeling/charts/modeling-etsicatalog/resources/config/logging/log.yml similarity index 77% rename from kubernetes/modeling/charts/modeling-genericparser/resources/config/logging/log.yml rename to kubernetes/modeling/charts/modeling-etsicatalog/resources/config/logging/log.yml index 1c4cf6c1c4..5ac5fefe92 100644 --- a/kubernetes/modeling/charts/modeling-genericparser/resources/config/logging/log.yml +++ b/kubernetes/modeling/charts/modeling-etsicatalog/resources/config/logging/log.yml @@ -2,29 +2,33 @@ version: 1 disable_existing_loggers: False loggers: - gengricparser: - handlers: [gengricparserlocal_handler, gengricparser_handler] + catalog: + handlers: [cataloglocal_handler, catalog_handler] level: "DEBUG" propagate: False django: handlers: [django_handler] level: "DEBUG" propagate: False + tosca: + handlers: [cataloglocal_handler, catalog_handler] + level: "DEBUG" + propagate: False handlers: - gengricparserlocal_handler: + cataloglocal_handler: level: "DEBUG" class: "logging.handlers.RotatingFileHandler" - filename: "logs/runtime_gengricparser.log" + filename: "logs/runtime_catalog.log" formatter: "standard" maxBytes: 52428800 backupCount: 10 - gengricparser_handler: + catalog_handler: level: "DEBUG" class: "logging.handlers.RotatingFileHandler" - filename: "/var/log/onap/modeling/genericparser/runtime_gengricparser.log" + filename: "/var/log/onap/modeling/etsicatalog/runtime_catalog.log" formatter: "mdcFormat" maxBytes: 52428800 diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/configmap.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/configmap.yaml similarity index 100% rename from kubernetes/modeling/charts/modeling-genericparser/templates/configmap.yaml rename to kubernetes/modeling/charts/modeling-etsicatalog/templates/configmap.yaml diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/deployment.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml similarity index 95% rename from kubernetes/modeling/charts/modeling-genericparser/templates/deployment.yaml rename to kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml index b61cd87e6c..08d5e139b1 100644 --- a/kubernetes/modeling/charts/modeling-genericparser/templates/deployment.yaml +++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml @@ -77,15 +77,15 @@ spec: - name: REDIS_ADDR value: "{{ .Values.global.config.redisServiceName }}:{{ .Values.global.config.redisPort }}" volumeMounts: - - name: {{ include "common.fullname" . }}-genericparser - mountPath: /service/modeling/genericparser/static + - name: {{ include "common.fullname" . }}-etsicatalog + mountPath: /service/modeling/etsicatalog/static - name: {{ include "common.fullname" . }}-localtime mountPath: /etc/localtime readOnly: true - name: {{ include "common.fullname" . }}-logs mountPath: /var/log/onap - name: {{ include "common.fullname" . }}-logconfig - mountPath: /opt/modeling/genericparser/config/log.yml + mountPath: /opt/modeling/etsicatalog/config/log.yml subPath: log.yml resources: {{ include "common.resources" . | indent 12 }} @@ -112,7 +112,7 @@ spec: mountPath: /usr/share/filebeat/data volumes: - - name: {{ include "common.fullname" . }}-genericparser + - name: {{ include "common.fullname" . }}-etsicatalog {{- if .Values.persistence.enabled }} persistentVolumeClaim: claimName: {{ include "common.fullname" . }} diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/pv.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/pv.yaml similarity index 100% rename from kubernetes/modeling/charts/modeling-genericparser/templates/pv.yaml rename to kubernetes/modeling/charts/modeling-etsicatalog/templates/pv.yaml diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/pvc.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/pvc.yaml similarity index 100% rename from kubernetes/modeling/charts/modeling-genericparser/templates/pvc.yaml rename to kubernetes/modeling/charts/modeling-etsicatalog/templates/pvc.yaml diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/service.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/service.yaml similarity index 90% rename from kubernetes/modeling/charts/modeling-genericparser/templates/service.yaml rename to kubernetes/modeling/charts/modeling-etsicatalog/templates/service.yaml index c69be571c8..217e6af759 100644 --- a/kubernetes/modeling/charts/modeling-genericparser/templates/service.yaml +++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/service.yaml @@ -31,6 +31,14 @@ metadata: "protocol": "REST", "port": "{{.Values.service.externalPort}}", "visualRange":"1" + } + { + "serviceName": "etsicatalog", + "version": "v1", + "url": "/api/catalog/v1", + "protocol": "REST", + "port": "{{.Values.service.externalPort}}", + "visualRange":"1" } { "serviceName": "nsd", diff --git a/kubernetes/modeling/charts/modeling-genericparser/values.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml similarity index 95% rename from kubernetes/modeling/charts/modeling-genericparser/values.yaml rename to kubernetes/modeling/charts/modeling-etsicatalog/values.yaml index 467d7315b5..3217389755 100644 --- a/kubernetes/modeling/charts/modeling-genericparser/values.yaml +++ b/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml @@ -29,7 +29,7 @@ global: flavor: small repository: nexus3.onap.org:10001 -image: onap/modeling/genericparser:1.0.2 +image: onap/modeling/etsicatalog:1.0.4 pullPolicy: Always #Istio sidecar injection policy @@ -79,12 +79,12 @@ persistence: accessMode: ReadWriteOnce size: 2Gi mountPath: /dockerdata-nfs - mountSubPath: modeling/genericparser + mountSubPath: modeling/etsicatalog service: type: ClusterIP - name: modeling-genericparser - portName: modeling-genericparser + name: modeling-etsicatalog + portName: modeling-etsicatalog externalPort: 8806 internalPort: 8806 # nodePort: 30806 -- 2.16.6