From 6e20d0fb3f4dacda0c6cbccc7cf0424a21432fcf Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Tue, 10 Dec 2019 13:37:26 -0500 Subject: [PATCH] Remove old microservices from aai chart Issue-ID: AAI-2733 Signed-off-by: Jimmy Forsyth Change-Id: Ib471d6c3e8aca7a06f18dfd6167131f1d1df0456 --- components/aai-champ/Chart.yaml | 19 -- components/aai-champ/requirements.yaml | 22 -- .../config/appconfig/auth/champ_policy.json | 19 -- .../config/appconfig/auth/tomcat_keystore | Bin 3429 -> 0 bytes .../config/appconfig/champ-api.properties | 20 -- .../resources/config/dynamic/conf/champ-beans.xml | 86 ------- .../aai-champ/resources/config/log/logback.xml | 176 ------------- .../resources/fproxy/config/fproxy.properties | 2 - .../resources/fproxy/config/logback-spring.xml | 45 ---- .../aai-champ/resources/fproxy/config/readme.txt | 1 - .../rproxy/config/auth/uri-authorization.json | 99 -------- .../resources/rproxy/config/cadi.properties | 39 --- .../rproxy/config/forward-proxy.properties | 4 - .../resources/rproxy/config/logback-spring.xml | 45 ---- .../rproxy/config/primary-service.properties | 3 - .../aai-champ/resources/rproxy/config/readme.txt | 1 - .../rproxy/config/reverse-proxy.properties | 1 - components/aai-champ/templates/configmap.yaml | 95 ------- components/aai-champ/templates/deployment.yaml | 277 --------------------- components/aai-champ/templates/secrets.yaml | 60 ----- components/aai-champ/templates/service.yaml | 53 ---- components/aai-champ/values.yaml | 90 ------- components/aai-gizmo/.helmignore | 21 -- components/aai-gizmo/Chart.yaml | 19 -- components/aai-gizmo/resources/config/README.txt | 24 -- .../aai-gizmo/resources/config/auth/champ-cert.p12 | Bin 2556 -> 0 bytes .../resources/config/auth/client-cert.p12 | Bin 2556 -> 0 bytes .../resources/config/auth/crud_policy.json | 18 -- .../resources/config/auth/datarouter-cert.p12 | Bin 2556 -> 0 bytes .../resources/config/auth/tomcat_keystore | Bin 2214 -> 0 bytes .../aai-gizmo/resources/config/crud-api.properties | 20 -- .../aai-gizmo/resources/config/crud-beans.xml | 47 ---- .../resources/config/edgeprops-ingest.properties | 3 - .../resources/config/log/filebeat/filebeat.yml | 55 ---- .../aai-gizmo/resources/config/log/logback.xml | 196 --------------- .../config/model/edge_properties_v10.json | 10 - .../config/model/edge_properties_v11.json | 6 - .../config/model/edge_properties_v12.json | 6 - .../config/model/edge_properties_v13.json | 6 - .../config/model/edge_properties_v14.json | 6 - .../config/model/edge_properties_v15.json | 6 - .../resources/config/model/edge_properties_v7.json | 10 - .../resources/config/model/edge_properties_v8.json | 10 - .../resources/config/model/edge_properties_v9.json | 10 - .../resources/config/schema-ingest.properties | 45 ---- .../resources/fproxy/config/fproxy.properties | 2 - .../resources/fproxy/config/logback-spring.xml | 45 ---- .../aai-gizmo/resources/fproxy/config/readme.txt | 1 - .../rproxy/config/auth/uri-authorization.json | 99 -------- .../resources/rproxy/config/cadi.properties | 39 --- .../rproxy/config/forward-proxy.properties | 4 - .../resources/rproxy/config/logback-spring.xml | 45 ---- .../rproxy/config/primary-service.properties | 3 - .../aai-gizmo/resources/rproxy/config/readme.txt | 1 - .../rproxy/config/reverse-proxy.properties | 1 - components/aai-gizmo/templates/NOTES.txt | 33 --- components/aai-gizmo/templates/configmap.yaml | 110 -------- components/aai-gizmo/templates/deployment.yaml | 271 -------------------- components/aai-gizmo/templates/secrets.yaml | 54 ---- components/aai-gizmo/templates/service.yaml | 54 ---- components/aai-gizmo/values.yaml | 81 ------ components/aai-graphgraph/Chart.yaml | 19 -- .../aai-graphgraph/config/application.properties | 66 ----- components/aai-graphgraph/templates/configmap.yaml | 26 -- .../aai-graphgraph/templates/deployment.yaml | 119 --------- components/aai-graphgraph/templates/service.yaml | 33 --- components/aai-graphgraph/values.yaml | 88 ------- components/aai-spike/Chart.yaml | 18 -- components/aai-spike/requirements.yaml | 21 -- .../resources/config/auth/client-cert.p12 | Bin 3617 -> 0 bytes .../resources/config/auth/tomcat_keystore | Bin 3429 -> 0 bytes .../resources/config/edgeprops-ingest.properties | 23 -- components/aai-spike/resources/config/logback.xml | 194 --------------- .../model/edge_props/edge_properties_v10.json | 10 - .../model/edge_props/edge_properties_v11.json | 6 - .../model/edge_props/edge_properties_v12.json | 6 - .../model/edge_props/edge_properties_v13.json | 6 - .../model/edge_props/edge_properties_v14.json | 6 - .../model/edge_props/edge_properties_v15.json | 6 - .../model/edge_props/edge_properties_v7.json | 10 - .../model/edge_props/edge_properties_v8.json | 10 - .../model/edge_props/edge_properties_v9.json | 10 - .../resources/config/schema-ingest.properties | 65 ----- .../aai-spike/resources/config/spike-beans.xml | 62 ----- .../aai-spike/resources/config/spike.properties | 28 --- components/aai-spike/templates/configmap.yaml | 39 --- components/aai-spike/templates/deployment.yaml | 166 ------------ components/aai-spike/templates/secrets.yaml | 42 ---- components/aai-spike/templates/service.yaml | 39 --- components/aai-spike/values.yaml | 88 ------- requirements.yaml | 16 -- values.yaml | 8 - 92 files changed, 3748 deletions(-) delete mode 100644 components/aai-champ/Chart.yaml delete mode 100644 components/aai-champ/requirements.yaml delete mode 100644 components/aai-champ/resources/config/appconfig/auth/champ_policy.json delete mode 100644 components/aai-champ/resources/config/appconfig/auth/tomcat_keystore delete mode 100644 components/aai-champ/resources/config/appconfig/champ-api.properties delete mode 100644 components/aai-champ/resources/config/dynamic/conf/champ-beans.xml delete mode 100644 components/aai-champ/resources/config/log/logback.xml delete mode 100644 components/aai-champ/resources/fproxy/config/fproxy.properties delete mode 100644 components/aai-champ/resources/fproxy/config/logback-spring.xml delete mode 100644 components/aai-champ/resources/fproxy/config/readme.txt delete mode 100644 components/aai-champ/resources/rproxy/config/auth/uri-authorization.json delete mode 100644 components/aai-champ/resources/rproxy/config/cadi.properties delete mode 100644 components/aai-champ/resources/rproxy/config/forward-proxy.properties delete mode 100644 components/aai-champ/resources/rproxy/config/logback-spring.xml delete mode 100644 components/aai-champ/resources/rproxy/config/primary-service.properties delete mode 100644 components/aai-champ/resources/rproxy/config/readme.txt delete mode 100644 components/aai-champ/resources/rproxy/config/reverse-proxy.properties delete mode 100644 components/aai-champ/templates/configmap.yaml delete mode 100644 components/aai-champ/templates/deployment.yaml delete mode 100644 components/aai-champ/templates/secrets.yaml delete mode 100644 components/aai-champ/templates/service.yaml delete mode 100644 components/aai-champ/values.yaml delete mode 100644 components/aai-gizmo/.helmignore delete mode 100644 components/aai-gizmo/Chart.yaml delete mode 100644 components/aai-gizmo/resources/config/README.txt delete mode 100644 components/aai-gizmo/resources/config/auth/champ-cert.p12 delete mode 100644 components/aai-gizmo/resources/config/auth/client-cert.p12 delete mode 100644 components/aai-gizmo/resources/config/auth/crud_policy.json delete mode 100644 components/aai-gizmo/resources/config/auth/datarouter-cert.p12 delete mode 100644 components/aai-gizmo/resources/config/auth/tomcat_keystore delete mode 100644 components/aai-gizmo/resources/config/crud-api.properties delete mode 100644 components/aai-gizmo/resources/config/crud-beans.xml delete mode 100644 components/aai-gizmo/resources/config/edgeprops-ingest.properties delete mode 100644 components/aai-gizmo/resources/config/log/filebeat/filebeat.yml delete mode 100644 components/aai-gizmo/resources/config/log/logback.xml delete mode 100644 components/aai-gizmo/resources/config/model/edge_properties_v10.json delete mode 100644 components/aai-gizmo/resources/config/model/edge_properties_v11.json delete mode 100644 components/aai-gizmo/resources/config/model/edge_properties_v12.json delete mode 100644 components/aai-gizmo/resources/config/model/edge_properties_v13.json delete mode 100644 components/aai-gizmo/resources/config/model/edge_properties_v14.json delete mode 100644 components/aai-gizmo/resources/config/model/edge_properties_v15.json delete mode 100644 components/aai-gizmo/resources/config/model/edge_properties_v7.json delete mode 100644 components/aai-gizmo/resources/config/model/edge_properties_v8.json delete mode 100644 components/aai-gizmo/resources/config/model/edge_properties_v9.json delete mode 100644 components/aai-gizmo/resources/config/schema-ingest.properties delete mode 100644 components/aai-gizmo/resources/fproxy/config/fproxy.properties delete mode 100644 components/aai-gizmo/resources/fproxy/config/logback-spring.xml delete mode 100644 components/aai-gizmo/resources/fproxy/config/readme.txt delete mode 100644 components/aai-gizmo/resources/rproxy/config/auth/uri-authorization.json delete mode 100644 components/aai-gizmo/resources/rproxy/config/cadi.properties delete mode 100644 components/aai-gizmo/resources/rproxy/config/forward-proxy.properties delete mode 100644 components/aai-gizmo/resources/rproxy/config/logback-spring.xml delete mode 100644 components/aai-gizmo/resources/rproxy/config/primary-service.properties delete mode 100644 components/aai-gizmo/resources/rproxy/config/readme.txt delete mode 100644 components/aai-gizmo/resources/rproxy/config/reverse-proxy.properties delete mode 100644 components/aai-gizmo/templates/NOTES.txt delete mode 100644 components/aai-gizmo/templates/configmap.yaml delete mode 100644 components/aai-gizmo/templates/deployment.yaml delete mode 100644 components/aai-gizmo/templates/secrets.yaml delete mode 100644 components/aai-gizmo/templates/service.yaml delete mode 100644 components/aai-gizmo/values.yaml delete mode 100644 components/aai-graphgraph/Chart.yaml delete mode 100644 components/aai-graphgraph/config/application.properties delete mode 100644 components/aai-graphgraph/templates/configmap.yaml delete mode 100644 components/aai-graphgraph/templates/deployment.yaml delete mode 100644 components/aai-graphgraph/templates/service.yaml delete mode 100644 components/aai-graphgraph/values.yaml delete mode 100644 components/aai-spike/Chart.yaml delete mode 100644 components/aai-spike/requirements.yaml delete mode 100644 components/aai-spike/resources/config/auth/client-cert.p12 delete mode 100644 components/aai-spike/resources/config/auth/tomcat_keystore delete mode 100644 components/aai-spike/resources/config/edgeprops-ingest.properties delete mode 100644 components/aai-spike/resources/config/logback.xml delete mode 100644 components/aai-spike/resources/config/model/edge_props/edge_properties_v10.json delete mode 100644 components/aai-spike/resources/config/model/edge_props/edge_properties_v11.json delete mode 100644 components/aai-spike/resources/config/model/edge_props/edge_properties_v12.json delete mode 100644 components/aai-spike/resources/config/model/edge_props/edge_properties_v13.json delete mode 100644 components/aai-spike/resources/config/model/edge_props/edge_properties_v14.json delete mode 100644 components/aai-spike/resources/config/model/edge_props/edge_properties_v15.json delete mode 100644 components/aai-spike/resources/config/model/edge_props/edge_properties_v7.json delete mode 100644 components/aai-spike/resources/config/model/edge_props/edge_properties_v8.json delete mode 100644 components/aai-spike/resources/config/model/edge_props/edge_properties_v9.json delete mode 100644 components/aai-spike/resources/config/schema-ingest.properties delete mode 100644 components/aai-spike/resources/config/spike-beans.xml delete mode 100644 components/aai-spike/resources/config/spike.properties delete mode 100644 components/aai-spike/templates/configmap.yaml delete mode 100644 components/aai-spike/templates/deployment.yaml delete mode 100644 components/aai-spike/templates/secrets.yaml delete mode 100644 components/aai-spike/templates/service.yaml delete mode 100644 components/aai-spike/values.yaml diff --git a/components/aai-champ/Chart.yaml b/components/aai-champ/Chart.yaml deleted file mode 100644 index 9d0a967..0000000 --- a/components/aai-champ/Chart.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# Modifications Copyright © 2018 Bell Canada -# -# 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. - -apiVersion: v1 -description: ONAP AAI Champ microservice -name: aai-champ -version: 5.0.0 diff --git a/components/aai-champ/requirements.yaml b/components/aai-champ/requirements.yaml deleted file mode 100644 index d920c92..0000000 --- a/components/aai-champ/requirements.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# Modifications Copyright © 2018 Bell Canada -# -# 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. - -dependencies: - - name: common - version: ~5.x-0 - # local reference to common chart, as it is - # a part of this chart's package and will not - # be published independently to a repo (at this point) - repository: '@local' diff --git a/components/aai-champ/resources/config/appconfig/auth/champ_policy.json b/components/aai-champ/resources/config/appconfig/auth/champ_policy.json deleted file mode 100644 index a059e86..0000000 --- a/components/aai-champ/resources/config/appconfig/auth/champ_policy.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "roles": [ - { - "name": "admin", - "functions": [ - { - "name": "search", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" } ] - } - ], - - "users": [ - { - "username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA" - } - ] - } - ] -} - diff --git a/components/aai-champ/resources/config/appconfig/auth/tomcat_keystore b/components/aai-champ/resources/config/appconfig/auth/tomcat_keystore deleted file mode 100644 index c4c72718ff1e42cb9c7ac04ef72c66237f497180..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3429 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 diff --git a/components/aai-champ/resources/config/appconfig/champ-api.properties b/components/aai-champ/resources/config/appconfig/champ-api.properties deleted file mode 100644 index 0aba797..0000000 --- a/components/aai-champ/resources/config/appconfig/champ-api.properties +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada, AT&T -# -# 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. - -keyName=aai-uuid -sourceOfTruthName=source-of-truth -createdTsName=aai-created-ts -lastModTsName=aai-last-mod-ts -collectionPropertiesKey=properties - diff --git a/components/aai-champ/resources/config/dynamic/conf/champ-beans.xml b/components/aai-champ/resources/config/dynamic/conf/champ-beans.xml deleted file mode 100644 index 08390b6..0000000 --- a/components/aai-champ/resources/config/dynamic/conf/champ-beans.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/components/aai-champ/resources/config/log/logback.xml b/components/aai-champ/resources/config/log/logback.xml deleted file mode 100644 index 67f6ac3..0000000 --- a/components/aai-champ/resources/config/log/logback.xml +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - ${errorLogPattern} - - - - - - - - - ${logDirectory}/${generalLogName}.log - - ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - ${errorLogPattern} - - - - - - INFO - - 256 - - - - - ${logDirectory}/${auditLogName}.log - - ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - ${auditMetricPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}.log - - ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - ${auditMetricPattern} - - - - - 256 - - - - - ${logDirectory}/${debugLogName}.log - - ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - ${errorLogPattern} - - - - - 256 - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/components/aai-champ/resources/fproxy/config/fproxy.properties b/components/aai-champ/resources/fproxy/config/fproxy.properties deleted file mode 100644 index f512fb7..0000000 --- a/components/aai-champ/resources/fproxy/config/fproxy.properties +++ /dev/null @@ -1,2 +0,0 @@ -credential.cache.timeout.ms=180000 -transactionid.header.name=X-TransactionId \ No newline at end of file diff --git a/components/aai-champ/resources/fproxy/config/logback-spring.xml b/components/aai-champ/resources/fproxy/config/logback-spring.xml deleted file mode 100644 index 0ece55c..0000000 --- a/components/aai-champ/resources/fproxy/config/logback-spring.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - %d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable - - - - - - ${LOGS}/${FILEPREFIX}.log - - %d %p %C{1.} [%t] %m%n - - - - - ${LOGS}/archived/${FILEPREFIX}-%d{yyyy-MM-dd}.%i.log - - - 10MB - - - - - - - - - - - - - - \ No newline at end of file diff --git a/components/aai-champ/resources/fproxy/config/readme.txt b/components/aai-champ/resources/fproxy/config/readme.txt deleted file mode 100644 index 79cf29e..0000000 --- a/components/aai-champ/resources/fproxy/config/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Relevant configuration files need to be copied here to successfully run this service locally. \ No newline at end of file diff --git a/components/aai-champ/resources/rproxy/config/auth/uri-authorization.json b/components/aai-champ/resources/rproxy/config/auth/uri-authorization.json deleted file mode 100644 index ca34049..0000000 --- a/components/aai-champ/resources/rproxy/config/auth/uri-authorization.json +++ /dev/null @@ -1,99 +0,0 @@ - [ - { - "uri": "\/not\/allowed\/at\/all$", - "permissions": [ - "test.auth.access.ifYouLikedItYouShouldHavePutAPermissionOnIt" - ] - }, - { - "uri": "\/one\/auth\/required$", - "permissions": [ - "test.auth.access.aSimpleSingleAuth" - ] - }, - { - "uri": "\/multi\/auth\/required$", - "permissions": [ - "test.auth.access.aMultipleAuth1", - "test.auth.access.aMultipleAuth2", - "test.auth.access.aMultipleAuth3" - ] - }, - { - "uri": "\/one\/[^\/]+\/required$", - "permissions": [ - "test.auth.access.aSimpleSingleAuth" - ] - }, - { - "uri": "\/services\/getAAFRequest$", - "permissions": [ - "test.auth.access|services|GET,PUT" - ] - }, - { - "uri": "\/admin\/getAAFRequest$", - "permissions": [ - "test.auth.access|admin|GET,PUT,POST" - ] - }, - { - "uri": "\/service\/aai\/webapp\/index.html$", - "permissions": [ - "test.auth.access|services|GET,PUT" - ] - }, - { - "uri": "\/services\/aai\/webapp\/index.html$", - "permissions": [ - "test.auth.access|services|GET,PUT" - ] - }, - { - "uri": "\/$", - "permissions": [ - "\\|services\\|GET", - "test\\.auth\\.access\\|services\\|GET,PUT" - ] - }, - { - "uri": "\/aai\/v10\/cloud-infrastructure\/cloud-regions$", - "permissions": [ - "test\\.auth\\.access\\|rest\\|read" - ] - }, - { - "uri": "\/aai\/v10\/cloud-infrastructure\/cloud-regions\/cloud-region\/[^\/]+[\/][^\/]+$*", - "permissions": [ - "test.auth.access|clouds|read", - "test.auth.access|tenants|read" - ] - }, - { - "uri": "\/aai\/v10\/cloud-infrastructure\/cloud-regions\/cloud-region\/[^\/]+[\/][^\/]+\/tenants/tenant/[^\/]+/vservers/vserver/[^\/]+$", - "permissions": [ - "test.auth.access|clouds|read", - "test.auth.access|tenants|read", - "test.auth.access|vservers|read" - ] - }, - { - "uri": "\/backend$", - "permissions": [ - "test\\.auth\\.access\\|services\\|GET,PUT", - "\\|services\\|GET" - ] - }, - { - "uri": "\/services\/inventory\/.*", - "permissions": [ - "org\\.onap\\.aai\\.resources\\|\\*\\|.*" - ] - }, - { - "uri": "\/services\/champ-service\/.*", - "permissions": [ - "org\\.onap\\.aai\\.resources\\|\\*\\|.*" - ] - } - ] diff --git a/components/aai-champ/resources/rproxy/config/cadi.properties b/components/aai-champ/resources/rproxy/config/cadi.properties deleted file mode 100644 index 4a375d3..0000000 --- a/components/aai-champ/resources/rproxy/config/cadi.properties +++ /dev/null @@ -1,39 +0,0 @@ -# This is a normal Java Properties File -# Comments are with Pound Signs at beginning of lines, -# and multi-line expression of properties can be obtained by backslash at end of line - -#hostname is used for local testing where you may have to set your hostname to **.att.com or **.sbc.com. The example given below -#will allow for an ATT cross domain cookie to be used for GLO. If you are running on Windows corp machine, your machine name -#may be used automatically by cadi. However, if it is not, you will need to use hostname=mywebserver.att.com and add mywebserver.att.com -#to your hosts file on your machine. -#hostname=test.aic.cip.att.com - -cadi_loglevel=DEBUG - -# OAuth2 -aaf_oauth2_token_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.token:2.1/token -aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.introspect:2.1/introspect - -cadi_latitude=37.78187 -cadi_longitude=-122.26147 - -# Locate URL (which AAF Env) -aaf_locate_url=https://aaf-locate.{{.Release.Namespace}}:8095 - -# AAF URL -aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1 - -cadi_keyfile=/opt/app/rproxy/config/security/keyfile -cadi_keystore=/opt/app/rproxy/config/auth/org.onap.aai.p12 -cadi_keystore_password=enc:383RDJRFA6yQz9AOxUxC1iIg3xTJXityw05MswnpnEtelRQy2D4r5INQjrea7GTV -cadi_alias=aai@aai.onap.org -cadi_truststore=/opt/app/rproxy/config/auth/tomcat_keystore -cadi_truststore_password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 - -aaf_env=DEV - -aaf_id=demo@people.osaaf.org -aaf_password=enc:92w4px0y_rrm265LXLpw58QnNPgDXykyA1YTrflbAKz - -# This is a colon separated list of client cert issuers -cadi_x509_issuers=CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA \ No newline at end of file diff --git a/components/aai-champ/resources/rproxy/config/forward-proxy.properties b/components/aai-champ/resources/rproxy/config/forward-proxy.properties deleted file mode 100644 index 1b58d42..0000000 --- a/components/aai-champ/resources/rproxy/config/forward-proxy.properties +++ /dev/null @@ -1,4 +0,0 @@ -forward-proxy.protocol = https -forward-proxy.host = localhost -forward-proxy.port = 10680 -forward-proxy.cacheurl = /credential-cache \ No newline at end of file diff --git a/components/aai-champ/resources/rproxy/config/logback-spring.xml b/components/aai-champ/resources/rproxy/config/logback-spring.xml deleted file mode 100644 index 735edb6..0000000 --- a/components/aai-champ/resources/rproxy/config/logback-spring.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - %d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable - - - - - - ${LOGS}/${FILEPREFIX}.log - - %d %p %C{1.} [%t] %m%n - - - - - ${LOGS}/archived/${FILEPREFIX}-%d{yyyy-MM-dd}.%i.log - - - 10MB - - - - - - - - - - - - - - \ No newline at end of file diff --git a/components/aai-champ/resources/rproxy/config/primary-service.properties b/components/aai-champ/resources/rproxy/config/primary-service.properties deleted file mode 100644 index 8d64529..0000000 --- a/components/aai-champ/resources/rproxy/config/primary-service.properties +++ /dev/null @@ -1,3 +0,0 @@ -primary-service.protocol = https -primary-service.host = localhost -primary-service.port = 9522 \ No newline at end of file diff --git a/components/aai-champ/resources/rproxy/config/readme.txt b/components/aai-champ/resources/rproxy/config/readme.txt deleted file mode 100644 index 79cf29e..0000000 --- a/components/aai-champ/resources/rproxy/config/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Relevant configuration files need to be copied here to successfully run this service locally. \ No newline at end of file diff --git a/components/aai-champ/resources/rproxy/config/reverse-proxy.properties b/components/aai-champ/resources/rproxy/config/reverse-proxy.properties deleted file mode 100644 index 8d46e1f..0000000 --- a/components/aai-champ/resources/rproxy/config/reverse-proxy.properties +++ /dev/null @@ -1 +0,0 @@ -transactionid.header.name=X-TransactionId \ No newline at end of file diff --git a/components/aai-champ/templates/configmap.yaml b/components/aai-champ/templates/configmap.yaml deleted file mode 100644 index c3966e7..0000000 --- a/components/aai-champ/templates/configmap.yaml +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# Modifications Copyright © 2018 Bell Canada -# -# 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. - -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/config/appconfig/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-dynamic - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/config/dynamic/conf/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-log-configmap - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }} -{{ if .Values.global.installSidecarSecurity }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-fproxy-config - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/fproxy/config/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-fproxy-log-config - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/fproxy/config/logback-spring.xml").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-rproxy-config - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/rproxy/config/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-rproxy-log-config - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/rproxy/config/logback-spring.xml").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-rproxy-uri-auth-config - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/rproxy/config/auth/uri-authorization.json").AsConfig . | indent 2 }} -{{ end }} \ No newline at end of file diff --git a/components/aai-champ/templates/deployment.yaml b/components/aai-champ/templates/deployment.yaml deleted file mode 100644 index a311f68..0000000 --- a/components/aai-champ/templates/deployment.yaml +++ /dev/null @@ -1,277 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# Modifications Copyright © 2018 Bell Canada -# -# 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. - -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - replicas: {{ .Values.replicaCount }} - template: - metadata: - labels: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - spec: - initContainers: - - command: - - /root/ready.py - args: - - --container-name - {{- if .Values.global.cassandra.localCluster }} - - aai-cassandra - {{- else }} - - cassandra - {{- end }} - env: - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - name: {{ include "common.name" . }}-readiness - {{ if .Values.global.installSidecarSecurity }} - - name: {{ .Values.global.tproxyConfig.name }} - image: "{{ include "common.repository" . }}/{{ .Values.global.tproxyConfig.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - securityContext: - privileged: true - {{ end }} - containers: - - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - ports: - - containerPort: {{ .Values.service.internalPort }} - # disable liveness probe when breakpoints set in debugger - # so K8s doesn't restart unresponsive container - {{ if .Values.liveness.enabled }} - livenessProbe: - tcpSocket: - port: {{ .Values.service.internalPort }} - initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end }} - readinessProbe: - tcpSocket: - port: {{ .Values.service.internalPort }} - initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.readiness.periodSeconds }} - env: - - name: CONFIG_HOME - value: "/opt/app/champ-service/appconfig" - - name: GRAPHIMPL - value: "janus-deps" - - name: KEY_STORE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "common.fullname" . }}-pass - key: KEY_STORE_PASSWORD - - name: KEY_MANAGER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "common.fullname" . }}-pass - key: KEY_MANAGER_PASSWORD - - name: SERVICE_BEANS - value: "/opt/app/champ-service/dynamic/conf" - volumeMounts: - - mountPath: /etc/localtime - name: localtime - readOnly: true - - mountPath: /opt/app/champ-service/appconfig/champ-api.properties - name: {{ include "common.fullname" . }}-config - subPath: champ-api.properties - - mountPath: /opt/app/champ-service/appconfig/auth - name: {{ include "common.fullname" . }}-secrets - - mountPath: /opt/app/champ-service/dynamic/conf/champ-beans.xml - name: {{ include "common.fullname" . }}-dynamic-config - subPath: champ-beans.xml - - mountPath: /opt/app/champ-service/bundleconfig/etc/logback.xml - name: {{ include "common.fullname" . }}-logback-config - subPath: logback.xml - - mountPath: /var/log/onap - name: {{ include "common.fullname" . }}-logs - resources: -{{ include "common.resources" . }} - {{- if .Values.nodeSelector }} - nodeSelector: -{{ toYaml .Values.nodeSelector | indent 8 }} - {{- end -}} - {{- if .Values.affinity }} - affinity: -{{ toYaml .Values.affinity | indent 8 }} - {{- end }} - - # side car containers - - name: filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - volumeMounts: - - mountPath: /usr/share/filebeat/filebeat.yml - subPath: filebeat.yml - name: filebeat-conf - - mountPath: /var/log/onap - name: {{ include "common.fullname" . }}-logs - - mountPath: /usr/share/filebeat/data - name: aai-filebeat - {{ if .Values.global.installSidecarSecurity }} - - name: {{ .Values.global.rproxy.name }} - image: "{{ include "common.repository" . }}/{{ .Values.global.rproxy.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - env: - - name: CONFIG_HOME - value: "/opt/app/rproxy/config" - - name: KEY_STORE_PASSWORD - value: {{ .Values.config.keyStorePassword }} - - name: spring_profiles_active - value: {{ .Values.global.rproxy.activeSpringProfiles }} - volumeMounts: - - name: {{ include "common.fullname" . }}-rproxy-config - mountPath: /opt/app/rproxy/config/forward-proxy.properties - subPath: forward-proxy.properties - - name: {{ include "common.fullname" . }}-rproxy-config - mountPath: /opt/app/rproxy/config/primary-service.properties - subPath: primary-service.properties - - name: {{ include "common.fullname" . }}-rproxy-config - mountPath: /opt/app/rproxy/config/reverse-proxy.properties - subPath: reverse-proxy.properties - - name: {{ include "common.fullname" . }}-rproxy-config - mountPath: /opt/app/rproxy/config/cadi.properties - subPath: cadi.properties - - name: {{ include "common.fullname" . }}-rproxy-log-config - mountPath: /opt/app/rproxy/config/logback-spring.xml - subPath: logback-spring.xml - - name: {{ include "common.fullname" . }}-rproxy-uri-auth-config - mountPath: /opt/app/rproxy/config/auth/uri-authorization.json - subPath: uri-authorization.json - - name: {{ include "common.fullname" . }}-rproxy-auth-certs - mountPath: /opt/app/rproxy/config/auth/tomcat_keystore - subPath: tomcat_keystore - - name: {{ include "common.fullname" . }}-rproxy-auth-certs - mountPath: /opt/app/rproxy/config/auth/client-cert.p12 - subPath: client-cert.p12 - - name: {{ include "common.fullname" . }}-rproxy-auth-certs - mountPath: /opt/app/rproxy/config/auth/org.onap.aai.p12 - subPath: org.onap.aai.p12 - - name: {{ include "common.fullname" . }}-rproxy-security-config - mountPath: /opt/app/rproxy/config/security/keyfile - subPath: keyfile - - ports: - - containerPort: {{ .Values.global.rproxy.port }} - - - name: {{ .Values.global.fproxy.name }} - image: "{{ include "common.repository" . }}/{{ .Values.global.fproxy.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - env: - - name: CONFIG_HOME - value: "/opt/app/fproxy/config" - - name: KEY_STORE_PASSWORD - value: {{ .Values.config.keyStorePassword }} - - name: TRUST_STORE_PASSWORD - value: {{ .Values.config.trustStorePassword }} - - name: spring_profiles_active - value: {{ .Values.global.fproxy.activeSpringProfiles }} - volumeMounts: - - name: {{ include "common.fullname" . }}-fproxy-config - mountPath: /opt/app/fproxy/config/fproxy.properties - subPath: fproxy.properties - - name: {{ include "common.fullname" . }}-fproxy-log-config - mountPath: /opt/app/fproxy/config/logback-spring.xml - subPath: logback-spring.xml - - name: {{ include "common.fullname" . }}-fproxy-auth-certs - mountPath: /opt/app/fproxy/config/auth/tomcat_keystore - subPath: tomcat_keystore - - name: {{ include "common.fullname" . }}-fproxy-auth-certs - mountPath: /opt/app/fproxy/config/auth/fproxy_truststore - subPath: fproxy_truststore - - name: {{ include "common.fullname" . }}-fproxy-auth-certs - mountPath: /opt/app/fproxy/config/auth/client-cert.p12 - subPath: client-cert.p12 - ports: - - containerPort: {{ .Values.global.fproxy.port }} - {{ end }} - - volumes: - - name: localtime - hostPath: - path: /etc/localtime - - name: {{ include "common.fullname" . }}-config - configMap: - name: {{ include "common.fullname" . }} - items: - - key: champ-api.properties - path: champ-api.properties - - name: {{ include "common.fullname" . }}-secrets - secret: - secretName: {{ include "common.fullname" . }}-champ - - name: {{ include "common.fullname" . }}-dynamic-config - configMap: - name: {{ include "common.fullname" . }}-dynamic - items: - - key: champ-beans.xml - path: champ-beans.xml - - name: {{ include "common.fullname" . }}-logs - emptyDir: {} - - name: {{ include "common.fullname" . }}-logback-config - configMap: - name: {{ include "common.fullname" . }}-log-configmap - items: - - key: logback.xml - path: logback.xml - - name: filebeat-conf - configMap: - name: aai-filebeat - - name: aai-filebeat - emptyDir: {} - {{ if .Values.global.installSidecarSecurity }} - - name: {{ include "common.fullname" . }}-rproxy-config - configMap: - name: {{ include "common.fullname" . }}-rproxy-config - - name: {{ include "common.fullname" . }}-rproxy-log-config - configMap: - name: {{ include "common.fullname" . }}-rproxy-log-config - - name: {{ include "common.fullname" . }}-rproxy-uri-auth-config - configMap: - name: {{ include "common.fullname" . }}-rproxy-uri-auth-config - - name: {{ include "common.fullname" . }}-rproxy-auth-config - secret: - secretName: {{ include "common.fullname" . }}-rproxy-auth-config - - name: {{ include "common.fullname" . }}-rproxy-auth-certs - secret: - secretName: aai-rproxy-auth-certs - - name: {{ include "common.fullname" . }}-rproxy-security-config - secret: - secretName: aai-rproxy-security-config - - name: {{ include "common.fullname" . }}-fproxy-config - configMap: - name: {{ include "common.fullname" . }}-fproxy-config - - name: {{ include "common.fullname" . }}-fproxy-log-config - configMap: - name: {{ include "common.fullname" . }}-fproxy-log-config - - name: {{ include "common.fullname" . }}-fproxy-auth-certs - secret: - secretName: aai-fproxy-auth-certs - {{ end }} - imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/components/aai-champ/templates/secrets.yaml b/components/aai-champ/templates/secrets.yaml deleted file mode 100644 index fa18956..0000000 --- a/components/aai-champ/templates/secrets.yaml +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# Modifications Copyright © 2018 Bell Canada -# -# 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. - -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.fullname" . }}-champ - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -type: Opaque -data: -{{ tpl (.Files.Glob "resources/config/appconfig/auth/*").AsSecrets . | indent 2 }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.fullname" . }}-pass - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -type: Opaque -data: - KEY_STORE_PASSWORD: {{ .Values.config.keyStorePassword | b64enc | quote }} - KEY_MANAGER_PASSWORD: {{ .Values.config.keyManagerPassword | b64enc | quote }} - -{{ if .Values.global.installSidecarSecurity }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.fullname" . }}-rproxy-auth-config - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -type: Opaque -data: -{{ tpl (.Files.Glob "resources/rproxy/config/auth/*").AsSecrets . | indent 2 }} -{{ end }} \ No newline at end of file diff --git a/components/aai-champ/templates/service.yaml b/components/aai-champ/templates/service.yaml deleted file mode 100644 index e67d42a..0000000 --- a/components/aai-champ/templates/service.yaml +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# Modifications Copyright © 2018 Bell Canada -# -# 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. - -apiVersion: v1 -kind: Service -metadata: - name: {{ include "common.servicename" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - type: {{ .Values.service.type }} - ports: - {{ if .Values.global.installSidecarSecurity }} - {{if eq .Values.service.type "NodePort" -}} - - port: {{ .Values.service.internalPort }} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - targetPort: {{ .Values.global.rproxy.port }} - name: {{ .Values.service.portName }} - {{- else -}} - - port: {{ .Values.service.externalPort }} - targetPort: {{ .Values.global.rproxy.port }} - name: {{ .Values.service.portName }} - {{- end}} - {{ else }} - {{if eq .Values.service.type "NodePort" -}} - - port: {{ .Values.service.internalPort}} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort}} - name: {{ .Values.service.portName }} - {{- else -}} - - port: {{ .Values.service.externalPort }} - targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.portName }} - {{- end}} - {{ end }} - selector: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} diff --git a/components/aai-champ/values.yaml b/components/aai-champ/values.yaml deleted file mode 100644 index 3bcd60a..0000000 --- a/components/aai-champ/values.yaml +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# Modifications Copyright © 2018 Bell Canada -# -# 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. - -################################################################# -# Global configuration defaults. -################################################################# -global: - readinessImage: readiness-check:2.0.2 - loggingImage: beats/filebeat:5.5.0 - -################################################################# -# Application configuration defaults. -################################################################# - -# application image -image: onap/champ:1.5.2 - -flavor: small - -# application configuration -config: - keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 - keyManagerPassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 - trustStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 - -# default number of instances -replicaCount: 1 - -nodeSelector: {} - -affinity: {} - -# probe configuration parameters -liveness: - initialDelaySeconds: 10 - periodSeconds: 10 - # necessary to disable liveness probe when setting breakpoints - # in debugger so K8s doesn't restart unresponsive container - enabled: false - -readiness: - initialDelaySeconds: 10 - periodSeconds: 10 - -service: - type: NodePort - portName: aai-champ - internalPort: 9522 - externalPort: 9522 - nodePort: 78 - -ingress: - enabled: false - -resources: - small: - limits: - cpu: 2 - memory: 4Gi - requests: - cpu: 0.5 - memory: 1Gi - large: - limits: - cpu: 4 - memory: 8Gi - requests: - cpu: 1 - memory: 2Gi - unlimited: {} - -# XML beans configuration -event: - port: - dmaap: 3905 - protocol: https - publisher: - topic: champRawEvents diff --git a/components/aai-gizmo/.helmignore b/components/aai-gizmo/.helmignore deleted file mode 100644 index daebc7d..0000000 --- a/components/aai-gizmo/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/components/aai-gizmo/Chart.yaml b/components/aai-gizmo/Chart.yaml deleted file mode 100644 index 2a69250..0000000 --- a/components/aai-gizmo/Chart.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# Modifications Copyright © 2018 Bell Canada -# -# 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. - -apiVersion: v1 -description: Gizmo service -name: aai-gizmo -version: 5.0.0 diff --git a/components/aai-gizmo/resources/config/README.txt b/components/aai-gizmo/resources/config/README.txt deleted file mode 100644 index 3761781..0000000 --- a/components/aai-gizmo/resources/config/README.txt +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada, AT&T -# -# 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. - -This directory contains all external configuration files that -need to be mounted into an application container. - -See the configmap.yaml in the templates directory for an example -of how to load (ie map) config files from this directory, into -Kubernetes, for distribution within the k8s cluster. - -See deployment.yaml in the templates directory for an example -of how the 'config mapped' files are then mounted into the -containers. diff --git a/components/aai-gizmo/resources/config/auth/champ-cert.p12 b/components/aai-gizmo/resources/config/auth/champ-cert.p12 deleted file mode 100644 index dbf4fcacecf190fb0244dce0d1b438e6fea4500d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2556 zcmY+EdpHw{8^>p6vvN1q+;S^Iwz0#F1O>%q@$`lt@_`#}p!mZsr!v zrA;)F+=b00##|C}&vBmT_dDk~f4tB8JfH9PegFKR2+$26A3ur!eGP_c+_bv6F3bnv zqY$7^K?G>QJ|?3G0>A$!5^w_%1YGv9lQ! z2xbYdREtLj!#tMeXTuU~Y}^mN=>q~m01yH6;iwV9rpF(${h@HJ?@grEMCee9ri-P) zwzE2^?>3>tjiqo5*=`e>dbXiy^X|@E0$!PKLudIJtgh4W8suwce{PMLt2sx-*UI6F z!=)~#bGYY1wTtBr?TXBfjP2}S>r)?dXjlH6NdFDxJivFEjLiGlmGFMS9SiW?*?m-# z6vbW7ozLnRpnP1x;1qCc*giY4axyE6+VS)Ztd?rL6ea=|uIDxv(Z78GS8#VoK1cJ8 z!FSDn*aO*Dx^Bf(*PeI%;F-7^_85~7(P(TNt(ZEztJE{opI(0q0k#DB4{pJ@<7p|) zpZtoQpC34>S1l`7lj$C)&u8Bd-;@;d-QOjbY?tfoBF&HJ^-Eb@v9|e~4pp?YJgza+-^?9hj4GbOZGiTk*` zAbxe_30a7E8x*F}ckf`o3;K=T_4}P|dc-SD@KbApw{&dRXeRFAiP&yTX{gAZtFhiU;|2D-kJHZr4^2}y z-yy;3?Oqd%Tw_%HZhrrHwr3!+%>6}3Z#<07>lT!6<@ucUdq}KG>~?qu!KmL5y8*bE zLav3Fm)&ApK@K!c7u`27&VN1E-;l89F>JcyJToKFXt1jFa!+dZZf`;1)h>Zi`b+$| zOatMJv&P|yQuXMBaP1FqCUN`b9IyHbW9vytIu}WAz32`X(@&jJe|%8_c9qTdYIHw z3fZtxHhk>d{+J@y6QH!L5;&97BmG4fersW56HO~_aff2xrb14q;B$h>Dl>!u-0^#3 zNM)Lp-+>qA%2{haKilb6wE~VGeF98WyTD%5*2t#3y@legMFULBxF@-nUq$W=S2R<) zI48ac)-CNcs?~L2;SJ0qALf6G&Rw5L^MCbG^vC>37XW*fZee2c>60$!G%;(z%l36t zVR3dNTR{B=kNDllFa+A>A}pnZyHmD?-})}8SjYUd6ghk(<8u1b8VN5Z(jz!uX<@xQ z?gc*Y;wbUR8lJ2rgmFlsgovS9poe; z%0J?oiYmm1E;^?_bV$$TeAa6(KcIHD^=++kgqXG4qb+YU#nLPjzn3`@-VW&ZQ;i&q zQ+=P9?vT$%MXeFKXZMQjXR(BZ77X~0DuFSsn@PzYuW*6-_qZ0DEnz99sZ)ti;* z%*hSuCsbrr8!5ub?T^D8^E{C%|5*w!^qc(G$nIGG>bz3GL;o&GkPg9Z*648Z&9>g4 zxgSFPB5mlK@GzB8nxxlmWRilyg#ccoTDp=D`f8@fW=Uharxj&N8gb2qChAMuxN-e` z@z=#64FA;6o|9IL_x#8ZI(1z(LlCrbIV;B|yf?ti?AILK$%L3pqW_gUAxcv+G_s$C z>&IhLG?_i%%Moj~pI!leKDom7$j?gD`J@t-uW%TSMtJ1I5Y>bsno58xjYj38Ok z#dww61flet6${l96L3ai^70CVZGPYGD<*B_QpKhmaPi`3gUVa&Rkow~faF)WiAIf{ zw!VVbLBOewjxYw*#ZPy-u+{ImT1YqQ$$b;6$<*anGHM4j&i57=^Z96?+pCw6>}QGd-<8Iza65dzA2s5Elcr`LwveyTFFUwuyNMqbe>8zPTb$EBtzuSv%NFNd5cYEh{uDhjr)({@X`vvX!;d%ccy~WAQpexeVZ|F3K zh+iEDrjnV#qVX%yh#DKUexv+rS0|4)+YYs{K9=l0;8pDe`nY>J&-|1qBOe zitqzv1OOly$@=nb#PO1w+DFZwsfNPY!%h`*Aebw;+{L0$LiiNyc&sYG#@NT=%=+JI F_zSHP#{>WX diff --git a/components/aai-gizmo/resources/config/auth/client-cert.p12 b/components/aai-gizmo/resources/config/auth/client-cert.p12 deleted file mode 100644 index dbf4fcacecf190fb0244dce0d1b438e6fea4500d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2556 zcmY+EdpHw{8^>p6vvN1q+;S^Iwz0#F1O>%q@$`lt@_`#}p!mZsr!v zrA;)F+=b00##|C}&vBmT_dDk~f4tB8JfH9PegFKR2+$26A3ur!eGP_c+_bv6F3bnv zqY$7^K?G>QJ|?3G0>A$!5^w_%1YGv9lQ! z2xbYdREtLj!#tMeXTuU~Y}^mN=>q~m01yH6;iwV9rpF(${h@HJ?@grEMCee9ri-P) zwzE2^?>3>tjiqo5*=`e>dbXiy^X|@E0$!PKLudIJtgh4W8suwce{PMLt2sx-*UI6F z!=)~#bGYY1wTtBr?TXBfjP2}S>r)?dXjlH6NdFDxJivFEjLiGlmGFMS9SiW?*?m-# z6vbW7ozLnRpnP1x;1qCc*giY4axyE6+VS)Ztd?rL6ea=|uIDxv(Z78GS8#VoK1cJ8 z!FSDn*aO*Dx^Bf(*PeI%;F-7^_85~7(P(TNt(ZEztJE{opI(0q0k#DB4{pJ@<7p|) zpZtoQpC34>S1l`7lj$C)&u8Bd-;@;d-QOjbY?tfoBF&HJ^-Eb@v9|e~4pp?YJgza+-^?9hj4GbOZGiTk*` zAbxe_30a7E8x*F}ckf`o3;K=T_4}P|dc-SD@KbApw{&dRXeRFAiP&yTX{gAZtFhiU;|2D-kJHZr4^2}y z-yy;3?Oqd%Tw_%HZhrrHwr3!+%>6}3Z#<07>lT!6<@ucUdq}KG>~?qu!KmL5y8*bE zLav3Fm)&ApK@K!c7u`27&VN1E-;l89F>JcyJToKFXt1jFa!+dZZf`;1)h>Zi`b+$| zOatMJv&P|yQuXMBaP1FqCUN`b9IyHbW9vytIu}WAz32`X(@&jJe|%8_c9qTdYIHw z3fZtxHhk>d{+J@y6QH!L5;&97BmG4fersW56HO~_aff2xrb14q;B$h>Dl>!u-0^#3 zNM)Lp-+>qA%2{haKilb6wE~VGeF98WyTD%5*2t#3y@legMFULBxF@-nUq$W=S2R<) zI48ac)-CNcs?~L2;SJ0qALf6G&Rw5L^MCbG^vC>37XW*fZee2c>60$!G%;(z%l36t zVR3dNTR{B=kNDllFa+A>A}pnZyHmD?-})}8SjYUd6ghk(<8u1b8VN5Z(jz!uX<@xQ z?gc*Y;wbUR8lJ2rgmFlsgovS9poe; z%0J?oiYmm1E;^?_bV$$TeAa6(KcIHD^=++kgqXG4qb+YU#nLPjzn3`@-VW&ZQ;i&q zQ+=P9?vT$%MXeFKXZMQjXR(BZ77X~0DuFSsn@PzYuW*6-_qZ0DEnz99sZ)ti;* z%*hSuCsbrr8!5ub?T^D8^E{C%|5*w!^qc(G$nIGG>bz3GL;o&GkPg9Z*648Z&9>g4 zxgSFPB5mlK@GzB8nxxlmWRilyg#ccoTDp=D`f8@fW=Uharxj&N8gb2qChAMuxN-e` z@z=#64FA;6o|9IL_x#8ZI(1z(LlCrbIV;B|yf?ti?AILK$%L3pqW_gUAxcv+G_s$C z>&IhLG?_i%%Moj~pI!leKDom7$j?gD`J@t-uW%TSMtJ1I5Y>bsno58xjYj38Ok z#dww61flet6${l96L3ai^70CVZGPYGD<*B_QpKhmaPi`3gUVa&Rkow~faF)WiAIf{ zw!VVbLBOewjxYw*#ZPy-u+{ImT1YqQ$$b;6$<*anGHM4j&i57=^Z96?+pCw6>}QGd-<8Iza65dzA2s5Elcr`LwveyTFFUwuyNMqbe>8zPTb$EBtzuSv%NFNd5cYEh{uDhjr)({@X`vvX!;d%ccy~WAQpexeVZ|F3K zh+iEDrjnV#qVX%yh#DKUexv+rS0|4)+YYs{K9=l0;8pDe`nY>J&-|1qBOe zitqzv1OOly$@=nb#PO1w+DFZwsfNPY!%h`*Aebw;+{L0$LiiNyc&sYG#@NT=%=+JI F_zSHP#{>WX diff --git a/components/aai-gizmo/resources/config/auth/crud_policy.json b/components/aai-gizmo/resources/config/auth/crud_policy.json deleted file mode 100644 index 7a5007e..0000000 --- a/components/aai-gizmo/resources/config/auth/crud_policy.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "roles": [ - { - "name": "admin", - "functions": [ - { - "name": "crud", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" }, { "name": "PATCH"} ] - } - ], - - "users": [ - { - "username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA" - } - ] - } - ] -} \ No newline at end of file diff --git a/components/aai-gizmo/resources/config/auth/datarouter-cert.p12 b/components/aai-gizmo/resources/config/auth/datarouter-cert.p12 deleted file mode 100644 index dbf4fcacecf190fb0244dce0d1b438e6fea4500d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2556 zcmY+EdpHw{8^>p6vvN1q+;S^Iwz0#F1O>%q@$`lt@_`#}p!mZsr!v zrA;)F+=b00##|C}&vBmT_dDk~f4tB8JfH9PegFKR2+$26A3ur!eGP_c+_bv6F3bnv zqY$7^K?G>QJ|?3G0>A$!5^w_%1YGv9lQ! z2xbYdREtLj!#tMeXTuU~Y}^mN=>q~m01yH6;iwV9rpF(${h@HJ?@grEMCee9ri-P) zwzE2^?>3>tjiqo5*=`e>dbXiy^X|@E0$!PKLudIJtgh4W8suwce{PMLt2sx-*UI6F z!=)~#bGYY1wTtBr?TXBfjP2}S>r)?dXjlH6NdFDxJivFEjLiGlmGFMS9SiW?*?m-# z6vbW7ozLnRpnP1x;1qCc*giY4axyE6+VS)Ztd?rL6ea=|uIDxv(Z78GS8#VoK1cJ8 z!FSDn*aO*Dx^Bf(*PeI%;F-7^_85~7(P(TNt(ZEztJE{opI(0q0k#DB4{pJ@<7p|) zpZtoQpC34>S1l`7lj$C)&u8Bd-;@;d-QOjbY?tfoBF&HJ^-Eb@v9|e~4pp?YJgza+-^?9hj4GbOZGiTk*` zAbxe_30a7E8x*F}ckf`o3;K=T_4}P|dc-SD@KbApw{&dRXeRFAiP&yTX{gAZtFhiU;|2D-kJHZr4^2}y z-yy;3?Oqd%Tw_%HZhrrHwr3!+%>6}3Z#<07>lT!6<@ucUdq}KG>~?qu!KmL5y8*bE zLav3Fm)&ApK@K!c7u`27&VN1E-;l89F>JcyJToKFXt1jFa!+dZZf`;1)h>Zi`b+$| zOatMJv&P|yQuXMBaP1FqCUN`b9IyHbW9vytIu}WAz32`X(@&jJe|%8_c9qTdYIHw z3fZtxHhk>d{+J@y6QH!L5;&97BmG4fersW56HO~_aff2xrb14q;B$h>Dl>!u-0^#3 zNM)Lp-+>qA%2{haKilb6wE~VGeF98WyTD%5*2t#3y@legMFULBxF@-nUq$W=S2R<) zI48ac)-CNcs?~L2;SJ0qALf6G&Rw5L^MCbG^vC>37XW*fZee2c>60$!G%;(z%l36t zVR3dNTR{B=kNDllFa+A>A}pnZyHmD?-})}8SjYUd6ghk(<8u1b8VN5Z(jz!uX<@xQ z?gc*Y;wbUR8lJ2rgmFlsgovS9poe; z%0J?oiYmm1E;^?_bV$$TeAa6(KcIHD^=++kgqXG4qb+YU#nLPjzn3`@-VW&ZQ;i&q zQ+=P9?vT$%MXeFKXZMQjXR(BZ77X~0DuFSsn@PzYuW*6-_qZ0DEnz99sZ)ti;* z%*hSuCsbrr8!5ub?T^D8^E{C%|5*w!^qc(G$nIGG>bz3GL;o&GkPg9Z*648Z&9>g4 zxgSFPB5mlK@GzB8nxxlmWRilyg#ccoTDp=D`f8@fW=Uharxj&N8gb2qChAMuxN-e` z@z=#64FA;6o|9IL_x#8ZI(1z(LlCrbIV;B|yf?ti?AILK$%L3pqW_gUAxcv+G_s$C z>&IhLG?_i%%Moj~pI!leKDom7$j?gD`J@t-uW%TSMtJ1I5Y>bsno58xjYj38Ok z#dww61flet6${l96L3ai^70CVZGPYGD<*B_QpKhmaPi`3gUVa&Rkow~faF)WiAIf{ zw!VVbLBOewjxYw*#ZPy-u+{ImT1YqQ$$b;6$<*anGHM4j&i57=^Z96?+pCw6>}QGd-<8Iza65dzA2s5Elcr`LwveyTFFUwuyNMqbe>8zPTb$EBtzuSv%NFNd5cYEh{uDhjr)({@X`vvX!;d%ccy~WAQpexeVZ|F3K zh+iEDrjnV#qVX%yh#DKUexv+rS0|4)+YYs{K9=l0;8pDe`nY>J&-|1qBOe zitqzv1OOly$@=nb#PO1w+DFZwsfNPY!%h`*Aebw;+{L0$LiiNyc&sYG#@NT=%=+JI F_zSHP#{>WX diff --git a/components/aai-gizmo/resources/config/auth/tomcat_keystore b/components/aai-gizmo/resources/config/auth/tomcat_keystore deleted file mode 100644 index 9eec841aa2c1243b5ca3e22b0b116e5bca2afd49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2214 zcmcJQXHyf35{AvG`{CJ{ot=GmXP3T7-vj^vpko357Sz|n&7RYU`$h=up~Z`{XDvR*`$ zzz#)47haP~tv|D6mK5}zGvJ;XTcs8(8BRtSutt0nY_g%MoRa|;|Md5m6Fh;Jq2N{Y z_@3}C$JB}YtUs*Za?s`JeoMO1+r=63TnZY#qy*QgQqWyhEkSt;6nsS%)@q-fP~E0k z;;U!hctBy*u?73i4m--P-{w7I}r@otzjdND9D8ErKeeYe+W~WR6XoY%67E(c zKG2?clD{PU%-x8D{xsDjm8_i!Iz*!~sprgz-pbd|wD(J^B61Y&c8N|WjVZ|w(#tL3 z);vAKL47*5^D&KRS;w=+hJbeg9DS27bTdLTKaF?v@IGVZYIWHjnM2&;#FbO!hU2qE z+bdse`Ua`*ZDSbQ2`zDZPe8T@&;k+)>fplIw{8rpK#w_^oyy@JG-<*ytx4iE#yxnm0w= zsQ3mhmsjlZsqDe$)4tZiZ8RyqHRA(V@Z-;JVxjT&?A7`G1xSuj{d4T^ z`)2$ClX^CNSj2ZA7>6eiBWnlCZ#_k7+R{j3Zs3k}#59ZG%&egH70h}?*UV&AM*Nux zftp}&{@Bu4uYsw@OI5B^W#l8Gva3CRE@@gldvhn`*Zk<$Y0#?*w(wKl@IPPerG#ew zF#ma(&R;XYX7qXa!7I*7ye&-MlMsvA*gq!(+D7brD%esfz4f5p*wqG`A;*o|ZZ!I} z+5PP#v@U?VeeENz+c5~Ar}mueC$HJKfJ&S_*{uz6VF>tC@l@c(g?Mr?%9Bnz=F$N% zGJwGPmUyvf1q#=GQSz;4>Y0n!PhQ=nPlaG+ZKuVDSYCSTCB@@0XY72sTWR}GFu0sM zuJU)M7B9no2}*V)H*Q$sZ4bK=uc;9Z#*YlOBsxVL(zz4`vhyg-qhWGi7huPU<11)Y5*UN!14#^-uFzS7BV58VKr zEA@&jM5+va6#HX6u>AXmQdEdZs8yblX}kfBR64HCf0!aQRy-pc`BR7Bd{w0`La7pI zkm=yi-+ve=rYfwtttUgeMdb|Jcjx%UI#bu~NFgHk+;KiDl~>v4d7X3w z9rc55$0f!7n&sJ9{L+P^xOe}Ks>QqeF)(&V{YCm!er2w>_iX(t_Tivuge8N>R-3qr~xQviRhIz7E zmF2Mnc|_>mPq`r8ijUH>?@90qr{15OW~Xm0vAh-gzs|zfiNZj${Gzru|mOS5GWjURRewE_Y};HIkp*=k2hBQiz7ez0-g*`J z;kBFnkU1$tF0Q3m>%h|VsX%2p1>*X`1iB_Xsp#U?;-t;1ook?X4d(qVk*{RR6P$!( zp1b3J(1hT0hDnnDpuGp1ZS=|N6}7K@$PGzIw|!Z2!?d{VA_xow0CUArqA20xnF@14 z_#iwJi$B9~LoCv7gCyLen@bi+ATHT|ns~f5$0h;+Rx~^Phbuh2WcIpC_L=IRX6m;L zysyK_ECDymj03FucK5@FeBsQGhhk{RwcU?BM=B2vJs7~^Rk^HuniMI0TX6bN0{i~@uuQZjr@ z0~JCi^gFuj9Za{klpnkui<5%Dg>7HPFqAv?53G&aN9E0RU&+ronb{ED1*wh|l;Zsh_>tSL diff --git a/components/aai-gizmo/resources/config/crud-api.properties b/components/aai-gizmo/resources/config/crud-api.properties deleted file mode 100644 index 0b7f95f..0000000 --- a/components/aai-gizmo/resources/config/crud-api.properties +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada, AT&T -# -# 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. - - -# CRUD-API configuration - -crud.async.request.timeout=60000 -crud.async.response.process.poll.interval=1000 -crud.collection.properties.key=properties diff --git a/components/aai-gizmo/resources/config/crud-beans.xml b/components/aai-gizmo/resources/config/crud-beans.xml deleted file mode 100644 index e0ab32b..0000000 --- a/components/aai-gizmo/resources/config/crud-beans.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/components/aai-gizmo/resources/config/edgeprops-ingest.properties b/components/aai-gizmo/resources/config/edgeprops-ingest.properties deleted file mode 100644 index fbefd30..0000000 --- a/components/aai-gizmo/resources/config/edgeprops-ingest.properties +++ /dev/null @@ -1,3 +0,0 @@ -# DB Edge Property files are copied here: -edgePropsDir=/opt/app/crud-service/config/model - diff --git a/components/aai-gizmo/resources/config/log/filebeat/filebeat.yml b/components/aai-gizmo/resources/config/log/filebeat/filebeat.yml deleted file mode 100644 index d7f0b0a..0000000 --- a/components/aai-gizmo/resources/config/log/filebeat/filebeat.yml +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada, AT&T -# -# 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. - -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.{{ .Release.Name }}-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/components/aai-gizmo/resources/config/log/logback.xml b/components/aai-gizmo/resources/config/log/logback.xml deleted file mode 100644 index c6bcf57..0000000 --- a/components/aai-gizmo/resources/config/log/logback.xml +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${errorLogPattern} - - - - - - - - - - - ${logDirectory}/${generalLogName}.log - - ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - ${errorLogPattern} - - - - - - INFO - - 256 - - - - - - - - ${logDirectory}/${auditLogName}.log - - ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - ${auditMetricPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}.log - - ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - - ${auditMetricPattern} - - - - - - 256 - - - - - ${logDirectory}/${debugLogName}.log - - ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - ${errorLogPattern} - - - - - 256 - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/components/aai-gizmo/resources/config/model/edge_properties_v10.json b/components/aai-gizmo/resources/config/model/edge_properties_v10.json deleted file mode 100644 index 7cbddae..0000000 --- a/components/aai-gizmo/resources/config/model/edge_properties_v10.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "isParent":"java.lang.Boolean", - "isParent-REV":"java.lang.Boolean", - "usesResource":"java.lang.Boolean", - "usesResource-REV":"java.lang.Boolean", - "SVC-INFRA":"java.lang.Boolean", - "SVC-INFRA-REV":"java.lang.Boolean", - "hasDelTarget":"java.lang.Boolean", - "hasDelTarget-REV":"java.lang.Boolean" -} diff --git a/components/aai-gizmo/resources/config/model/edge_properties_v11.json b/components/aai-gizmo/resources/config/model/edge_properties_v11.json deleted file mode 100644 index 09e19b0..0000000 --- a/components/aai-gizmo/resources/config/model/edge_properties_v11.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "contains-other-v": "java.lang.String", - "delete-other-v": "java.lang.String", - "SVC-INFRA": "java.lang.String", - "prevent-delete": "java.lang.String" -} \ No newline at end of file diff --git a/components/aai-gizmo/resources/config/model/edge_properties_v12.json b/components/aai-gizmo/resources/config/model/edge_properties_v12.json deleted file mode 100644 index 09e19b0..0000000 --- a/components/aai-gizmo/resources/config/model/edge_properties_v12.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "contains-other-v": "java.lang.String", - "delete-other-v": "java.lang.String", - "SVC-INFRA": "java.lang.String", - "prevent-delete": "java.lang.String" -} \ No newline at end of file diff --git a/components/aai-gizmo/resources/config/model/edge_properties_v13.json b/components/aai-gizmo/resources/config/model/edge_properties_v13.json deleted file mode 100644 index 09e19b0..0000000 --- a/components/aai-gizmo/resources/config/model/edge_properties_v13.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "contains-other-v": "java.lang.String", - "delete-other-v": "java.lang.String", - "SVC-INFRA": "java.lang.String", - "prevent-delete": "java.lang.String" -} \ No newline at end of file diff --git a/components/aai-gizmo/resources/config/model/edge_properties_v14.json b/components/aai-gizmo/resources/config/model/edge_properties_v14.json deleted file mode 100644 index 8d00636..0000000 --- a/components/aai-gizmo/resources/config/model/edge_properties_v14.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "contains-other-v": "java.lang.String", - "delete-other-v": "java.lang.String", - "SVC-INFRA": "java.lang.String", - "prevent-delete": "java.lang.String" -} \ No newline at end of file diff --git a/components/aai-gizmo/resources/config/model/edge_properties_v15.json b/components/aai-gizmo/resources/config/model/edge_properties_v15.json deleted file mode 100644 index 8d00636..0000000 --- a/components/aai-gizmo/resources/config/model/edge_properties_v15.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "contains-other-v": "java.lang.String", - "delete-other-v": "java.lang.String", - "SVC-INFRA": "java.lang.String", - "prevent-delete": "java.lang.String" -} \ No newline at end of file diff --git a/components/aai-gizmo/resources/config/model/edge_properties_v7.json b/components/aai-gizmo/resources/config/model/edge_properties_v7.json deleted file mode 100644 index 7cbddae..0000000 --- a/components/aai-gizmo/resources/config/model/edge_properties_v7.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "isParent":"java.lang.Boolean", - "isParent-REV":"java.lang.Boolean", - "usesResource":"java.lang.Boolean", - "usesResource-REV":"java.lang.Boolean", - "SVC-INFRA":"java.lang.Boolean", - "SVC-INFRA-REV":"java.lang.Boolean", - "hasDelTarget":"java.lang.Boolean", - "hasDelTarget-REV":"java.lang.Boolean" -} diff --git a/components/aai-gizmo/resources/config/model/edge_properties_v8.json b/components/aai-gizmo/resources/config/model/edge_properties_v8.json deleted file mode 100644 index 7cbddae..0000000 --- a/components/aai-gizmo/resources/config/model/edge_properties_v8.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "isParent":"java.lang.Boolean", - "isParent-REV":"java.lang.Boolean", - "usesResource":"java.lang.Boolean", - "usesResource-REV":"java.lang.Boolean", - "SVC-INFRA":"java.lang.Boolean", - "SVC-INFRA-REV":"java.lang.Boolean", - "hasDelTarget":"java.lang.Boolean", - "hasDelTarget-REV":"java.lang.Boolean" -} diff --git a/components/aai-gizmo/resources/config/model/edge_properties_v9.json b/components/aai-gizmo/resources/config/model/edge_properties_v9.json deleted file mode 100644 index 7cbddae..0000000 --- a/components/aai-gizmo/resources/config/model/edge_properties_v9.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "isParent":"java.lang.Boolean", - "isParent-REV":"java.lang.Boolean", - "usesResource":"java.lang.Boolean", - "usesResource-REV":"java.lang.Boolean", - "SVC-INFRA":"java.lang.Boolean", - "SVC-INFRA-REV":"java.lang.Boolean", - "hasDelTarget":"java.lang.Boolean", - "hasDelTarget-REV":"java.lang.Boolean" -} diff --git a/components/aai-gizmo/resources/config/schema-ingest.properties b/components/aai-gizmo/resources/config/schema-ingest.properties deleted file mode 100644 index 647d4d9..0000000 --- a/components/aai-gizmo/resources/config/schema-ingest.properties +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# Schema Version Related Attributes -############################################################################### -schema.uri.base.path=/aai -# Lists all of the versions in the schema -schema.version.list=v10,v11,v12,v13,v14,v15 -# Specifies from which version should the depth parameter to default to zero -schema.version.depth.start=v10 -# Specifies from which version should the related link be displayed in response payload -schema.version.related.link.start=v10 -# Specifies from which version should the client see only the uri excluding host info -# Before this version server base will also be included -schema.version.app.root.start=v11 -# Specifies from which version should the namespace be changed -schema.version.namespace.change.start=v11 -# Specifies from which version should the client start seeing the edge label in payload -schema.version.edge.label.start=v12 -# Specifies the version that the application should default to -schema.version.api.default=v15 - -############################################################################### -# Schema Location Related Attributes -############################################################################### -# Schema Location Related Attributes -schema.configuration.location=NA -schema.nodes.location=/opt/app/crud-api/bundleconfig/etc/onap/oxm -schema.edges.location=/opt/app/crud-api/bundleconfig/etc/onap/dbedgerules - -############################################################################### -# Schema Service Related Attributes -############################################################################### -# Specifies whether to use the schema service or local schema files -schema.translator.list=config - -schema.service.base.url=https://:8452/aai/schema-service/v1/ -schema.service.nodes.endpoint=nodes?version= -schema.service.edges.endpoint=edgerules?version= -schema.service.versions.endpoint=versions - -#Default rest client is the two-way-ssl -schema.service.client=two-way-ssl -#Replace the below with the A&AI client key store -schema.service.ssl.key-store=${CONFIG_HOME}/auth/client-cert.p12 -#Replace the below with the A&AI tomcat trust store -schema.service.ssl.trust-store=${CONFIG_HOME}/auth/tomcat_keystore \ No newline at end of file diff --git a/components/aai-gizmo/resources/fproxy/config/fproxy.properties b/components/aai-gizmo/resources/fproxy/config/fproxy.properties deleted file mode 100644 index f512fb7..0000000 --- a/components/aai-gizmo/resources/fproxy/config/fproxy.properties +++ /dev/null @@ -1,2 +0,0 @@ -credential.cache.timeout.ms=180000 -transactionid.header.name=X-TransactionId \ No newline at end of file diff --git a/components/aai-gizmo/resources/fproxy/config/logback-spring.xml b/components/aai-gizmo/resources/fproxy/config/logback-spring.xml deleted file mode 100644 index 2e62379..0000000 --- a/components/aai-gizmo/resources/fproxy/config/logback-spring.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - %d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable - - - - - - ${LOGS}/${FILEPREFIX}.log - - %d %p %C{1.} [%t] %m%n - - - - - ${LOGS}/archived/${FILEPREFIX}-%d{yyyy-MM-dd}.%i.log - - - 10MB - - - - - - - - - - - - - - \ No newline at end of file diff --git a/components/aai-gizmo/resources/fproxy/config/readme.txt b/components/aai-gizmo/resources/fproxy/config/readme.txt deleted file mode 100644 index 79cf29e..0000000 --- a/components/aai-gizmo/resources/fproxy/config/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Relevant configuration files need to be copied here to successfully run this service locally. \ No newline at end of file diff --git a/components/aai-gizmo/resources/rproxy/config/auth/uri-authorization.json b/components/aai-gizmo/resources/rproxy/config/auth/uri-authorization.json deleted file mode 100644 index 54d5de2..0000000 --- a/components/aai-gizmo/resources/rproxy/config/auth/uri-authorization.json +++ /dev/null @@ -1,99 +0,0 @@ -[ - { - "uri": "\/not\/allowed\/at\/all$", - "permissions": [ - "test.auth.access.ifYouLikedItYouShouldHavePutAPermissionOnIt" - ] - }, - { - "uri": "\/one\/auth\/required$", - "permissions": [ - "test.auth.access.aSimpleSingleAuth" - ] - }, - { - "uri": "\/multi\/auth\/required$", - "permissions": [ - "test.auth.access.aMultipleAuth1", - "test.auth.access.aMultipleAuth2", - "test.auth.access.aMultipleAuth3" - ] - }, - { - "uri": "\/one\/[^\/]+\/required$", - "permissions": [ - "test.auth.access.aSimpleSingleAuth" - ] - }, - { - "uri": "\/services\/getAAFRequest$", - "permissions": [ - "test.auth.access|services|GET,PUT" - ] - }, - { - "uri": "\/admin\/getAAFRequest$", - "permissions": [ - "test.auth.access|admin|GET,PUT,POST" - ] - }, - { - "uri": "\/service\/aai\/webapp\/index.html$", - "permissions": [ - "test.auth.access|services|GET,PUT" - ] - }, - { - "uri": "\/services\/aai\/webapp\/index.html$", - "permissions": [ - "test.auth.access|services|GET,PUT" - ] - }, - { - "uri": "\/$", - "permissions": [ - "\\|services\\|GET", - "test\\.auth\\.access\\|services\\|GET,PUT" - ] - }, - { - "uri": "\/aai\/v10\/cloud-infrastructure\/cloud-regions$", - "permissions": [ - "test\\.auth\\.access\\|rest\\|read" - ] - }, - { - "uri": "\/aai\/v10\/cloud-infrastructure\/cloud-regions\/cloud-region\/[^\/]+[\/][^\/]+$*", - "permissions": [ - "test.auth.access|clouds|read", - "test.auth.access|tenants|read" - ] - }, - { - "uri": "\/aai\/v10\/cloud-infrastructure\/cloud-regions\/cloud-region\/[^\/]+[\/][^\/]+\/tenants/tenant/[^\/]+/vservers/vserver/[^\/]+$", - "permissions": [ - "test.auth.access|clouds|read", - "test.auth.access|tenants|read", - "test.auth.access|vservers|read" - ] - }, - { - "uri": "\/backend$", - "permissions": [ - "test\\.auth\\.access\\|services\\|GET,PUT", - "\\|services\\|GET" - ] - }, - { - "uri": "\/services\/inventory\/.*", - "permissions": [ - "org\\.onap\\.aai\\.resources\\|\\*\\|.*" - ] - }, - { - "uri": "\/services\/gizmo\/.*", - "permissions": [ - "org\\.onap\\.aai\\.resources\\|\\*\\|.*" - ] - } -] diff --git a/components/aai-gizmo/resources/rproxy/config/cadi.properties b/components/aai-gizmo/resources/rproxy/config/cadi.properties deleted file mode 100644 index f82d11e..0000000 --- a/components/aai-gizmo/resources/rproxy/config/cadi.properties +++ /dev/null @@ -1,39 +0,0 @@ -# This is a normal Java Properties File -# Comments are with Pound Signs at beginning of lines, -# and multi-line expression of properties can be obtained by backslash at end of line - -#hostname is used for local testing where you may have to set your hostname to **.att.com or **.sbc.com. The example given below -#will allow for an ATT cross domain cookie to be used for GLO. If you are running on Windows corp machine, your machine name -#may be used automatically by cadi. However, if it is not, you will need to use hostname=mywebserver.att.com and add mywebserver.att.com -#to your hosts file on your machine. -#hostname=test.aic.cip.att.com - -cadi_loglevel=DEBUG - -# OAuth2 -aaf_oauth2_token_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.token:2.1/token -aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.introspect:2.1/introspect - -cadi_latitude=37.78187 -cadi_longitude=-122.26147 - -# Locate URL (which AAF Env) -aaf_locate_url=https://aaf-locate.{{.Release.Namespace}}:8095 - -# AAF URL -aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1 - -cadi_keyfile=/opt/app/rproxy/config/security/keyfile -cadi_keystore=/opt/app/rproxy/config/auth/org.onap.aai.p12 -cadi_keystore_password=enc:383RDJRFA6yQz9AOxUxC1iIg3xTJXityw05MswnpnEtelRQy2D4r5INQjrea7GTV -cadi_alias=aai@aai.onap.org -cadi_truststore=/opt/app/rproxy/config/auth/tomcat_keystore -cadi_truststore_password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 - -aaf_env=DEV - -aaf_id=demo@people.osaaf.org -aaf_password=enc:92w4px0y_rrm265LXLpw58QnNPgDXykyA1YTrflbAKz - -# This is a colon separated list of client cert issuers -cadi_x509_issuers=CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA \ No newline at end of file diff --git a/components/aai-gizmo/resources/rproxy/config/forward-proxy.properties b/components/aai-gizmo/resources/rproxy/config/forward-proxy.properties deleted file mode 100644 index 1b58d42..0000000 --- a/components/aai-gizmo/resources/rproxy/config/forward-proxy.properties +++ /dev/null @@ -1,4 +0,0 @@ -forward-proxy.protocol = https -forward-proxy.host = localhost -forward-proxy.port = 10680 -forward-proxy.cacheurl = /credential-cache \ No newline at end of file diff --git a/components/aai-gizmo/resources/rproxy/config/logback-spring.xml b/components/aai-gizmo/resources/rproxy/config/logback-spring.xml deleted file mode 100644 index 7659e28..0000000 --- a/components/aai-gizmo/resources/rproxy/config/logback-spring.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - %d{ISO8601} %-5level [%t] %C{1.}: %msg%n%throwable - - - - - - ${LOGS}/${FILEPREFIX}.log - - %d %p %C{1.} [%t] %m%n - - - - - ${LOGS}/archived/${FILEPREFIX}-%d{yyyy-MM-dd}.%i.log - - - 10MB - - - - - - - - - - - - - - diff --git a/components/aai-gizmo/resources/rproxy/config/primary-service.properties b/components/aai-gizmo/resources/rproxy/config/primary-service.properties deleted file mode 100644 index 8ab780e..0000000 --- a/components/aai-gizmo/resources/rproxy/config/primary-service.properties +++ /dev/null @@ -1,3 +0,0 @@ -primary-service.protocol = https -primary-service.host = localhost -primary-service.port = 9520 diff --git a/components/aai-gizmo/resources/rproxy/config/readme.txt b/components/aai-gizmo/resources/rproxy/config/readme.txt deleted file mode 100644 index 79cf29e..0000000 --- a/components/aai-gizmo/resources/rproxy/config/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Relevant configuration files need to be copied here to successfully run this service locally. \ No newline at end of file diff --git a/components/aai-gizmo/resources/rproxy/config/reverse-proxy.properties b/components/aai-gizmo/resources/rproxy/config/reverse-proxy.properties deleted file mode 100644 index 8d46e1f..0000000 --- a/components/aai-gizmo/resources/rproxy/config/reverse-proxy.properties +++ /dev/null @@ -1 +0,0 @@ -transactionid.header.name=X-TransactionId \ No newline at end of file diff --git a/components/aai-gizmo/templates/NOTES.txt b/components/aai-gizmo/templates/NOTES.txt deleted file mode 100644 index 0def4ed..0000000 --- a/components/aai-gizmo/templates/NOTES.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada, AT&T -# -# 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. - -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range .Values.ingress.hosts }} - http://{{ . }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "common.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get svc -w {{ include "common.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "common.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') - echo http://$SERVICE_IP:{{ .Values.service.externalPort }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "common.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }} -{{- end }} diff --git a/components/aai-gizmo/templates/configmap.yaml b/components/aai-gizmo/templates/configmap.yaml deleted file mode 100644 index 2a4a1b5..0000000 --- a/components/aai-gizmo/templates/configmap.yaml +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# Modifications Copyright © 2018 Bell Canada -# -# 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. - -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-configmap - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-model-configmap - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/config/model/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-log-configmap - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-filebeat-configmap - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }} - -{{ if .Values.global.installSidecarSecurity }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-fproxy-config - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/fproxy/config/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-fproxy-log-config - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/fproxy/config/logback-spring.xml").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-rproxy-config - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/rproxy/config/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-rproxy-log-config - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/rproxy/config/logback-spring.xml").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-rproxy-uri-auth-config - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/rproxy/config/auth/uri-authorization.json").AsConfig . | indent 2 }} -{{ end }} - diff --git a/components/aai-gizmo/templates/deployment.yaml b/components/aai-gizmo/templates/deployment.yaml deleted file mode 100644 index 0f491d8..0000000 --- a/components/aai-gizmo/templates/deployment.yaml +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# Modifications Copyright © 2018 Bell Canada -# -# 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. - -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - replicas: {{ .Values.replicaCount }} - template: - metadata: - labels: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - spec: - {{ if .Values.global.installSidecarSecurity }} - initContainers: - - name: {{ .Values.global.tproxyConfig.name }} - image: "{{ include "common.repository" . }}/{{ .Values.global.tproxyConfig.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - securityContext: - privileged: true - {{ end }} - containers: - - name: {{ .Chart.Name }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - ports: - - containerPort: {{ .Values.service.internalPort }} - # disable liveness probe when breakpoints set in debugger - # so K8s doesn't restart unresponsive container - {{ if .Values.liveness.enabled }} - livenessProbe: - tcpSocket: - port: {{ .Values.service.internalPort }} - initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} - timeoutSeconds: {{ .Values.liveness.timeoutSeconds }} - periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end }} - readinessProbe: - tcpSocket: - port: {{ .Values.service.internalPort }} - initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} - timeoutSeconds: {{ .Values.readiness.timeoutSeconds }} - periodSeconds: {{ .Values.readiness.periodSeconds }} - env: - - name: CONFIG_HOME - value: /opt/app/crud-service/config/ - - name: KEY_STORE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "common.fullname" . }}-pass - key: KEY_STORE_PASSWORD - - name: KEY_MANAGER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "common.fullname" . }}-pass - key: KEY_MANAGER_PASSWORD - - name: SERVICE_BEANS - value: /opt/app/crud-service/dynamic/conf - volumeMounts: - - mountPath: /etc/localtime - name: localtime - readOnly: true - - mountPath: /opt/app/crud-service/config/crud-api.properties - subPath: crud-api.properties - name: {{ include "common.fullname" . }}-config - - mountPath: /opt/app/crud-service/config/schema-ingest.properties - subPath: schema-ingest.properties - name: {{ include "common.fullname" . }}-config - - mountPath: /opt/app/crud-service/config/edgeprops-ingest.properties - subPath: edgeprops-ingest.properties - name: {{ include "common.fullname" . }}-config - - mountPath: /opt/app/crud-service/config/model/ - name: {{ include "common.fullname" . }}-model-config - - mountPath: /opt/app/crud-service/config/auth - name: {{ include "common.fullname" . }}-auth-secret - - mountPath: /opt/app/crud-service/dynamic/conf/crud-beans.xml - name: {{ include "common.fullname" . }}-config - subPath: crud-beans.xml - - mountPath: /var/log/onap - name: {{ include "common.fullname" . }}-logs - - mountPath: /opt/app/crud-api/bundleconfig/etc/logback.xml - name: {{ include "common.fullname" . }}-logback-config - subPath: logback.xml - resources: -{{ include "common.resources" . }} - {{- if .Values.nodeSelector }} - nodeSelector: -{{ toYaml .Values.nodeSelector | indent 8 }} - {{- end -}} - {{- if .Values.affinity }} - affinity: -{{ toYaml .Values.affinity | indent 8 }} - {{- end }} - - - name: filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - volumeMounts: - - mountPath: /usr/share/filebeat/filebeat.yml - name: filebeat-conf - subPath: filebeat.yml - - mountPath: /var/log/onap - name: {{ include "common.fullname" . }}-logs - - mountPath: /usr/share/filebeat/data - name: {{ include "common.fullname" . }}-data-filebeat - - {{ if .Values.global.installSidecarSecurity }} - - name: {{ .Values.global.rproxy.name }} - image: "{{ include "common.repository" . }}/{{ .Values.global.rproxy.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - env: - - name: CONFIG_HOME - value: "/opt/app/rproxy/config" - - name: KEY_STORE_PASSWORD - value: {{ .Values.config.keyStorePassword }} - - name: spring_profiles_active - value: {{ .Values.global.rproxy.activeSpringProfiles }} - volumeMounts: - - name: {{ include "common.fullname" . }}-rproxy-config - mountPath: /opt/app/rproxy/config/forward-proxy.properties - subPath: forward-proxy.properties - - name: {{ include "common.fullname" . }}-rproxy-config - mountPath: /opt/app/rproxy/config/primary-service.properties - subPath: primary-service.properties - - name: {{ include "common.fullname" . }}-rproxy-config - mountPath: /opt/app/rproxy/config/reverse-proxy.properties - subPath: reverse-proxy.properties - - name: {{ include "common.fullname" . }}-rproxy-config - mountPath: /opt/app/rproxy/config/cadi.properties - subPath: cadi.properties - - name: {{ include "common.fullname" . }}-rproxy-log-config - mountPath: /opt/app/rproxy/config/logback-spring.xml - subPath: logback-spring.xml - - name: {{ include "common.fullname" . }}-rproxy-uri-auth-config - mountPath: /opt/app/rproxy/config/auth/uri-authorization.json - subPath: uri-authorization.json - - name: {{ include "common.fullname" . }}-rproxy-auth-certs - mountPath: /opt/app/rproxy/config/auth/tomcat_keystore - subPath: tomcat_keystore - - name: {{ include "common.fullname" . }}-rproxy-auth-certs - mountPath: /opt/app/rproxy/config/auth/client-cert.p12 - subPath: client-cert.p12 - - name: {{ include "common.fullname" . }}-rproxy-auth-certs - mountPath: /opt/app/rproxy/config/auth/org.onap.aai.p12 - subPath: org.onap.aai.p12 - - name: {{ include "common.fullname" . }}-rproxy-security-config - mountPath: /opt/app/rproxy/config/security/keyfile - subPath: keyfile - - ports: - - containerPort: {{ .Values.global.rproxy.port }} - - - name: {{ .Values.global.fproxy.name }} - image: "{{ include "common.repository" . }}/{{ .Values.global.fproxy.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - env: - - name: CONFIG_HOME - value: "/opt/app/fproxy/config" - - name: KEY_STORE_PASSWORD - value: {{ .Values.config.keyStorePassword }} - - name: TRUST_STORE_PASSWORD - value: {{ .Values.config.trustStorePassword }} - - name: spring_profiles_active - value: {{ .Values.global.fproxy.activeSpringProfiles }} - volumeMounts: - - name: {{ include "common.fullname" . }}-fproxy-config - mountPath: /opt/app/fproxy/config/fproxy.properties - subPath: fproxy.properties - - name: {{ include "common.fullname" . }}-fproxy-log-config - mountPath: /opt/app/fproxy/config/logback-spring.xml - subPath: logback-spring.xml - - name: {{ include "common.fullname" . }}-fproxy-auth-certs - mountPath: /opt/app/fproxy/config/auth/tomcat_keystore - subPath: tomcat_keystore - - name: {{ include "common.fullname" . }}-fproxy-auth-certs - mountPath: /opt/app/fproxy/config/auth/fproxy_truststore - subPath: fproxy_truststore - - name: {{ include "common.fullname" . }}-fproxy-auth-certs - mountPath: /opt/app/fproxy/config/auth/client-cert.p12 - subPath: client-cert.p12 - ports: - - containerPort: {{ .Values.global.fproxy.port }} - {{ end }} - - volumes: - - name: localtime - hostPath: - path: /etc/localtime - - name: {{ include "common.fullname" . }}-data-filebeat - emptyDir: {} - - name: filebeat-conf - configMap: - name: {{ include "common.fullname" . }}-filebeat-configmap - - name: {{ include "common.fullname" . }}-logs - emptyDir: {} - - name: {{ include "common.fullname" . }}-auth-secret - secret: - secretName: {{ include "common.fullname" . }}-auth - - name: {{ include "common.fullname" . }}-config - configMap: - name: {{ include "common.fullname" . }}-configmap - items: - - key: crud-api.properties - path: crud-api.properties - - key: schema-ingest.properties - path: schema-ingest.properties - - key: edgeprops-ingest.properties - path: edgeprops-ingest.properties - - key: crud-beans.xml - path: crud-beans.xml - - name: {{ include "common.fullname" . }}-logback-config - configMap: - name: {{ include "common.fullname" . }}-log-configmap - items: - - key: logback.xml - path: logback.xml - - name: {{ include "common.fullname" . }}-model-config - configMap: - name: {{ include "common.fullname" . }}-model-configmap - {{ if .Values.global.installSidecarSecurity }} - - name: {{ include "common.fullname" . }}-rproxy-config - configMap: - name: {{ include "common.fullname" . }}-rproxy-config - - name: {{ include "common.fullname" . }}-rproxy-log-config - configMap: - name: {{ include "common.fullname" . }}-rproxy-log-config - - name: {{ include "common.fullname" . }}-rproxy-uri-auth-config - configMap: - name: {{ include "common.fullname" . }}-rproxy-uri-auth-config - - name: {{ include "common.fullname" . }}-rproxy-auth-config - secret: - secretName: {{ include "common.fullname" . }}-rproxy-auth-config - - name: {{ include "common.fullname" . }}-rproxy-auth-certs - secret: - secretName: aai-rproxy-auth-certs - - name: {{ include "common.fullname" . }}-rproxy-security-config - secret: - secretName: aai-rproxy-security-config - - name: {{ include "common.fullname" . }}-fproxy-config - configMap: - name: {{ include "common.fullname" . }}-fproxy-config - - name: {{ include "common.fullname" . }}-fproxy-log-config - configMap: - name: {{ include "common.fullname" . }}-fproxy-log-config - - name: {{ include "common.fullname" . }}-fproxy-auth-certs - secret: - secretName: aai-fproxy-auth-certs - {{ end }} - - imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/components/aai-gizmo/templates/secrets.yaml b/components/aai-gizmo/templates/secrets.yaml deleted file mode 100644 index 96c3424..0000000 --- a/components/aai-gizmo/templates/secrets.yaml +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# Modifications Copyright © 2018 Bell Canada -# -# 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. - -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.fullname" . }}-auth - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ (.Files.Glob "resources/config/auth/*").AsSecrets | indent 2 }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.fullname" . }}-pass - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -type: Opaque -data: - KEY_STORE_PASSWORD: {{ .Values.config.keyStorePassword | b64enc | quote }} - KEY_MANAGER_PASSWORD: {{ .Values.config.keyManagerPassword | b64enc | quote }} - -{{ if .Values.global.installSidecarSecurity }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.fullname" . }}-rproxy-auth-config - namespace: {{ include "common.namespace" . }} -type: Opaque -data: -{{ tpl (.Files.Glob "resources/rproxy/config/auth/*").AsSecrets . | indent 2 }} -{{ end }} diff --git a/components/aai-gizmo/templates/service.yaml b/components/aai-gizmo/templates/service.yaml deleted file mode 100644 index a584800..0000000 --- a/components/aai-gizmo/templates/service.yaml +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# Modifications Copyright © 2018 Bell Canada -# -# 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. - -apiVersion: v1 -kind: Service -metadata: - name: {{ include "common.servicename" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - annotations: -spec: - type: {{ .Values.service.type }} - ports: - {{ if .Values.global.installSidecarSecurity }} - {{if eq .Values.service.type "NodePort" -}} - - port: {{ .Values.service.internalPort }} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - targetPort: {{ .Values.global.rproxy.port }} - name: {{ .Values.service.portName }} - {{- else -}} - - port: {{ .Values.service.externalPort }} - targetPort: {{ .Values.global.rproxy.port }} - name: {{ .Values.service.portName }} - {{- end}} - {{ else }} - {{if eq .Values.service.type "NodePort" -}} - - port: {{ .Values.service.internalPort }} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.portName }} - {{- else -}} - - port: {{ .Values.service.externalPort }} - targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.portName }} - {{- end}} - {{ end }} - selector: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} diff --git a/components/aai-gizmo/values.yaml b/components/aai-gizmo/values.yaml deleted file mode 100644 index b5c8828..0000000 --- a/components/aai-gizmo/values.yaml +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# Modifications Copyright © 2018 Bell Canada -# -# 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. - -################################################################# -global: - nodePortPrefix: 302 - loggingImage: beats/filebeat:5.5.0 - -################################################################# -# Application configuration defaults. -################################################################# - -# application image -image: onap/gizmo:1.5.2 -flavor: small -# application configuration -config: - keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 - keyManagerPassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 - trustStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 - -# default number of instances -replicaCount: 1 - -nodeSelector: {} - -affinity: {} - -# probe configuration parameters -liveness: - initialDelaySeconds: 60 - timeoutSeconds: 10 - periodSeconds: 10 - # necessary to disable liveness probe when setting breakpoints - # in debugger so K8s doesn't restart unresponsive container - enabled: true - -readiness: - initialDelaySeconds: 60 - timeoutSeconds: 10 - periodSeconds: 10 - -service: - type: NodePort - name: aai-crud-service - portName: aai-crud-service - internalPort: 9520 - externalPort: 9520 - nodePort: 68 - -ingress: - enabled: false - -resources: - small: - limits: - cpu: 2 - memory: 4Gi - requests: - cpu: 0.5 - memory: 1Gi - large: - limits: - cpu: 4 - memory: 8Gi - requests: - cpu: 1 - memory: 1536Mi - unlimited: {} diff --git a/components/aai-graphgraph/Chart.yaml b/components/aai-graphgraph/Chart.yaml deleted file mode 100644 index 79fab9e..0000000 --- a/components/aai-graphgraph/Chart.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright © 2019 Orange -# -# 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. - - -apiVersion: v1 -description: ONAP AAI Graphgraph -name: aai-graphgraph -version: 5.0.0 diff --git a/components/aai-graphgraph/config/application.properties b/components/aai-graphgraph/config/application.properties deleted file mode 100644 index 0d31641..0000000 --- a/components/aai-graphgraph/config/application.properties +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright © 2019 Orange -# -# 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. - -# Schema related attributes for the oxm and edges -# Any additional schema related attributes should start with prefix schema -spring.application.name=graphgraph - -schema.configuration.location=N/A -schema.source.name=onap -schema.nodes.location=${server.local.startpath}/schema/${schema.source.name}/oxm/ -schema.edges.location=${server.local.startpath}/schema/${schema.source.name}/dbedgerules/ - -server.local.startpath=/graphgraph -schema.ingest.file=${server.local.startpath}/application.properties - -# Schema Version Related Attributes - -schema.uri.base.path={{ .Values.global.config.schema.uri.base.path }} -# Lists all of the versions in the schema -schema.version.list={{ .Values.global.config.schema.version.list }} -# Specifies from which version should the depth parameter to default to zero -schema.version.depth.start={{ .Values.global.config.schema.version.depth }} -# Specifies from which version should the related link be displayed in response payload -schema.version.related.link.start={{ .Values.global.config.schema.version.related.link }} -# Specifies from which version should the client see only the uri excluding host info -# Before this version server base will also be included -schema.version.app.root.start={{ .Values.global.config.schema.version.app.root }} -# Specifies from which version should the namespace be changed -schema.version.namespace.change.start={{ .Values.global.config.schema.version.namespace.change }} -# Specifies from which version should the client start seeing the edge label in payload -schema.version.edge.label.start={{ .Values.global.config.schema.version.edge.label }} -# Specifies the version that the application should default to -schema.version.api.default={{ .Values.global.config.schema.version.api.default }} -schema.translator.list=schema-service -schema.service.base.url=https://aai-schema-service.{{ include "common.namespace" . }}:8452/aai/schema-service/v1/ -# schema.service.client=no-auth -schema.service.nodes.endpoint=nodes?version= -schema.service.edges.endpoint=edgerules?version= -schema.service.versions.endpoint=versions - -schema.service.versions.override=false - -server.port=8453 -schema.service.ssl.enabled-protocols=TLSv1.1,TLSv1.2 -schema.service.ssl.client-auth=want -schema.service.ssl.key-store-type=JKS -schema.service.client=one-way-ssl -schema.service.ssl.key-store=${server.local.startpath}/etc/auth/{{ .Values.global.config.keystore.filename }} -schema.service.ssl.trust-store=${server.local.startpath}/etc/auth/{{ .Values.global.config.truststore.filename }} -schema.service.ssl.key-store-password=password({{ .Values.global.config.keystore.passwd }}) -schema.service.ssl.trust-store-password=password({{ .Values.global.config.truststore.passwd }}) - - - - diff --git a/components/aai-graphgraph/templates/configmap.yaml b/components/aai-graphgraph/templates/configmap.yaml deleted file mode 100644 index a75cde1..0000000 --- a/components/aai-graphgraph/templates/configmap.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright © 2019 Orange -# -# 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. - -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-springapp-configmap - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "config/application.properties").AsConfig . | indent 2 }} diff --git a/components/aai-graphgraph/templates/deployment.yaml b/components/aai-graphgraph/templates/deployment.yaml deleted file mode 100644 index 520dbf6..0000000 --- a/components/aai-graphgraph/templates/deployment.yaml +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright © 2019 Orange -# Modifications Copyright © 2018 AT&T -# -# 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. - -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app: {{ include "common.name" . }} - template: - metadata: - labels: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - name: {{ include "common.name" . }} - annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} - spec: - hostname: aai-graphgraph - initContainers: - - command: - - /root/ready.py - args: - - --container-name - - aai-schema-service - env: - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - name: {{ include "common.name" . }}-readiness - containers: - - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - env: - - name: LOCAL_USER_ID - value: {{ .Values.global.config.userId | quote }} - - name: LOCAL_GROUP_ID - value: {{ .Values.global.config.groupId | quote }} - volumeMounts: - - mountPath: /etc/localtime - name: localtime - readOnly: true - - mountPath: /graphgraph/application.properties - name: springapp-conf - subPath: application.properties - {{ $global := . }} - {{ range $job := .Values.global.config.auth.files }} - - mountPath: /graphgraph/etc/auth/{{ . }} - name: auth-truststore-sec - subPath: {{ . }} - {{ end }} - ports: - - containerPort: 8453 - # disable liveness probe when breakpoints set in debugger - # so K8s doesn't restart unresponsive container - {{ if .Values.liveness.enabled }} - livenessProbe: - tcpSocket: - port: {{ .Values.service.internalPort }} - initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end }} - resources: -{{ include "common.resources" . | indent 12 }} - {{- if .Values.nodeSelector }} - nodeSelector: -{{ toYaml .Values.nodeSelector | indent 8 }} - {{- end -}} - {{- if .Values.affinity }} - affinity: -{{ toYaml .Values.affinity | indent 8 }} - {{- end }} - volumes: - - name: aai-common-aai-auth-mount - secret: - secretName: aai-common-aai-auth - - name: localtime - hostPath: - path: /etc/localtime - - name: springapp-conf - configMap: - name: {{ include "common.fullname" . }}-springapp-configmap - - name: auth-truststore-sec - secret: - secretName: aai-common-truststore - items: - {{ range $job := .Values.global.config.auth.files }} - - key: {{ . }} - path: {{ . }} - {{ end }} - restartPolicy: {{ .Values.restartPolicy }} - imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/components/aai-graphgraph/templates/service.yaml b/components/aai-graphgraph/templates/service.yaml deleted file mode 100644 index cc4253d..0000000 --- a/components/aai-graphgraph/templates/service.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright © 2019 Orange -# -# 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. - -apiVersion: v1 -kind: Service -metadata: - name: {{ include "common.servicename" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - ports: - - port: {{ .Values.service.internalPort }} - name: {{ .Values.service.portName }} - targetPort: {{ .Values.service.internalPort }} - protocol: TCP - selector: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} diff --git a/components/aai-graphgraph/values.yaml b/components/aai-graphgraph/values.yaml deleted file mode 100644 index a89dea3..0000000 --- a/components/aai-graphgraph/values.yaml +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright © 2019 Orange -# -# 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. - -# Default values for resources. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. -global: # global defaults - nodePortPrefix: 303 - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.2 - -# application image -repository: nexus3.onap.org:10001 -image: onap/aai-graphgraph:1.5 -pullPolicy: Always -restartPolicy: Always -flavor: small -# default number of instances -replicaCount: 1 - -nodeSelector: {} - -affinity: {} - -# probe configuration parameters -liveness: - initialDelaySeconds: 60 - periodSeconds: 60 - # necessary to disable liveness probe when setting breakpoints - # in debugger so K8s doesn't restart unresponsive container - enabled: false - -readiness: - initialDelaySeconds: 60 - periodSeconds: 10 - -service: - portName: aai-graphgraph-8453 - internalPort: 8453 - nodePort: 85 - -ingress: - enabled: false - - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # - # Example: - # Configure resource requests and limits - # ref: http://kubernetes.io/docs/user-guide/compute-resources/ - # Minimum memory for development is 2 CPU cores and 4GB memory - # Minimum memory for production is 4 CPU cores and 8GB memory -#resources: -# limits: -# cpu: 2 -# memory: 4Gi -# requests: -# cpu: 2 -# memory: 4Gi -resources: - small: - limits: - cpu: 0.1 - memory: 2Gi - requests: - cpu: 0.01 - memory: 1Gi - large: - limits: - cpu: 0.1 - memory: 2Gi - requests: - cpu: 0.01 - memory: 1Gi - unlimited: {} diff --git a/components/aai-spike/Chart.yaml b/components/aai-spike/Chart.yaml deleted file mode 100644 index a9dd730..0000000 --- a/components/aai-spike/Chart.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# -# 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. - -apiVersion: v1 -description: ONAP AAI Spike microservice -name: aai-spike -version: 5.0.0 \ No newline at end of file diff --git a/components/aai-spike/requirements.yaml b/components/aai-spike/requirements.yaml deleted file mode 100644 index 19fcb5f..0000000 --- a/components/aai-spike/requirements.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# -# 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. - -dependencies: - - name: common - version: ~5.x-0 - # local reference to common chart, as it is - # a part of this chart's package and will not - # be published independently to a repo (at this point) - repository: '@local' diff --git a/components/aai-spike/resources/config/auth/client-cert.p12 b/components/aai-spike/resources/config/auth/client-cert.p12 deleted file mode 100644 index d9fe86e4ece3713ea5bae80fd9219344f8289ad1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3617 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 JAq9rz{tI2+vm*ci diff --git a/components/aai-spike/resources/config/auth/tomcat_keystore b/components/aai-spike/resources/config/auth/tomcat_keystore deleted file mode 100644 index 025f3c49da16d9b72b9e5c4481cf2ee7d01d2a3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3429 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 - - - - - - - - - - - - - - - - - - - - - - - - ${errorLogPattern} - - - - - - - - - - - ${logDirectory}/${generalLogName}.log - - ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - ${errorLogPattern} - - - - - - INFO - - 256 - - - - - - - ${logDirectory}/${auditLogName}.log - - ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - ${auditMetricPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}.log - - ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - - ${auditMetricPattern} - - - - - 256 - - - - - ${logDirectory}/${debugLogName}.log - - ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip - - 60 - - - ${errorLogPattern} - - - - - 256 - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/components/aai-spike/resources/config/model/edge_props/edge_properties_v10.json b/components/aai-spike/resources/config/model/edge_props/edge_properties_v10.json deleted file mode 100644 index 7cbddae..0000000 --- a/components/aai-spike/resources/config/model/edge_props/edge_properties_v10.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "isParent":"java.lang.Boolean", - "isParent-REV":"java.lang.Boolean", - "usesResource":"java.lang.Boolean", - "usesResource-REV":"java.lang.Boolean", - "SVC-INFRA":"java.lang.Boolean", - "SVC-INFRA-REV":"java.lang.Boolean", - "hasDelTarget":"java.lang.Boolean", - "hasDelTarget-REV":"java.lang.Boolean" -} diff --git a/components/aai-spike/resources/config/model/edge_props/edge_properties_v11.json b/components/aai-spike/resources/config/model/edge_props/edge_properties_v11.json deleted file mode 100644 index 8d00636..0000000 --- a/components/aai-spike/resources/config/model/edge_props/edge_properties_v11.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "contains-other-v": "java.lang.String", - "delete-other-v": "java.lang.String", - "SVC-INFRA": "java.lang.String", - "prevent-delete": "java.lang.String" -} \ No newline at end of file diff --git a/components/aai-spike/resources/config/model/edge_props/edge_properties_v12.json b/components/aai-spike/resources/config/model/edge_props/edge_properties_v12.json deleted file mode 100644 index 8d00636..0000000 --- a/components/aai-spike/resources/config/model/edge_props/edge_properties_v12.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "contains-other-v": "java.lang.String", - "delete-other-v": "java.lang.String", - "SVC-INFRA": "java.lang.String", - "prevent-delete": "java.lang.String" -} \ No newline at end of file diff --git a/components/aai-spike/resources/config/model/edge_props/edge_properties_v13.json b/components/aai-spike/resources/config/model/edge_props/edge_properties_v13.json deleted file mode 100644 index 8d00636..0000000 --- a/components/aai-spike/resources/config/model/edge_props/edge_properties_v13.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "contains-other-v": "java.lang.String", - "delete-other-v": "java.lang.String", - "SVC-INFRA": "java.lang.String", - "prevent-delete": "java.lang.String" -} \ No newline at end of file diff --git a/components/aai-spike/resources/config/model/edge_props/edge_properties_v14.json b/components/aai-spike/resources/config/model/edge_props/edge_properties_v14.json deleted file mode 100644 index 8d00636..0000000 --- a/components/aai-spike/resources/config/model/edge_props/edge_properties_v14.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "contains-other-v": "java.lang.String", - "delete-other-v": "java.lang.String", - "SVC-INFRA": "java.lang.String", - "prevent-delete": "java.lang.String" -} \ No newline at end of file diff --git a/components/aai-spike/resources/config/model/edge_props/edge_properties_v15.json b/components/aai-spike/resources/config/model/edge_props/edge_properties_v15.json deleted file mode 100644 index 8d00636..0000000 --- a/components/aai-spike/resources/config/model/edge_props/edge_properties_v15.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "contains-other-v": "java.lang.String", - "delete-other-v": "java.lang.String", - "SVC-INFRA": "java.lang.String", - "prevent-delete": "java.lang.String" -} \ No newline at end of file diff --git a/components/aai-spike/resources/config/model/edge_props/edge_properties_v7.json b/components/aai-spike/resources/config/model/edge_props/edge_properties_v7.json deleted file mode 100644 index 7cbddae..0000000 --- a/components/aai-spike/resources/config/model/edge_props/edge_properties_v7.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "isParent":"java.lang.Boolean", - "isParent-REV":"java.lang.Boolean", - "usesResource":"java.lang.Boolean", - "usesResource-REV":"java.lang.Boolean", - "SVC-INFRA":"java.lang.Boolean", - "SVC-INFRA-REV":"java.lang.Boolean", - "hasDelTarget":"java.lang.Boolean", - "hasDelTarget-REV":"java.lang.Boolean" -} diff --git a/components/aai-spike/resources/config/model/edge_props/edge_properties_v8.json b/components/aai-spike/resources/config/model/edge_props/edge_properties_v8.json deleted file mode 100644 index 7cbddae..0000000 --- a/components/aai-spike/resources/config/model/edge_props/edge_properties_v8.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "isParent":"java.lang.Boolean", - "isParent-REV":"java.lang.Boolean", - "usesResource":"java.lang.Boolean", - "usesResource-REV":"java.lang.Boolean", - "SVC-INFRA":"java.lang.Boolean", - "SVC-INFRA-REV":"java.lang.Boolean", - "hasDelTarget":"java.lang.Boolean", - "hasDelTarget-REV":"java.lang.Boolean" -} diff --git a/components/aai-spike/resources/config/model/edge_props/edge_properties_v9.json b/components/aai-spike/resources/config/model/edge_props/edge_properties_v9.json deleted file mode 100644 index 7cbddae..0000000 --- a/components/aai-spike/resources/config/model/edge_props/edge_properties_v9.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "isParent":"java.lang.Boolean", - "isParent-REV":"java.lang.Boolean", - "usesResource":"java.lang.Boolean", - "usesResource-REV":"java.lang.Boolean", - "SVC-INFRA":"java.lang.Boolean", - "SVC-INFRA-REV":"java.lang.Boolean", - "hasDelTarget":"java.lang.Boolean", - "hasDelTarget-REV":"java.lang.Boolean" -} diff --git a/components/aai-spike/resources/config/schema-ingest.properties b/components/aai-spike/resources/config/schema-ingest.properties deleted file mode 100644 index 1569761..0000000 --- a/components/aai-spike/resources/config/schema-ingest.properties +++ /dev/null @@ -1,65 +0,0 @@ -# -# ============LICENSE_START======================================================= -# org.onap.aai -# ================================================================================ -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. -# Copyright © 2018 Amdocs -# ================================================================================ -# 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========================================================= -# - -####################################### -# Schema Version Related Attributes -####################################### -schema.uri.base.path=/aai -# Lists all of the versions in the schema -schema.version.list=v10,v11,v12,v13,v14,v15 -# Specifies from which version should the depth parameter to default to zero -schema.version.depth.start=v10 -# Specifies from which version should the related link be displayed in response payload -schema.version.related.link.start=v10 -# Specifies from which version should the client see only the uri excluding host info -# Before this version server base will also be included -schema.version.app.root.start=v11 -# Specifies from which version should the namespace be changed -schema.version.namespace.change.start=v11 -# Specifies from which version should the client start seeing the edge label in payload -schema.version.edge.label.start=v12 -# Specifies the version that the application should default to -schema.version.api.default=v15 - -####################################### -# Schema Location Related Attributes -####################################### -schema.configuration.location=NA -schema.nodes.location=/opt/app/spike/bundleconfig/etc/onap/oxm -schema.edges.location=/opt/app/spike/bundleconfig/etc/onap/dbedgerules - -############################################################################### -# Schema Service Related Attributes -############################################################################### -# Specifies whether to use the schema service (schema-service) or local schema files (config) -schema.translator.list=config - -schema.service.base.url=https://:8452/aai/schema-service/v1/ -schema.service.nodes.endpoint=nodes?version= -schema.service.edges.endpoint=edgerules?version= -schema.service.versions.endpoint=versions - -#Default rest client is the two-way-ssl -schema.service.client=two-way-ssl -#Replace the below with the A&AI client key store -schema.service.ssl.key-store=${CONFIG_HOME}/auth/client-cert.p12 -#Replace the below with the A&AI tomcat trust store -schema.service.ssl.trust-store=${CONFIG_HOME}/auth/tomcat_keystore diff --git a/components/aai-spike/resources/config/spike-beans.xml b/components/aai-spike/resources/config/spike-beans.xml deleted file mode 100644 index 50be8cb..0000000 --- a/components/aai-spike/resources/config/spike-beans.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/components/aai-spike/resources/config/spike.properties b/components/aai-spike/resources/config/spike.properties deleted file mode 100644 index c3ba4a3..0000000 --- a/components/aai-spike/resources/config/spike.properties +++ /dev/null @@ -1,28 +0,0 @@ -# -# ============LICENSE_START======================================================= -# org.onap.aai -# ================================================================================ -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. -# Copyright © 2018 Amdocs -# ================================================================================ -# 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========================================================= -# - -# Spike configuration - -spike.event.poll.interval=30000 -spike.event.offset.period= 10000 -spike.event.queue.capacity=10000 -spike.event.queue.delay=10000 -spike.props.reserved=source-of-truth,last-mod-source-of-truth,aai-created-ts,aai-last-mod-ts diff --git a/components/aai-spike/templates/configmap.yaml b/components/aai-spike/templates/configmap.yaml deleted file mode 100644 index ebd4fb0..0000000 --- a/components/aai-spike/templates/configmap.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# -# 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. - -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-configmap - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-edge-props-configmap - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/config/model/edge_props/*").AsConfig . | indent 2 }} diff --git a/components/aai-spike/templates/deployment.yaml b/components/aai-spike/templates/deployment.yaml deleted file mode 100644 index c962f1d..0000000 --- a/components/aai-spike/templates/deployment.yaml +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# -# 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. - -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - replicas: {{ .Values.replicaCount }} - template: - metadata: - labels: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - spec: - initContainers: - - command: - - /root/ready.py - args: - - --container-name - - message-router-kafka - env: - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - name: {{ include "common.name" . }}-readiness - containers: - - name: {{ .Chart.Name }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - ports: - - containerPort: {{ .Values.service.internalPort }} - # disable liveness probe when breakpoints set in debugger - # so K8s doesn't restart unresponsive container - {{ if .Values.liveness.enabled }} - livenessProbe: - tcpSocket: - port: {{ .Values.service.internalPort }} - initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end }} - readinessProbe: - tcpSocket: - port: {{ .Values.service.internalPort }} - initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.readiness.periodSeconds }} - env: - - name: CONFIG_HOME - value: /opt/app/spike/config - - name: KEY_STORE_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "common.fullname" . }}-pass - key: KEY_STORE_PASSWORD - - name: KEY_MANAGER_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "common.fullname" . }}-pass - key: KEY_MANAGER_PASSWORD - - name: SERVICE_BEANS - value: /opt/app/spike/dynamic/conf - volumeMounts: - - mountPath: /etc/localtime - name: localtime - readOnly: true - - mountPath: /opt/app/spike/config/auth - name: {{ include "common.fullname" . }}-secrets - - mountPath: /opt/app/spike/dynamic/conf/spike-beans.xml - name: {{ include "common.fullname" . }}-config - subPath: spike-beans.xml - - mountPath: /opt/app/spike/config/spike.properties - subPath: spike.properties - name: {{ include "common.fullname" . }}-config - - mountPath: /opt/app/spike/config/schema-ingest.properties - subPath: schema-ingest.properties - name: {{ include "common.fullname" . }}-config - - mountPath: /opt/app/spike/config/edgeprops-ingest.properties - subPath: edgeprops-ingest.properties - name: {{ include "common.fullname" . }}-config - - mountPath: /opt/app/spike/config/model/edge_props - name: {{ include "common.fullname" . }}-edge-props-config - - mountPath: /opt/app/spike/bundleconfig/etc/logback.xml - name: {{ include "common.fullname" . }}-config - subPath: logback.xml - - mountPath: /var/log/onap - name: {{ include "common.fullname" . }}-logs - resources: -{{ include "common.resources" . }} - {{- if .Values.nodeSelector }} - nodeSelector: -{{ toYaml .Values.nodeSelector | indent 8 }} - {{- end -}} - {{- if .Values.affinity }} - affinity: -{{ toYaml .Values.affinity | indent 8 }} - {{- end }} - - # side car containers - - name: filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - volumeMounts: - - mountPath: /usr/share/filebeat/filebeat.yml - subPath: filebeat.yml - name: filebeat-conf - - mountPath: /var/log/onap - name: {{ include "common.fullname" . }}-logs - - mountPath: /usr/share/filebeat/data - name: aai-filebeat - resources: -{{ include "common.resources" . }} - - volumes: - - name: localtime - hostPath: - path: /etc/localtime - - name: {{ include "common.fullname" . }}-secrets - secret: - secretName: {{ include "common.fullname" . }}-spike-secrets - - name: {{ include "common.fullname" . }}-config - configMap: - name: {{ include "common.fullname" . }}-configmap - items: - - key: spike.properties - path: spike.properties - - key: spike-beans.xml - path: spike-beans.xml - - key: schema-ingest.properties - path: schema-ingest.properties - - key: edgeprops-ingest.properties - path: edgeprops-ingest.properties - - key: logback.xml - path: logback.xml - - name: {{ include "common.fullname" . }}-edge-props-config - configMap: - name: {{ include "common.fullname" . }}-edge-props-configmap - - name: filebeat-conf - configMap: - name: aai-filebeat - - name: {{ include "common.fullname" . }}-logs - emptyDir: {} - - name: aai-filebeat - emptyDir: {} - imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/components/aai-spike/templates/secrets.yaml b/components/aai-spike/templates/secrets.yaml deleted file mode 100644 index 510805d..0000000 --- a/components/aai-spike/templates/secrets.yaml +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# -# 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. - -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.fullname" . }}-spike-secrets - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -type: Opaque -data: -{{ tpl (.Files.Glob "resources/config/auth/*").AsSecrets . | indent 2 }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.fullname" . }}-pass - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -type: Opaque -data: - KEY_STORE_PASSWORD: {{ .Values.config.keyStorePassword | b64enc | quote }} - KEY_MANAGER_PASSWORD: {{ .Values.config.keyManagerPassword | b64enc | quote }} diff --git a/components/aai-spike/templates/service.yaml b/components/aai-spike/templates/service.yaml deleted file mode 100644 index 745c73b..0000000 --- a/components/aai-spike/templates/service.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# -# 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. - -apiVersion: v1 -kind: Service -metadata: - name: {{ include "common.servicename" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - type: {{ .Values.service.type }} - ports: - {{if eq .Values.service.type "NodePort" -}} - - port: {{ .Values.service.internalPort}} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort}} - name: {{ .Values.service.portName }} - {{- else -}} - - port: {{ .Values.service.externalPort }} - targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.portName }} - {{- end}} - selector: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} diff --git a/components/aai-spike/values.yaml b/components/aai-spike/values.yaml deleted file mode 100644 index c4901ab..0000000 --- a/components/aai-spike/values.yaml +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T -# -# 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. - -################################################################# -# Global configuration defaults. -################################################################# -global: - readinessImage: readiness-check:2.0.2 - loggingImage: beats/filebeat:5.5.0 - -################################################################# -# Application configuration defaults. -################################################################# - -# application image -image: onap/spike:1.5.1 -flavor: small -# application configuration -config: - keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 - keyManagerPassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 - -# default number of instances -replicaCount: 1 - -nodeSelector: {} - -affinity: {} - -# probe configuration parameters -liveness: - initialDelaySeconds: 10 - periodSeconds: 10 - # necessary to disable liveness probe when setting breakpoints - # in debugger so K8s doesn't restart unresponsive container - enabled: false - -readiness: - initialDelaySeconds: 10 - periodSeconds: 10 - -service: - type: NodePort - portName: spike - externalPort: 9518 - internalPort: 9518 - nodePort: 39 - -ingress: - enabled: false - -resources: - small: - limits: - cpu: 2 - memory: 4Gi - requests: - cpu: 0.5 - memory: 1Gi - large: - limits: - cpu: 4 - memory: 8Gi - requests: - cpu: 1 - memory: 1536Mi - unlimited: {} - -# XML bean configuration -event: - port: - dmaap: 3905 - protocol: https - consumer: - topic: champRawEvents - publisher: - topic: spikeEvents diff --git a/requirements.yaml b/requirements.yaml index 176826e..46b4d3d 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -31,10 +31,6 @@ dependencies: version: ~5.x-0 repository: 'file://components/aai-babel' condition: aai-babel.enabled - - name: aai-champ - version: ~5.x-0 - repository: 'file://components/aai-champ' - condition: aai-champ.enabled - name: aai-data-router version: ~5.x-0 repository: 'file://components/aai-data-router' @@ -43,10 +39,6 @@ dependencies: version: ~5.x-0 repository: 'file://components/aai-elasticsearch' condition: aai-elasticsearch.enabled - - name: aai-gizmo - version: ~5.x-0 - repository: 'file://components/aai-gizmo' - condition: aai-gizmo.enabled - name: aai-graphadmin version: ~5.x-0 repository: 'file://components/aai-graphadmin' @@ -71,15 +63,7 @@ dependencies: version: ~5.x-0 repository: 'file://components/aai-sparky-be' condition: aai-sparky-be.enabled - - name: aai-spike - version: ~5.x-0 - repository: 'file://components/aai-spike' - condition: aai-spike.enabled - name: aai-traversal version: ~5.x-0 repository: 'file://components/aai-traversal' condition: aai-traversal.enabled - - name: aai-graphgraph - version: ~5.x-0 - repository: 'file://components/aai-graphgraph' - condition: aai-graphgraph.enabled diff --git a/values.yaml b/values.yaml index 55f9319..f389a93 100644 --- a/values.yaml +++ b/values.yaml @@ -75,8 +75,6 @@ global: # global defaults serviceName: aai babel: serviceName: aai-babel - champ: - serviceName: aai-champ aaiElasticsearch: serviceName: aai-elasticsearch resources: @@ -375,9 +373,3 @@ resources: memory: 2Gi unlimited: {} -aai-champ: - enabled: false -aai-gizmo: - enabled: false -aai-spike: - enabled: false -- 2.16.6