From 82cee4d96d7a8d829877d1ecbd1e68c5853b150e Mon Sep 17 00:00:00 2001 From: Daniel Silverthorn Date: Wed, 28 Mar 2018 19:18:19 +0000 Subject: Conform to helm standards Change-Id: I6cda4dbc168ae6cb110deca5596e5d96f517e7fe Issue-ID: OOM-790 Signed-off-by: Daniel Silverthorn --- .../aai/charts/gizmo/resources/config/README.txt | 10 - .../gizmo/resources/config/auth/champ-cert.p12 | Bin 2556 -> 0 bytes .../gizmo/resources/config/auth/crud_policy.json | 18 -- .../resources/config/auth/datarouter-cert.p12 | Bin 2556 -> 0 bytes .../gizmo/resources/config/auth/tomcat_keystore | Bin 2214 -> 0 bytes .../gizmo/resources/config/crud-api.properties | 5 - .../charts/gizmo/resources/config/crud-beans.xml | 35 ---- .../resources/config/log/filebeat/filebeat.yml | 41 ---- .../charts/gizmo/resources/config/log/logback.xml | 213 --------------------- .../config/model/edge_properties_v11.json | 6 - .../config/model/edge_properties_v12.json | 6 - .../config/model/edge_properties_v13.json | 6 - 12 files changed, 340 deletions(-) delete mode 100644 kubernetes/aai/charts/gizmo/resources/config/README.txt delete mode 100644 kubernetes/aai/charts/gizmo/resources/config/auth/champ-cert.p12 delete mode 100644 kubernetes/aai/charts/gizmo/resources/config/auth/crud_policy.json delete mode 100644 kubernetes/aai/charts/gizmo/resources/config/auth/datarouter-cert.p12 delete mode 100644 kubernetes/aai/charts/gizmo/resources/config/auth/tomcat_keystore delete mode 100644 kubernetes/aai/charts/gizmo/resources/config/crud-api.properties delete mode 100644 kubernetes/aai/charts/gizmo/resources/config/crud-beans.xml delete mode 100644 kubernetes/aai/charts/gizmo/resources/config/log/filebeat/filebeat.yml delete mode 100644 kubernetes/aai/charts/gizmo/resources/config/log/logback.xml delete mode 100644 kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v11.json delete mode 100644 kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v12.json delete mode 100644 kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v13.json (limited to 'kubernetes/aai/charts/gizmo/resources') diff --git a/kubernetes/aai/charts/gizmo/resources/config/README.txt b/kubernetes/aai/charts/gizmo/resources/config/README.txt deleted file mode 100644 index 5cc01497f5..0000000000 --- a/kubernetes/aai/charts/gizmo/resources/config/README.txt +++ /dev/null @@ -1,10 +0,0 @@ -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/kubernetes/aai/charts/gizmo/resources/config/auth/champ-cert.p12 b/kubernetes/aai/charts/gizmo/resources/config/auth/champ-cert.p12 deleted file mode 100644 index dbf4fcacec..0000000000 Binary files a/kubernetes/aai/charts/gizmo/resources/config/auth/champ-cert.p12 and /dev/null differ diff --git a/kubernetes/aai/charts/gizmo/resources/config/auth/crud_policy.json b/kubernetes/aai/charts/gizmo/resources/config/auth/crud_policy.json deleted file mode 100644 index d8b065e7f6..0000000000 --- a/kubernetes/aai/charts/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/kubernetes/aai/charts/gizmo/resources/config/auth/datarouter-cert.p12 b/kubernetes/aai/charts/gizmo/resources/config/auth/datarouter-cert.p12 deleted file mode 100644 index dbf4fcacec..0000000000 Binary files a/kubernetes/aai/charts/gizmo/resources/config/auth/datarouter-cert.p12 and /dev/null differ diff --git a/kubernetes/aai/charts/gizmo/resources/config/auth/tomcat_keystore b/kubernetes/aai/charts/gizmo/resources/config/auth/tomcat_keystore deleted file mode 100644 index 9eec841aa2..0000000000 Binary files a/kubernetes/aai/charts/gizmo/resources/config/auth/tomcat_keystore and /dev/null differ diff --git a/kubernetes/aai/charts/gizmo/resources/config/crud-api.properties b/kubernetes/aai/charts/gizmo/resources/config/crud-api.properties deleted file mode 100644 index a86d47203a..0000000000 --- a/kubernetes/aai/charts/gizmo/resources/config/crud-api.properties +++ /dev/null @@ -1,5 +0,0 @@ -# CRUD-API configuration - -crud.async.request.timeout=60000 -crud.async.response.process.poll.interval=1000 -crud.collection.properties.key=properties diff --git a/kubernetes/aai/charts/gizmo/resources/config/crud-beans.xml b/kubernetes/aai/charts/gizmo/resources/config/crud-beans.xml deleted file mode 100644 index 04f1210433..0000000000 --- a/kubernetes/aai/charts/gizmo/resources/config/crud-beans.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/kubernetes/aai/charts/gizmo/resources/config/log/filebeat/filebeat.yml b/kubernetes/aai/charts/gizmo/resources/config/log/filebeat/filebeat.yml deleted file mode 100644 index 9ad559c027..0000000000 --- a/kubernetes/aai/charts/gizmo/resources/config/log/filebeat/filebeat.yml +++ /dev/null @@ -1,41 +0,0 @@ -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/kubernetes/aai/charts/gizmo/resources/config/log/logback.xml b/kubernetes/aai/charts/gizmo/resources/config/log/logback.xml deleted file mode 100644 index f63afd3c6b..0000000000 --- a/kubernetes/aai/charts/gizmo/resources/config/log/logback.xml +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - ${pattern} - - - - - - - - ${logDirectory}/${generalLogName}.log - - ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.%i.log - - ${maxFileSize} - - ${maxHistory} - ${totalSizeCap} - - - ${pattern} - - - - - - INFO - - ${queueSize} - - - - - ${logDirectory}/${auditLogName}.log - - ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log - - ${maxFileSize} - - ${maxHistory} - ${totalSizeCap} - - - ${pattern} - - - - ${queueSize} - - - - ${logDirectory}/${metricsLogName}.log - - ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log - - ${maxFileSize} - - ${maxHistory} - ${totalSizeCap} - - - ${pattern} - - - - ${queueSize} - - - - ${logDirectory}/${errorLogName}.log - - ${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log - - ${maxFileSize} - - ${maxHistory} - ${totalSizeCap} - - - ${pattern} - - - INFO - - - - ${queueSize} - - - - ${logDirectory}/${debugLogName}.log - - ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log - - ${maxFileSize} - - ${maxHistory} - ${totalSizeCap} - - - ${pattern} - - - - ${queueSize} - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v11.json b/kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v11.json deleted file mode 100644 index 8d00636d27..0000000000 --- a/kubernetes/aai/charts/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/kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v12.json b/kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v12.json deleted file mode 100644 index 8d00636d27..0000000000 --- a/kubernetes/aai/charts/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/kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v13.json b/kubernetes/aai/charts/gizmo/resources/config/model/edge_properties_v13.json deleted file mode 100644 index 8d00636d27..0000000000 --- a/kubernetes/aai/charts/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 -- cgit 1.2.3-korg