diff options
22 files changed, 53 insertions, 29 deletions
diff --git a/kubernetes/aai b/kubernetes/aai -Subproject 9d23a1c8a97d5878e2aafc871f17af007349c28 +Subproject d68960684392a6da61805e4161ae032549db610 diff --git a/kubernetes/appc/charts/appc-ansible-server/values.yaml b/kubernetes/appc/charts/appc-ansible-server/values.yaml index f2dd150160..7b0767c80f 100644 --- a/kubernetes/appc/charts/appc-ansible-server/values.yaml +++ b/kubernetes/appc/charts/appc-ansible-server/values.yaml @@ -29,7 +29,7 @@ flavor: small # application image repository: nexus3.onap.org:10001 -image: onap/ccsdk-ansible-server-image:0.4.2 +image: onap/ccsdk-ansible-server-image:0.4.4 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/appc/charts/appc-cdt/values.yaml b/kubernetes/appc/charts/appc-cdt/values.yaml index 52adfc4d6e..6c138fad87 100644 --- a/kubernetes/appc/charts/appc-cdt/values.yaml +++ b/kubernetes/appc/charts/appc-cdt/values.yaml @@ -26,7 +26,7 @@ flavor: small # application image repository: nexus3.onap.org:10001 -image: onap/appc-cdt-image:1.6.3 +image: onap/appc-cdt-image:1.6.4 pullPolicy: Always # application configuration diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index 00ed799bef..2312638adc 100644 --- a/kubernetes/appc/values.yaml +++ b/kubernetes/appc/values.yaml @@ -31,7 +31,7 @@ global: flavor: small # application image repository: nexus3.onap.org:10001 -image: onap/appc-image:1.6.3 +image: onap/appc-image:1.6.4 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh b/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh index aaf7a2615c..b037058c2b 100755 --- a/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh +++ b/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh @@ -85,6 +85,12 @@ then echo " 'dbUser': '$dbUser'," >>$customSettingsFile echo " 'dbPassword': '$dbPassword'," >>$customSettingsFile echo " 'gitLocalRepository': '$gitLocalRepository'" >>$customSettingsFile + echo " 'restConfUrl': '$restConfUrl'," >>$customSettingsFile + echo " 'restConfUser': '$restConfUser'," >>$customSettingsFile + echo " 'restConfPassword': '$restConfPassword'," >>$customSettingsFile + echo " 'formatXML': '$formatXML'," >>$customSettingsFile + echo " 'formatJSON': '$formatJSON'," >>$customSettingsFile + echo " 'enableHttps': true" >>$customSettingsFile echo " }" >>$customSettingsFile fi #echo "Created custom settings file $customSettingsFile" diff --git a/kubernetes/common/dgbuilder/resources/scripts/customSettings.js b/kubernetes/common/dgbuilder/resources/scripts/customSettings.js index e3349b9d5a..66b7b5ed15 100644 --- a/kubernetes/common/dgbuilder/resources/scripts/customSettings.js +++ b/kubernetes/common/dgbuilder/resources/scripts/customSettings.js @@ -35,6 +35,11 @@ module.exports={ "dbUser": "sdnctl", "dbPassword": "{{.Values.config.dbSdnctlPassword}}", "gitLocalRepository": "", + "restConfUrl": "http://localhost:8181/restconf/operations/SLI-API:execute-graph", + "restConfUser": "admin", + "restConfPassword": "admin", + "formatXML": "Y", + "formatJSON": "Y", "httpRoot": "/", "disableEditor": false, "httpAdminRoot": "/", @@ -49,5 +54,6 @@ module.exports={ }, "uiHost": "0.0.0.0", "version": "0.9.1", - "performGitPull": "N" + "performGitPull": "N", + "enableHttps" : true } diff --git a/kubernetes/common/dgbuilder/values.yaml b/kubernetes/common/dgbuilder/values.yaml index df52fbc64b..fa205e227e 100644 --- a/kubernetes/common/dgbuilder/values.yaml +++ b/kubernetes/common/dgbuilder/values.yaml @@ -47,7 +47,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/ccsdk-dgbuilder-image:0.6.0 +image: onap/ccsdk-dgbuilder-image:0.6.3 pullPolicy: Always # flag to enable debugging - application support required 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/msb/charts/msb-discovery/values.yaml b/kubernetes/msb/charts/msb-discovery/values.yaml index bc279e0dcb..b47127865d 100644 --- a/kubernetes/msb/charts/msb-discovery/values.yaml +++ b/kubernetes/msb/charts/msb-discovery/values.yaml @@ -24,7 +24,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/msb/msb_discovery:1.2.3 +image: onap/msb/msb_discovery:1.2.5 pullPolicy: Always istioSidecar: true diff --git a/kubernetes/msb/charts/msb-eag/values.yaml b/kubernetes/msb/charts/msb-eag/values.yaml index e8b28ac2f2..e25fa28685 100644 --- a/kubernetes/msb/charts/msb-eag/values.yaml +++ b/kubernetes/msb/charts/msb-eag/values.yaml @@ -24,7 +24,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/msb/msb_apigateway:1.2.4 +image: onap/msb/msb_apigateway:1.2.5 pullPolicy: Always istioSidecar: true diff --git a/kubernetes/msb/charts/msb-iag/values.yaml b/kubernetes/msb/charts/msb-iag/values.yaml index 6008cea479..4aaeaeadc3 100644 --- a/kubernetes/msb/charts/msb-iag/values.yaml +++ b/kubernetes/msb/charts/msb-iag/values.yaml @@ -24,7 +24,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/msb/msb_apigateway:1.2.4 +image: onap/msb/msb_apigateway:1.2.5 pullPolicy: Always istioSidecar: true diff --git a/kubernetes/multicloud/charts/multicloud-k8s/values.yaml b/kubernetes/multicloud/charts/multicloud-k8s/values.yaml index 3b8e9bfc43..e7117d7e9f 100644 --- a/kubernetes/multicloud/charts/multicloud-k8s/values.yaml +++ b/kubernetes/multicloud/charts/multicloud-k8s/values.yaml @@ -26,8 +26,8 @@ global: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 -image: onap/multicloud/k8s:0.4.0 +repository: registry.hub.docker.com +image: onap/multicloud-k8s:0.5.0 pullPolicy: Always # flag to enable debugging - application support required 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/vfc/charts/vfc-catalog/values.yaml b/kubernetes/vfc/charts/vfc-catalog/values.yaml index aea74c614b..1a8808b358 100644 --- a/kubernetes/vfc/charts/vfc-catalog/values.yaml +++ b/kubernetes/vfc/charts/vfc-catalog/values.yaml @@ -76,7 +76,7 @@ persistence: ## GKE, AWS & OpenStack) ## # storageClass: "-" - accessMode: ReadWriteMany + accessMode: ReadWriteOnce size: 2Gi mountPath: /dockerdata-nfs mountSubPath: vfc/catalog |