diff options
author | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-12-10 12:15:27 +0100 |
---|---|---|
committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-12-11 10:52:10 +0100 |
commit | 47eb4d2c38499bd60cdfb01010319ed5bf4ac45f (patch) | |
tree | 8c22acd7b3d8620e2243c8225987481f1e0cf594 /kubernetes/aai/components/aai-babel | |
parent | 490b37494e74cbd16118bf686936e497f43ad047 (diff) |
[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 <sylvain.desbureaux@orange.com>
Change-Id: I26b790965d2926792f801b87294d15a074de7be6
Diffstat (limited to 'kubernetes/aai/components/aai-babel')
7 files changed, 14 insertions, 0 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 |