openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From csantan...@apache.org
Subject [incubator-openwhisk-deploy-kube] branch master updated: helm linting (#343)
Date Fri, 09 Nov 2018 13:16:29 GMT
This is an automated email from the ASF dual-hosted git repository.

csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
     new a82e606  helm linting (#343)
a82e606 is described below

commit a82e606396af85469bd3512b7e3bed0a027d4252
Author: David Grove <dgrove-oss@users.noreply.github.com>
AuthorDate: Fri Nov 9 08:16:25 2018 -0500

    helm linting (#343)
    
    1. namespace all template defines with the chart name
      2. add LICENSE to all charts
      3. add tiller semver to all charts
      4. boilerplate labels linking resource back to Chart
      5. add icon URL
---
 helm/openwhisk-providers/Chart.yaml                |   1 +
 helm/openwhisk-providers/LICENSE                   | 202 +++++++++++++++++++++
 .../openwhisk-providers/charts/ow-alarm/Chart.yaml |   1 +
 helm/openwhisk-providers/charts/ow-alarm/LICENSE   | 202 +++++++++++++++++++++
 .../charts/ow-cloudant/Chart.yaml                  |   1 +
 .../openwhisk-providers/charts/ow-cloudant/LICENSE | 202 +++++++++++++++++++++
 .../openwhisk-providers/charts/ow-kafka/Chart.yaml |   1 +
 helm/openwhisk-providers/charts/ow-kafka/LICENSE   | 202 +++++++++++++++++++++
 helm/openwhisk/Chart.yaml                          |   3 +
 helm/openwhisk/LICENSE                             | 202 +++++++++++++++++++++
 helm/openwhisk/templates/_affinity.tpl             |   8 +-
 helm/openwhisk/templates/_helpers.tpl              |  41 +++--
 helm/openwhisk/templates/_invoker-helpers.tpl      |   8 +-
 helm/openwhisk/templates/_readiness.tpl            |  22 +--
 helm/openwhisk/templates/apigateway-pod.yaml       |   8 +-
 helm/openwhisk/templates/apigateway-svc.yaml       |   1 +
 helm/openwhisk/templates/controller-pod.yaml       |  16 +-
 helm/openwhisk/templates/controller-svc.yaml       |   1 +
 helm/openwhisk/templates/couchdb-init-job.yaml     |   4 +
 helm/openwhisk/templates/couchdb-pod.yaml          |   6 +-
 helm/openwhisk/templates/couchdb-svc.yaml          |   1 +
 helm/openwhisk/templates/install-catalog-job.yaml  |   6 +-
 .../openwhisk/templates/install-routemgmt-job.yaml |   6 +-
 helm/openwhisk/templates/invoker-agent-pod.yaml    |  10 +-
 helm/openwhisk/templates/invoker-pod.yaml          |  22 ++-
 helm/openwhisk/templates/kafka-pod.yaml            |  12 +-
 helm/openwhisk/templates/kafka-svc.yaml            |   3 +
 helm/openwhisk/templates/nginx-cm.yaml             |   4 +-
 helm/openwhisk/templates/nginx-pod.yaml            |   8 +-
 helm/openwhisk/templates/nginx-svc.yaml            |   1 +
 helm/openwhisk/templates/ow-db-cm.yaml             |   6 +-
 helm/openwhisk/templates/redis-pod.yaml            |   6 +-
 helm/openwhisk/templates/redis-svc.yaml            |   1 +
 helm/openwhisk/templates/zookeeper-pod.yaml        |   8 +-
 helm/openwhisk/templates/zookeeper-svc.yaml        |   1 +
 35 files changed, 1152 insertions(+), 75 deletions(-)

diff --git a/helm/openwhisk-providers/Chart.yaml b/helm/openwhisk-providers/Chart.yaml
index 742e60f..a957f72 100644
--- a/helm/openwhisk-providers/Chart.yaml
+++ b/helm/openwhisk-providers/Chart.yaml
@@ -10,3 +10,4 @@ keywords:
 maintainers:
   - name: Apache OpenWhisk committers
     email: dev@openwhisk.apache.org
+tillerVersion: ">=2.10.0"
diff --git a/helm/openwhisk-providers/LICENSE b/helm/openwhisk-providers/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/helm/openwhisk-providers/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/helm/openwhisk-providers/charts/ow-alarm/Chart.yaml b/helm/openwhisk-providers/charts/ow-alarm/Chart.yaml
index 96ec1aa..001cba9 100644
--- a/helm/openwhisk-providers/charts/ow-alarm/Chart.yaml
+++ b/helm/openwhisk-providers/charts/ow-alarm/Chart.yaml
@@ -10,3 +10,4 @@ keywords:
 maintainers:
   - name: Apache OpenWhisk committers
     email: dev@openwhisk.apache.org
+tillerVersion: ">=2.10.0"
diff --git a/helm/openwhisk-providers/charts/ow-alarm/LICENSE b/helm/openwhisk-providers/charts/ow-alarm/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/helm/openwhisk-providers/charts/ow-alarm/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/helm/openwhisk-providers/charts/ow-cloudant/Chart.yaml b/helm/openwhisk-providers/charts/ow-cloudant/Chart.yaml
index 4fd8371..175591e 100644
--- a/helm/openwhisk-providers/charts/ow-cloudant/Chart.yaml
+++ b/helm/openwhisk-providers/charts/ow-cloudant/Chart.yaml
@@ -10,3 +10,4 @@ keywords:
 maintainers:
   - name: Apache OpenWhisk committers
     email: dev@openwhisk.apache.org
+tillerVersion: ">=2.10.0"
diff --git a/helm/openwhisk-providers/charts/ow-cloudant/LICENSE b/helm/openwhisk-providers/charts/ow-cloudant/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/helm/openwhisk-providers/charts/ow-cloudant/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/helm/openwhisk-providers/charts/ow-kafka/Chart.yaml b/helm/openwhisk-providers/charts/ow-kafka/Chart.yaml
index 21b2802..6551987 100644
--- a/helm/openwhisk-providers/charts/ow-kafka/Chart.yaml
+++ b/helm/openwhisk-providers/charts/ow-kafka/Chart.yaml
@@ -10,3 +10,4 @@ keywords:
 maintainers:
   - name: Apache OpenWhisk committers
     email: dev@openwhisk.apache.org
+tillerVersion: ">=2.10.0"
diff --git a/helm/openwhisk-providers/charts/ow-kafka/LICENSE b/helm/openwhisk-providers/charts/ow-kafka/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/helm/openwhisk-providers/charts/ow-kafka/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/helm/openwhisk/Chart.yaml b/helm/openwhisk/Chart.yaml
index 889345c..16efa0b 100644
--- a/helm/openwhisk/Chart.yaml
+++ b/helm/openwhisk/Chart.yaml
@@ -5,8 +5,11 @@ apiVersion: v1
 description: A Helm chart to deploy Apache OpenWhisk for Kubernetes
 name: openwhisk
 version: 0.1.0
+icon: https://raw.githubusercontent.com/apache/incubator-openwhisk/682eb5b62ee6ba8017ab54226c2ace3637f4f1ec/docs/images/whisk_icon_full-color_with_tm_64x64-300dpi.png
 keywords:
   - Apache OpenWhisk
 maintainers:
   - name: Apache OpenWhisk committers
     email: dev@openwhisk.apache.org
+tillerVersion: ">=2.10.0"
+kubeVersion: "1.10 - 1.11"
diff --git a/helm/openwhisk/LICENSE b/helm/openwhisk/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/helm/openwhisk/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/helm/openwhisk/templates/_affinity.tpl b/helm/openwhisk/templates/_affinity.tpl
index 237bdc5..25a3776 100644
--- a/helm/openwhisk/templates/_affinity.tpl
+++ b/helm/openwhisk/templates/_affinity.tpl
@@ -4,7 +4,7 @@
 # This file defines template snippets for scheduler affinity and anti-affinity
 
 {{/* Generic core affinity */}}
-{{- define "affinity.core" -}}
+{{- define "openwhisk.affinity.core" -}}
 # prefer to not run on an invoker node (only prefer because of single node clusters)
 nodeAffinity:
   preferredDuringSchedulingIgnoredDuringExecution:
@@ -29,7 +29,7 @@ nodeAffinity:
 
 
 {{/* Generic edge affinity */}}
-{{- define "affinity.edge" -}}
+{{- define "openwhisk.affinity.edge" -}}
 # prefer to not run on an invoker node (only prefer because of single node clusters)
 nodeAffinity:
   preferredDuringSchedulingIgnoredDuringExecution:
@@ -54,7 +54,7 @@ nodeAffinity:
 
 
 {{/* Invoker node affinity */}}
-{{- define "affinity.invoker" -}}
+{{- define "openwhisk.affinity.invoker" -}}
 # run only on nodes labeled with openwhisk-role={{ .Values.affinity.invokerNodeLabel }}
 nodeAffinity:
   requiredDuringSchedulingIgnoredDuringExecution:
@@ -68,7 +68,7 @@ nodeAffinity:
 
 
 {{/* Self anti-affinity */}}
-{{- define "affinity.selfAntiAffinity" -}}
+{{- define "openwhisk.affinity.selfAntiAffinity" -}}
 # Fault tolerance: prevent multiple instances of {{ . }} from running on the same node
 podAntiAffinity:
   requiredDuringSchedulingIgnoredDuringExecution:
diff --git a/helm/openwhisk/templates/_helpers.tpl b/helm/openwhisk/templates/_helpers.tpl
index f86c58e..4f2a0ca 100644
--- a/helm/openwhisk/templates/_helpers.tpl
+++ b/helm/openwhisk/templates/_helpers.tpl
@@ -1,18 +1,35 @@
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
 
+{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "openwhisk.fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/* boilerplate labels */}}
+{{- define "openwhisk.label_boilerplate" -}}
+heritage: {{ .Release.Service | quote }}
+release: {{ .Release.Name | quote }}
+chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+app: {{ template "openwhisk.fullname" . }}
+{{- end -}}
+
 {{/* hostname for apigateway */}}
-{{- define "apigw_host" -}}
+{{- define "openwhisk.apigw_host" -}}
 {{ .Values.apigw.name }}.{{ .Release.Namespace }}.svc.{{ .Values.k8s.domain }}
 {{- end -}}
 
 {{/* hostname for controller */}}
-{{- define "controller_host" -}}
+{{- define "openwhisk.controller_host" -}}
 {{ .Values.controller.name }}.{{ .Release.Namespace }}.svc.{{ .Values.k8s.domain }}
 {{- end -}}
 
 {{/* hostname for database */}}
-{{- define "db_host" -}}
+{{- define "openwhisk.db_host" -}}
 {{- if .Values.db.external -}}
 {{ .Values.db.host }}
 {{- else -}}
@@ -20,12 +37,12 @@
 {{- end -}}
 {{- end -}}
 
-{{- define "db_authentication" -}}
+{{- define "openwhisk.db_authentication" -}}
 {{ .Values.db.auth.username }}:{{ .Values.db.auth.password }}
 {{- end -}}
 
 {{/* hostname for kafka */}}
-{{- define "kafka_host" -}}
+{{- define "openwhisk.kafka_host" -}}
 {{- if .Values.kafka.external -}}
 {{ .Values.kafka.name }}
 {{- else -}}
@@ -34,12 +51,12 @@
 {{- end -}}
 
 {{/* hostname for redis */}}
-{{- define "redis_host" -}}
+{{- define "openwhisk.redis_host" -}}
 {{ .Values.redis.name }}.{{ .Release.Namespace }}.svc.{{ .Values.k8s.domain }}
 {{- end -}}
 
 {{/* client connection string for zookeeper cluster (server1:port server2:port ... serverN:port)*/}}
-{{- define "zookeeper_connect" -}}
+{{- define "openwhisk.zookeeper_connect" -}}
 {{- if .Values.zookeeper.external -}}
 {{ .Values.zookeeper.name }}
 {{- else -}}
@@ -51,7 +68,7 @@
 {{- end -}}
 
 {{/* host name for server.0 in zookeeper cluster */}}
-{{- define "zookeeper_zero_host" -}}
+{{- define "openwhisk.zookeeper_zero_host" -}}
 {{- if .Values.zookeeper.external -}}
 {{ .Values.zookeeper.name }}
 {{- else -}}
@@ -61,12 +78,12 @@
 
 
 {{/* Runtimes manifest */}}
-{{- define "runtimes_manifest" -}}
+{{- define "openwhisk.runtimes_manifest" -}}
 {{ .Files.Get .Values.whisk.runtimes | quote }}
 {{- end -}}
 
 {{/* Environment variables required for accessing CouchDB from a pod */}}
-{{- define "whisk.dbEnvVars" -}}
+{{- define "openwhisk.dbEnvVars" -}}
 - name: "CONFIG_whisk_couchdb_username"
   valueFrom:
     secretKeyRef:
@@ -88,7 +105,7 @@
       name: db.config
       key: db_protocol
 - name: "CONFIG_whisk_couchdb_host"
-  value: {{ include "db_host" . | quote }}
+  value: {{ include "openwhisk.db_host" . | quote }}
 - name: "CONFIG_whisk_couchdb_provider"
   valueFrom:
     configMapKeyRef:
@@ -113,6 +130,6 @@
 
 
 {{/* tlssecretname for ingress */}}
-{{- define "tls_secret_name" -}}
+{{- define "openwhisk.tls_secret_name" -}}
 {{ .Values.whisk.ingress.tlssecretname | default "ow-ingress-tls-secret" | quote }}
 {{- end -}}
diff --git a/helm/openwhisk/templates/_invoker-helpers.tpl b/helm/openwhisk/templates/_invoker-helpers.tpl
index cca7f7f..18aff0d 100644
--- a/helm/openwhisk/templates/_invoker-helpers.tpl
+++ b/helm/openwhisk/templates/_invoker-helpers.tpl
@@ -1,7 +1,7 @@
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
 
-{{- define "docker_volumes" -}}
+{{- define "openwhisk.docker_volumes" -}}
 - name: cgroup
   hostPath:
     path: "/sys/fs/cgroup"
@@ -20,7 +20,7 @@
     path: "/var/run/docker.sock"
 {{- end -}}
 
-{{- define "docker_volume_mounts" -}}
+{{- define "openwhisk.docker_volume_mounts" -}}
 - name: cgroup
   mountPath: "/sys/fs/cgroup"
 - name: runc
@@ -31,7 +31,7 @@
   mountPath: "/containers"
 {{- end -}}
 
-{{- define "docker_pull_runtimes" -}}
+{{- define "openwhisk.docker_pull_runtimes" -}}
 - name: docker-pull-runtimes
   imagePullPolicy: {{ .Values.invoker.imagePullPolicy | quote }}
   image: {{ .Values.invoker.pullRuntimesImage | quote }}
@@ -44,7 +44,7 @@
   env:
     # action runtimes
     - name: "RUNTIMES_MANIFEST"
-      value: {{ template "runtimes_manifest" . }}
+      value: {{ template "openwhisk.runtimes_manifest" . }}
 {{- if ne .Values.docker.registry.name "" }}
     - name: "RUNTIMES_REGISTRY"
       value: "{{- .Values.docker.registry.name -}}/"
diff --git a/helm/openwhisk/templates/_readiness.tpl b/helm/openwhisk/templates/_readiness.tpl
index ac1c27b..11ead09 100644
--- a/helm/openwhisk/templates/_readiness.tpl
+++ b/helm/openwhisk/templates/_readiness.tpl
@@ -2,7 +2,7 @@
 # license agreements; and to You under the Apache License, Version 2.0.
 
 {{/* Init container that waits for couchdb to be ready */}}
-{{- define "readiness.waitForCouchDB" -}}
+{{- define "openwhisk.readiness.waitForCouchDB" -}}
 {{ if not .Values.db.wipeAndInit }}
 # if not db.wipeAndInit, the external db must already be ready; so no need for init container
 {{- else -}}
@@ -11,46 +11,46 @@
   imagePullPolicy: "IfNotPresent"
   env:
   - name: "READINESS_URL"
-    value: {{ .Values.db.protocol }}://{{ include "db_host" . }}:{{ .Values.db.port }}/ow_kube_couchdb_initialized_marker
-  command: ["sh", "-c", "while true; do echo 'checking CouchDB readiness'; wget -T 5 --spider $READINESS_URL --header=\"Authorization: Basic {{ include "db_authentication" . | b64enc }}\"; result=$?; if [ $result -eq 0 ]; then echo 'Success: CouchDB is ready!'; break; fi; echo '...not ready yet; sleeping 3 seconds before retry'; sleep 3; done;"]
+    value: {{ .Values.db.protocol }}://{{ include "openwhisk.db_host" . }}:{{ .Values.db.port }}/ow_kube_couchdb_initialized_marker
+  command: ["sh", "-c", "while true; do echo 'checking CouchDB readiness'; wget -T 5 --spider $READINESS_URL --header=\"Authorization: Basic {{ include "openwhisk.db_authentication" . | b64enc }}\"; result=$?; if [ $result -eq 0 ]; then echo 'Success: CouchDB is ready!'; break; fi; echo '...not ready yet; sleeping 3 seconds before retry'; sleep 3; done;"]
 {{- end -}}
 {{- end -}}
 
 {{/* Init container that waits for kafka to be ready */}}
-{{- define "readiness.waitForKafka" -}}
+{{- define "openwhisk.readiness.waitForKafka" -}}
 - name: "wait-for-kafka"
   image: "busybox"
   imagePullPolicy: "IfNotPresent"
   # TODO: I haven't found an easy external test to determine that kafka is up, so as a hack we wait for zookeeper and then sleep for 10 seconds and cross our fingers!
-  command: ["sh", "-c", 'result=1; until [ $result -eq 0 ]; do OK=$(echo ruok | nc -w 1 {{ include "zookeeper_zero_host" . }} {{ .Values.zookeeper.port }}); if [ "$OK" == "imok" ]; then result=0; echo "zookeeper returned imok!"; else echo waiting for zookeeper to be ready; sleep 1; fi done; echo "Zookeeper is up; will wait for 10 seconds to give kafka time to initialize"; sleep 10;']
+  command: ["sh", "-c", 'result=1; until [ $result -eq 0 ]; do OK=$(echo ruok | nc -w 1 {{ include "openwhisk.zookeeper_zero_host" . }} {{ .Values.zookeeper.port }}); if [ "$OK" == "imok" ]; then result=0; echo "zookeeper returned imok!"; else echo waiting for zookeeper to be ready; sleep 1; fi done; echo "Zookeeper is up; will wait for 10 seconds to give kafka time to initialize"; sleep 10;']
 {{- end -}}
 
 {{/* Init container that waits for zookeeper to be ready */}}
-{{- define "readiness.waitForZookeeper" -}}
+{{- define "openwhisk.readiness.waitForZookeeper" -}}
 - name: "wait-for-zookeeper"
   image: "busybox"
   imagePullPolicy: "IfNotPresent"
-  command: ["sh", "-c", 'result=1; until [ $result -eq 0 ]; do OK=$(echo ruok | nc -w 1 {{ include "zookeeper_zero_host" . }} {{ .Values.zookeeper.port }}); if [ "$OK" == "imok" ]; then result=0; echo "zookeeper returned imok!"; else echo waiting for zookeeper to be ready; sleep 1; fi; done; echo "Success: zookeeper is up"']
+  command: ["sh", "-c", 'result=1; until [ $result -eq 0 ]; do OK=$(echo ruok | nc -w 1 {{ include "openwhisk.zookeeper_zero_host" . }} {{ .Values.zookeeper.port }}); if [ "$OK" == "imok" ]; then result=0; echo "zookeeper returned imok!"; else echo waiting for zookeeper to be ready; sleep 1; fi; done; echo "Success: zookeeper is up"']
 {{- end -}}
 
 {{/* Init container that waits for controller to be ready */}}
-{{- define "readiness.waitForController" -}}
+{{- define "openwhisk.readiness.waitForController" -}}
 - name: "wait-for-controller"
   image: "busybox"
   imagePullPolicy: "IfNotPresent"
   env:
   - name: "READINESS_URL"
-    value: http://{{ include "controller_host" . }}:{{ .Values.controller.port }}/ping
+    value: http://{{ include "openwhisk.controller_host" . }}:{{ .Values.controller.port }}/ping
   command: ["sh", "-c", "result=1; until [ $result -eq 0 ]; do echo 'Checking controller readiness'; wget -T 5 --spider $READINESS_URL; result=$?; sleep 1; done; echo 'Success: controller is ready'"]
 {{- end -}}
 
 {{/* Init container that waits for at least 1 healthy invoker */}}
-{{- define "readiness.waitForHealthyInvoker" -}}
+{{- define "openwhisk.readiness.waitForHealthyInvoker" -}}
 - name: "wait-for-healthy-invoker"
   image: "busybox"
   imagePullPolicy: "IfNotPresent"
   env:
   - name: "READINESS_URL"
-    value: "http://{{ include "controller_host" . }}:{{ .Values.controller.port }}/invokers/healthy/count"
+    value: "http://{{ include "openwhisk.controller_host" . }}:{{ .Values.controller.port }}/invokers/healthy/count"
   command: ["sh", "-c", "echo 0 > /tmp/count.txt; while true; do echo 'waiting for healthy invoker'; wget -T 5 -qO /tmp/count.txt --no-check-certificate \"$READINESS_URL\"; NUM_HEALTHY_INVOKERS=$(cat /tmp/count.txt); if [ $NUM_HEALTHY_INVOKERS -gt 0 ]; then echo \"Success: there are $NUM_HEALTHY_INVOKERS healthy invokers\"; break; fi; echo '...not ready yet; sleeping 3 seconds before retry'; sleep 3; done;"]
 {{- end -}}
diff --git a/helm/openwhisk/templates/apigateway-pod.yaml b/helm/openwhisk/templates/apigateway-pod.yaml
index 974738c..4578f86 100644
--- a/helm/openwhisk/templates/apigateway-pod.yaml
+++ b/helm/openwhisk/templates/apigateway-pod.yaml
@@ -8,6 +8,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     name: {{ .Values.apigw.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   replicas: {{ .Values.apigw.replicaCount }}
   selector:
@@ -17,13 +18,14 @@ spec:
     metadata:
       labels:
         name: {{ .Values.apigw.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 8 }}
     spec:
       restartPolicy: {{ .Values.apigw.restartPolicy }}
 
       {{- if .Values.affinity.enabled }}
       affinity:
-{{ include "affinity.core" . | indent 8 }}
-{{ include "affinity.selfAntiAffinity" ( .Values.apigw.name | quote ) | indent 8 }}
+{{ include "openwhisk.affinity.core" . | indent 8 }}
+{{ include "openwhisk.affinity.selfAntiAffinity" ( .Values.apigw.name | quote ) | indent 8 }}
       {{- end }}
 
       containers:
@@ -37,7 +39,7 @@ spec:
             containerPort: {{ .Values.apigw.apiPort }}
           env:
           - name: "REDIS_HOST"
-            value: "{{ include "redis_host" . }}"
+            value: "{{ include "openwhisk.redis_host" . }}"
           - name: "REDIS_PORT"
             value: {{ .Values.redis.port | quote }}
           - name: "PUBLIC_GATEWAY_URL"
diff --git a/helm/openwhisk/templates/apigateway-svc.yaml b/helm/openwhisk/templates/apigateway-svc.yaml
index 1e4854f..2be3540 100644
--- a/helm/openwhisk/templates/apigateway-svc.yaml
+++ b/helm/openwhisk/templates/apigateway-svc.yaml
@@ -8,6 +8,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     name: {{ .Values.apigw.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   selector:
     name: {{ .Values.apigw.name | quote }}
diff --git a/helm/openwhisk/templates/controller-pod.yaml b/helm/openwhisk/templates/controller-pod.yaml
index 7f1682f..3590c80 100644
--- a/helm/openwhisk/templates/controller-pod.yaml
+++ b/helm/openwhisk/templates/controller-pod.yaml
@@ -8,6 +8,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     name: {{ .Values.controller.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   serviceName: {{ .Values.controller.name | quote }}
   podManagementPolicy: "Parallel"
@@ -19,20 +20,21 @@ spec:
     metadata:
       labels:
         name: {{ .Values.controller.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 8 }}
     spec:
       serviceAccountName: ow-core
       restartPolicy: {{ .Values.controller.restartPolicy }}
 
       {{- if .Values.affinity.enabled }}
       affinity:
-{{ include "affinity.core" . | indent 8 }}
-{{ include "affinity.selfAntiAffinity" ( .Values.controller.name | quote ) | indent 8 }}
+{{ include "openwhisk.affinity.core" . | indent 8 }}
+{{ include "openwhisk.affinity.selfAntiAffinity" ( .Values.controller.name | quote ) | indent 8 }}
       {{- end }}
 
       initContainers:
       # The controller must wait for kafka and couchdb to be ready before it starts
-{{ include "readiness.waitForKafka" . | indent 6 }}
-{{ include "readiness.waitForCouchDB" . | indent 6 }}
+{{ include "openwhisk.readiness.waitForKafka" . | indent 6 }}
+{{ include "openwhisk.readiness.waitForCouchDB" . | indent 6 }}
 
       containers:
       - name: {{ .Values.controller.name | quote }}
@@ -79,19 +81,19 @@ spec:
 
         # action runtimes
         - name: "RUNTIMES_MANIFEST"
-          value: {{ template "runtimes_manifest" . }}
+          value: {{ template "openwhisk.runtimes_manifest" . }}
 
         - name: "CONFIG_whisk_loadbalancer_invokerUserMemory"
           value: {{ .Values.whisk.loadbalancer.invokerUserMemory | quote }}
 
         # Kafka properties
         - name: "KAFKA_HOSTS"
-          value: "{{ include "kafka_host" . }}:{{ .Values.kafka.port }}"
+          value: "{{ include "openwhisk.kafka_host" . }}:{{ .Values.kafka.port }}"
         - name: "KAFKA_HOST_PORT"
           value: {{ .Values.kafka.port | quote }}
 
         # properties for DB connection
-{{ include "whisk.dbEnvVars" . | indent 8 }}
+{{ include "openwhisk.dbEnvVars" . | indent 8 }}
 
         - name: "LIMITS_ACTIONS_SEQUENCE_MAXLENGTH"
           value: {{ .Values.controller.limits.actionsSequenceMaxlength | quote }}
diff --git a/helm/openwhisk/templates/controller-svc.yaml b/helm/openwhisk/templates/controller-svc.yaml
index d9d1db5..f9e71b7 100644
--- a/helm/openwhisk/templates/controller-svc.yaml
+++ b/helm/openwhisk/templates/controller-svc.yaml
@@ -8,6 +8,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     name: {{ .Values.controller.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   selector:
     name: {{ .Values.controller.name | quote }}
diff --git a/helm/openwhisk/templates/couchdb-init-job.yaml b/helm/openwhisk/templates/couchdb-init-job.yaml
index 566c461..ce51ab5 100644
--- a/helm/openwhisk/templates/couchdb-init-job.yaml
+++ b/helm/openwhisk/templates/couchdb-init-job.yaml
@@ -7,11 +7,15 @@ kind: Job
 metadata:
   name: init-couchdb
   namespace: {{ .Release.Namespace | quote }}
+  labels:
+    name: init-couchdb
 spec:
   activeDeadlineSeconds: 600
   template:
     metadata:
       name: init-couchdb
+      labels:
+        name: init-couchdb
     spec:
       restartPolicy: Never
       volumes:
diff --git a/helm/openwhisk/templates/couchdb-pod.yaml b/helm/openwhisk/templates/couchdb-pod.yaml
index 2692b50..7b68672 100644
--- a/helm/openwhisk/templates/couchdb-pod.yaml
+++ b/helm/openwhisk/templates/couchdb-pod.yaml
@@ -9,6 +9,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     name: {{ .Values.db.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   replicas: {{ .Values.db.replicaCount }}
   selector:
@@ -18,13 +19,14 @@ spec:
     metadata:
       labels:
         name: {{ .Values.db.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 8 }}
     spec:
       restartPolicy: {{ .Values.db.restartPolicy }}
 
       {{- if .Values.affinity.enabled }}
       affinity:
-{{ include "affinity.core" . | indent 8 }}
-{{ include "affinity.selfAntiAffinity" ( .Values.db.name ) | indent 8 }}
+{{ include "openwhisk.affinity.core" . | indent 8 }}
+{{ include "openwhisk.affinity.selfAntiAffinity" ( .Values.db.name ) | indent 8 }}
       {{- end }}
 
       containers:
diff --git a/helm/openwhisk/templates/couchdb-svc.yaml b/helm/openwhisk/templates/couchdb-svc.yaml
index 33b8171..b3453d7 100644
--- a/helm/openwhisk/templates/couchdb-svc.yaml
+++ b/helm/openwhisk/templates/couchdb-svc.yaml
@@ -9,6 +9,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     name: {{ .Values.db.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   selector:
     name: {{ .Values.db.name | quote }}
diff --git a/helm/openwhisk/templates/install-catalog-job.yaml b/helm/openwhisk/templates/install-catalog-job.yaml
index bf31711..21f163b 100644
--- a/helm/openwhisk/templates/install-catalog-job.yaml
+++ b/helm/openwhisk/templates/install-catalog-job.yaml
@@ -6,11 +6,15 @@ kind: Job
 metadata:
   name: install-catalog
   namespace: {{ .Release.Namespace | quote }}
+  labels:
+    name: install-catalog
 spec:
   activeDeadlineSeconds: 600
   template:
     metadata:
       name: install-catalog
+      labels:
+        name: install-catalog
     spec:
       restartPolicy: Never
       volumes:
@@ -19,7 +23,7 @@ spec:
           name: install-catalog
       initContainers:
       # Wait for a controller to be up so we can perfom our CRUD actions with the CLI
-{{ include "readiness.waitForHealthyInvoker" . | indent 6 }}
+{{ include "openwhisk.readiness.waitForHealthyInvoker" . | indent 6 }}
       containers:
       - name: catalog
         image: {{ .Values.utility.scriptRunnerImage | quote }}
diff --git a/helm/openwhisk/templates/install-routemgmt-job.yaml b/helm/openwhisk/templates/install-routemgmt-job.yaml
index 0db56ef..7341eb0 100644
--- a/helm/openwhisk/templates/install-routemgmt-job.yaml
+++ b/helm/openwhisk/templates/install-routemgmt-job.yaml
@@ -6,11 +6,15 @@ kind: Job
 metadata:
   name: install-routemgmt
   namespace: {{ .Release.Namespace | quote }}
+  labels:
+    name: install-routemgmt
 spec:
   activeDeadlineSeconds: 600
   template:
     metadata:
       name: install-routemgmt
+      labels:
+        name: install-routemgmt
     spec:
       restartPolicy: Never
       volumes:
@@ -19,7 +23,7 @@ spec:
           name: install-routemgmt
       initContainers:
       # Wait for a controller to be up so we can perfom our CRUD actions with the CLI
-{{ include "readiness.waitForHealthyInvoker" . | indent 6 }}
+{{ include "openwhisk.readiness.waitForHealthyInvoker" . | indent 6 }}
       containers:
       - name: routemgmt
         image: {{ .Values.utility.scriptRunnerImage | quote }}
diff --git a/helm/openwhisk/templates/invoker-agent-pod.yaml b/helm/openwhisk/templates/invoker-agent-pod.yaml
index dfa0a5c..badeb14 100644
--- a/helm/openwhisk/templates/invoker-agent-pod.yaml
+++ b/helm/openwhisk/templates/invoker-agent-pod.yaml
@@ -9,6 +9,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     name: {{ .Values.invoker.containerFactory.kubernetes.agent.name | quote }}
+{{ include "openwhisk.label_boilerplate" .| indent 4 }}
 spec:
   selector:
     matchLabels:
@@ -17,15 +18,16 @@ spec:
     metadata:
       labels:
         name: {{ .Values.invoker.containerFactory.kubernetes.agent.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 8 }}
     spec:
       restartPolicy: Always
       hostNetwork: true
 
       affinity:
-{{ include "affinity.invoker" . | indent 8 }}
+{{ include "openwhisk.affinity.invoker" . | indent 8 }}
 
       volumes:
-{{ include "docker_volumes" . | indent 6 }}
+{{ include "openwhisk.docker_volumes" . | indent 6 }}
       - name: userlogs
         emptyDir: {}
       - name: task-dir
@@ -34,7 +36,7 @@ spec:
 
       initContainers:
       # Pull images for all default runtimes before starting invoker
-{{ include "docker_pull_runtimes" . | indent 6 }}
+{{ include "openwhisk.docker_pull_runtimes" . | indent 6 }}
 
       containers:
       - name: {{ .Values.invoker.containerFactory.kubernetes.agent.name | quote }}
@@ -46,7 +48,7 @@ spec:
         - name: agent
           containerPort: {{ .Values.invoker.containerFactory.kubernetes.agent.port }}
         volumeMounts:
-{{ include "docker_volume_mounts" . | indent 8 }}
+{{ include "openwhisk.docker_volume_mounts" . | indent 8 }}
         - name: userlogs
           mountPath: "/action-logs"
 {{- end }}
diff --git a/helm/openwhisk/templates/invoker-pod.yaml b/helm/openwhisk/templates/invoker-pod.yaml
index 0118110..ba93903 100644
--- a/helm/openwhisk/templates/invoker-pod.yaml
+++ b/helm/openwhisk/templates/invoker-pod.yaml
@@ -13,6 +13,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     name: {{ .Values.invoker.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
 {{- if eq .Values.invoker.containerFactory.impl "kubernetes" }}
   podManagementPolicy: "Parallel"
@@ -25,6 +26,7 @@ spec:
     metadata:
       labels:
         name: {{ .Values.invoker.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 8 }}
     spec:
 {{- if eq .Values.invoker.containerFactory.impl "kubernetes" }}
       serviceAccountName: {{ .Values.invoker.name | quote }}
@@ -32,14 +34,14 @@ spec:
       restartPolicy: {{ .Values.invoker.restartPolicy }}
 
       affinity:
-{{ include "affinity.invoker" . | indent 8 }}
+{{ include "openwhisk.affinity.invoker" . | indent 8 }}
 {{- if eq .Values.invoker.containerFactory.impl "kubernetes" }}
-{{ include "affinity.selfAntiAffinity" ( .Values.invoker.name | quote ) | indent 8 }}
+{{ include "openwhisk.affinity.selfAntiAffinity" ( .Values.invoker.name | quote ) | indent 8 }}
 {{- end }}
 
 {{- if eq .Values.invoker.containerFactory.impl "docker" }}
       volumes:
-{{ include "docker_volumes" . | indent 6 }}
+{{ include "openwhisk.docker_volumes" . | indent 6 }}
       - name: task-dir
         configMap:
           name: docker-pull-runtimes
@@ -48,10 +50,10 @@ spec:
       initContainers:
 {{- if eq .Values.invoker.containerFactory.impl "docker" }}
       # Pull images for all default runtimes before starting invoker
-{{ include "docker_pull_runtimes" . | indent 6 }}
+{{ include "openwhisk.docker_pull_runtimes" . | indent 6 }}
 {{- end }}
       # Wait for a controller to be up (which implies kafka, zookeeper, couchdb are all up as well).
-{{ include "readiness.waitForController" . | indent 6 }}
+{{ include "openwhisk.readiness.waitForController" . | indent 6 }}
 
       containers:
       - name: {{ .Values.invoker.name | quote }}
@@ -123,7 +125,7 @@ spec:
 
           # action runtimes
           - name: "RUNTIMES_MANIFEST"
-            value: {{ template "runtimes_manifest" . }}
+            value: {{ template "openwhisk.runtimes_manifest" . }}
 
           # Default to empty logs dir. This is because logs should go to stdout
           - name: "WHISK_LOGS_DIR"
@@ -137,20 +139,20 @@ spec:
                 key: whisk_info_date
 
           # properties for DB connection
-{{ include "whisk.dbEnvVars" . | indent 10 }}
+{{ include "openwhisk.dbEnvVars" . | indent 10 }}
 
           # properties for kafka connection
           - name: "KAFKA_HOSTS"
-            value: "{{ include "kafka_host" . }}:{{ .Values.kafka.port }}"
+            value: "{{ include "openwhisk.kafka_host" . }}:{{ .Values.kafka.port }}"
 
           # properties for zookeeper connection
           - name: "ZOOKEEPER_HOSTS"
-            value: "{{ include "zookeeper_connect" . }}"
+            value: "{{ include "openwhisk.zookeeper_connect" . }}"
 
         ports:
         - name: invoker
           containerPort: {{ .Values.invoker.port }}
 {{- if eq .Values.invoker.containerFactory.impl "docker" }}
         volumeMounts:
-{{ include "docker_volume_mounts" . | indent 8 }}
+{{ include "openwhisk.docker_volume_mounts" . | indent 8 }}
 {{- end }}
diff --git a/helm/openwhisk/templates/kafka-pod.yaml b/helm/openwhisk/templates/kafka-pod.yaml
index b42981f..cabb74a 100644
--- a/helm/openwhisk/templates/kafka-pod.yaml
+++ b/helm/openwhisk/templates/kafka-pod.yaml
@@ -7,6 +7,9 @@ kind: StatefulSet
 metadata:
   name: {{ .Values.kafka.name | quote }}
   namespace: {{ .Release.Namespace | quote }}
+  labels:
+    name: {{ .Values.kafka.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   serviceName: {{ .Values.kafka.name | quote }}
   podManagementPolicy: "Parallel"
@@ -18,13 +21,14 @@ spec:
     metadata:
       labels:
         name: {{ .Values.kafka.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 8 }}
     spec:
       restartPolicy: {{ .Values.kafka.restartPolicy }}
 
       {{- if .Values.affinity.enabled }}
       affinity:
-{{ include "affinity.core" . | indent 8 }}
-{{ include "affinity.selfAntiAffinity" ( .Values.kafka.name | quote ) | indent 8 }}
+{{ include "openwhisk.affinity.core" . | indent 8 }}
+{{ include "openwhisk.affinity.selfAntiAffinity" ( .Values.kafka.name | quote ) | indent 8 }}
       {{- end }}
 
 {{- if .Values.kafka.persistence.enabled }}
@@ -35,7 +39,7 @@ spec:
 {{- end }}
 
       initContainers:
-{{ include "readiness.waitForZookeeper" . | indent 6 }}
+{{ include "openwhisk.readiness.waitForZookeeper" . | indent 6 }}
 
       containers:
       - name: {{ .Values.kafka.name | quote }}
@@ -65,5 +69,5 @@ spec:
 
         # zookeeper info
         - name: "KAFKA_ZOOKEEPER_CONNECT"
-          value: "{{ include "zookeeper_connect" . }}"
+          value: "{{ include "openwhisk.zookeeper_connect" . }}"
 {{- end }}
diff --git a/helm/openwhisk/templates/kafka-svc.yaml b/helm/openwhisk/templates/kafka-svc.yaml
index 0668489..9a77d5f 100644
--- a/helm/openwhisk/templates/kafka-svc.yaml
+++ b/helm/openwhisk/templates/kafka-svc.yaml
@@ -7,6 +7,9 @@ kind: Service
 metadata:
   name: {{ .Values.kafka.name | quote }}
   namespace: {{ .Release.Namespace | quote }}
+  labels:
+    name: {{ .Values.kafka.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   ports:
   - name: broker
diff --git a/helm/openwhisk/templates/nginx-cm.yaml b/helm/openwhisk/templates/nginx-cm.yaml
index 9552538..421ecb5 100644
--- a/helm/openwhisk/templates/nginx-cm.yaml
+++ b/helm/openwhisk/templates/nginx-cm.yaml
@@ -52,9 +52,9 @@ data:
 
         # Hack to convince nginx to dynamically resolve the dns entries.
         resolver {{ .Values.k8s.dns }};
-        set $controllers {{ include "controller_host" . }};
+        set $controllers {{ include "openwhisk.controller_host" . }};
 {{- if or (eq .Values.whisk.ingress.type "NodePort") (eq .Values.whisk.ingress.type "LoadBalancer") }}
-        set $apigw {{ include "apigw_host" . }};
+        set $apigw {{ include "openwhisk.apigw_host" . }};
 {{- end }}
 
 {{- if or (eq .Values.whisk.ingress.type "NodePort") (eq .Values.whisk.ingress.type "LoadBalancer") }}
diff --git a/helm/openwhisk/templates/nginx-pod.yaml b/helm/openwhisk/templates/nginx-pod.yaml
index 5ed1300..9410365 100644
--- a/helm/openwhisk/templates/nginx-pod.yaml
+++ b/helm/openwhisk/templates/nginx-pod.yaml
@@ -7,7 +7,8 @@ metadata:
   name: {{ .Values.nginx.name | quote }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    name: nginx
+    name: {{ .Values.nginx.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   replicas: {{ .Values.nginx.replicaCount }}
   selector:
@@ -17,13 +18,14 @@ spec:
     metadata:
       labels:
         name: {{ .Values.nginx.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 8 }}
     spec:
       restartPolicy: {{ .Values.nginx.restartPolicy }}
 
       {{- if .Values.affinity.enabled }}
       affinity:
-{{ include "affinity.edge" . | indent 8 }}
-{{ include "affinity.selfAntiAffinity" ( .Values.nginx.name | quote ) | indent 8 }}
+{{ include "openwhisk.affinity.edge" . | indent 8 }}
+{{ include "openwhisk.affinity.selfAntiAffinity" ( .Values.nginx.name | quote ) | indent 8 }}
       {{- end }}
 
       volumes:
diff --git a/helm/openwhisk/templates/nginx-svc.yaml b/helm/openwhisk/templates/nginx-svc.yaml
index 5bf808b..a56e790 100644
--- a/helm/openwhisk/templates/nginx-svc.yaml
+++ b/helm/openwhisk/templates/nginx-svc.yaml
@@ -8,6 +8,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     name: {{ .Values.nginx.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   {{- if eq .Values.whisk.ingress.type "LoadBalancer" }}
   type: LoadBalancer
diff --git a/helm/openwhisk/templates/ow-db-cm.yaml b/helm/openwhisk/templates/ow-db-cm.yaml
index 4949add..7eb76b3 100644
--- a/helm/openwhisk/templates/ow-db-cm.yaml
+++ b/helm/openwhisk/templates/ow-db-cm.yaml
@@ -10,10 +10,10 @@ data:
   db_prefix: {{ .Values.db.dbPrefix | quote }}
   db_protocol: {{ .Values.db.protocol | quote }}
   db_provider: {{ .Values.db.provider | quote }}
-  db_host: {{ include "db_host" . | quote }}
+  db_host: {{ include "openwhisk.db_host" . | quote }}
   db_port: {{ .Values.db.port | quote }}
-  db_url: "{{ .Values.db.protocol }}://{{ include "db_host" . }}:{{ .Values.db.port }}"
-  db_host_port: "{{ include "db_host" . }}:{{ .Values.db.port }}"
+  db_url: "{{ .Values.db.protocol }}://{{ include "openwhisk.db_host" . }}:{{ .Values.db.port }}"
+  db_host_port: "{{ include "openwhisk.db_host" . }}:{{ .Values.db.port }}"
   db_whisk_actions: {{ .Values.db.actionsTable | quote }}
   db_whisk_activations: {{ .Values.db.activationsTable | quote }}
   db_whisk_auths: {{ .Values.db.authsTable | quote }}
diff --git a/helm/openwhisk/templates/redis-pod.yaml b/helm/openwhisk/templates/redis-pod.yaml
index 75fde54..7a0100d 100644
--- a/helm/openwhisk/templates/redis-pod.yaml
+++ b/helm/openwhisk/templates/redis-pod.yaml
@@ -8,6 +8,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     name: {{ .Values.redis.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   replicas: {{ .Values.redis.replicaCount }}
   selector:
@@ -17,13 +18,14 @@ spec:
     metadata:
       labels:
         name: {{ .Values.redis.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 8 }}
     spec:
       restartPolicy: {{ .Values.redis.restartPolicy }}
 
       {{- if .Values.affinity.enabled }}
       affinity:
-{{ include "affinity.core" . | indent 8 }}
-{{ include "affinity.selfAntiAffinity" ( .Values.redis.name | quote ) | indent 8 }}
+{{ include "openwhisk.affinity.core" . | indent 8 }}
+{{ include "openwhisk.affinity.selfAntiAffinity" ( .Values.redis.name | quote ) | indent 8 }}
       {{- end }}
 
 {{- if .Values.redis.persistence.enabled }}
diff --git a/helm/openwhisk/templates/redis-svc.yaml b/helm/openwhisk/templates/redis-svc.yaml
index 67fbe45..c62100d 100644
--- a/helm/openwhisk/templates/redis-svc.yaml
+++ b/helm/openwhisk/templates/redis-svc.yaml
@@ -8,6 +8,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     name: {{ .Values.redis.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   selector:
     name: {{ .Values.redis.name | quote }}
diff --git a/helm/openwhisk/templates/zookeeper-pod.yaml b/helm/openwhisk/templates/zookeeper-pod.yaml
index 0f5b4a6..0e91c39 100644
--- a/helm/openwhisk/templates/zookeeper-pod.yaml
+++ b/helm/openwhisk/templates/zookeeper-pod.yaml
@@ -7,6 +7,9 @@ kind: StatefulSet
 metadata:
   name: {{ .Values.zookeeper.name | quote }}
   namespace: {{ .Release.Namespace | quote}}
+  labels:
+    name: {{ .Values.zookeeper.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   serviceName: {{ .Values.zookeeper.name | quote }}
   podManagementPolicy: "Parallel"
@@ -18,13 +21,14 @@ spec:
     metadata:
       labels:
         name: {{ .Values.zookeeper.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 8 }}
     spec:
       restartPolicy: {{ .Values.zookeeper.restartPolicy | quote }}
 
 {{- if .Values.affinity.enabled }}
       affinity:
-{{ include "affinity.core" . | indent 8 }}
-{{ include "affinity.selfAntiAffinity" ( .Values.zookeeper.name | quote ) | indent 8 }}
+{{ include "openwhisk.affinity.core" . | indent 8 }}
+{{ include "openwhisk.affinity.selfAntiAffinity" ( .Values.zookeeper.name | quote ) | indent 8 }}
 {{- end }}
 
       volumes:
diff --git a/helm/openwhisk/templates/zookeeper-svc.yaml b/helm/openwhisk/templates/zookeeper-svc.yaml
index 9ed2933..fafea51 100644
--- a/helm/openwhisk/templates/zookeeper-svc.yaml
+++ b/helm/openwhisk/templates/zookeeper-svc.yaml
@@ -9,6 +9,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     name: {{ .Values.zookeeper.name | quote }}
+{{ include "openwhisk.label_boilerplate" . | indent 4 }}
 spec:
   selector:
     name: {{ .Values.zookeeper.name | quote }}


Mime
View raw message