Fix templates for missing apiVersion
Also make default values more genral
Change-Id: I14ae9fc5a64bb725ebdf2d110137c44cde1fff91
diff --git a/apps/person-detection-app/Chart.yaml b/apps/person-detection-app/Chart.yaml
index dd84ec7..273841e 100644
--- a/apps/person-detection-app/Chart.yaml
+++ b/apps/person-detection-app/Chart.yaml
@@ -1,5 +1,5 @@
-# Copyright 2020-present Open Networking Foundation
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# Copyright 2022-present Open Networking Foundation
+# SPDX-License-Identifier: Apache-2.0
apiVersion: v2
name: person-detection-app
@@ -18,7 +18,7 @@
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
diff --git a/apps/person-detection-app/templates/NOTES.txt b/apps/person-detection-app/templates/NOTES.txt
index ea5ed48..ef28adf 100644
--- a/apps/person-detection-app/templates/NOTES.txt
+++ b/apps/person-detection-app/templates/NOTES.txt
@@ -1,6 +1,6 @@
{{/*
-Copyright 2020-present Open Networking Foundation
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+Copyright 2022-present Open Networking Foundation
+SPDX-License-Identifier: Apache-2.0
*/}}
1. Get the application URL by running these commands:
diff --git a/apps/person-detection-app/templates/_helpers.tpl b/apps/person-detection-app/templates/_helpers.tpl
index 9b52287..f7aa1b4 100644
--- a/apps/person-detection-app/templates/_helpers.tpl
+++ b/apps/person-detection-app/templates/_helpers.tpl
@@ -1,6 +1,7 @@
{{/*
-Copyright 2020-present Open Networking Foundation
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# Copyright 2022-present Open Networking Foundation
+
+# SPDX-License-Identifier: Apache-2.0
*/}}
{{/*
diff --git a/apps/person-detection-app/templates/deployment.yaml b/apps/person-detection-app/templates/deployment.yaml
index 24e338d..09058d2 100644
--- a/apps/person-detection-app/templates/deployment.yaml
+++ b/apps/person-detection-app/templates/deployment.yaml
@@ -1,5 +1,8 @@
-# Copyright 2020-present Open Networking Foundation
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+{{/*
+# Copyright 2022-present Open Networking Foundation
+
+# SPDX-License-Identifier: Apache-2.0
+*/}}
apiVersion: apps/v1
kind: Deployment
diff --git a/apps/person-detection-app/templates/hpa.yaml b/apps/person-detection-app/templates/hpa.yaml
index 3ee2f7e..79595e2 100644
--- a/apps/person-detection-app/templates/hpa.yaml
+++ b/apps/person-detection-app/templates/hpa.yaml
@@ -1,5 +1,8 @@
-# Copyright 2020-present Open Networking Foundation
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+{{/*
+# Copyright 2022-present Open Networking Foundation
+
+# SPDX-License-Identifier: Apache-2.0
+*/}}
{{- if .Values.autoscaling.enabled }}
apiVersion: autoscaling/v2beta1
diff --git a/apps/person-detection-app/templates/ingress.yaml b/apps/person-detection-app/templates/ingress.yaml
index f43d0b9..c9952ec 100644
--- a/apps/person-detection-app/templates/ingress.yaml
+++ b/apps/person-detection-app/templates/ingress.yaml
@@ -1,5 +1,8 @@
-# Copyright 2020-present Open Networking Foundation
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+{{/*
+# Copyright 2022-present Open Networking Foundation
+
+# SPDX-License-Identifier: Apache-2.0
+*/}}
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "person-detection-app.fullname" . -}}
diff --git a/apps/person-detection-app/templates/service.yaml b/apps/person-detection-app/templates/service.yaml
index fed474d..1d7e02c 100644
--- a/apps/person-detection-app/templates/service.yaml
+++ b/apps/person-detection-app/templates/service.yaml
@@ -1,5 +1,8 @@
-# Copyright 2020-present Open Networking Foundation
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+{{/*
+# Copyright 2022-present Open Networking Foundation
+
+# SPDX-License-Identifier: Apache-2.0
+*/}}
apiVersion: v1
kind: Service
diff --git a/apps/person-detection-app/templates/serviceaccount.yaml b/apps/person-detection-app/templates/serviceaccount.yaml
index 795b694..9e6428d 100644
--- a/apps/person-detection-app/templates/serviceaccount.yaml
+++ b/apps/person-detection-app/templates/serviceaccount.yaml
@@ -1,5 +1,8 @@
-# Copyright 2020-present Open Networking Foundation
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+{{/*
+# Copyright 2022-present Open Networking Foundation
+
+# SPDX-License-Identifier: Apache-2.0
+*/}}
{{- if .Values.serviceAccount.create -}}
apiVersion: v1
diff --git a/apps/person-detection-app/templates/tests/test-connection.yaml b/apps/person-detection-app/templates/tests/test-connection.yaml
index 50cd63e..79766bb 100644
--- a/apps/person-detection-app/templates/tests/test-connection.yaml
+++ b/apps/person-detection-app/templates/tests/test-connection.yaml
@@ -1,5 +1,8 @@
-# Copyright 2020-present Open Networking Foundation
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+{{/*
+# Copyright 2022-present Open Networking Foundation
+
+# SPDX-License-Identifier: Apache-2.0
+*/}}
apiVersion: v1
kind: Pod
diff --git a/apps/person-detection-app/values.yaml b/apps/person-detection-app/values.yaml
index ab2bc30..6272fba 100644
--- a/apps/person-detection-app/values.yaml
+++ b/apps/person-detection-app/values.yaml
@@ -1,5 +1,5 @@
-# Copyright 2020-present Open Networking Foundation
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+# Copyright 2022-present Open Networking Foundation
+# SPDX-License-Identifier: Apache-2.0
#
# Default values for person-detection-app.
# This is a YAML-formatted file.
@@ -13,11 +13,11 @@
# Overrides the image tag whose default is the chart appVersion.
tag: "master"
-rocUrl: https://roc.demo.aetherproject.net/aether-roc-api/aether/v2.0.0/connectivity-service-v2/
-keycloakUrl: https://keycloak.demo.aetherproject.net/auth/realms/aether/protocol/openid-connect/token
-enterprise: ase-4g-enterprise
-site: ase-site-4g
-deviceGroup: ase-4g-device-group2
+rocUrl: http://aether-roc-api.aether-roc:8181/aether/v2.0.0/connectivity-service-v2/
+keycloakUrl: http://keycloak.aether-keycloak/auth/realms/aether/protocol/openid-connect/token
+enterprise: enterprise1
+site: site1
+deviceGroup: device-group1
numDevices: 1
mqttIp: 10.92.2.12