Adding Apache-2.0 and ONF Member licenses to aether-helm-charts

Change-Id: I15fe9b5a185d8eb10e68f763e3a3b49d3d12a65a
diff --git a/aether-apps/google-phylo/Chart.yaml b/aether-apps/google-phylo/Chart.yaml
index 7fd0cf2..ec6bfa8 100644
--- a/aether-apps/google-phylo/Chart.yaml
+++ b/aether-apps/google-phylo/Chart.yaml
@@ -1,16 +1,7 @@
 # Copyright 2020-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 ---
 apiVersion: v1
diff --git a/aether-apps/google-phylo/templates/_helpers.tpl b/aether-apps/google-phylo/templates/_helpers.tpl
index bf90988..5cf9f84 100644
--- a/aether-apps/google-phylo/templates/_helpers.tpl
+++ b/aether-apps/google-phylo/templates/_helpers.tpl
@@ -1,17 +1,10 @@
 {{- /*
+
 # Copyright 2020-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 */ -}}
 
 {{/*
diff --git a/aether-apps/google-phylo/templates/bin/_run-video-analytics-server.sh.tpl b/aether-apps/google-phylo/templates/bin/_run-video-analytics-server.sh.tpl
index 4bd7729..6b61d34 100644
--- a/aether-apps/google-phylo/templates/bin/_run-video-analytics-server.sh.tpl
+++ b/aether-apps/google-phylo/templates/bin/_run-video-analytics-server.sh.tpl
@@ -1,18 +1,9 @@
 #!/bin/bash
-#
+
 # Copyright 2020-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 /google/video_analytics_server_main \
         --mediapipe_graph_path=/google/demo_graph.pbtxt \
diff --git a/aether-apps/google-phylo/templates/configmap-phylo.yaml b/aether-apps/google-phylo/templates/configmap-phylo.yaml
index c10b501..3b415f9 100644
--- a/aether-apps/google-phylo/templates/configmap-phylo.yaml
+++ b/aether-apps/google-phylo/templates/configmap-phylo.yaml
@@ -1,17 +1,10 @@
 {{- /*
+
 # Copyright 2020-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 */ -}}
 
 apiVersion: v1
diff --git a/aether-apps/google-phylo/templates/deployment-phylo.yaml b/aether-apps/google-phylo/templates/deployment-phylo.yaml
index bea130b..0651ff0 100644
--- a/aether-apps/google-phylo/templates/deployment-phylo.yaml
+++ b/aether-apps/google-phylo/templates/deployment-phylo.yaml
@@ -1,17 +1,10 @@
 {{- /*
+
 # Copyright 2020-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 */ -}}
 
 {{ tuple "phylo" . | include "phylo.service_account" }}
diff --git a/aether-apps/google-phylo/templates/deployment-wowza-server.yaml b/aether-apps/google-phylo/templates/deployment-wowza-server.yaml
index f982142..71bf03c 100644
--- a/aether-apps/google-phylo/templates/deployment-wowza-server.yaml
+++ b/aether-apps/google-phylo/templates/deployment-wowza-server.yaml
@@ -1,17 +1,10 @@
 {{- /*
+
 # Copyright 2020-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 */ -}}
 
 ---
diff --git a/aether-apps/google-phylo/templates/service-phylo-rabbitmq.yaml b/aether-apps/google-phylo/templates/service-phylo-rabbitmq.yaml
index a52fde9..931eec8 100644
--- a/aether-apps/google-phylo/templates/service-phylo-rabbitmq.yaml
+++ b/aether-apps/google-phylo/templates/service-phylo-rabbitmq.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-present Open Networking Foundation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */}}
 
 {{- $context := . -}}
diff --git a/aether-apps/google-phylo/templates/service-phylo-rtsp-server.yaml b/aether-apps/google-phylo/templates/service-phylo-rtsp-server.yaml
index a9cdd2d..7c9d1ee 100644
--- a/aether-apps/google-phylo/templates/service-phylo-rtsp-server.yaml
+++ b/aether-apps/google-phylo/templates/service-phylo-rtsp-server.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-present Open Networking Foundation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */}}
 
 {{- $context := . -}}
diff --git a/aether-apps/google-phylo/templates/service-wowza.yaml b/aether-apps/google-phylo/templates/service-wowza.yaml
index 88e2647..dead85e 100644
--- a/aether-apps/google-phylo/templates/service-wowza.yaml
+++ b/aether-apps/google-phylo/templates/service-wowza.yaml
@@ -1,17 +1,10 @@
 {{- /*
+
 # Copyright 2020-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 */ -}}
 
 ---
diff --git a/aether-apps/google-phylo/values.yaml b/aether-apps/google-phylo/values.yaml
index 8caeb28..0eb37b4 100644
--- a/aether-apps/google-phylo/values.yaml
+++ b/aether-apps/google-phylo/values.yaml
@@ -1,16 +1,7 @@
 # Copyright 2020-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 images:
   tags:
diff --git a/aether-apps/infosys-deepstream/Chart.yaml b/aether-apps/infosys-deepstream/Chart.yaml
index 3e7b7c6..f63eb29 100644
--- a/aether-apps/infosys-deepstream/Chart.yaml
+++ b/aether-apps/infosys-deepstream/Chart.yaml
@@ -1,16 +1,7 @@
 # Copyright 2020-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 ---
 apiVersion: v1
diff --git a/aether-apps/infosys-deepstream/files/infer_config.txt.license b/aether-apps/infosys-deepstream/files/infer_config.txt.license
new file mode 100644
index 0000000..995fb49
--- /dev/null
+++ b/aether-apps/infosys-deepstream/files/infer_config.txt.license
@@ -0,0 +1,4 @@
+SPDX-FileCopyrightText: 2020 Open Networking Foundation <info@opennetworking.org>
+
+SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: LicenseRef-ONF-Member-Only
\ No newline at end of file
diff --git a/aether-apps/infosys-deepstream/files/msg_config.txt.license b/aether-apps/infosys-deepstream/files/msg_config.txt.license
new file mode 100644
index 0000000..995fb49
--- /dev/null
+++ b/aether-apps/infosys-deepstream/files/msg_config.txt.license
@@ -0,0 +1,4 @@
+SPDX-FileCopyrightText: 2020 Open Networking Foundation <info@opennetworking.org>
+
+SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: LicenseRef-ONF-Member-Only
\ No newline at end of file
diff --git a/aether-apps/infosys-deepstream/files/tracker_config.yml b/aether-apps/infosys-deepstream/files/tracker_config.yml
index 5d2b678..fc4beda 100755
--- a/aether-apps/infosys-deepstream/files/tracker_config.yml
+++ b/aether-apps/infosys-deepstream/files/tracker_config.yml
@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: 2020 Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 %YAML:1.0
 
 NvDCF:
diff --git a/aether-apps/infosys-deepstream/templates/_helpers.tpl b/aether-apps/infosys-deepstream/templates/_helpers.tpl
index 8120674..4432b21 100644
--- a/aether-apps/infosys-deepstream/templates/_helpers.tpl
+++ b/aether-apps/infosys-deepstream/templates/_helpers.tpl
@@ -1,17 +1,10 @@
 {{- /*
+
 # Copyright 2020-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 */ -}}
 
 {{/*
diff --git a/aether-apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl b/aether-apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl
index 15c96bc..049d045 100755
--- a/aether-apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl
+++ b/aether-apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl
@@ -1,24 +1,8 @@
-################################################################################
 # Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved.
 #
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-################################################################################
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 [message-broker]
 password = {{ .Values.config.deepstream.amqp.password }}
 hostname = {{ .Values.config.deepstream.amqp.host }}
diff --git a/aether-apps/infosys-deepstream/templates/config/_main_config.txt.tpl b/aether-apps/infosys-deepstream/templates/config/_main_config.txt.tpl
index 535897d..91624e1 100755
--- a/aether-apps/infosys-deepstream/templates/config/_main_config.txt.tpl
+++ b/aether-apps/infosys-deepstream/templates/config/_main_config.txt.tpl
@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: 2020 Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 [application]
 enable-perf-measurement=1
 perf-measurement-interval-sec=5
diff --git a/aether-apps/infosys-deepstream/templates/configmap-deepstream.yaml b/aether-apps/infosys-deepstream/templates/configmap-deepstream.yaml
index 5dad6ab..e4aed77 100644
--- a/aether-apps/infosys-deepstream/templates/configmap-deepstream.yaml
+++ b/aether-apps/infosys-deepstream/templates/configmap-deepstream.yaml
@@ -1,17 +1,10 @@
 {{- /*
+
 # Copyright 2020-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 */ -}}
 
 apiVersion: v1
diff --git a/aether-apps/infosys-deepstream/templates/deployment-deepstream.yaml b/aether-apps/infosys-deepstream/templates/deployment-deepstream.yaml
index 6684fdc..5036d5d 100644
--- a/aether-apps/infosys-deepstream/templates/deployment-deepstream.yaml
+++ b/aether-apps/infosys-deepstream/templates/deployment-deepstream.yaml
@@ -1,17 +1,10 @@
 {{- /*
+
 # Copyright 2020-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 */ -}}
 
 apiVersion: apps/v1
diff --git a/aether-apps/infosys-deepstream/values.yaml b/aether-apps/infosys-deepstream/values.yaml
index 76f6d9c..1335f45 100644
--- a/aether-apps/infosys-deepstream/values.yaml
+++ b/aether-apps/infosys-deepstream/values.yaml
@@ -1,16 +1,7 @@
 # Copyright 2020-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 images:
   tags:
diff --git a/aether-apps/ott-services/cdn-local/Chart.yaml b/aether-apps/ott-services/cdn-local/Chart.yaml
index 98dfe52..8fd8360 100644
--- a/aether-apps/ott-services/cdn-local/Chart.yaml
+++ b/aether-apps/ott-services/cdn-local/Chart.yaml
@@ -1,17 +1,9 @@
 ---
+
 # Copyright 2019-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 apiVersion: v1
 description: A Helm chart for M-CORD CDN Services in Local Edge
diff --git a/aether-apps/ott-services/cdn-local/templates/_helpers.tpl b/aether-apps/ott-services/cdn-local/templates/_helpers.tpl
index fc1894f..143793a 100644
--- a/aether-apps/ott-services/cdn-local/templates/_helpers.tpl
+++ b/aether-apps/ott-services/cdn-local/templates/_helpers.tpl
@@ -1,17 +1,8 @@
 {{- /*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-present Open Networking Foundation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */ -}}
 
 {{/*
diff --git a/aether-apps/ott-services/cdn-local/templates/bin/_run-nginx.sh.tpl b/aether-apps/ott-services/cdn-local/templates/bin/_run-nginx.sh.tpl
index ffe7916..9282225 100644
--- a/aether-apps/ott-services/cdn-local/templates/bin/_run-nginx.sh.tpl
+++ b/aether-apps/ott-services/cdn-local/templates/bin/_run-nginx.sh.tpl
@@ -1,18 +1,9 @@
 #!/bin/bash
-#
+
 # Copyright 2019-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 # Assume that SGI network gateway knows routes to UE pool
 {{- if .Values.config.sriov.enabled }}
diff --git a/aether-apps/ott-services/cdn-local/templates/configmap-nginx.yaml b/aether-apps/ott-services/cdn-local/templates/configmap-nginx.yaml
index 75db4d6..a8002d0 100644
--- a/aether-apps/ott-services/cdn-local/templates/configmap-nginx.yaml
+++ b/aether-apps/ott-services/cdn-local/templates/configmap-nginx.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-present Open Networking Foundation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */}}
 
 ---
diff --git a/aether-apps/ott-services/cdn-local/templates/networks.yaml b/aether-apps/ott-services/cdn-local/templates/networks.yaml
index be315f8..2c9c8e7 100644
--- a/aether-apps/ott-services/cdn-local/templates/networks.yaml
+++ b/aether-apps/ott-services/cdn-local/templates/networks.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-present Open Networking Foundation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */}}
 
 {{ if .Values.config.sriov.enabled }}
diff --git a/aether-apps/ott-services/cdn-local/templates/service-nginx.yaml b/aether-apps/ott-services/cdn-local/templates/service-nginx.yaml
index 08969e9..3555fdd 100644
--- a/aether-apps/ott-services/cdn-local/templates/service-nginx.yaml
+++ b/aether-apps/ott-services/cdn-local/templates/service-nginx.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-present Open Networking Foundation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */}}
 
 ---
diff --git a/aether-apps/ott-services/cdn-local/templates/statefulset-cdn-local.yaml b/aether-apps/ott-services/cdn-local/templates/statefulset-cdn-local.yaml
index 3937078..97adf34 100644
--- a/aether-apps/ott-services/cdn-local/templates/statefulset-cdn-local.yaml
+++ b/aether-apps/ott-services/cdn-local/templates/statefulset-cdn-local.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-present Open Networking Foundation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */}}
 
 {{ tuple "cdn-local" . | include "cdn-local.service_account" }}
diff --git a/aether-apps/ott-services/cdn-local/values.yaml b/aether-apps/ott-services/cdn-local/values.yaml
index 558600b..0114aa3 100644
--- a/aether-apps/ott-services/cdn-local/values.yaml
+++ b/aether-apps/ott-services/cdn-local/values.yaml
@@ -1,17 +1,9 @@
 ---
+
 # Copyright 2019-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 images:
   tags:
diff --git a/aether-apps/ott-services/cdn-remote/Chart.yaml b/aether-apps/ott-services/cdn-remote/Chart.yaml
index 6c6c2fb..72adc79 100644
--- a/aether-apps/ott-services/cdn-remote/Chart.yaml
+++ b/aether-apps/ott-services/cdn-remote/Chart.yaml
@@ -1,17 +1,9 @@
 ---
+
 # Copyright 2019-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 apiVersion: v1
 appVersion: "1.0"
diff --git a/aether-apps/ott-services/cdn-remote/templates/_helpers.tpl b/aether-apps/ott-services/cdn-remote/templates/_helpers.tpl
index 69921bd..2d09c3a 100644
--- a/aether-apps/ott-services/cdn-remote/templates/_helpers.tpl
+++ b/aether-apps/ott-services/cdn-remote/templates/_helpers.tpl
@@ -1,17 +1,8 @@
 {{- /*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-present Open Networking Foundation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */ -}}
 
 {{/*
diff --git a/aether-apps/ott-services/cdn-remote/templates/bin/_start-stream.sh.tpl b/aether-apps/ott-services/cdn-remote/templates/bin/_start-stream.sh.tpl
index 2d928b3..6598f9c 100644
--- a/aether-apps/ott-services/cdn-remote/templates/bin/_start-stream.sh.tpl
+++ b/aether-apps/ott-services/cdn-remote/templates/bin/_start-stream.sh.tpl
@@ -1,18 +1,9 @@
 #!/bin/bash
-#
+
 # Copyright 2019-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 QUALITY=$1
 
diff --git a/aether-apps/ott-services/cdn-remote/templates/configmap-video-archive.yaml b/aether-apps/ott-services/cdn-remote/templates/configmap-video-archive.yaml
index 29fa3c8..4a94c94 100644
--- a/aether-apps/ott-services/cdn-remote/templates/configmap-video-archive.yaml
+++ b/aether-apps/ott-services/cdn-remote/templates/configmap-video-archive.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-present Open Networking Foundation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */}}
 
 ---
diff --git a/aether-apps/ott-services/cdn-remote/templates/service-ant-media.yaml b/aether-apps/ott-services/cdn-remote/templates/service-ant-media.yaml
index ba31e53..d1dcdc1 100644
--- a/aether-apps/ott-services/cdn-remote/templates/service-ant-media.yaml
+++ b/aether-apps/ott-services/cdn-remote/templates/service-ant-media.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-present Open Networking Foundation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */}}
 
 ---
diff --git a/aether-apps/ott-services/cdn-remote/templates/statefulset-ant-media.yaml b/aether-apps/ott-services/cdn-remote/templates/statefulset-ant-media.yaml
index 1e9778a..3564e21 100644
--- a/aether-apps/ott-services/cdn-remote/templates/statefulset-ant-media.yaml
+++ b/aether-apps/ott-services/cdn-remote/templates/statefulset-ant-media.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-present Open Networking Foundation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */}}
 
 {{ tuple "ant-media" . | include "cdn-remote.service_account" }}
diff --git a/aether-apps/ott-services/cdn-remote/templates/statefulset-video-archive.yaml b/aether-apps/ott-services/cdn-remote/templates/statefulset-video-archive.yaml
index 2f5460a..56cf009 100644
--- a/aether-apps/ott-services/cdn-remote/templates/statefulset-video-archive.yaml
+++ b/aether-apps/ott-services/cdn-remote/templates/statefulset-video-archive.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-present Open Networking Foundation
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 */}}
 
 {{ tuple "video-archive" . | include "cdn-remote.service_account" }}
diff --git a/aether-apps/ott-services/cdn-remote/values.yaml b/aether-apps/ott-services/cdn-remote/values.yaml
index c515371..4d9e642 100644
--- a/aether-apps/ott-services/cdn-remote/values.yaml
+++ b/aether-apps/ott-services/cdn-remote/values.yaml
@@ -1,17 +1,9 @@
 ---
+
 # Copyright 2019-present Open Networking Foundation
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 images:
   tags: