Fix licensing
Change-Id: If77e112e4e144fc0036bad030ab4853b0c73bc5d
diff --git a/aether-apps/ott-services/cdn-local/Chart.yaml b/aether-apps/ott-services/cdn-local/Chart.yaml
index 8fd8360..b8a61ae 100644
--- a/aether-apps/ott-services/cdn-local/Chart.yaml
+++ b/aether-apps/ott-services/cdn-local/Chart.yaml
@@ -2,8 +2,7 @@
# Copyright 2019-present Open Networking Foundation
#
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
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 143793a..193d461 100644
--- a/aether-apps/ott-services/cdn-local/templates/_helpers.tpl
+++ b/aether-apps/ott-services/cdn-local/templates/_helpers.tpl
@@ -1,8 +1,7 @@
{{- /*
# Copyright 2019-present Open Networking Foundation
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
*/ -}}
{{/*
@@ -83,4 +82,4 @@
- services
- endpoints
- configmaps
-{{- end -}}
\ No newline at end of file
+{{- end -}}
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 9282225..40f0f1b 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
@@ -2,8 +2,7 @@
# Copyright 2019-present Open Networking Foundation
#
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
# 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 a8002d0..1711238 100644
--- a/aether-apps/ott-services/cdn-local/templates/configmap-nginx.yaml
+++ b/aether-apps/ott-services/cdn-local/templates/configmap-nginx.yaml
@@ -1,8 +1,7 @@
{{/*
# Copyright 2019-present Open Networking Foundation
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
*/}}
---
diff --git a/aether-apps/ott-services/cdn-local/templates/networks.yaml b/aether-apps/ott-services/cdn-local/templates/networks.yaml
index 2c9c8e7..f8c11cb 100644
--- a/aether-apps/ott-services/cdn-local/templates/networks.yaml
+++ b/aether-apps/ott-services/cdn-local/templates/networks.yaml
@@ -1,8 +1,7 @@
{{/*
# Copyright 2019-present Open Networking Foundation
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
*/}}
{{ 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 3555fdd..f95dd1e 100644
--- a/aether-apps/ott-services/cdn-local/templates/service-nginx.yaml
+++ b/aether-apps/ott-services/cdn-local/templates/service-nginx.yaml
@@ -1,8 +1,7 @@
{{/*
# Copyright 2019-present Open Networking Foundation
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
*/}}
---
@@ -44,4 +43,4 @@
port: {{ .Values.config.nginx.ports.rtmp }}
protocol: TCP
nodePort: {{ .Values.config.nginx.ports.nodePorts.rtmp }}
-{{- end }}
\ No newline at end of file
+{{- end }}
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 97adf34..4a6a5f1 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,8 +1,7 @@
{{/*
# Copyright 2019-present Open Networking Foundation
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
*/}}
{{ 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 0114aa3..cb96637 100644
--- a/aether-apps/ott-services/cdn-local/values.yaml
+++ b/aether-apps/ott-services/cdn-local/values.yaml
@@ -2,8 +2,7 @@
# Copyright 2019-present Open Networking Foundation
#
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
images:
tags:
diff --git a/aether-apps/ott-services/cdn-remote/Chart.yaml b/aether-apps/ott-services/cdn-remote/Chart.yaml
index 72adc79..1ec6b27 100644
--- a/aether-apps/ott-services/cdn-remote/Chart.yaml
+++ b/aether-apps/ott-services/cdn-remote/Chart.yaml
@@ -2,8 +2,7 @@
# Copyright 2019-present Open Networking Foundation
#
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
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 2d09c3a..ca3e853 100644
--- a/aether-apps/ott-services/cdn-remote/templates/_helpers.tpl
+++ b/aether-apps/ott-services/cdn-remote/templates/_helpers.tpl
@@ -1,8 +1,7 @@
{{- /*
# Copyright 2019-present Open Networking Foundation
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
*/ -}}
{{/*
@@ -92,4 +91,4 @@
- services
- endpoints
- configmaps
-{{- end -}}
\ No newline at end of file
+{{- end -}}
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 6598f9c..1d5da2f 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
@@ -2,11 +2,10 @@
# Copyright 2019-present Open Networking Foundation
#
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
QUALITY=$1
while true; do
ffmpeg -re -i /opt/cdn/movies/$QUALITY.mp4 -c copy -f flv rtmp://{{ tuple "ant-media" . | include "cdn-remote.get_domain" }}:1935/LiveApp/$QUALITY;
-done
\ No newline at end of file
+done
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 4a94c94..edc7930 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,8 +1,7 @@
{{/*
# Copyright 2019-present Open Networking Foundation
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
*/}}
---
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 d1dcdc1..3177248 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,8 +1,7 @@
{{/*
# Copyright 2019-present Open Networking Foundation
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
*/}}
---
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 3564e21..4138b8d 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,8 +1,7 @@
{{/*
# Copyright 2019-present Open Networking Foundation
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
*/}}
{{ tuple "ant-media" . | include "cdn-remote.service_account" }}
@@ -45,4 +44,4 @@
{{- if .Values.resources.enabled }}
resources:
{{ toYaml .Values.resources.antMedia | indent 10 }}
- {{- end }}
\ No newline at end of file
+ {{- end }}
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 56cf009..35e6b76 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,8 +1,7 @@
{{/*
# Copyright 2019-present Open Networking Foundation
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
*/}}
{{ tuple "video-archive" . | include "cdn-remote.service_account" }}
@@ -129,4 +128,4 @@
- name: start-script
configMap:
name: start-stream
- defaultMode: 493
\ No newline at end of file
+ defaultMode: 493
diff --git a/aether-apps/ott-services/cdn-remote/values.yaml b/aether-apps/ott-services/cdn-remote/values.yaml
index 4d9e642..50d32c6 100644
--- a/aether-apps/ott-services/cdn-remote/values.yaml
+++ b/aether-apps/ott-services/cdn-remote/values.yaml
@@ -2,8 +2,7 @@
# Copyright 2019-present Open Networking Foundation
#
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
images:
tags: