From 4869f57038858b5e390f7f9099a5d9ca5d3a9224 Mon Sep 17 00:00:00 2001
From: diwakar thyagaraj <diwakar.chitoor.thyagaraj@att.com>
Date: Thu, 21 May 2020 21:12:54 +0000
Subject: [PATCH] Remove OSH Authors copyright

The current copyright refers to a non-existent group
"openstack helm authors" with often out-of-date references that
are confusing when adding a new file to the repo.

This change removes all references to this copyright by the
non-existent group and any blank lines underneath.

Change-Id: Icdf013090dd26985d4443fdd4d1232182a1f699c
Signed-off-by: diwakar thyagaraj <diwakar.chitoor.thyagaraj@att.com>
---
 charts/calicoctl-utility/Chart.yaml                           | 2 --
 charts/calicoctl-utility/requirements.yaml                    | 2 --
 charts/calicoctl-utility/templates/_functions.tpl             | 4 +---
 charts/calicoctl-utility/templates/bin/_bootstrap.sh.tpl      | 2 --
 .../templates/bin/_calicoctl-utility-rootwrap.tpl             | 2 --
 charts/calicoctl-utility/templates/bin/_utilscli-sudo.tpl     | 2 --
 charts/calicoctl-utility/templates/bin/_utilscli.tpl          | 2 --
 charts/calicoctl-utility/templates/bin/_version_check.sh.tpl  | 2 --
 charts/calicoctl-utility/templates/configmap-bin.yaml         | 2 --
 charts/calicoctl-utility/templates/configmap-etc.yaml         | 2 --
 .../templates/deployment-calicoctl-utility.yaml               | 2 --
 charts/calicoctl-utility/templates/job-image-repo-sync.yaml   | 2 --
 .../calicoctl-utility/templates/secret-etcd-certificates.yaml | 2 --
 charts/calicoctl-utility/values.yaml                          | 2 --
 charts/ceph-utility/Chart.yaml                                | 2 --
 charts/ceph-utility/requirements.yaml                         | 2 --
 charts/ceph-utility/templates/bin/_bootstrap.sh.tpl           | 2 --
 charts/ceph-utility/templates/bin/_managekey.sh.tpl           | 2 --
 charts/ceph-utility/templates/bin/_utilscli-sudo.tpl          | 2 --
 .../templates/bin/utility/_ceph-utility-rootwrap.tpl          | 2 --
 charts/ceph-utility/templates/bin/utility/_help.tpl           | 2 --
 .../ceph-utility/templates/bin/utility/_osd-maintenance.tpl   | 2 --
 charts/ceph-utility/templates/bin/utility/_rbd_pv.tpl         | 3 ---
 charts/ceph-utility/templates/bin/utility/_utilscli.tpl       | 2 --
 charts/ceph-utility/templates/configmap-bin.yaml              | 2 --
 charts/ceph-utility/templates/configmap-etc-client.yaml       | 2 --
 charts/ceph-utility/templates/configmap-etc-sudoers.yaml      | 2 --
 charts/ceph-utility/templates/deployment-utility.yaml         | 2 --
 charts/ceph-utility/templates/network_policy.yaml             | 2 --
 charts/ceph-utility/values.yaml                               | 2 --
 charts/compute-utility/Chart.yaml                             | 2 --
 charts/compute-utility/requirements.yaml                      | 2 --
 charts/compute-utility/templates/bin/_bootstrap.sh.tpl        | 2 --
 charts/compute-utility/templates/bin/_start.sh.tpl            | 2 --
 charts/compute-utility/templates/bin/_utilscli-sudo.tpl       | 2 --
 .../templates/bin/utility/_compute-utility-rootwrap.tpl       | 2 --
 charts/compute-utility/templates/bin/utility/_compute.tpl     | 2 --
 charts/compute-utility/templates/bin/utility/_utilscli.tpl    | 2 --
 charts/compute-utility/templates/configmap-bin.yaml           | 2 --
 charts/compute-utility/templates/configmap-etc-client.yaml    | 2 --
 charts/compute-utility/templates/configmap-etc-sudoers.yaml   | 2 --
 charts/compute-utility/templates/deployment-utility.yaml      | 2 --
 charts/compute-utility/values.yaml                            | 2 --
 charts/etcdctl-utility/Chart.yaml                             | 2 --
 charts/etcdctl-utility/requirements.yaml                      | 2 --
 charts/etcdctl-utility/templates/bin/_bootstrap.sh.tpl        | 2 --
 charts/etcdctl-utility/templates/bin/_start.sh.tpl            | 2 --
 charts/etcdctl-utility/templates/bin/_utilscli-sudo.tpl       | 2 --
 .../templates/bin/utility/_etcdctl-utility-rootwrap.tpl       | 2 --
 charts/etcdctl-utility/templates/bin/utility/_utilscli.tpl    | 2 --
 charts/etcdctl-utility/templates/configmap-bin.yaml           | 2 --
 charts/etcdctl-utility/templates/configmap-etc-sudoers.yaml   | 2 --
 charts/etcdctl-utility/templates/configmap-etc.yaml           | 2 --
 .../etcdctl-utility/templates/deployment-etcdctl-utility.yaml | 2 --
 charts/etcdctl-utility/templates/job-image-repo-sync.yaml     | 2 --
 .../etcdctl-utility/templates/secret-etcd-certificates.yaml   | 2 --
 charts/etcdctl-utility/values.yaml                            | 2 --
 charts/mysqlclient-utility/Chart.yaml                         | 2 --
 charts/mysqlclient-utility/requirements.yaml                  | 2 --
 charts/mysqlclient-utility/templates/bin/_bootstrap.sh.tpl    | 2 --
 charts/mysqlclient-utility/templates/bin/_start.sh.tpl        | 2 --
 charts/mysqlclient-utility/templates/bin/_utilscli-sudo.tpl   | 2 --
 .../templates/bin/utility/_mysqlclient-utility-rootwrap.tpl   | 1 -
 .../mysqlclient-utility/templates/bin/utility/_utilscli.tpl   | 2 --
 charts/mysqlclient-utility/templates/configmap-bin.yaml       | 2 --
 .../mysqlclient-utility/templates/configmap-etc-client.yaml   | 2 --
 .../mysqlclient-utility/templates/configmap-etc-sudoers.yaml  | 2 --
 charts/mysqlclient-utility/templates/deployment-utility.yaml  | 2 --
 .../templates/tests/check-mysql-client.yaml                   | 1 -
 charts/mysqlclient-utility/values.yaml                        | 2 --
 charts/openstack-utility/Chart.yaml                           | 2 --
 charts/openstack-utility/requirements.yaml                    | 2 --
 charts/openstack-utility/templates/bin/_bootstrap.sh.tpl      | 2 --
 charts/openstack-utility/templates/bin/_start.sh.tpl          | 2 --
 charts/openstack-utility/templates/bin/_utilscli-sudo.tpl     | 2 --
 .../templates/bin/utility/_openstack-utility-rootwrap.tpl     | 2 --
 charts/openstack-utility/templates/bin/utility/_utilscli.tpl  | 2 --
 charts/openstack-utility/templates/configmap-bin.yaml         | 2 --
 charts/openstack-utility/templates/configmap-etc-client.yaml  | 2 --
 charts/openstack-utility/templates/configmap-etc-sudoers.yaml | 2 --
 charts/openstack-utility/templates/deployment-utility.yaml    | 2 --
 charts/postgresql-utility/Chart.yaml                          | 2 --
 charts/postgresql-utility/requirements.yaml                   | 2 --
 charts/postgresql-utility/templates/bin/_bootstrap.sh.tpl     | 2 --
 charts/postgresql-utility/templates/bin/_start.sh.tpl         | 2 --
 charts/postgresql-utility/templates/bin/_utilscli-sudo.tpl    | 1 -
 .../templates/bin/utility/_postgresql-utility-rootwrap.tpl    | 2 --
 charts/postgresql-utility/templates/bin/utility/_utilscli.tpl | 2 --
 charts/postgresql-utility/templates/configmap-etc.yaml        | 2 --
 charts/postgresql-utility/templates/deployment-utility.yaml   | 2 --
 charts/postgresql-utility/templates/secrets-admin.yaml        | 2 --
 charts/postgresql-utility/templates/secrets-etc.yaml          | 2 --
 .../postgresql-utility/templates/secrets/_admin_user.conf.tpl | 2 --
 charts/postgresql-utility/values.yaml                         | 2 --
 images/calicoctl-utility/Makefile                             | 2 --
 tools/deployment/apparmor/005-calicoctl-utility.sh            | 3 ---
 tools/deployment/apparmor/020-compute-utility.sh              | 2 --
 tools/deployment/apparmor/030-etcdctl-utility.sh              | 3 ---
 tools/deployment/apparmor/040-mysqlclient-utility.sh          | 3 ---
 tools/deployment/apparmor/050-openstack-utility.sh            | 3 ---
 tools/deployment/apparmor/060-postgresql-utility.sh           | 3 ---
 tools/gate/playbooks/airship-porthole-collect-logs.yaml       | 2 --
 tools/gate/playbooks/airship-porthole-gate-runner.yaml        | 2 --
 tools/gate/playbooks/vars.yaml                                | 2 --
 tools/gate/playbooks/zuul-linter.yaml                         | 2 --
 105 files changed, 1 insertion(+), 214 deletions(-)

diff --git a/charts/calicoctl-utility/Chart.yaml b/charts/calicoctl-utility/Chart.yaml
index 4398e258..910758ab 100644
--- a/charts/calicoctl-utility/Chart.yaml
+++ b/charts/calicoctl-utility/Chart.yaml
@@ -1,5 +1,3 @@
-# Copyright 2019 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/calicoctl-utility/requirements.yaml b/charts/calicoctl-utility/requirements.yaml
index e69c985d..5669e12c 100644
--- a/charts/calicoctl-utility/requirements.yaml
+++ b/charts/calicoctl-utility/requirements.yaml
@@ -1,5 +1,3 @@
-# Copyright 2019 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/calicoctl-utility/templates/_functions.tpl b/charts/calicoctl-utility/templates/_functions.tpl
index 2203ea77..01b7a475 100644
--- a/charts/calicoctl-utility/templates/_functions.tpl
+++ b/charts/calicoctl-utility/templates/_functions.tpl
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
@@ -21,4 +19,4 @@ limitations under the License.
 {{- $_ := required "Must specify all or none of etcd_crt, etcd_ca, etcd_key" .Values.endpoints.etcd.auth.client.tls.key -}}
 true
 {{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/charts/calicoctl-utility/templates/bin/_bootstrap.sh.tpl b/charts/calicoctl-utility/templates/bin/_bootstrap.sh.tpl
index 3985fa94..34a39875 100644
--- a/charts/calicoctl-utility/templates/bin/_bootstrap.sh.tpl
+++ b/charts/calicoctl-utility/templates/bin/_bootstrap.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/sh
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/calicoctl-utility/templates/bin/_calicoctl-utility-rootwrap.tpl b/charts/calicoctl-utility/templates/bin/_calicoctl-utility-rootwrap.tpl
index d93269c8..86995bd5 100644
--- a/charts/calicoctl-utility/templates/bin/_calicoctl-utility-rootwrap.tpl
+++ b/charts/calicoctl-utility/templates/bin/_calicoctl-utility-rootwrap.tpl
@@ -1,7 +1,5 @@
 #!/usr/bin/python3
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/calicoctl-utility/templates/bin/_utilscli-sudo.tpl b/charts/calicoctl-utility/templates/bin/_utilscli-sudo.tpl
index bfe5bf74..3155f714 100644
--- a/charts/calicoctl-utility/templates/bin/_utilscli-sudo.tpl
+++ b/charts/calicoctl-utility/templates/bin/_utilscli-sudo.tpl
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/calicoctl-utility/templates/bin/_utilscli.tpl b/charts/calicoctl-utility/templates/bin/_utilscli.tpl
index 4be746b4..c6ef2928 100644
--- a/charts/calicoctl-utility/templates/bin/_utilscli.tpl
+++ b/charts/calicoctl-utility/templates/bin/_utilscli.tpl
@@ -1,7 +1,5 @@
 #!/bin/sh
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/calicoctl-utility/templates/bin/_version_check.sh.tpl b/charts/calicoctl-utility/templates/bin/_version_check.sh.tpl
index 285f10c0..bfc3b1c4 100644
--- a/charts/calicoctl-utility/templates/bin/_version_check.sh.tpl
+++ b/charts/calicoctl-utility/templates/bin/_version_check.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/sh
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/calicoctl-utility/templates/configmap-bin.yaml b/charts/calicoctl-utility/templates/configmap-bin.yaml
index 43295b71..5d48324a 100644
--- a/charts/calicoctl-utility/templates/configmap-bin.yaml
+++ b/charts/calicoctl-utility/templates/configmap-bin.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/calicoctl-utility/templates/configmap-etc.yaml b/charts/calicoctl-utility/templates/configmap-etc.yaml
index 18dea1e8..eb695f00 100644
--- a/charts/calicoctl-utility/templates/configmap-etc.yaml
+++ b/charts/calicoctl-utility/templates/configmap-etc.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/calicoctl-utility/templates/deployment-calicoctl-utility.yaml b/charts/calicoctl-utility/templates/deployment-calicoctl-utility.yaml
index 11cf4e3b..5248605f 100644
--- a/charts/calicoctl-utility/templates/deployment-calicoctl-utility.yaml
+++ b/charts/calicoctl-utility/templates/deployment-calicoctl-utility.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/calicoctl-utility/templates/job-image-repo-sync.yaml b/charts/calicoctl-utility/templates/job-image-repo-sync.yaml
index 166f571b..581d8104 100644
--- a/charts/calicoctl-utility/templates/job-image-repo-sync.yaml
+++ b/charts/calicoctl-utility/templates/job-image-repo-sync.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/calicoctl-utility/templates/secret-etcd-certificates.yaml b/charts/calicoctl-utility/templates/secret-etcd-certificates.yaml
index 0dc776f0..17c6e858 100644
--- a/charts/calicoctl-utility/templates/secret-etcd-certificates.yaml
+++ b/charts/calicoctl-utility/templates/secret-etcd-certificates.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/calicoctl-utility/values.yaml b/charts/calicoctl-utility/values.yaml
index 530392cb..9701842b 100644
--- a/charts/calicoctl-utility/values.yaml
+++ b/charts/calicoctl-utility/values.yaml
@@ -1,5 +1,3 @@
-# Copyright 2019 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/ceph-utility/Chart.yaml b/charts/ceph-utility/Chart.yaml
index b59ac251..7c5a3025 100644
--- a/charts/ceph-utility/Chart.yaml
+++ b/charts/ceph-utility/Chart.yaml
@@ -1,5 +1,3 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/ceph-utility/requirements.yaml b/charts/ceph-utility/requirements.yaml
index 53782e69..5669e12c 100644
--- a/charts/ceph-utility/requirements.yaml
+++ b/charts/ceph-utility/requirements.yaml
@@ -1,5 +1,3 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/ceph-utility/templates/bin/_bootstrap.sh.tpl b/charts/ceph-utility/templates/bin/_bootstrap.sh.tpl
index 49f9d5d5..27497f9a 100644
--- a/charts/ceph-utility/templates/bin/_bootstrap.sh.tpl
+++ b/charts/ceph-utility/templates/bin/_bootstrap.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/ceph-utility/templates/bin/_managekey.sh.tpl b/charts/ceph-utility/templates/bin/_managekey.sh.tpl
index 5de2674d..dca22581 100644
--- a/charts/ceph-utility/templates/bin/_managekey.sh.tpl
+++ b/charts/ceph-utility/templates/bin/_managekey.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/ceph-utility/templates/bin/_utilscli-sudo.tpl b/charts/ceph-utility/templates/bin/_utilscli-sudo.tpl
index e2bd6c6c..796eff1a 100644
--- a/charts/ceph-utility/templates/bin/_utilscli-sudo.tpl
+++ b/charts/ceph-utility/templates/bin/_utilscli-sudo.tpl
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/ceph-utility/templates/bin/utility/_ceph-utility-rootwrap.tpl b/charts/ceph-utility/templates/bin/utility/_ceph-utility-rootwrap.tpl
index ab010a89..b4d0fda0 100644
--- a/charts/ceph-utility/templates/bin/utility/_ceph-utility-rootwrap.tpl
+++ b/charts/ceph-utility/templates/bin/utility/_ceph-utility-rootwrap.tpl
@@ -1,7 +1,5 @@
 #!/usr/bin/python3
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/ceph-utility/templates/bin/utility/_help.tpl b/charts/ceph-utility/templates/bin/utility/_help.tpl
index 507698f2..45eb3efa 100644
--- a/charts/ceph-utility/templates/bin/utility/_help.tpl
+++ b/charts/ceph-utility/templates/bin/utility/_help.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/ceph-utility/templates/bin/utility/_osd-maintenance.tpl b/charts/ceph-utility/templates/bin/utility/_osd-maintenance.tpl
index 10d5246e..87791a79 100644
--- a/charts/ceph-utility/templates/bin/utility/_osd-maintenance.tpl
+++ b/charts/ceph-utility/templates/bin/utility/_osd-maintenance.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/ceph-utility/templates/bin/utility/_rbd_pv.tpl b/charts/ceph-utility/templates/bin/utility/_rbd_pv.tpl
index fdddc45f..0e4e3fbc 100644
--- a/charts/ceph-utility/templates/bin/utility/_rbd_pv.tpl
+++ b/charts/ceph-utility/templates/bin/utility/_rbd_pv.tpl
@@ -1,8 +1,5 @@
 #!/bin/bash
-
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/ceph-utility/templates/bin/utility/_utilscli.tpl b/charts/ceph-utility/templates/bin/utility/_utilscli.tpl
index 810114ea..a873d21c 100644
--- a/charts/ceph-utility/templates/bin/utility/_utilscli.tpl
+++ b/charts/ceph-utility/templates/bin/utility/_utilscli.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/ceph-utility/templates/configmap-bin.yaml b/charts/ceph-utility/templates/configmap-bin.yaml
index 38c150f3..5ab59ef4 100644
--- a/charts/ceph-utility/templates/configmap-bin.yaml
+++ b/charts/ceph-utility/templates/configmap-bin.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/ceph-utility/templates/configmap-etc-client.yaml b/charts/ceph-utility/templates/configmap-etc-client.yaml
index 917cabcf..de1173fb 100644
--- a/charts/ceph-utility/templates/configmap-etc-client.yaml
+++ b/charts/ceph-utility/templates/configmap-etc-client.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/ceph-utility/templates/configmap-etc-sudoers.yaml b/charts/ceph-utility/templates/configmap-etc-sudoers.yaml
index 952ba6d7..2b90c3bb 100644
--- a/charts/ceph-utility/templates/configmap-etc-sudoers.yaml
+++ b/charts/ceph-utility/templates/configmap-etc-sudoers.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/ceph-utility/templates/deployment-utility.yaml b/charts/ceph-utility/templates/deployment-utility.yaml
index e08d35bd..a02c6ebe 100644
--- a/charts/ceph-utility/templates/deployment-utility.yaml
+++ b/charts/ceph-utility/templates/deployment-utility.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/ceph-utility/templates/network_policy.yaml b/charts/ceph-utility/templates/network_policy.yaml
index 2473397a..5ec75f4a 100644
--- a/charts/ceph-utility/templates/network_policy.yaml
+++ b/charts/ceph-utility/templates/network_policy.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/ceph-utility/values.yaml b/charts/ceph-utility/values.yaml
index 9e7035bc..fe5da31b 100644
--- a/charts/ceph-utility/values.yaml
+++ b/charts/ceph-utility/values.yaml
@@ -1,5 +1,3 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/compute-utility/Chart.yaml b/charts/compute-utility/Chart.yaml
index 95f6b908..38ce55f1 100644
--- a/charts/compute-utility/Chart.yaml
+++ b/charts/compute-utility/Chart.yaml
@@ -1,5 +1,3 @@
-# Copyright 2019 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/compute-utility/requirements.yaml b/charts/compute-utility/requirements.yaml
index e69c985d..5669e12c 100644
--- a/charts/compute-utility/requirements.yaml
+++ b/charts/compute-utility/requirements.yaml
@@ -1,5 +1,3 @@
-# Copyright 2019 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/compute-utility/templates/bin/_bootstrap.sh.tpl b/charts/compute-utility/templates/bin/_bootstrap.sh.tpl
index 4b5d093a..0673b7a5 100644
--- a/charts/compute-utility/templates/bin/_bootstrap.sh.tpl
+++ b/charts/compute-utility/templates/bin/_bootstrap.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/compute-utility/templates/bin/_start.sh.tpl b/charts/compute-utility/templates/bin/_start.sh.tpl
index 88fb20a9..a1c9a2f4 100644
--- a/charts/compute-utility/templates/bin/_start.sh.tpl
+++ b/charts/compute-utility/templates/bin/_start.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/compute-utility/templates/bin/_utilscli-sudo.tpl b/charts/compute-utility/templates/bin/_utilscli-sudo.tpl
index 68bff331..6b2a8965 100644
--- a/charts/compute-utility/templates/bin/_utilscli-sudo.tpl
+++ b/charts/compute-utility/templates/bin/_utilscli-sudo.tpl
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/compute-utility/templates/bin/utility/_compute-utility-rootwrap.tpl b/charts/compute-utility/templates/bin/utility/_compute-utility-rootwrap.tpl
index 0c1c0dbe..3edcbdcc 100644
--- a/charts/compute-utility/templates/bin/utility/_compute-utility-rootwrap.tpl
+++ b/charts/compute-utility/templates/bin/utility/_compute-utility-rootwrap.tpl
@@ -1,7 +1,5 @@
 #!/usr/bin/python3
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/compute-utility/templates/bin/utility/_compute.tpl b/charts/compute-utility/templates/bin/utility/_compute.tpl
index fe7a27ff..a60aec9f 100644
--- a/charts/compute-utility/templates/bin/utility/_compute.tpl
+++ b/charts/compute-utility/templates/bin/utility/_compute.tpl
@@ -1,8 +1,6 @@
 #!/bin/bash
 
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/compute-utility/templates/bin/utility/_utilscli.tpl b/charts/compute-utility/templates/bin/utility/_utilscli.tpl
index 627b19da..24d4250a 100644
--- a/charts/compute-utility/templates/bin/utility/_utilscli.tpl
+++ b/charts/compute-utility/templates/bin/utility/_utilscli.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/compute-utility/templates/configmap-bin.yaml b/charts/compute-utility/templates/configmap-bin.yaml
index 1bc239c1..2540a1e9 100644
--- a/charts/compute-utility/templates/configmap-bin.yaml
+++ b/charts/compute-utility/templates/configmap-bin.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/compute-utility/templates/configmap-etc-client.yaml b/charts/compute-utility/templates/configmap-etc-client.yaml
index 6991640f..2dbd94fd 100644
--- a/charts/compute-utility/templates/configmap-etc-client.yaml
+++ b/charts/compute-utility/templates/configmap-etc-client.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/compute-utility/templates/configmap-etc-sudoers.yaml b/charts/compute-utility/templates/configmap-etc-sudoers.yaml
index 2057e861..2b90c3bb 100644
--- a/charts/compute-utility/templates/configmap-etc-sudoers.yaml
+++ b/charts/compute-utility/templates/configmap-etc-sudoers.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/compute-utility/templates/deployment-utility.yaml b/charts/compute-utility/templates/deployment-utility.yaml
index d01ab224..98996889 100644
--- a/charts/compute-utility/templates/deployment-utility.yaml
+++ b/charts/compute-utility/templates/deployment-utility.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/compute-utility/values.yaml b/charts/compute-utility/values.yaml
index 675bdff9..456e5274 100644
--- a/charts/compute-utility/values.yaml
+++ b/charts/compute-utility/values.yaml
@@ -1,5 +1,3 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/etcdctl-utility/Chart.yaml b/charts/etcdctl-utility/Chart.yaml
index 8082df41..bdcbf4f9 100644
--- a/charts/etcdctl-utility/Chart.yaml
+++ b/charts/etcdctl-utility/Chart.yaml
@@ -1,5 +1,3 @@
-# Copyright 2019 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/etcdctl-utility/requirements.yaml b/charts/etcdctl-utility/requirements.yaml
index e69c985d..5669e12c 100644
--- a/charts/etcdctl-utility/requirements.yaml
+++ b/charts/etcdctl-utility/requirements.yaml
@@ -1,5 +1,3 @@
-# Copyright 2019 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/etcdctl-utility/templates/bin/_bootstrap.sh.tpl b/charts/etcdctl-utility/templates/bin/_bootstrap.sh.tpl
index 4b5d093a..0673b7a5 100644
--- a/charts/etcdctl-utility/templates/bin/_bootstrap.sh.tpl
+++ b/charts/etcdctl-utility/templates/bin/_bootstrap.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/etcdctl-utility/templates/bin/_start.sh.tpl b/charts/etcdctl-utility/templates/bin/_start.sh.tpl
index d50546cf..466d0e66 100644
--- a/charts/etcdctl-utility/templates/bin/_start.sh.tpl
+++ b/charts/etcdctl-utility/templates/bin/_start.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/etcdctl-utility/templates/bin/_utilscli-sudo.tpl b/charts/etcdctl-utility/templates/bin/_utilscli-sudo.tpl
index 1d2920c6..3d637ce2 100644
--- a/charts/etcdctl-utility/templates/bin/_utilscli-sudo.tpl
+++ b/charts/etcdctl-utility/templates/bin/_utilscli-sudo.tpl
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/etcdctl-utility/templates/bin/utility/_etcdctl-utility-rootwrap.tpl b/charts/etcdctl-utility/templates/bin/utility/_etcdctl-utility-rootwrap.tpl
index a3c9d1d6..448b985f 100644
--- a/charts/etcdctl-utility/templates/bin/utility/_etcdctl-utility-rootwrap.tpl
+++ b/charts/etcdctl-utility/templates/bin/utility/_etcdctl-utility-rootwrap.tpl
@@ -1,7 +1,5 @@
 #!/usr/bin/python3
 {{/*
-  Copyright 2019 The Openstack-Helm Authors.
-
   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
diff --git a/charts/etcdctl-utility/templates/bin/utility/_utilscli.tpl b/charts/etcdctl-utility/templates/bin/utility/_utilscli.tpl
index 8701005d..6b5ff6dc 100644
--- a/charts/etcdctl-utility/templates/bin/utility/_utilscli.tpl
+++ b/charts/etcdctl-utility/templates/bin/utility/_utilscli.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/etcdctl-utility/templates/configmap-bin.yaml b/charts/etcdctl-utility/templates/configmap-bin.yaml
index ef906170..1e8bf4af 100644
--- a/charts/etcdctl-utility/templates/configmap-bin.yaml
+++ b/charts/etcdctl-utility/templates/configmap-bin.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/etcdctl-utility/templates/configmap-etc-sudoers.yaml b/charts/etcdctl-utility/templates/configmap-etc-sudoers.yaml
index 2057e861..2b90c3bb 100644
--- a/charts/etcdctl-utility/templates/configmap-etc-sudoers.yaml
+++ b/charts/etcdctl-utility/templates/configmap-etc-sudoers.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/etcdctl-utility/templates/configmap-etc.yaml b/charts/etcdctl-utility/templates/configmap-etc.yaml
index d4710af1..d395b890 100644
--- a/charts/etcdctl-utility/templates/configmap-etc.yaml
+++ b/charts/etcdctl-utility/templates/configmap-etc.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/etcdctl-utility/templates/deployment-etcdctl-utility.yaml b/charts/etcdctl-utility/templates/deployment-etcdctl-utility.yaml
index c99e2321..7ad28ae8 100644
--- a/charts/etcdctl-utility/templates/deployment-etcdctl-utility.yaml
+++ b/charts/etcdctl-utility/templates/deployment-etcdctl-utility.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/etcdctl-utility/templates/job-image-repo-sync.yaml b/charts/etcdctl-utility/templates/job-image-repo-sync.yaml
index f7671f4f..3ffc3222 100644
--- a/charts/etcdctl-utility/templates/job-image-repo-sync.yaml
+++ b/charts/etcdctl-utility/templates/job-image-repo-sync.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/etcdctl-utility/templates/secret-etcd-certificates.yaml b/charts/etcdctl-utility/templates/secret-etcd-certificates.yaml
index 742cfbec..9e2369ae 100644
--- a/charts/etcdctl-utility/templates/secret-etcd-certificates.yaml
+++ b/charts/etcdctl-utility/templates/secret-etcd-certificates.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/etcdctl-utility/values.yaml b/charts/etcdctl-utility/values.yaml
index b5769d9b..0e46e10f 100644
--- a/charts/etcdctl-utility/values.yaml
+++ b/charts/etcdctl-utility/values.yaml
@@ -1,5 +1,3 @@
-# Copyright 2019 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/mysqlclient-utility/Chart.yaml b/charts/mysqlclient-utility/Chart.yaml
index d30d25f6..6ce50bea 100644
--- a/charts/mysqlclient-utility/Chart.yaml
+++ b/charts/mysqlclient-utility/Chart.yaml
@@ -1,5 +1,3 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/mysqlclient-utility/requirements.yaml b/charts/mysqlclient-utility/requirements.yaml
index e69c985d..5669e12c 100644
--- a/charts/mysqlclient-utility/requirements.yaml
+++ b/charts/mysqlclient-utility/requirements.yaml
@@ -1,5 +1,3 @@
-# Copyright 2019 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/mysqlclient-utility/templates/bin/_bootstrap.sh.tpl b/charts/mysqlclient-utility/templates/bin/_bootstrap.sh.tpl
index 99f7c2b6..91e3d094 100644
--- a/charts/mysqlclient-utility/templates/bin/_bootstrap.sh.tpl
+++ b/charts/mysqlclient-utility/templates/bin/_bootstrap.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/mysqlclient-utility/templates/bin/_start.sh.tpl b/charts/mysqlclient-utility/templates/bin/_start.sh.tpl
index 4026d46d..e17f658d 100644
--- a/charts/mysqlclient-utility/templates/bin/_start.sh.tpl
+++ b/charts/mysqlclient-utility/templates/bin/_start.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/mysqlclient-utility/templates/bin/_utilscli-sudo.tpl b/charts/mysqlclient-utility/templates/bin/_utilscli-sudo.tpl
index d1db41cb..a855d8d2 100644
--- a/charts/mysqlclient-utility/templates/bin/_utilscli-sudo.tpl
+++ b/charts/mysqlclient-utility/templates/bin/_utilscli-sudo.tpl
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/mysqlclient-utility/templates/bin/utility/_mysqlclient-utility-rootwrap.tpl b/charts/mysqlclient-utility/templates/bin/utility/_mysqlclient-utility-rootwrap.tpl
index 3682d1a7..f5117b11 100644
--- a/charts/mysqlclient-utility/templates/bin/utility/_mysqlclient-utility-rootwrap.tpl
+++ b/charts/mysqlclient-utility/templates/bin/utility/_mysqlclient-utility-rootwrap.tpl
@@ -1,6 +1,5 @@
 #!/usr/bin/python3
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
 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
diff --git a/charts/mysqlclient-utility/templates/bin/utility/_utilscli.tpl b/charts/mysqlclient-utility/templates/bin/utility/_utilscli.tpl
index 309a8bdd..36d0a6a2 100644
--- a/charts/mysqlclient-utility/templates/bin/utility/_utilscli.tpl
+++ b/charts/mysqlclient-utility/templates/bin/utility/_utilscli.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/mysqlclient-utility/templates/configmap-bin.yaml b/charts/mysqlclient-utility/templates/configmap-bin.yaml
index 50a9357d..fdc42567 100644
--- a/charts/mysqlclient-utility/templates/configmap-bin.yaml
+++ b/charts/mysqlclient-utility/templates/configmap-bin.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/mysqlclient-utility/templates/configmap-etc-client.yaml b/charts/mysqlclient-utility/templates/configmap-etc-client.yaml
index 73693abb..3b442c06 100644
--- a/charts/mysqlclient-utility/templates/configmap-etc-client.yaml
+++ b/charts/mysqlclient-utility/templates/configmap-etc-client.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/mysqlclient-utility/templates/configmap-etc-sudoers.yaml b/charts/mysqlclient-utility/templates/configmap-etc-sudoers.yaml
index bc23a76f..69501e6f 100644
--- a/charts/mysqlclient-utility/templates/configmap-etc-sudoers.yaml
+++ b/charts/mysqlclient-utility/templates/configmap-etc-sudoers.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/mysqlclient-utility/templates/deployment-utility.yaml b/charts/mysqlclient-utility/templates/deployment-utility.yaml
index 833bda68..c326dbed 100644
--- a/charts/mysqlclient-utility/templates/deployment-utility.yaml
+++ b/charts/mysqlclient-utility/templates/deployment-utility.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/mysqlclient-utility/templates/tests/check-mysql-client.yaml b/charts/mysqlclient-utility/templates/tests/check-mysql-client.yaml
index cbeecbbc..409e7305 100644
--- a/charts/mysqlclient-utility/templates/tests/check-mysql-client.yaml
+++ b/charts/mysqlclient-utility/templates/tests/check-mysql-client.yaml
@@ -1,5 +1,4 @@
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
 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
diff --git a/charts/mysqlclient-utility/values.yaml b/charts/mysqlclient-utility/values.yaml
index 8d431c04..1e423e4f 100644
--- a/charts/mysqlclient-utility/values.yaml
+++ b/charts/mysqlclient-utility/values.yaml
@@ -1,5 +1,3 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/openstack-utility/Chart.yaml b/charts/openstack-utility/Chart.yaml
index 3d60a128..d6accdd9 100644
--- a/charts/openstack-utility/Chart.yaml
+++ b/charts/openstack-utility/Chart.yaml
@@ -1,5 +1,3 @@
-# Copyright 2019 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/openstack-utility/requirements.yaml b/charts/openstack-utility/requirements.yaml
index e69c985d..5669e12c 100644
--- a/charts/openstack-utility/requirements.yaml
+++ b/charts/openstack-utility/requirements.yaml
@@ -1,5 +1,3 @@
-# Copyright 2019 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/openstack-utility/templates/bin/_bootstrap.sh.tpl b/charts/openstack-utility/templates/bin/_bootstrap.sh.tpl
index 4b5d093a..0673b7a5 100644
--- a/charts/openstack-utility/templates/bin/_bootstrap.sh.tpl
+++ b/charts/openstack-utility/templates/bin/_bootstrap.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/openstack-utility/templates/bin/_start.sh.tpl b/charts/openstack-utility/templates/bin/_start.sh.tpl
index 0e6319bc..73e3b895 100644
--- a/charts/openstack-utility/templates/bin/_start.sh.tpl
+++ b/charts/openstack-utility/templates/bin/_start.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/openstack-utility/templates/bin/_utilscli-sudo.tpl b/charts/openstack-utility/templates/bin/_utilscli-sudo.tpl
index 03d44ad2..283fab6b 100644
--- a/charts/openstack-utility/templates/bin/_utilscli-sudo.tpl
+++ b/charts/openstack-utility/templates/bin/_utilscli-sudo.tpl
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/openstack-utility/templates/bin/utility/_openstack-utility-rootwrap.tpl b/charts/openstack-utility/templates/bin/utility/_openstack-utility-rootwrap.tpl
index 295615ef..31f38385 100644
--- a/charts/openstack-utility/templates/bin/utility/_openstack-utility-rootwrap.tpl
+++ b/charts/openstack-utility/templates/bin/utility/_openstack-utility-rootwrap.tpl
@@ -1,7 +1,5 @@
 #!/usr/bin/python3
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/openstack-utility/templates/bin/utility/_utilscli.tpl b/charts/openstack-utility/templates/bin/utility/_utilscli.tpl
index f532f489..868258a9 100644
--- a/charts/openstack-utility/templates/bin/utility/_utilscli.tpl
+++ b/charts/openstack-utility/templates/bin/utility/_utilscli.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/openstack-utility/templates/configmap-bin.yaml b/charts/openstack-utility/templates/configmap-bin.yaml
index 00a66066..7c49698a 100644
--- a/charts/openstack-utility/templates/configmap-bin.yaml
+++ b/charts/openstack-utility/templates/configmap-bin.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/openstack-utility/templates/configmap-etc-client.yaml b/charts/openstack-utility/templates/configmap-etc-client.yaml
index 9291348e..3a39fec1 100644
--- a/charts/openstack-utility/templates/configmap-etc-client.yaml
+++ b/charts/openstack-utility/templates/configmap-etc-client.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/openstack-utility/templates/configmap-etc-sudoers.yaml b/charts/openstack-utility/templates/configmap-etc-sudoers.yaml
index 2057e861..2b90c3bb 100644
--- a/charts/openstack-utility/templates/configmap-etc-sudoers.yaml
+++ b/charts/openstack-utility/templates/configmap-etc-sudoers.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/openstack-utility/templates/deployment-utility.yaml b/charts/openstack-utility/templates/deployment-utility.yaml
index 0fe910f5..0e84dcdc 100644
--- a/charts/openstack-utility/templates/deployment-utility.yaml
+++ b/charts/openstack-utility/templates/deployment-utility.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/postgresql-utility/Chart.yaml b/charts/postgresql-utility/Chart.yaml
index f2e3256a..91ee4a21 100644
--- a/charts/postgresql-utility/Chart.yaml
+++ b/charts/postgresql-utility/Chart.yaml
@@ -1,5 +1,3 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/postgresql-utility/requirements.yaml b/charts/postgresql-utility/requirements.yaml
index 742ad0eb..e2b28d61 100644
--- a/charts/postgresql-utility/requirements.yaml
+++ b/charts/postgresql-utility/requirements.yaml
@@ -1,5 +1,3 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
 # 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
diff --git a/charts/postgresql-utility/templates/bin/_bootstrap.sh.tpl b/charts/postgresql-utility/templates/bin/_bootstrap.sh.tpl
index f9dbb5f0..11cefe2f 100644
--- a/charts/postgresql-utility/templates/bin/_bootstrap.sh.tpl
+++ b/charts/postgresql-utility/templates/bin/_bootstrap.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/sh
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/postgresql-utility/templates/bin/_start.sh.tpl b/charts/postgresql-utility/templates/bin/_start.sh.tpl
index f734ef94..91a013e7 100644
--- a/charts/postgresql-utility/templates/bin/_start.sh.tpl
+++ b/charts/postgresql-utility/templates/bin/_start.sh.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/postgresql-utility/templates/bin/_utilscli-sudo.tpl b/charts/postgresql-utility/templates/bin/_utilscli-sudo.tpl
index 32a244e3..9ff0d414 100644
--- a/charts/postgresql-utility/templates/bin/_utilscli-sudo.tpl
+++ b/charts/postgresql-utility/templates/bin/_utilscli-sudo.tpl
@@ -1,5 +1,4 @@
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
 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
diff --git a/charts/postgresql-utility/templates/bin/utility/_postgresql-utility-rootwrap.tpl b/charts/postgresql-utility/templates/bin/utility/_postgresql-utility-rootwrap.tpl
index 53e2e8fe..1c917dfc 100644
--- a/charts/postgresql-utility/templates/bin/utility/_postgresql-utility-rootwrap.tpl
+++ b/charts/postgresql-utility/templates/bin/utility/_postgresql-utility-rootwrap.tpl
@@ -1,7 +1,5 @@
 #!/usr/bin/python3
 {{/*
-  Copyright 2017 The Openstack-Helm Authors.
-
   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
diff --git a/charts/postgresql-utility/templates/bin/utility/_utilscli.tpl b/charts/postgresql-utility/templates/bin/utility/_utilscli.tpl
index 0861e7c7..bc05eb7d 100644
--- a/charts/postgresql-utility/templates/bin/utility/_utilscli.tpl
+++ b/charts/postgresql-utility/templates/bin/utility/_utilscli.tpl
@@ -1,7 +1,5 @@
 #!/bin/bash
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/postgresql-utility/templates/configmap-etc.yaml b/charts/postgresql-utility/templates/configmap-etc.yaml
index 9dddf06a..e01f6bf7 100644
--- a/charts/postgresql-utility/templates/configmap-etc.yaml
+++ b/charts/postgresql-utility/templates/configmap-etc.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/postgresql-utility/templates/deployment-utility.yaml b/charts/postgresql-utility/templates/deployment-utility.yaml
index 3ee1679f..f035e49c 100644
--- a/charts/postgresql-utility/templates/deployment-utility.yaml
+++ b/charts/postgresql-utility/templates/deployment-utility.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2019 The Openstack-Helm Authors.
-
 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
diff --git a/charts/postgresql-utility/templates/secrets-admin.yaml b/charts/postgresql-utility/templates/secrets-admin.yaml
index 998cb384..75b68291 100644
--- a/charts/postgresql-utility/templates/secrets-admin.yaml
+++ b/charts/postgresql-utility/templates/secrets-admin.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/postgresql-utility/templates/secrets-etc.yaml b/charts/postgresql-utility/templates/secrets-etc.yaml
index e841e1cc..0fc295e0 100644
--- a/charts/postgresql-utility/templates/secrets-etc.yaml
+++ b/charts/postgresql-utility/templates/secrets-etc.yaml
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/postgresql-utility/templates/secrets/_admin_user.conf.tpl b/charts/postgresql-utility/templates/secrets/_admin_user.conf.tpl
index 9b945ea6..4f4b332a 100644
--- a/charts/postgresql-utility/templates/secrets/_admin_user.conf.tpl
+++ b/charts/postgresql-utility/templates/secrets/_admin_user.conf.tpl
@@ -1,6 +1,4 @@
 {{/*
-Copyright 2017 The Openstack-Helm Authors.
-
 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
diff --git a/charts/postgresql-utility/values.yaml b/charts/postgresql-utility/values.yaml
index 6d3509bc..82b1988b 100644
--- a/charts/postgresql-utility/values.yaml
+++ b/charts/postgresql-utility/values.yaml
@@ -1,5 +1,3 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
 # 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
diff --git a/images/calicoctl-utility/Makefile b/images/calicoctl-utility/Makefile
index 9440248e..1d3d0e5d 100644
--- a/images/calicoctl-utility/Makefile
+++ b/images/calicoctl-utility/Makefile
@@ -1,5 +1,3 @@
-# Copyright 2019 The Openstack-Helm Authors.
-#
 # 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
diff --git a/tools/deployment/apparmor/005-calicoctl-utility.sh b/tools/deployment/apparmor/005-calicoctl-utility.sh
index 2919afc1..d6de71c6 100755
--- a/tools/deployment/apparmor/005-calicoctl-utility.sh
+++ b/tools/deployment/apparmor/005-calicoctl-utility.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-
-# Copyright 2019 The Openstack-Helm Authors.
-#
 #    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
diff --git a/tools/deployment/apparmor/020-compute-utility.sh b/tools/deployment/apparmor/020-compute-utility.sh
index ed9c1195..718c369e 100755
--- a/tools/deployment/apparmor/020-compute-utility.sh
+++ b/tools/deployment/apparmor/020-compute-utility.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-
-# Copyright 2019 The Openstack-Helm Authors.
 #
 #    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
diff --git a/tools/deployment/apparmor/030-etcdctl-utility.sh b/tools/deployment/apparmor/030-etcdctl-utility.sh
index bcf18e4a..35773f12 100755
--- a/tools/deployment/apparmor/030-etcdctl-utility.sh
+++ b/tools/deployment/apparmor/030-etcdctl-utility.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-
-# Copyright 2019 The Openstack-Helm Authors.
-#
 #    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
diff --git a/tools/deployment/apparmor/040-mysqlclient-utility.sh b/tools/deployment/apparmor/040-mysqlclient-utility.sh
index 44ad7467..089f338a 100755
--- a/tools/deployment/apparmor/040-mysqlclient-utility.sh
+++ b/tools/deployment/apparmor/040-mysqlclient-utility.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-
-# Copyright 2019 The Openstack-Helm Authors.
-#
 #    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
diff --git a/tools/deployment/apparmor/050-openstack-utility.sh b/tools/deployment/apparmor/050-openstack-utility.sh
index eb0e5794..50c3013e 100755
--- a/tools/deployment/apparmor/050-openstack-utility.sh
+++ b/tools/deployment/apparmor/050-openstack-utility.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-
-# Copyright 2017 The Openstack-Helm Authors.
-#
 #    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
diff --git a/tools/deployment/apparmor/060-postgresql-utility.sh b/tools/deployment/apparmor/060-postgresql-utility.sh
index 801392b6..4f051369 100755
--- a/tools/deployment/apparmor/060-postgresql-utility.sh
+++ b/tools/deployment/apparmor/060-postgresql-utility.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-
-# Copyright 2019 The Openstack-Helm Authors.
-#
 #    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
diff --git a/tools/gate/playbooks/airship-porthole-collect-logs.yaml b/tools/gate/playbooks/airship-porthole-collect-logs.yaml
index 01c9ad90..30ac3324 100644
--- a/tools/gate/playbooks/airship-porthole-collect-logs.yaml
+++ b/tools/gate/playbooks/airship-porthole-collect-logs.yaml
@@ -1,5 +1,3 @@
-# Copyright 2020 Openstack-Helm Authors.
-#
 # 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
diff --git a/tools/gate/playbooks/airship-porthole-gate-runner.yaml b/tools/gate/playbooks/airship-porthole-gate-runner.yaml
index a8b92df2..aae7b981 100644
--- a/tools/gate/playbooks/airship-porthole-gate-runner.yaml
+++ b/tools/gate/playbooks/airship-porthole-gate-runner.yaml
@@ -1,5 +1,3 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
 # 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
diff --git a/tools/gate/playbooks/vars.yaml b/tools/gate/playbooks/vars.yaml
index c89b7980..75aee365 100644
--- a/tools/gate/playbooks/vars.yaml
+++ b/tools/gate/playbooks/vars.yaml
@@ -1,5 +1,3 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
 # 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
diff --git a/tools/gate/playbooks/zuul-linter.yaml b/tools/gate/playbooks/zuul-linter.yaml
index 608b06ff..060f7c86 100644
--- a/tools/gate/playbooks/zuul-linter.yaml
+++ b/tools/gate/playbooks/zuul-linter.yaml
@@ -1,5 +1,3 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
 # 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