diff options
Diffstat (limited to 'kubernetes')
21 files changed, 103 insertions, 27 deletions
diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml index f078bd17ce..e568996b15 100644 --- a/kubernetes/common/cassandra/values.yaml +++ b/kubernetes/common/cassandra/values.yaml @@ -37,7 +37,7 @@ debugEnabled: false config: cluster_domain: cluster.local heap: - max: 512M + max: 2048M min: 100M jvmOpts: -Dcassandra.consistent.rangemovement=false clusterName: cassandra diff --git a/kubernetes/modeling/charts/modeling-genericparser/.helmignore b/kubernetes/modeling/charts/modeling-etsicatalog/.helmignore index f0c1319444..f0c1319444 100644 --- a/kubernetes/modeling/charts/modeling-genericparser/.helmignore +++ b/kubernetes/modeling/charts/modeling-etsicatalog/.helmignore diff --git a/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml b/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 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 index 1d0751a01b..1d0751a01b 100644 --- a/kubernetes/modeling/charts/modeling-genericparser/templates/configmap.yaml +++ b/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 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 index d1e1b04121..d1e1b04121 100644 --- a/kubernetes/modeling/charts/modeling-genericparser/templates/pv.yaml +++ b/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 index 74ba690fa6..74ba690fa6 100644 --- a/kubernetes/modeling/charts/modeling-genericparser/templates/pvc.yaml +++ b/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 index c69be571c8..217e6af759 100644 --- a/kubernetes/modeling/charts/modeling-genericparser/templates/service.yaml +++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/service.yaml @@ -32,6 +32,14 @@ metadata: "port": "{{.Values.service.externalPort}}", "visualRange":"1" } + { + "serviceName": "etsicatalog", + "version": "v1", + "url": "/api/catalog/v1", + "protocol": "REST", + "port": "{{.Values.service.externalPort}}", + "visualRange":"1" + } { "serviceName": "nsd", "version": "v1", diff --git a/kubernetes/modeling/charts/modeling-genericparser/values.yaml b/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 diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml index 426b3efd07..9fd0789e32 100644 --- a/kubernetes/multicloud/values.yaml +++ b/kubernetes/multicloud/values.yaml @@ -20,7 +20,7 @@ global: nodePortPrefix: 302 loggingRepository: docker.elastic.co loggingImage: beats/filebeat:5.5.0 - artifactImage: onap/multicloud/framework-artifactbroker:1.4.1 + artifactImage: onap/multicloud/framework-artifactbroker:1.4.2 prometheus: enabled: false @@ -29,7 +29,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/multicloud/framework:1.4.1 +image: onap/multicloud/framework:1.4.2 pullPolicy: Always #Istio sidecar injection policy diff --git a/kubernetes/onap/resources/environments/public-cloud.yaml b/kubernetes/onap/resources/environments/public-cloud.yaml index 2d4360c579..3062e4e3fa 100644 --- a/kubernetes/onap/resources/environments/public-cloud.yaml +++ b/kubernetes/onap/resources/environments/public-cloud.yaml @@ -95,11 +95,24 @@ portal: readiness: initialDelaySeconds: 60 sdc: + sdc-fe: + liveness: + initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 + readiness: + initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 sdc-be: liveness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 readiness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 sdc-cs: liveness: initialDelaySeconds: 120 @@ -107,14 +120,18 @@ sdc: initialDelaySeconds: 120 sdc-es: liveness: - initialDelaySeconds: 60 + initialDelaySeconds: 120 readiness: initialDelaySeconds: 120 sdc-onboarding-be: liveness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 readiness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 sdnc: liveness: initialDelaySeconds: 60 diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml index 75ce8e529b..2788e244e2 100644 --- a/kubernetes/onap/resources/overrides/environment.yaml +++ b/kubernetes/onap/resources/overrides/environment.yaml @@ -157,11 +157,24 @@ portal: readiness: periodSeconds: 60 sdc: + sdc-fe: + liveness: + initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 + readiness: + initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 sdc-be: liveness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 readiness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 sdc-cs: liveness: initialDelaySeconds: 120 @@ -177,8 +190,12 @@ sdc: sdc-onboarding-be: liveness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 readiness: initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 sdnc: liveness: initialDelaySeconds: 60 diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml index 07861444e7..7ef1e02714 100644 --- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml +++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml @@ -68,6 +68,16 @@ sdnc: enabled: true so: enabled: true + so-monitoring: + enabled: true + ingress: + enabled: true + service: + - path: "/so-monitoring" + name: "so-monitoring" + port: 9091 + annotations: + nginx.ingress.kubernetes.io/ssl-redirect: "false" uui: enabled: true vfc: @@ -75,8 +85,15 @@ vfc: vid: enabled: true ingress: - enabled: true + enabled: true + service: + - path: "/vid" + name: "vid-http" + port: 8080 + annotations: + nginx.ingress.kubernetes.io/ssl-redirect: "false" vnfsdk: enabled: true nginx-ingress: enabled: true + diff --git a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml index 62dffd6376..ee4da9b7b1 100644 --- a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml +++ b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml @@ -73,12 +73,14 @@ spec: port: {{ .Values.service.internalPort2 }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} + timeoutSeconds: {{ .Values.liveness.timeoutSeconds }} {{ end }} readinessProbe: tcpSocket: port: {{ .Values.service.internalPort2 }} initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.liveness.timeoutSeconds }} resources: {{ include "common.resources" . | indent 12 }} env: diff --git a/kubernetes/sdc/charts/sdc-fe/values.yaml b/kubernetes/sdc/charts/sdc-fe/values.yaml index 6831555a44..8878f1a0b6 100644 --- a/kubernetes/sdc/charts/sdc-fe/values.yaml +++ b/kubernetes/sdc/charts/sdc-fe/values.yaml @@ -51,14 +51,16 @@ affinity: {} # probe configuration parameters liveness: initialDelaySeconds: 10 - periodSeconds: 10 + periodSeconds: 60 + timeoutSeconds: 15 # necessary to disable liveness probe when setting breakpoints # in debugger so K8s doesn't restart unresponsive container enabled: true readiness: initialDelaySeconds: 10 - periodSeconds: 10 + periodSeconds: 60 + timeoutSeconds: 15 service: #Example service definition with external, internal and node ports. diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml index 70895d308d..dee139beb5 100644 --- a/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml +++ b/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml @@ -60,6 +60,7 @@ spec: - "/var/lib/ready-probe.sh" initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} + timeoutSeconds: {{ .Values.liveness.timeoutSeconds }} {{ end }} readinessProbe: exec: @@ -67,6 +68,7 @@ spec: - "/var/lib/ready-probe.sh" initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.liveness.timeoutSeconds }} resources: {{ include "common.resources" . | indent 12 }} env: diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml index ce04d480f0..a6a3f6bd22 100644 --- a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml +++ b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml @@ -48,15 +48,17 @@ affinity: {} # probe configuration parameters liveness: - initialDelaySeconds: 60 - periodSeconds: 10 + initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 # necessary to disable liveness probe when setting breakpoints # in debugger so K8s doesn't restart unresponsive container enabled: true readiness: - initialDelaySeconds: 60 - periodSeconds: 10 + initialDelaySeconds: 120 + periodSeconds: 60 + timeoutSeconds: 15 service: type: ClusterIP diff --git a/kubernetes/vid/resources/certs/org.onap.vid.jks b/kubernetes/vid/resources/certs/org.onap.vid.jks Binary files differindex 3c2ce9157d..2b9338dc74 100644 --- a/kubernetes/vid/resources/certs/org.onap.vid.jks +++ b/kubernetes/vid/resources/certs/org.onap.vid.jks diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml index cd24150c4f..9221af7dcf 100644 --- a/kubernetes/vid/templates/deployment.yaml +++ b/kubernetes/vid/templates/deployment.yaml @@ -94,6 +94,10 @@ spec: value: "{{ .Values.config.roleaccesscentralized }}" - name: VID_CONTACT_US_LINK value: "{{ .Values.config.vidcontactuslink }}" + - name: VID_KEYSTORE_PASSWORD + value: {{ .Values.config.vidkeystorepassword | quote }} + - name: CATALINA_OPTS + value: "-Dvid.keystore.password=$(VID_KEYSTORE_PASSWORD) -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=/opt/app/vid/etc/org.onap.vid.jks -Dcom.att.eelf.logging.file=logback.xml -Dcom.att.eelf.logging.path=/tmp" - name: VID_UEB_URL_LIST value: message-router.{{ include "common.namespace" . }} - name: VID_MYSQL_HOST diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml index 9c445659cb..61002778fd 100644 --- a/kubernetes/vid/values.yaml +++ b/kubernetes/vid/values.yaml @@ -36,6 +36,7 @@ mariadb_image: library/mariadb:10 # application configuration config: vidmysqlpassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U + vidkeystorepassword: '\^7w\!f+aR\{EJcTRsDuA7x\,+c\!' asdcclientrestauth: "Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=" asdcclientrestport: "8443" vidaaiport: "8443" |