From 54668628a12b389d40853c58330977a70bd4795d Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Mon, 5 Aug 2019 12:01:16 -0400 Subject: Disable non-workflow mS in helm charts Issue-ID: AAI-2558 Signed-off-by: Jimmy Forsyth Change-Id: I06b4049b2e5c0bae734b4619abd6298a99ae2a11 --- charts/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 --- charts/aai-gizmo/resources/config/crud-beans.xml | 47 ----- .../resources/config/edgeprops-ingest.properties | 3 - .../resources/config/log/filebeat/filebeat.yml | 55 ------ charts/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 ----- 21 files changed, 478 deletions(-) delete mode 100644 charts/aai-gizmo/resources/config/README.txt delete mode 100644 charts/aai-gizmo/resources/config/auth/champ-cert.p12 delete mode 100644 charts/aai-gizmo/resources/config/auth/client-cert.p12 delete mode 100644 charts/aai-gizmo/resources/config/auth/crud_policy.json delete mode 100644 charts/aai-gizmo/resources/config/auth/datarouter-cert.p12 delete mode 100644 charts/aai-gizmo/resources/config/auth/tomcat_keystore delete mode 100644 charts/aai-gizmo/resources/config/crud-api.properties delete mode 100644 charts/aai-gizmo/resources/config/crud-beans.xml delete mode 100644 charts/aai-gizmo/resources/config/edgeprops-ingest.properties delete mode 100644 charts/aai-gizmo/resources/config/log/filebeat/filebeat.yml delete mode 100644 charts/aai-gizmo/resources/config/log/logback.xml delete mode 100644 charts/aai-gizmo/resources/config/model/edge_properties_v10.json delete mode 100644 charts/aai-gizmo/resources/config/model/edge_properties_v11.json delete mode 100644 charts/aai-gizmo/resources/config/model/edge_properties_v12.json delete mode 100644 charts/aai-gizmo/resources/config/model/edge_properties_v13.json delete mode 100644 charts/aai-gizmo/resources/config/model/edge_properties_v14.json delete mode 100644 charts/aai-gizmo/resources/config/model/edge_properties_v15.json delete mode 100644 charts/aai-gizmo/resources/config/model/edge_properties_v7.json delete mode 100644 charts/aai-gizmo/resources/config/model/edge_properties_v8.json delete mode 100644 charts/aai-gizmo/resources/config/model/edge_properties_v9.json delete mode 100644 charts/aai-gizmo/resources/config/schema-ingest.properties (limited to 'charts/aai-gizmo/resources/config') diff --git a/charts/aai-gizmo/resources/config/README.txt b/charts/aai-gizmo/resources/config/README.txt deleted file mode 100644 index 3761781..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/auth/champ-cert.p12 b/charts/aai-gizmo/resources/config/auth/champ-cert.p12 deleted file mode 100644 index dbf4fca..0000000 Binary files a/charts/aai-gizmo/resources/config/auth/champ-cert.p12 and /dev/null differ diff --git a/charts/aai-gizmo/resources/config/auth/client-cert.p12 b/charts/aai-gizmo/resources/config/auth/client-cert.p12 deleted file mode 100644 index dbf4fca..0000000 Binary files a/charts/aai-gizmo/resources/config/auth/client-cert.p12 and /dev/null differ diff --git a/charts/aai-gizmo/resources/config/auth/crud_policy.json b/charts/aai-gizmo/resources/config/auth/crud_policy.json deleted file mode 100644 index 7a5007e..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/auth/datarouter-cert.p12 b/charts/aai-gizmo/resources/config/auth/datarouter-cert.p12 deleted file mode 100644 index dbf4fca..0000000 Binary files a/charts/aai-gizmo/resources/config/auth/datarouter-cert.p12 and /dev/null differ diff --git a/charts/aai-gizmo/resources/config/auth/tomcat_keystore b/charts/aai-gizmo/resources/config/auth/tomcat_keystore deleted file mode 100644 index 9eec841..0000000 Binary files a/charts/aai-gizmo/resources/config/auth/tomcat_keystore and /dev/null differ diff --git a/charts/aai-gizmo/resources/config/crud-api.properties b/charts/aai-gizmo/resources/config/crud-api.properties deleted file mode 100644 index 0b7f95f..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/crud-beans.xml b/charts/aai-gizmo/resources/config/crud-beans.xml deleted file mode 100644 index e0ab32b..0000000 --- a/charts/aai-gizmo/resources/config/crud-beans.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/charts/aai-gizmo/resources/config/edgeprops-ingest.properties b/charts/aai-gizmo/resources/config/edgeprops-ingest.properties deleted file mode 100644 index fbefd30..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/log/filebeat/filebeat.yml b/charts/aai-gizmo/resources/config/log/filebeat/filebeat.yml deleted file mode 100644 index d7f0b0a..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/log/logback.xml b/charts/aai-gizmo/resources/config/log/logback.xml deleted file mode 100644 index c6bcf57..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/model/edge_properties_v10.json b/charts/aai-gizmo/resources/config/model/edge_properties_v10.json deleted file mode 100644 index 7cbddae..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/model/edge_properties_v11.json b/charts/aai-gizmo/resources/config/model/edge_properties_v11.json deleted file mode 100644 index 09e19b0..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/model/edge_properties_v12.json b/charts/aai-gizmo/resources/config/model/edge_properties_v12.json deleted file mode 100644 index 09e19b0..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/model/edge_properties_v13.json b/charts/aai-gizmo/resources/config/model/edge_properties_v13.json deleted file mode 100644 index 09e19b0..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/model/edge_properties_v14.json b/charts/aai-gizmo/resources/config/model/edge_properties_v14.json deleted file mode 100644 index 8d00636..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/model/edge_properties_v15.json b/charts/aai-gizmo/resources/config/model/edge_properties_v15.json deleted file mode 100644 index 8d00636..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/model/edge_properties_v7.json b/charts/aai-gizmo/resources/config/model/edge_properties_v7.json deleted file mode 100644 index 7cbddae..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/model/edge_properties_v8.json b/charts/aai-gizmo/resources/config/model/edge_properties_v8.json deleted file mode 100644 index 7cbddae..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/model/edge_properties_v9.json b/charts/aai-gizmo/resources/config/model/edge_properties_v9.json deleted file mode 100644 index 7cbddae..0000000 --- a/charts/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/charts/aai-gizmo/resources/config/schema-ingest.properties b/charts/aai-gizmo/resources/config/schema-ingest.properties deleted file mode 100644 index 647d4d9..0000000 --- a/charts/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 -- cgit 1.2.3-korg