diff options
24 files changed, 238 insertions, 78 deletions
diff --git a/blueprints/k8s-bbs-event-processor.yaml b/blueprints/k8s-bbs-event-processor.yaml index 5115b6b..cbd0318 100644 --- a/blueprints/k8s-bbs-event-processor.yaml +++ b/blueprints/k8s-bbs-event-processor.yaml @@ -19,7 +19,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports:
- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- - plugin:k8splugin?version=3.0.0
+ - plugin:k8splugin?version=3.4.2
inputs:
aai_enrichment_host:
diff --git a/blueprints/k8s-datafile.yaml b/blueprints/k8s-datafile.yaml index 7ab5607..87f508c 100644 --- a/blueprints/k8s-datafile.yaml +++ b/blueprints/k8s-datafile.yaml @@ -6,7 +6,7 @@ tosca_definitions_version: cloudify_dsl_1_3 description: Docker application to collect log file from PNF imports: - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml -- plugin:k8splugin?version=3.3.0 +- plugin:k8splugin?version=3.4.2 - plugin:dmaap?version=1.5.0 inputs: PM_MEAS_FILES_feed0_location: diff --git a/blueprints/k8s-datalake-admin-ui.yaml b/blueprints/k8s-datalake-admin-ui.yaml index 1428de8..7c663ca 100644 --- a/blueprints/k8s-datalake-admin-ui.yaml +++ b/blueprints/k8s-datalake-admin-ui.yaml @@ -26,7 +26,7 @@ inputs: image_name: description: datalake feeder image URL. type: string - default: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakeadminui:1.0.2 + default: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakeadminui:1.1.0 container_port: type: string description: exposed container port diff --git a/blueprints/k8s-datalake-des.yaml b/blueprints/k8s-datalake-des.yaml new file mode 100644 index 0000000..debe95d --- /dev/null +++ b/blueprints/k8s-datalake-des.yaml @@ -0,0 +1,127 @@ +# ============LICENSE_START==================================================== +# ============================================================================= +# Copyright (C) 2020 China Mobile +# ============================================================================= +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END====================================================== +#author: Kai Lu (lukai@chinamobile.com) +tosca_definitions_version: cloudify_dsl_1_3 +imports: + - "https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml" + - plugin:k8splugin?version=3.4.2 +inputs: + service_name: + type: string + default: 'dcae-des' + mariadb_address: + type: string + description: MariaDB URL + default: "mariadb-galera" + mariadb_port: + type: string + description: MariaDB port + default: "3306" + db_username: + type: string + description: MariaDB Username + default: "root" + db_password: + description: MariaDB password + type: string + default: "secretpassword" + presto_address: + type: string + description: Presto URL + default: "dl-presto" + presto_port: + type: string + description: Presto port + default: "9000" + presto_username: + type: string + description: Presto Username + default: "user" + presto_password: + description: Presto password + type: string + default: "test" + image_name: + description: des image URL. + type: string + default: nexus3.onap.org:10003/onap/org.onap.dcaegen2.services.datalake.exposure.service:1.1.0 + dl_hostname: + type: string + description: dl default des_hostname + default: k8s-des + container_port: + type: string + description: exposed container port + default: "1681" + host_port: + type: string + description: external port + default: "30409" +node_templates: + datalake: + type: dcae.nodes.ContainerizedServiceComponent + interfaces: + cloudify.interfaces.lifecycle: + start: + inputs: + ports: + - '1681:0' + - concat: [{get_input: container_port},":",{get_input: host_port}] + envs: + MYSQL_HOST: + get_input: mariadb_address + MYSQL_PORT: + get_input: mariadb_port + MYSQL_ROOT_PASSWORD: + get_input: db_password + PRESTO_HOST: + get_input: presto_address + PRESTO_PORT: + get_input: presto_port + PRESTO_USER: + get_input: presto_username + PRESTO_PASSWORD: + get_input: presto_password + properties: + application_config: + MYSQL_HOST: + get_input: mariadb_address + MYSQL_PORT: + get_input: mariadb_port + MYSQL_ROOT_PASSWORD: + get_input: db_password + PRESTO_HOST: + get_input: presto_address + PRESTO_PORT: + get_input: presto_port + PRESTO_USER: + get_input: presto_username + PRESTO_PASSWORD: + get_input: presto_password + HOSTNAME: + get_input: dl_hostname + image: + get_input: image_name + docker_config: + healthcheck: + interval: 90s + timeout: 10s + type: http + endpoint: /datalake/v1/exposure + service_component_type: 'dcae-des' + service_id: 'dcae-des' + service_component_name_override: 'dcae-des'
\ No newline at end of file diff --git a/blueprints/k8s-datalake-feeder.yaml b/blueprints/k8s-datalake-feeder.yaml index bd67c79..b88892e 100644 --- a/blueprints/k8s-datalake-feeder.yaml +++ b/blueprints/k8s-datalake-feeder.yaml @@ -42,7 +42,7 @@ inputs: image_name: description: datalake feeder image URL. type: string - default: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakefeeder:1.0.2 + default: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakefeeder:1.1.0 dl_hostname: type: string description: dl default dl_hostname diff --git a/blueprints/k8s-heartbeat.yaml b/blueprints/k8s-heartbeat.yaml index a8e2cf6..2fdee83 100644 --- a/blueprints/k8s-heartbeat.yaml +++ b/blueprints/k8s-heartbeat.yaml @@ -1,6 +1,7 @@ # ============LICENSE_START==================================================== # ============================================================================= # Copyright (C) 2019-2020 AT&T +# Copyright (C) 2020 Wipro Limited # ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,7 +20,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=3.4.2 - plugin:pgaas?version=1.3.0 @@ -65,21 +66,13 @@ inputs: namespace: type: string default: 'onap' - pg_dbName: - type: string - default: 'postgres' - pg_ipAddress: - type: string - default: 'hbpostgres-write' - pg_passwd: - type: string - default: 'postgres' - pg_portNum: + pgaas_cluster_name: type: string - default: '5432' - pg_userName: + description: pg cluster + default: "dcae-pg-primary.onap" + pg_dbName: type: string - default: 'postgres' + default: 'heartbeat' ves_heartbeat_publish_url: type: string default: 'http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT' @@ -87,28 +80,13 @@ inputs: type: string default: 'http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_CL_OUTPUT' node_templates: - hbpostgres: - type: dcae.nodes.ContainerizedApplication + hbpgaas: + type: dcae.nodes.pgaas.database properties: - name: - "hbpostgres-write" - image: - "postgres:9.5.2" - interfaces: - cloudify.interfaces.lifecycle: - start: - inputs: - envs: - PGDATA: - "/var/lib/postgresql/data/hbpostgres" - POSTGRES_PASSWORD: - { get_input: pg_passwd } - POSTGRES_USER: - { get_input: pg_userName } - SERVICE_NAME: - "hbpostgres-write" - ports: - - "5432:0" + writerfqdn: { get_input: pgaas_cluster_name } + name: { get_input: pg_dbName} + use_existing: false + heartbeat: interfaces: cloudify.interfaces.lifecycle: @@ -122,12 +100,13 @@ node_templates: groupID: get_input: groupID pg_ipAddress: - get_input: pg_ipAddress + { get_attribute: [ hbpgaas, admin, host ] } pg_passwd: - get_input: pg_passwd - pg_portNum: "5432" + { get_attribute: [ hbpgaas, admin, password ] } + pg_portNum: + { get_attribute: [ hbpgaas, admin, port ] } pg_userName: - get_input: pg_userName + { get_attribute: [ hbpgaas, admin, user ] } pg_dbName: get_input: pg_dbName ports: @@ -144,13 +123,13 @@ node_templates: groupID: get_input: groupID pg_ipAddress: - get_input: pg_ipAddress + { get_attribute: [ hbpgaas, admin, host ] } pg_passwd: - get_input: pg_passwd + { get_attribute: [ hbpgaas, admin, password ] } pg_portNum: - get_input: pg_portNum + { get_attribute: [ hbpgaas, admin, port ] } pg_userName: - get_input: pg_userName + { get_attribute: [ hbpgaas, admin, user ] } pg_dbName: get_input: pg_dbName heartbeat_config: '{"vnfs": [{"eventName": "Heartbeat_vDNS","heartbeatcountmissed": 3,"heartbeatinterval": 60,"closedLoopControlName": "ControlLoopEvent1", "policyVersion": "1.0.0.5", "policyName":"vFireWall","policyScope": "resource=sampleResource,type=sampletype,CLName=sampleCLName","target_type": "VNF", "target": "genVnfName", "version": "1.0"}, {"eventName": "Heartbeat_vFW","heartbeatcountmissed": 3, "heartbeatinterval": 60,"closedLoopControlName": "ControlLoopEvent1","policyVersion": "1.0.0.5","policyName": "vFireWall","policyScope": "resource=sampleResource,type=sampletype,CLName=sampleCLName", "target_type":"VNF", "target": "genVnfName", "version": "1.0"}, {"eventName": "Heartbeat_xx","heartbeatcountmissed": 3, "heartbeatinterval": 60,"closedLoopControlName": "ControlLoopEvent1","policyVersion": "1.0.0.5","policyName": "vFireWall", "policyScope": "resource=sampleResource,type=sampletype,CLName=sampleCLName","target_type": "VNF","target": "genVnfName","version": "1.0"}]}' @@ -181,6 +160,5 @@ node_templates: type: dcae.nodes.ContainerizedServiceComponent relationships: - type: cloudify.relationships.depends_on - target: hbpostgres - + target: hbpgaas diff --git a/blueprints/k8s-holmes-engine.yaml b/blueprints/k8s-holmes-engine.yaml index 64474c2..6557535 100644 --- a/blueprints/k8s-holmes-engine.yaml +++ b/blueprints/k8s-holmes-engine.yaml @@ -21,7 +21,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml -- plugin:k8splugin?version=3.3.0 +- plugin:k8splugin?version=3.4.2 - plugin:dcaepolicyplugin?version=2.4.0 - plugin:pgaas?version=1.3.0 inputs: @@ -44,7 +44,7 @@ inputs: default: "holmes" he_image: type: string - default: "nexus3.onap.org:10001/onap/holmes/engine-management:1.2.6" + default: "nexus3.onap.org:10001/onap/holmes/engine-management:1.2.9" service_component_type: type: string default: "holmes-engine-mgmt" @@ -54,7 +54,18 @@ inputs: service_component_name_override: type: string default: "holmes-engine-mgmt" - + dcae-analytics-holmes-engine-mgt_cpu_limit: + type: string + default: "500m" + dcae-analytics-holmes-engine-mgt_cpu_request: + type: string + default: "500m" + dcae-analytics-holmes-engine-mgt_memory_limit: + type: string + default: "1024Mi" + dcae-analytics-holmes-engine-mgt_memory_request: + type: string + default: "256Mi" node_templates: pgaasvm: type: dcae.nodes.pgaas.database @@ -105,6 +116,17 @@ node_templates: image: { get_input: he_image } # need to use truncated name!! #service_component_type: dcae-analytics-holmes-engin-management + resource_config: + limits: + cpu: + get_input: dcae-analytics-holmes-engine-mgt_cpu_limit + memory: + get_input: dcae-analytics-holmes-engine-mgt_memory_limit + requests: + cpu: + get_input: dcae-analytics-holmes-engine-mgt_cpu_request + memory: + get_input: dcae-analytics-holmes-engine-mgt_memory_request relationships: - type: cloudify.relationships.depends_on target: pgaasvm diff --git a/blueprints/k8s-holmes-rules.yaml b/blueprints/k8s-holmes-rules.yaml index 2431131..c1e1f00 100644 --- a/blueprints/k8s-holmes-rules.yaml +++ b/blueprints/k8s-holmes-rules.yaml @@ -20,7 +20,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml -- plugin:k8splugin?version=3.3.0 +- plugin:k8splugin?version=3.4.2 - plugin:dcaepolicyplugin?version=2.4.0 - plugin:pgaas?version=1.3.0 inputs: @@ -37,7 +37,7 @@ inputs: default: "holmes" hr_image: type: string - default: "nexus3.onap.org:10001/onap/holmes/rule-management:1.2.7" + default: "nexus3.onap.org:10001/onap/holmes/rule-management:1.2.9" service_component_type: type: string default: "holmes-rule-mgmt" @@ -47,6 +47,18 @@ inputs: service_component_name_override: type: string default: "holmes-rule-mgmt" + dcae-analytics-holmes-rule-mgt_cpu_limit: + type: string + default: "250m" + dcae-analytics-holmes-rule-mgt_cpu_request: + type: string + default: "250m" + dcae-analytics-holmes-rule-mgt_memory_limit: + type: string + default: "1024Mi" + dcae-analytics-holmes-rule-mgt_memory_request: + type: string + default: "256Mi" node_templates: pgaasvm: type: dcae.nodes.pgaas.database @@ -86,6 +98,17 @@ node_templates: streams_subscribes: {} image: { get_input: hr_image } #service_component_type: dcae-analytics-holmes-rule-management + resource_config: + limits: + cpu: + get_input: dcae-analytics-holmes-rule-mgt_cpu_limit + memory: + get_input: dcae-analytics-holmes-rule-mgt_memory_limit + requests: + cpu: + get_input: dcae-analytics-holmes-rule-mgt_cpu_request + memory: + get_input: dcae-analytics-holmes-rule-mgt_memory_request relationships: - type: cloudify.relationships.depends_on target: pgaasvm diff --git a/blueprints/k8s-hv-ves.yaml b/blueprints/k8s-hv-ves.yaml index d6f753a..8c42786 100644 --- a/blueprints/k8s-hv-ves.yaml +++ b/blueprints/k8s-hv-ves.yaml @@ -22,7 +22,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.4.1 + - plugin:k8splugin?version=3.4.2 inputs: tag_version: diff --git a/blueprints/k8s-pm-mapper.yaml b/blueprints/k8s-pm-mapper.yaml index ad6a325..ead7d74 100644 --- a/blueprints/k8s-pm-mapper.yaml +++ b/blueprints/k8s-pm-mapper.yaml @@ -23,7 +23,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml' - - plugin:k8splugin?version=3.3.0 + - plugin:k8splugin?version=3.4.2 - plugin:dmaap?version=1.5.0 inputs: diff --git a/blueprints/k8s-pmsh.yaml b/blueprints/k8s-pmsh.yaml index 2dc5b60..92405b6 100644 --- a/blueprints/k8s-pmsh.yaml +++ b/blueprints/k8s-pmsh.yaml @@ -22,13 +22,13 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml' - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=3.4.2 - plugin:pgaas?version=1.3.0 inputs: tag_version: type: string description: Docker image to be used - default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:1.1.1' + default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:1.1.2' replicas: type: integer description: Number of instances diff --git a/blueprints/k8s-prh.yaml b/blueprints/k8s-prh.yaml index f625912..22ea068 100644 --- a/blueprints/k8s-prh.yaml +++ b/blueprints/k8s-prh.yaml @@ -22,7 +22,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.3.0 + - plugin:k8splugin?version=3.4.2 inputs: pnfUrl: type: string diff --git a/blueprints/k8s-sonhms.yaml b/blueprints/k8s-sonhms.yaml index 4d9d648..c707ac1 100644 --- a/blueprints/k8s-sonhms.yaml +++ b/blueprints/k8s-sonhms.yaml @@ -19,7 +19,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml" - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=3.4.2 - plugin:pgaas?version=1.3.0 - plugin:dcaepolicyplugin?version=2.4.0 inputs: @@ -30,7 +30,7 @@ inputs: tag_version: type: string description: docker image name and version - default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:2.0.2" + default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:2.1.2" pgaas_cluster_name: type: string description: pg cluster diff --git a/blueprints/k8s-tcagen2-clampnode.yaml b/blueprints/k8s-tcagen2-clampnode.yaml index cc15ffa..e7d967a 100644 --- a/blueprints/k8s-tcagen2-clampnode.yaml +++ b/blueprints/k8s-tcagen2-clampnode.yaml @@ -19,7 +19,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=3.4.2 - plugin:clamppolicyplugin?version=1.1.0 inputs: service_name: @@ -37,7 +37,7 @@ inputs: default: "mongodb://dcae-mongohost/dcae-tcagen2" tag_version: type: string - default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.0" + default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.1" tca.aai.password: type: string default: "DCAE" diff --git a/blueprints/k8s-tcagen2.yaml b/blueprints/k8s-tcagen2.yaml index 3c35b61..046d65c 100644 --- a/blueprints/k8s-tcagen2.yaml +++ b/blueprints/k8s-tcagen2.yaml @@ -18,7 +18,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.3.0 + - plugin:k8splugin?version=3.4.2 inputs: service_component_type: type: string @@ -41,7 +41,7 @@ inputs: default: "mongodb://dcae-mongohost/dcae-tcagen2" tag_version: type: string - default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.0" + default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.1" tca.aai.password: type: string default: "DCAE" diff --git a/blueprints/k8s-ves-mapper.yaml b/blueprints/k8s-ves-mapper.yaml index 0967122..b7c277a 100644 --- a/blueprints/k8s-ves-mapper.yaml +++ b/blueprints/k8s-ves-mapper.yaml @@ -20,7 +20,7 @@ description: "This blueprint deploys the UniversalVESAdapter" imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.0.0 + - plugin:k8splugin?version=3.4.2 inputs: rcc_notification_url: diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml index 845857a..56e9e9c 100644 --- a/blueprints/k8s-ves.yaml +++ b/blueprints/k8s-ves.yaml @@ -22,7 +22,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.4.1 + - plugin:k8splugin?version=3.4.2 inputs: ves_other_publish_url: @@ -57,7 +57,7 @@ inputs: default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT" tag_version: type: string - default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.7.5" + default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.7.8" internal_port: type: string description: Kubernetes node port on which collector is exposed @@ -77,12 +77,6 @@ inputs: auth_method: type: string default: "noAuth" - component_name: - type: string - default: "dcae-ves-collector" - dns_component_name: - type: string - default: "dcae-ves-collector" service_component_type: type: string default: "dcae-ves-collector" @@ -145,7 +139,7 @@ node_templates: - concat: [{get_input: internal_port_tls},":",{get_input: external_port_tls}] properties: application_config: - collector.dmaap.streamid: fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration|3GPP-FaultSupervision=ves-3gpp-fault-supervision|3GPP-Heartbeat=ves-3gpp-heartbeat|3GPP-Provisioning=ves-3gpp-provisioning|3GPP-PerformanceAssurance=ves-3gpp-performance-assurance + collector.dmaap.streamid: fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurement=ves-measurement|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration|3GPP-FaultSupervision=ves-3gpp-fault-supervision|3GPP-Heartbeat=ves-3gpp-heartbeat|3GPP-Provisioning=ves-3gpp-provisioning|3GPP-PerformanceAssurance=ves-3gpp-performance-assurance collector.inputQueue.maxPending: "8096" collector.keystore.file.location: /opt/app/dcae-certificate/cert.jks collector.keystore.passwordfile: /opt/app/dcae-certificate/jks.pass diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh index 1db498e..c43ea09 100755 --- a/mvn-phase-script.sh +++ b/mvn-phase-script.sh @@ -85,7 +85,7 @@ echo "MVN_DOCKERREGISTRY_PUBLIC is [$MVN_DOCKERREGISTRY_PUBLIC]" echo "HOME is [$HOME]" echo "PROJECT_ROOT is [$PROJECT_ROOT]" -MVN_RELEASE_TAG="${MVN_RELEASE_TAG:-R7}" +MVN_RELEASE_TAG="${MVN_RELEASE_TAG:-R8}" if ! wget -O ${PROJECT_ROOT}/mvn-phase-lib.sh \ @@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <groupId>org.onap.dcaegen2.deployments</groupId> <artifactId>k8s-bootstrap-container</artifactId> <name>dcaegen2-deployments-k8s-bootstrap-container</name> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.8-SNAPSHOT</version> <url>http://maven.apache.org</url> <packaging>pom</packaging> diff --git a/blueprints/k8s-tca-clampnode.yaml b/reference_templates/k8s-tca-clampnode.yaml index c2a0cc3..c2a0cc3 100644 --- a/blueprints/k8s-tca-clampnode.yaml +++ b/reference_templates/k8s-tca-clampnode.yaml diff --git a/blueprints/k8s-tca.yaml b/reference_templates/k8s-tca.yaml index 627aee4..627aee4 100644 --- a/blueprints/k8s-tca.yaml +++ b/reference_templates/k8s-tca.yaml diff --git a/releases/2.1.6-k8s-bootstrap-container.yaml b/releases/2.1.6-k8s-bootstrap-container.yaml new file mode 100644 index 0000000..e6f60aa --- /dev/null +++ b/releases/2.1.6-k8s-bootstrap-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '2.1.6' +project: 'dcaegen2/blueprints' +log_dir: 'dcaegen2-platform-blueprints-master-merge-java/300' +ref: 04f2c06f34ae9c2cd91af8d665bf158b9c7d824e +containers: + - name: 'org.onap.dcaegen2.deployments.k8s-bootstrap-container' + version: '2.1.6-SNAPSHOT-20200922T203744Z' diff --git a/releases/2.1.7-k8s-bootstrap-container.yaml b/releases/2.1.7-k8s-bootstrap-container.yaml new file mode 100644 index 0000000..53fdb69 --- /dev/null +++ b/releases/2.1.7-k8s-bootstrap-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '2.1.7' +project: 'dcaegen2/blueprints' +log_dir: 'dcaegen2-platform-blueprints-master-merge-java/311' +ref: 2feaeca5b8c7fe10ac6562fcba266fe0510bfcd4 +containers: + - name: 'org.onap.dcaegen2.deployments.k8s-bootstrap-container' + version: '2.1.7-SNAPSHOT-20201019T223811Z' diff --git a/version.properties b/version.properties index 201272e..8ac80b7 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=2
minor=1
-patch=5
+patch=8
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT
|