From 47eb4d2c38499bd60cdfb01010319ed5bf4ac45f Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Thu, 10 Dec 2020 12:15:27 +0100 Subject: [PATCH] [AAI] Make AAI helm3 compatible Helm3 doesn't like empty components with only license headers so we remove them as much as possible. Issue-ID: OOM-2562 Signed-off-by: Sylvain Desbureaux Change-Id: I26b790965d2926792f801b87294d15a074de7be6 --- .../resources/config/artifact-generator.properties | 2 ++ .../resources/config/babel-auth.properties | 2 ++ .../resources/rproxy/config/cadi.properties | 2 ++ .../components/aai-babel/templates/configmap.yaml | 2 ++ .../components/aai-babel/templates/deployment.yaml | 2 ++ .../components/aai-babel/templates/secrets.yaml | 2 ++ .../components/aai-babel/templates/service.yaml | 2 ++ .../resources/config/schemaIngest.properties | 2 ++ .../resources/dynamic/conf/entity-event-policy.xml | 3 +- .../aai-data-router/templates/configmap.yaml | 2 ++ .../aai-data-router/templates/deployment.yaml | 2 ++ .../aai-data-router/templates/secret.yaml | 2 ++ .../resources/config/elasticsearch.yml | 34 +++++++++++++++++----- .../aai-elasticsearch/resources/config/jvm.options | 7 ++++- .../resources/config/log4j2.properties | 7 +++-- .../aai-elasticsearch/templates/configmap.yaml | 2 ++ .../aai-elasticsearch/templates/deployment.yaml | 2 ++ .../aai-elasticsearch/templates/service.yaml | 2 ++ .../resources/config/aaiconfig.properties | 2 ++ .../resources/config/application.properties | 4 ++- .../resources/config/janusgraph-cached.properties | 2 ++ .../config/janusgraph-realtime.properties | 2 ++ .../resources/config/localhost-access-logback.xml | 4 +-- .../aai-graphadmin/resources/config/logback.xml | 4 +-- .../janusgraph-migration-cached.properties | 2 ++ .../migration/janusgraph-migration-real.properties | 2 ++ .../resources/config/realm.properties | 4 ++- .../aai-graphadmin/templates/configmap.yaml | 2 ++ .../aai-graphadmin/templates/deployment.yaml | 2 ++ .../templates/job-copy-db-backup.yaml | 2 ++ .../aai-graphadmin/templates/job-create-db.yaml | 2 ++ .../aai-graphadmin/templates/job-migration.yaml | 2 ++ .../aai-graphadmin/templates/service.yaml | 2 ++ .../resources/config/log/logback.xml | 3 +- .../resources/config/model-loader.properties | 2 ++ .../aai-modelloader/templates/configmap.yaml | 2 ++ .../aai-modelloader/templates/deployment.yaml | 2 ++ .../aai-modelloader/templates/secret.yaml | 2 ++ .../aai-modelloader/templates/service.yaml | 2 ++ .../resources/config/aaiconfig.properties | 2 ++ .../resources/config/application.properties | 2 ++ .../resources/config/janusgraph-cached.properties | 2 ++ .../config/janusgraph-realtime.properties | 2 ++ .../resources/config/localhost-access-logback.xml | 5 +++- .../aai-resources/resources/config/logback.xml | 2 ++ .../resources/config/realm.properties | 2 ++ .../resources/rproxy/config/cadi.properties | 2 ++ .../aai-resources/templates/configmap.yaml | 2 ++ .../aai-resources/templates/deployment.yaml | 2 ++ .../aai-resources/templates/service.yaml | 2 ++ .../aai-schema-service/config/aaiconfig.properties | 2 ++ .../config/application.properties | 2 ++ .../config/localhost-access-logback.xml | 5 +++- .../aai-schema-service/config/logback.xml | 2 ++ .../aai-schema-service/templates/configmap.yaml | 2 ++ .../aai-schema-service/templates/deployment.yaml | 2 ++ .../aai-schema-service/templates/service.yaml | 2 ++ .../resources/config/elastic-search.properties | 3 +- .../resources/config/log/logback.xml | 3 +- .../resources/rproxy/config/cadi.properties | 2 ++ .../aai-search-data/templates/configmap.yaml | 2 ++ .../aai-search-data/templates/deployment.yaml | 2 ++ .../aai-search-data/templates/secret.yaml | 2 ++ .../aai-search-data/templates/service.yaml | 4 ++- .../config/application-oxm-default.properties | 2 ++ .../config/application-oxm-override.properties | 2 ++ .../config/application-oxm-schema-prod.properties | 2 ++ .../config/application-resources.properties | 2 ++ .../resources/config/application-ssl.properties | 2 ++ .../resources/config/application.properties | 2 ++ .../config/auth/csp-cookie-filter.properties | 2 ++ .../portal/BOOT-INF/classes/portal.properties | 2 ++ .../config/portal/portal-authentication.properties | 7 ++++- .../aai-sparky-be/resources/config/roles.config | 2 ++ .../aai-sparky-be/templates/configmap.yaml | 2 ++ .../aai-sparky-be/templates/deployment.yaml | 2 ++ .../components/aai-sparky-be/templates/secret.yaml | 2 ++ .../aai-sparky-be/templates/service.yaml | 2 ++ .../resources/config/aaiconfig.properties | 2 ++ .../resources/config/application.properties | 2 ++ .../resources/config/janusgraph-cached.properties | 2 ++ .../config/janusgraph-realtime.properties | 2 ++ .../resources/config/localhost-access-logback.xml | 5 +++- .../aai-traversal/resources/config/logback.xml | 2 ++ .../resources/config/realm.properties | 2 ++ .../aai-traversal/templates/configmap.yaml | 2 ++ .../aai-traversal/templates/deployment.yaml | 2 ++ .../components/aai-traversal/templates/job.yaml | 2 ++ .../aai-traversal/templates/service.yaml | 2 ++ .../config/haproxy/haproxy-pluggable-security.cfg | 3 +- .../aai/resources/config/haproxy/haproxy.cfg | 3 +- .../aai/resources/config/log/filebeat/filebeat.yml | 14 +++++++-- kubernetes/aai/templates/configmap.yaml | 2 ++ kubernetes/aai/templates/deployment.yaml | 3 +- kubernetes/aai/templates/secret.yaml | 2 ++ kubernetes/aai/templates/service.yaml | 2 ++ 96 files changed, 245 insertions(+), 32 deletions(-) diff --git a/kubernetes/aai/components/aai-babel/resources/config/artifact-generator.properties b/kubernetes/aai/components/aai-babel/resources/config/artifact-generator.properties index e246b00c2e..c8ac25e6aa 100644 --- a/kubernetes/aai/components/aai-babel/resources/config/artifact-generator.properties +++ b/kubernetes/aai/components/aai-babel/resources/config/artifact-generator.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,6 +15,7 @@ #action widget details +*/}} AAI.model-version-id.action=fd7fb09e-d930-41b9-b83f-cfde9df48640 AAI.model-invariant-id.action=af593b4b-490e-4665-ad74-2f6351c0a7ce #action-data widget details diff --git a/kubernetes/aai/components/aai-babel/resources/config/babel-auth.properties b/kubernetes/aai/components/aai-babel/resources/config/babel-auth.properties index ef85c23a04..5d3738ec71 100644 --- a/kubernetes/aai/components/aai-babel/resources/config/babel-auth.properties +++ b/kubernetes/aai/components/aai-babel/resources/config/babel-auth.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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. +*/}} auth.policy.file=/auth/auth_policy.json auth.authentication.disable=true diff --git a/kubernetes/aai/components/aai-babel/resources/rproxy/config/cadi.properties b/kubernetes/aai/components/aai-babel/resources/rproxy/config/cadi.properties index a82e38caf6..188c55bee2 100644 --- a/kubernetes/aai/components/aai-babel/resources/rproxy/config/cadi.properties +++ b/kubernetes/aai/components/aai-babel/resources/rproxy/config/cadi.properties @@ -1,3 +1,4 @@ +{{/* # 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 @@ -7,6 +8,7 @@ #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 cadi_keyfile=/opt/app/rproxy/config/security/keyfile diff --git a/kubernetes/aai/components/aai-babel/templates/configmap.yaml b/kubernetes/aai/components/aai-babel/templates/configmap.yaml index 07e684d440..cdd2a4fefe 100644 --- a/kubernetes/aai/components/aai-babel/templates/configmap.yaml +++ b/kubernetes/aai/components/aai-babel/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, AT&T # Modifications Copyright © 2018 Bell Canada # @@ -12,6 +13,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-babel/templates/deployment.yaml b/kubernetes/aai/components/aai-babel/templates/deployment.yaml index f67a799b93..e75815ecb6 100644 --- a/kubernetes/aai/components/aai-babel/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-babel/templates/deployment.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, AT&T # Modifications Copyright © 2018 Bell Canada # Modifications Copyright © 2020 Orange @@ -13,6 +14,7 @@ # 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: apps/v1 kind: Deployment diff --git a/kubernetes/aai/components/aai-babel/templates/secrets.yaml b/kubernetes/aai/components/aai-babel/templates/secrets.yaml index adc2220da1..630ce83b31 100644 --- a/kubernetes/aai/components/aai-babel/templates/secrets.yaml +++ b/kubernetes/aai/components/aai-babel/templates/secrets.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, AT&T # Modifications Copyright © 2018 Bell Canada # @@ -12,6 +13,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-babel/templates/service.yaml b/kubernetes/aai/components/aai-babel/templates/service.yaml index 69892ac32a..fb7295581c 100644 --- a/kubernetes/aai/components/aai-babel/templates/service.yaml +++ b/kubernetes/aai/components/aai-babel/templates/service.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, AT&T # Modifications Copyright © 2018 Bell Canada # @@ -12,6 +13,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-data-router/resources/config/schemaIngest.properties b/kubernetes/aai/components/aai-data-router/resources/config/schemaIngest.properties index b94ce51e81..33f79fb810 100644 --- a/kubernetes/aai/components/aai-data-router/resources/config/schemaIngest.properties +++ b/kubernetes/aai/components/aai-data-router/resources/config/schemaIngest.properties @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -23,6 +24,7 @@ # Properties for the SchemaLocationsBean # Files named aai_oxm_v*.xml are unpacked here: +*/}} nodeDir=/opt/app/data-router/onap/oxm # Dummy folder/directory: edgeDir= diff --git a/kubernetes/aai/components/aai-data-router/resources/dynamic/conf/entity-event-policy.xml b/kubernetes/aai/components/aai-data-router/resources/dynamic/conf/entity-event-policy.xml index b5e4129595..039738a50d 100644 --- a/kubernetes/aai/components/aai-data-router/resources/dynamic/conf/entity-event-policy.xml +++ b/kubernetes/aai/components/aai-data-router/resources/dynamic/conf/entity-event-policy.xml @@ -1,3 +1,4 @@ +{{/* - +*/}} , @@ -62,10 +63,10 @@ node.data: true # By default, multiple nodes are allowed to start from the same installation location # to disable it, set the following: - +*/}} node.max_local_storage_nodes: 1 - +{{/* #################################### Index #################################### # You can set a number of options (such as shard/replica options, mapping # or analyzer definitions, translog settings, ...) for indices globally, @@ -115,7 +116,7 @@ node.max_local_storage_nodes: 1 # Path to directory where to store index data allocated for this node. # Use swm auto link to redirect the data directory if necessary. - +*/}} path.data: /usr/share/elasticsearch/data # path.data: /path/to/data1,/path/to/data2 @@ -126,7 +127,7 @@ path.logs: /usr/share/elasticsearch/logs #path.plugins: /opt/app/elasticsearch/plugins - +{{/* #################################### Plugin ################################### # If a plugin listed here is not installed for current node, the node will not start. @@ -164,15 +165,16 @@ path.logs: /usr/share/elasticsearch/logs # bootstrap.system_call_filter to false. # See: https://www.elastic.co/guide/en/elasticsearch/reference/current/system-call-filter-check.html # -# seccomp is found in Linux kernels: 2.6.37–2.6.39, 3.0–3.19, 4.0–4.9, +# seccomp is found in Linux kernels: 2.6.37�2.6.39, 3.0�3.19, 4.0�4.9, # 4.10-rc+HEAD # # The default setting is to disable the filters assuming an older kernel # version where seccomp is not available. # See: https://discuss.elastic.co/t/elasticsearch-warn-unable-to-install-syscall-filter/42819 - +*/}} bootstrap.system_call_filter: false +{{/* ############################## Network And HTTP ############################### # Elasticsearch, by default, binds itself to the 0.0.0.0 address, and listens # on port [9200-9300] for HTTP traffic and on port [9300-9400] for node-to-node @@ -180,8 +182,10 @@ bootstrap.system_call_filter: false # try the next port). # Set the bind address specifically (IPv4 or IPv6): +*/}} network.bind_host: 0.0.0.0 +{{/* # Set the address other nodes will use to communicate with this node. If not # set, it is automatically derived. It must point to an actual IP address. @@ -192,6 +196,7 @@ network.bind_host: 0.0.0.0 # Set a custom port for the node to node communication (9300 by default): +*/}} transport.tcp.port: {{ .Values.service.internalPort2 }} # Enable compression for all communication between nodes (disabled by default): @@ -214,6 +219,7 @@ http.cors.enabled: false http.cors.allow-origin: "/.*/" http.cors.allow-headers: X-Requested-With, Content-Type, Content-Length http.cors.allow-credentials: false +{{/* ################################### Gateway ################################### # The gateway allows for persisting the cluster state between full cluster @@ -235,6 +241,7 @@ http.cors.allow-credentials: false # Allow recovery process after N nodes in a cluster are up: # # gateway.recover_after_nodes: 1 +*/}} gateway.recover_after_nodes: 1 # Set the timeout to initiate the recovery process, once the N nodes @@ -250,6 +257,7 @@ gateway.recover_after_time: 5m # gateway.expected_nodes: 2 gateway.expected_nodes: 2 +{{/* ############################# Recovery Throttling ############################# # These settings allow to control the process of shards allocation between @@ -268,8 +276,10 @@ gateway.expected_nodes: 2 # Set to throttle throughput when recovering (eg. 100mb, by default 20mb): # indices.recovery.max_bytes_per_sec: 20mb +*/}} indices.recovery.max_bytes_per_sec: 20mb +{{/* # Set to limit the number of open concurrent streams when # recovering a shard from a peer: # @@ -285,15 +295,19 @@ indices.recovery.max_bytes_per_sec: 20mb # operational within the cluster. Its recommended to set it to a higher value # than 1 when running more than 2 nodes in the cluster. # +*/}} discovery.zen.minimum_master_nodes: 1 +{{/* # Set the time to wait for ping responses from other nodes when discovering. # Set this option to a higher value on a slow or congested network # to minimize discovery failures: # # discovery.zen.ping_timeout: 3s +*/}} discovery.zen.ping_timeout: 3s +{{/* # For more information, see # @@ -310,8 +324,11 @@ discovery.zen.ping_timeout: 3s # to perform discovery when new nodes (master or data) are started: # # discovery.zen.ping.unicast.hosts: ["host1", "host2:port"] + +*/}} discovery.zen.ping.unicast.hosts: ["0.0.0.0"] +{{/* # EC2 discovery allows to use AWS EC2 API in order to perform discovery. # # You have to install the cloud-aws plugin for enabling the EC2 discovery. @@ -366,6 +383,7 @@ discovery.zen.ping.unicast.hosts: ["0.0.0.0"] # x-pack security conflicts with searchguard +*/}} xpack.security.enabled: false xpack.ml.enabled: false xpack.monitoring.enabled: false diff --git a/kubernetes/aai/components/aai-elasticsearch/resources/config/jvm.options b/kubernetes/aai/components/aai-elasticsearch/resources/config/jvm.options index e69d7983c0..db4d2f0779 100644 --- a/kubernetes/aai/components/aai-elasticsearch/resources/config/jvm.options +++ b/kubernetes/aai/components/aai-elasticsearch/resources/config/jvm.options @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, AT&T, Bell Canada # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,10 +33,11 @@ # Xms represents the initial size of total heap space # Xmx represents the maximum size of total heap space - +*/}} -Xms1g -Xmx1g +{{/* ################################################################ ## Expert settings ################################################################ @@ -47,6 +49,7 @@ ################################################################ ## GC configuration +*/}} -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly @@ -92,6 +95,7 @@ # heap dumps are created in the working directory of the JVM -XX:+HeapDumpOnOutOfMemoryError +{{/* # specify an alternative path for heap dumps # ensure the directory exists and has sufficient space #-XX:HeapDumpPath=/heap/dump/path @@ -115,3 +119,4 @@ #-XX:+UseGCLogFileRotation #-XX:NumberOfGCLogFiles=32 #-XX:GCLogFileSize=128M +*/}} \ No newline at end of file diff --git a/kubernetes/aai/components/aai-elasticsearch/resources/config/log4j2.properties b/kubernetes/aai/components/aai-elasticsearch/resources/config/log4j2.properties index e674865221..86200c6c10 100644 --- a/kubernetes/aai/components/aai-elasticsearch/resources/config/log4j2.properties +++ b/kubernetes/aai/components/aai-elasticsearch/resources/config/log4j2.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, AT&T, Bell Canada # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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. +*/}} status = error @@ -38,6 +40,7 @@ rootLogger.level = info rootLogger.appenderRef.console.ref = console rootLogger.appenderRef.rolling.ref = rolling +{{/* # appender.deprecation_rolling.type = RollingFile # appender.deprecation_rolling.name = deprecation_rolling # appender.deprecation_rolling.fileName = ${sys:es.logs.base_path}_deprecation.log @@ -49,12 +52,12 @@ rootLogger.appenderRef.rolling.ref = rolling # appender.deprecation_rolling.policies.size.size = 1GB # appender.deprecation_rolling.strategy.type = DefaultRolloverStrategy # appender.deprecation_rolling.strategy.max = 4 - + # logger.deprecation.name = org.elasticsearch.deprecation # logger.deprecation.level = warn # logger.deprecation.appenderRef.deprecation_rolling.ref = deprecation_rolling # logger.deprecation.additivity = false - +*/}} appender.index_search_slowlog_rolling.type = RollingFile appender.index_search_slowlog_rolling.name = index_search_slowlog_rolling appender.index_search_slowlog_rolling.fileName = ${sys:es.logs.base_path}_index_search_slowlog.log diff --git a/kubernetes/aai/components/aai-elasticsearch/templates/configmap.yaml b/kubernetes/aai/components/aai-elasticsearch/templates/configmap.yaml index b3af5da60b..63775038f4 100644 --- a/kubernetes/aai/components/aai-elasticsearch/templates/configmap.yaml +++ b/kubernetes/aai/components/aai-elasticsearch/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-elasticsearch/templates/deployment.yaml b/kubernetes/aai/components/aai-elasticsearch/templates/deployment.yaml index 135d3f8a57..3a92d97ff7 100644 --- a/kubernetes/aai/components/aai-elasticsearch/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-elasticsearch/templates/deployment.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # Modifications Copyright © 2020 Orange # @@ -12,6 +13,7 @@ # 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: apps/v1 kind: Deployment diff --git a/kubernetes/aai/components/aai-elasticsearch/templates/service.yaml b/kubernetes/aai/components/aai-elasticsearch/templates/service.yaml index 68d767b380..66dfd493dd 100644 --- a/kubernetes/aai/components/aai-elasticsearch/templates/service.yaml +++ b/kubernetes/aai/components/aai-elasticsearch/templates/service.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties index e9ec6850e4..e62ba07bfd 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -16,6 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= +*/}} aai.config.checktime=1000 diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties index 7cc354ac53..8cefebc825 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties @@ -1,8 +1,9 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai # ================================================================================ -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. +# Copyright � 2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,6 +19,7 @@ # ============LICENSE_END========================================================= # The following info parameters are being referenced by ajsc6 +*/}} info.build.artifact=aai-graphadmin info.build.name=resources info.build.description=Resources Microservice diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-cached.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-cached.properties index 232262e8c2..5962ebd6fc 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-cached.properties +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-cached.properties @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -16,6 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= +*/}} query.fast-property=true query.smart-limit=false diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties index 923611d2ea..61550e7a57 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # Copyright © 2018 AT&T Intellectual Property. All rights reserved. @@ -14,6 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= +*/}} query.fast-property=true query.smart-limit=false diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml index 95d41235b2..c84cb5a62f 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml @@ -1,5 +1,5 @@ diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml b/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml index 553de3f134..7f055cf51f 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml @@ -1,6 +1,6 @@ diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-cached.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-cached.properties index b8f9a7fd38..155f872aea 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-cached.properties +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-cached.properties @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # Copyright © 2018 AT&T Intellectual Property. All rights reserved. @@ -14,6 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= +*/}} query.fast-property=true query.smart-limit=false diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-real.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-real.properties index 4b7261e937..fb0e274e3f 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-real.properties +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-real.properties @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # Copyright © 2018 AT&T Intellectual Property. All rights reserved. @@ -14,6 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= +*/}} query.fast-property=true query.smart-limit=false diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/realm.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/realm.properties index 97627eac16..ccd9864fb6 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/realm.properties +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/realm.properties @@ -1,8 +1,9 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai # ================================================================================ -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. +# Copyright � 2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,6 +19,7 @@ # ============LICENSE_END========================================================= # format : username: password[,rolename ...] # default username/password: AAI/AAI, MSO/MSO, ModelLoader/ModelLoader... +*/ -}} AAI:OBF:1gfr1ev31gg7,admin MSO:OBF:1jzx1lz31k01,admin SDNC:OBF:1itr1i0l1i151isv,admin diff --git a/kubernetes/aai/components/aai-graphadmin/templates/configmap.yaml b/kubernetes/aai/components/aai-graphadmin/templates/configmap.yaml index e70474362d..91cd748066 100644 --- a/kubernetes/aai/components/aai-graphadmin/templates/configmap.yaml +++ b/kubernetes/aai/components/aai-graphadmin/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -16,6 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= +*/}} apiVersion: v1 kind: ConfigMap diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml index 7991ced7f3..5e6f2bc33d 100644 --- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -18,6 +19,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= +*/}} apiVersion: apps/v1 kind: Deployment metadata: diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml index 98fc98d78f..154ad30c1a 100644 --- a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml +++ b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -30,6 +31,7 @@ # that resources traversal and graphadmin wait until this job is done # If you are using an existing cassandra cluster not coming from oom # then it is your job to ensure that there are no connections to the database +*/}} {{- if .Values.global.jobs.migration.enabled }} --- diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml index dce8324141..79144680b4 100644 --- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml +++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -30,6 +31,7 @@ # that resources traversal and graphadmin wait until this job is done # If you are using an existing cassandra cluster not coming from oom # then it is your job to ensure that there are no connections to the database +*/}} {{- if and ( not .Values.global.jobs.migration.enabled ) ( .Values.global.jobs.createSchema.enabled ) }} apiVersion: batch/v1 diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml index d5dbeefc48..4b100dd97b 100644 --- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml +++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -30,6 +31,7 @@ # that resources traversal and graphadmin wait until this job is done # If you are using an existing cassandra cluster not coming from oom # then it is your job to ensure that there are no connections to the database +*/}} {{- if .Values.global.jobs.migration.enabled }} --- diff --git a/kubernetes/aai/components/aai-graphadmin/templates/service.yaml b/kubernetes/aai/components/aai-graphadmin/templates/service.yaml index ab6c67709d..2f7aaa960d 100644 --- a/kubernetes/aai/components/aai-graphadmin/templates/service.yaml +++ b/kubernetes/aai/components/aai-graphadmin/templates/service.yaml @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -16,6 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= +*/}} apiVersion: v1 kind: Service diff --git a/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml b/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml index 72b5dab65a..3c12026407 100644 --- a/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml +++ b/kubernetes/aai/components/aai-modelloader/resources/config/log/logback.xml @@ -1,3 +1,4 @@ +{{/* - +*/}} diff --git a/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties b/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties index 246e52895a..772fa0da1b 100644 --- a/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties +++ b/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +14,7 @@ # limitations under the License. # Model Loader Distribution Client Configuration +*/}} ml.distribution.ACTIVE_SERVER_TLS_AUTH=false ml.distribution.ASDC_ADDRESS=sdc-be.{{.Release.Namespace}}:8443 ml.distribution.CONSUMER_GROUP=aai-ml-group diff --git a/kubernetes/aai/components/aai-modelloader/templates/configmap.yaml b/kubernetes/aai/components/aai-modelloader/templates/configmap.yaml index d1b14e4e16..534fd021da 100644 --- a/kubernetes/aai/components/aai-modelloader/templates/configmap.yaml +++ b/kubernetes/aai/components/aai-modelloader/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml index bb6b3c4137..0d24bfe957 100644 --- a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, AT&T # Modifications Copyright © 2018 Bell Canada # Modifications Copyright © 2020 Orange @@ -13,6 +14,7 @@ # 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: apps/v1 kind: Deployment diff --git a/kubernetes/aai/components/aai-modelloader/templates/secret.yaml b/kubernetes/aai/components/aai-modelloader/templates/secret.yaml index 292e03571a..d6013c832e 100644 --- a/kubernetes/aai/components/aai-modelloader/templates/secret.yaml +++ b/kubernetes/aai/components/aai-modelloader/templates/secret.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-modelloader/templates/service.yaml b/kubernetes/aai/components/aai-modelloader/templates/service.yaml index 37ed1dee7a..fad857bb41 100644 --- a/kubernetes/aai/components/aai-modelloader/templates/service.yaml +++ b/kubernetes/aai/components/aai-modelloader/templates/service.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties index f2e7caaa29..70e8bec01a 100644 --- a/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties +++ b/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -29,6 +30,7 @@ # REMEMBER TO THINK ABOUT ENVIRONMENTAL DIFFERENCES AND CHANGE THE # TEMPLATE AND *ALL* DATAFILES #################################################################### +*/}} aai.config.checktime=1000 diff --git a/kubernetes/aai/components/aai-resources/resources/config/application.properties b/kubernetes/aai/components/aai-resources/resources/config/application.properties index d0a9c14345..61410c551e 100644 --- a/kubernetes/aai/components/aai-resources/resources/config/application.properties +++ b/kubernetes/aai/components/aai-resources/resources/config/application.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +14,7 @@ # limitations under the License. # The following info parameters are being referenced by ajsc6 +*/}} info.build.artifact=aai-resources info.build.name=resources info.build.description=Resources Microservice diff --git a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-cached.properties b/kubernetes/aai/components/aai-resources/resources/config/janusgraph-cached.properties index 1db2774d52..b6fdd4c58f 100644 --- a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-cached.properties +++ b/kubernetes/aai/components/aai-resources/resources/config/janusgraph-cached.properties @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -19,6 +20,7 @@ # # ECOMP is a trademark and service mark of AT&T Intellectual Property. # +*/}} query.fast-property=true query.smart-limit=false diff --git a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties b/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties index 36cbc4201d..836dc7b176 100644 --- a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties +++ b/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # Copyright © 2017 AT&T Intellectual Property. All rights reserved. @@ -17,6 +18,7 @@ # # ECOMP is a trademark and service mark of AT&T Intellectual Property. # +*/}} query.fast-property=true query.smart-limit=false diff --git a/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml index 4cf6c74333..7f6a03168e 100644 --- a/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml +++ b/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml @@ -1,3 +1,4 @@ +{{/* +*/}} - +{{/* +*/}} \ No newline at end of file diff --git a/kubernetes/aai/components/aai-resources/resources/config/logback.xml b/kubernetes/aai/components/aai-resources/resources/config/logback.xml index f24e86d8d0..df35aaa0ed 100644 --- a/kubernetes/aai/components/aai-resources/resources/config/logback.xml +++ b/kubernetes/aai/components/aai-resources/resources/config/logback.xml @@ -1,3 +1,4 @@ +{{/* +*/}} diff --git a/kubernetes/aai/components/aai-resources/resources/config/realm.properties b/kubernetes/aai/components/aai-resources/resources/config/realm.properties index 0499b34f1c..9fbd122492 100644 --- a/kubernetes/aai/components/aai-resources/resources/config/realm.properties +++ b/kubernetes/aai/components/aai-resources/resources/config/realm.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +14,7 @@ # limitations under the License. # format : username: password[,rolename ...] # default username/password: AAI/AAI, MSO/MSO, ModelLoader/ModelLoader... +*/ -}} AAI:OBF:1gfr1ev31gg7,admin MSO:OBF:1jzx1lz31k01,admin SDNC:OBF:1itr1i0l1i151isv,admin diff --git a/kubernetes/aai/components/aai-resources/resources/rproxy/config/cadi.properties b/kubernetes/aai/components/aai-resources/resources/rproxy/config/cadi.properties index 4980071db6..fb3d1ccd3e 100644 --- a/kubernetes/aai/components/aai-resources/resources/rproxy/config/cadi.properties +++ b/kubernetes/aai/components/aai-resources/resources/rproxy/config/cadi.properties @@ -1,3 +1,4 @@ +{{/* # 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 @@ -7,6 +8,7 @@ #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 diff --git a/kubernetes/aai/components/aai-resources/templates/configmap.yaml b/kubernetes/aai/components/aai-resources/templates/configmap.yaml index 1a1192abfc..2927031eb5 100644 --- a/kubernetes/aai/components/aai-resources/templates/configmap.yaml +++ b/kubernetes/aai/components/aai-resources/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml index 4c3a0c1649..84d3df3927 100644 --- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright (c) 2017 Amdocs, Bell Canada # Modifications Copyright (c) 2018 AT&T # Modifications Copyright (c) 2020 Nokia @@ -13,6 +14,7 @@ # 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: apps/v1 kind: Deployment diff --git a/kubernetes/aai/components/aai-resources/templates/service.yaml b/kubernetes/aai/components/aai-resources/templates/service.yaml index 68d767b380..66dfd493dd 100644 --- a/kubernetes/aai/components/aai-resources/templates/service.yaml +++ b/kubernetes/aai/components/aai-resources/templates/service.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties b/kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties index 2172d715de..b107cd4f3a 100644 --- a/kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties +++ b/kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -16,6 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= +*/}} aai.server.url.base=https://aai.{{ include "common.namespace" . }}:8443/aai/ aai.server.url=https://aai.{{ include "common.namespace" . }}:8443/aai/{{ .Values.global.config.schema.version.api.default }}/ diff --git a/kubernetes/aai/components/aai-schema-service/config/application.properties b/kubernetes/aai/components/aai-schema-service/config/application.properties index a639c41343..499fa96cd5 100644 --- a/kubernetes/aai/components/aai-schema-service/config/application.properties +++ b/kubernetes/aai/components/aai-schema-service/config/application.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +14,7 @@ # limitations under the License. # The following info parameters are being referenced by ajsc6 +*/}} info.build.artifact=aai-schema-service info.build.name=schema-service info.build.description=Schema Service Microservice diff --git a/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml index 447f2390b1..c2099d6b77 100644 --- a/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml +++ b/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml @@ -1,3 +1,4 @@ +{{/* +*/}} - +{{/* +*/}} \ No newline at end of file diff --git a/kubernetes/aai/components/aai-schema-service/config/logback.xml b/kubernetes/aai/components/aai-schema-service/config/logback.xml index 9cfffe9c37..cfcd3c02e6 100644 --- a/kubernetes/aai/components/aai-schema-service/config/logback.xml +++ b/kubernetes/aai/components/aai-schema-service/config/logback.xml @@ -1,3 +1,4 @@ +{{/* +*/}} diff --git a/kubernetes/aai/components/aai-schema-service/templates/configmap.yaml b/kubernetes/aai/components/aai-schema-service/templates/configmap.yaml index 9b7ea73181..23a2af54a2 100644 --- a/kubernetes/aai/components/aai-schema-service/templates/configmap.yaml +++ b/kubernetes/aai/components/aai-schema-service/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml b/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml index e792fb072a..25be4db147 100644 --- a/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2017 Amdocs, Bell Canada # Modifications Copyright © 2018 AT&T # Modifications Copyright © 2020 Orange @@ -13,6 +14,7 @@ # 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: apps/v1 kind: Deployment diff --git a/kubernetes/aai/components/aai-schema-service/templates/service.yaml b/kubernetes/aai/components/aai-schema-service/templates/service.yaml index 68d767b380..66dfd493dd 100644 --- a/kubernetes/aai/components/aai-schema-service/templates/service.yaml +++ b/kubernetes/aai/components/aai-schema-service/templates/service.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-search-data/resources/config/elastic-search.properties b/kubernetes/aai/components/aai-search-data/resources/config/elastic-search.properties index 65de20de7e..e3ebbfac39 100644 --- a/kubernetes/aai/components/aai-search-data/resources/config/elastic-search.properties +++ b/kubernetes/aai/components/aai-search-data/resources/config/elastic-search.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,7 +14,7 @@ # limitations under the License. # ElasticSearch Configuration - +*/}} es.cluster-name=ES_AAI es.ip-address=aai-elasticsearch.{{.Release.Namespace}} es.http-port={{ .Values.config.elasticsearchHttpPort }} diff --git a/kubernetes/aai/components/aai-search-data/resources/config/log/logback.xml b/kubernetes/aai/components/aai-search-data/resources/config/log/logback.xml index adfed4aa60..58bff2a02d 100644 --- a/kubernetes/aai/components/aai-search-data/resources/config/log/logback.xml +++ b/kubernetes/aai/components/aai-search-data/resources/config/log/logback.xml @@ -1,3 +1,4 @@ +{{/* - +*/}} diff --git a/kubernetes/aai/components/aai-search-data/resources/rproxy/config/cadi.properties b/kubernetes/aai/components/aai-search-data/resources/rproxy/config/cadi.properties index 4980071db6..fb3d1ccd3e 100644 --- a/kubernetes/aai/components/aai-search-data/resources/rproxy/config/cadi.properties +++ b/kubernetes/aai/components/aai-search-data/resources/rproxy/config/cadi.properties @@ -1,3 +1,4 @@ +{{/* # 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 @@ -7,6 +8,7 @@ #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 diff --git a/kubernetes/aai/components/aai-search-data/templates/configmap.yaml b/kubernetes/aai/components/aai-search-data/templates/configmap.yaml index 0ef6aa9b10..28cf730930 100644 --- a/kubernetes/aai/components/aai-search-data/templates/configmap.yaml +++ b/kubernetes/aai/components/aai-search-data/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-search-data/templates/deployment.yaml b/kubernetes/aai/components/aai-search-data/templates/deployment.yaml index 25145ac434..eb4aefeeb3 100644 --- a/kubernetes/aai/components/aai-search-data/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-search-data/templates/deployment.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2017 Amdocs, Bell Canada # Modifications Copyright © 2018 AT&T # Modifications Copyright © 2020 Orange @@ -13,6 +14,7 @@ # 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: apps/v1 kind: Deployment diff --git a/kubernetes/aai/components/aai-search-data/templates/secret.yaml b/kubernetes/aai/components/aai-search-data/templates/secret.yaml index 1ae4f4d61d..eacae25647 100644 --- a/kubernetes/aai/components/aai-search-data/templates/secret.yaml +++ b/kubernetes/aai/components/aai-search-data/templates/secret.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-search-data/templates/service.yaml b/kubernetes/aai/components/aai-search-data/templates/service.yaml index 889807930a..940222cd3e 100644 --- a/kubernetes/aai/components/aai-search-data/templates/service.yaml +++ b/kubernetes/aai/components/aai-search-data/templates/service.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 @@ -25,7 +27,7 @@ metadata: spec: type: {{ .Values.service.type }} ports: - {{ if .Values.global.installSidecarSecurity }} +{{ if .Values.global.installSidecarSecurity }} {{if eq .Values.service.type "NodePort" -}} - port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/application-oxm-default.properties b/kubernetes/aai/components/aai-sparky-be/resources/config/application-oxm-default.properties index 67a22f71f7..084f6e46bc 100644 --- a/kubernetes/aai/components/aai-sparky-be/resources/config/application-oxm-default.properties +++ b/kubernetes/aai/components/aai-sparky-be/resources/config/application-oxm-default.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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. +*/}} oxm.apiVersion=v14 oxm.apiVersionList=v8,v9,v10,v11,v12,v13,v14 \ No newline at end of file diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/application-oxm-override.properties b/kubernetes/aai/components/aai-sparky-be/resources/config/application-oxm-override.properties index 5c733e852b..4465fb3e11 100644 --- a/kubernetes/aai/components/aai-sparky-be/resources/config/application-oxm-override.properties +++ b/kubernetes/aai/components/aai-sparky-be/resources/config/application-oxm-override.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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. +*/}} oxm.apiVersionOverride=v14 oxm.apiVersionList=v8,v9,v10,v11,v12,v13,v14 \ No newline at end of file diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/application-oxm-schema-prod.properties b/kubernetes/aai/components/aai-sparky-be/resources/config/application-oxm-schema-prod.properties index c7f6bbc1d3..094c815744 100644 --- a/kubernetes/aai/components/aai-sparky-be/resources/config/application-oxm-schema-prod.properties +++ b/kubernetes/aai/components/aai-sparky-be/resources/config/application-oxm-schema-prod.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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. +*/}} oxm.schemaNodeDir=/opt/app/sparky/onap/oxm #schemaServiceTranslator is used to define whether to retreive the oxm from schema service microservice or read from the disk, possible values are schema-service/config diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/application-resources.properties b/kubernetes/aai/components/aai-sparky-be/resources/config/application-resources.properties index cdd3d480b1..59c0349b06 100644 --- a/kubernetes/aai/components/aai-sparky-be/resources/config/application-resources.properties +++ b/kubernetes/aai/components/aai-sparky-be/resources/config/application-resources.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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. +*/}} resources.hostname=aai resources.port=8443 diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/application-ssl.properties b/kubernetes/aai/components/aai-sparky-be/resources/config/application-ssl.properties index 50e843249a..26565bb1a0 100644 --- a/kubernetes/aai/components/aai-sparky-be/resources/config/application-ssl.properties +++ b/kubernetes/aai/components/aai-sparky-be/resources/config/application-ssl.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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. +*/}} server.port=8000 server.ssl.key-store=file:${CONFIG_HOME}/auth/org.onap.aai.p12 diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/application.properties b/kubernetes/aai/components/aai-sparky-be/resources/config/application.properties index 108f9ef7b5..929d4ea34d 100644 --- a/kubernetes/aai/components/aai-sparky-be/resources/config/application.properties +++ b/kubernetes/aai/components/aai-sparky-be/resources/config/application.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,6 +16,7 @@ # # disable the default thyme leaf icon on web-pages # +*/}} spring.mvc.favicon.enabled=false # diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/auth/csp-cookie-filter.properties b/kubernetes/aai/components/aai-sparky-be/resources/config/auth/csp-cookie-filter.properties index 6edc3d97db..cb2f73eb8e 100644 --- a/kubernetes/aai/components/aai-sparky-be/resources/config/auth/csp-cookie-filter.properties +++ b/kubernetes/aai/components/aai-sparky-be/resources/config/auth/csp-cookie-filter.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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.login.url=aaiportal.onap.org diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties b/kubernetes/aai/components/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties index e18585d576..2592e5ca7c 100644 --- a/kubernetes/aai/components/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties +++ b/kubernetes/aai/components/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +19,7 @@ ################################################################################ # Java class that implements the ECOMP role and user mgt API +*/}} portal.api.impl.class = org.onap.aai.sparky.security.portal.PortalRestAPICentralServiceImpl # Instance of ECOMP Portal where the app has been on-boarded diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/portal/portal-authentication.properties b/kubernetes/aai/components/aai-sparky-be/resources/config/portal/portal-authentication.properties index 97b5399f54..e1ddd326f9 100644 --- a/kubernetes/aai/components/aai-sparky-be/resources/config/portal/portal-authentication.properties +++ b/kubernetes/aai/components/aai-sparky-be/resources/config/portal/portal-authentication.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,14 +18,18 @@ ##################################################################################### ############################## Auth ############################## +*/}} username={{.Values.config.portalUsername}} password={{.Values.config.portalPassword}} +{{/* ############################## ############################## # # ONAP Cookie Processing - During initial development, this flag, if true, will # prevent the portal interface's login processing from searching for a user -# specific cookie, and will instead allow passage if a valid session cookie is discovered. +# specific cookie, and will instead allow passage if a valid session cookie is +# discovered. +*/}} onap_enabled={{.Values.config.portalOnapEnabled}} onap.user_id_cookie_name={{.Values.config.portalCookieName}} cookie_decryptor_classname={{.Values.config.cookieDecryptorClass}} diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/roles.config b/kubernetes/aai/components/aai-sparky-be/resources/config/roles.config index ee131d8414..df41395058 100644 --- a/kubernetes/aai/components/aai-sparky-be/resources/config/roles.config +++ b/kubernetes/aai/components/aai-sparky-be/resources/config/roles.config @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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. +*/}} [ { diff --git a/kubernetes/aai/components/aai-sparky-be/templates/configmap.yaml b/kubernetes/aai/components/aai-sparky-be/templates/configmap.yaml index 9e0a5726bd..162e96b0dc 100644 --- a/kubernetes/aai/components/aai-sparky-be/templates/configmap.yaml +++ b/kubernetes/aai/components/aai-sparky-be/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml index 479f09fc5c..c441a49732 100644 --- a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright (c) 2017 Amdocs, Bell Canada # Modifications Copyright (c) 2018 AT&T # Modifications Copyright (c) 2020 Nokia @@ -13,6 +14,7 @@ # 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: apps/v1 kind: Deployment diff --git a/kubernetes/aai/components/aai-sparky-be/templates/secret.yaml b/kubernetes/aai/components/aai-sparky-be/templates/secret.yaml index 292e03571a..d6013c832e 100644 --- a/kubernetes/aai/components/aai-sparky-be/templates/secret.yaml +++ b/kubernetes/aai/components/aai-sparky-be/templates/secret.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-sparky-be/templates/service.yaml b/kubernetes/aai/components/aai-sparky-be/templates/service.yaml index 5c939ae48e..4633472a3b 100644 --- a/kubernetes/aai/components/aai-sparky-be/templates/service.yaml +++ b/kubernetes/aai/components/aai-sparky-be/templates/service.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties index 0f23eda515..c7771e1133 100644 --- a/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties +++ b/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -19,6 +20,7 @@ # # ECOMP is a trademark and service mark of AT&T Intellectual Property. # +*/}} aai.config.checktime=1000 diff --git a/kubernetes/aai/components/aai-traversal/resources/config/application.properties b/kubernetes/aai/components/aai-traversal/resources/config/application.properties index 4a025bacd2..31ed2be3fe 100644 --- a/kubernetes/aai/components/aai-traversal/resources/config/application.properties +++ b/kubernetes/aai/components/aai-traversal/resources/config/application.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +14,7 @@ # limitations under the License. # The following info parameters are being referenced by ajsc6 +*/}} info.build.artifact=aai-traversal info.build.name=traversal info.build.description=Traversal Microservice diff --git a/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-cached.properties b/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-cached.properties index 1db2774d52..b6fdd4c58f 100644 --- a/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-cached.properties +++ b/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-cached.properties @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # org.onap.aai @@ -19,6 +20,7 @@ # # ECOMP is a trademark and service mark of AT&T Intellectual Property. # +*/}} query.fast-property=true query.smart-limit=false diff --git a/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-realtime.properties b/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-realtime.properties index 36cbc4201d..836dc7b176 100644 --- a/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-realtime.properties +++ b/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-realtime.properties @@ -1,3 +1,4 @@ +{{/* # # ============LICENSE_START======================================================= # Copyright © 2017 AT&T Intellectual Property. All rights reserved. @@ -17,6 +18,7 @@ # # ECOMP is a trademark and service mark of AT&T Intellectual Property. # +*/}} query.fast-property=true query.smart-limit=false diff --git a/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml index 4cf6c74333..7f6a03168e 100644 --- a/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml +++ b/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml @@ -1,3 +1,4 @@ +{{/* +*/}} - +{{/* +*/}} \ No newline at end of file diff --git a/kubernetes/aai/components/aai-traversal/resources/config/logback.xml b/kubernetes/aai/components/aai-traversal/resources/config/logback.xml index f24e86d8d0..df35aaa0ed 100644 --- a/kubernetes/aai/components/aai-traversal/resources/config/logback.xml +++ b/kubernetes/aai/components/aai-traversal/resources/config/logback.xml @@ -1,3 +1,4 @@ +{{/* +*/}} diff --git a/kubernetes/aai/components/aai-traversal/resources/config/realm.properties b/kubernetes/aai/components/aai-traversal/resources/config/realm.properties index 0499b34f1c..9fbd122492 100644 --- a/kubernetes/aai/components/aai-traversal/resources/config/realm.properties +++ b/kubernetes/aai/components/aai-traversal/resources/config/realm.properties @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +14,7 @@ # limitations under the License. # format : username: password[,rolename ...] # default username/password: AAI/AAI, MSO/MSO, ModelLoader/ModelLoader... +*/ -}} AAI:OBF:1gfr1ev31gg7,admin MSO:OBF:1jzx1lz31k01,admin SDNC:OBF:1itr1i0l1i151isv,admin diff --git a/kubernetes/aai/components/aai-traversal/templates/configmap.yaml b/kubernetes/aai/components/aai-traversal/templates/configmap.yaml index 08bd2b3cbc..5c6dc7293d 100644 --- a/kubernetes/aai/components/aai-traversal/templates/configmap.yaml +++ b/kubernetes/aai/components/aai-traversal/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml index f890d71b40..ab1cb309d8 100644 --- a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright (c) 2017 Amdocs, Bell Canada # Modifications Copyright (c) 2018 AT&T # Modifications Copyright (c) 2020 Nokia, Orange @@ -13,6 +14,7 @@ # 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: apps/v1 kind: Deployment diff --git a/kubernetes/aai/components/aai-traversal/templates/job.yaml b/kubernetes/aai/components/aai-traversal/templates/job.yaml index bd121af953..16e7022c0d 100644 --- a/kubernetes/aai/components/aai-traversal/templates/job.yaml +++ b/kubernetes/aai/components/aai-traversal/templates/job.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright (c) 2017-2018 AT&T # Modifications Copyright (c) 2018 Amdocs, Bell Canada # Modifications Copyright (c) 2020 Nokia, Orange @@ -13,6 +14,7 @@ # 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. +*/}} {{ if .Values.global.jobs.updateQueryData.enabled }} diff --git a/kubernetes/aai/components/aai-traversal/templates/service.yaml b/kubernetes/aai/components/aai-traversal/templates/service.yaml index 68d767b380..66dfd493dd 100644 --- a/kubernetes/aai/components/aai-traversal/templates/service.yaml +++ b/kubernetes/aai/components/aai-traversal/templates/service.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/resources/config/haproxy/haproxy-pluggable-security.cfg b/kubernetes/aai/resources/config/haproxy/haproxy-pluggable-security.cfg index 1c82050db0..b05ffaeaf2 100644 --- a/kubernetes/aai/resources/config/haproxy/haproxy-pluggable-security.cfg +++ b/kubernetes/aai/resources/config/haproxy/haproxy-pluggable-security.cfg @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,7 +12,7 @@ # 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 log /dev/log local0 stats socket /usr/local/etc/haproxy/haproxy.socket mode 660 level admin diff --git a/kubernetes/aai/resources/config/haproxy/haproxy.cfg b/kubernetes/aai/resources/config/haproxy/haproxy.cfg index 4606a42439..ea29c903ba 100644 --- a/kubernetes/aai/resources/config/haproxy/haproxy.cfg +++ b/kubernetes/aai/resources/config/haproxy/haproxy.cfg @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,7 +12,7 @@ # 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 log /dev/log local0 stats socket /usr/local/etc/haproxy/haproxy.socket mode 660 level admin diff --git a/kubernetes/aai/resources/config/log/filebeat/filebeat.yml b/kubernetes/aai/resources/config/log/filebeat/filebeat.yml index 39cc6db9bf..8d0f36f036 100644 --- a/kubernetes/aai/resources/config/log/filebeat/filebeat.yml +++ b/kubernetes/aai/resources/config/log/filebeat/filebeat.yml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 @@ -25,20 +27,25 @@ filebeat.prospectors: # 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. + # 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: ["{{.Values.config.logstashServiceName}}.{{.Release.Namespace}}:{{.Values.config.logstashPort}}"] #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. @@ -53,3 +60,4 @@ output.logstash: #The passphrase used to decrypt an encrypted key stored in the configured key file #ssl.key_passphrase: $ssl.key_passphrase +*/}} \ No newline at end of file diff --git a/kubernetes/aai/templates/configmap.yaml b/kubernetes/aai/templates/configmap.yaml index c9cfbefbbe..d2735b4882 100644 --- a/kubernetes/aai/templates/configmap.yaml +++ b/kubernetes/aai/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +14,7 @@ # limitations under the License. # this is a shared resource for subcharts +*/}} apiVersion: v1 kind: ConfigMap metadata: diff --git a/kubernetes/aai/templates/deployment.yaml b/kubernetes/aai/templates/deployment.yaml index 7da0856289..83d78238b0 100644 --- a/kubernetes/aai/templates/deployment.yaml +++ b/kubernetes/aai/templates/deployment.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright (c) 2018 Amdocs, Bell Canada, AT&T # Modifications Copyright (c) 2020 Nokia, Orange # @@ -12,7 +13,7 @@ # 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: apps/v1 kind: Deployment diff --git a/kubernetes/aai/templates/secret.yaml b/kubernetes/aai/templates/secret.yaml index dd8be62aad..d868b9582e 100644 --- a/kubernetes/aai/templates/secret.yaml +++ b/kubernetes/aai/templates/secret.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 diff --git a/kubernetes/aai/templates/service.yaml b/kubernetes/aai/templates/service.yaml index 5ee966811c..a9b3af9301 100644 --- a/kubernetes/aai/templates/service.yaml +++ b/kubernetes/aai/templates/service.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright © 2018 Amdocs, Bell Canada, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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 -- 2.16.6