You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ni...@apache.org on 2022/01/17 16:50:43 UTC
[incubator-heron] branch master updated: Helm chart cleanup (#3758)
This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new 482f14f Helm chart cleanup (#3758)
482f14f is described below
commit 482f14fd56de7d1803a9b1c4a37568514a826d27
Author: Nicholas Nezis <ni...@gmail.com>
AuthorDate: Mon Jan 17 11:50:38 2022 -0500
Helm chart cleanup (#3758)
* Upgrade to Helm 3.7.2
* Add disclaimer files
* Updated Chart.yaml to v2 apiVersion (Helm 3)
---
WORKSPACE | 8 ++++----
deploy/kubernetes/helm/BUILD | 2 +-
deploy/kubernetes/helm/Chart.yaml.template | 30 ++++++++++++++++++++++--------
scripts/packages/BUILD | 1 -
4 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/WORKSPACE b/WORKSPACE
index 9b4da9f..adc14f2 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -359,17 +359,17 @@ http_archive(
http_archive(
name = "helm_mac",
build_file = "@//:third_party/helm/helm.BUILD",
- sha256 = "3a9efe337c61a61b3e160da919ac7af8cded8945b75706e401f3655a89d53ef5",
+ sha256 = "5a0738afb1e194853aab00258453be8624e0a1d34fcc3c779989ac8dbcd59436",
strip_prefix = "darwin-amd64",
- urls = ["https://get.helm.sh/helm-v3.7.1-darwin-amd64.tar.gz"],
+ urls = ["https://get.helm.sh/helm-v3.7.2-darwin-amd64.tar.gz"],
)
http_archive(
name = "helm_linux",
build_file = "@//:third_party/helm/helm.BUILD",
- sha256 = "6cd6cad4b97e10c33c978ff3ac97bb42b68f79766f1d2284cfd62ec04cd177f4",
+ sha256 = "4ae30e48966aba5f807a4e140dad6736ee1a392940101e4d79ffb4ee86200a9e",
strip_prefix = "linux-amd64",
- urls = ["https://get.helm.sh/helm-v3.7.1-linux-amd64.tar.gz"],
+ urls = ["https://get.helm.sh/helm-v3.7.2-linux-amd64.tar.gz"],
)
# end helm
diff --git a/deploy/kubernetes/helm/BUILD b/deploy/kubernetes/helm/BUILD
index a88d46a..9dffd03 100644
--- a/deploy/kubernetes/helm/BUILD
+++ b/deploy/kubernetes/helm/BUILD
@@ -4,5 +4,5 @@ package(default_visibility = ["//visibility:public"])
filegroup(
name = "chart",
- srcs = glob(["templates/*.yaml"] + ["templates/*.txt"] + ["templates/*.tpl"] + ["*.lock"] + ["*.yaml"] + ["*.template"]),
+ srcs = glob(["templates/*.yaml"] + ["templates/*.txt"] + ["templates/*.tpl"] + ["*.lock"] + ["*.yaml"] + ["*.template"]) + ["//:disclaimers"],
)
diff --git a/deploy/kubernetes/helm/Chart.yaml.template b/deploy/kubernetes/helm/Chart.yaml.template
index f9c7c72..21580df 100644
--- a/deploy/kubernetes/helm/Chart.yaml.template
+++ b/deploy/kubernetes/helm/Chart.yaml.template
@@ -14,16 +14,30 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-apiVersion: v1
-description: Heron is a fast distributed streaming engine for processing large data volumes with velocity
+---
+apiVersion: v2
name: heron
version: VERSION
+kubeVersion: 1.16
appVersion: VERSION
-icon: https://apache.github.io/incubator-heron/img/HeronTextLogo-small.png
-home: http://heron.io
+description: Heron is a fast distributed streaming engine for processing large data volumes with velocity
+type: application
+keywords:
+ - apache
+ - streaming
+ - analytics
+ - heron
+ - heronpy
+ - apache-heron
+ - heron-helm
+home: https://heron.apache.org/
+icon: https://heron.apache.org/img/HeronTextLogo-small.png
sources:
- - https://github.com/apache/incubator-heron.git
+ - https://github.com/apache/incubator-heron/
+ - https://github.com/apache/incubator-heron/tree/master/deploy/kubernetes/helm/
+dependencies:
maintainers:
- - name: Karthik Ramasamy
- email: kramasamy@gmail.com
+ - name: Apache Heron Developers
+ email: dev@heron.apache.org
+ url: https://heron.apache.org/
+annotations:
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD
index 2c8adc8..67a185d 100644
--- a/scripts/packages/BUILD
+++ b/scripts/packages/BUILD
@@ -687,7 +687,6 @@ genrule(
"export HERON_VERSION=$$(grep version $$RELEASE_FILE_DIR/$(location :release.yaml) | awk '{print $$3}')",
'export HERON_VERSION=$$(echo $$HERON_VERSION | sed -e "s/^\'//" -e "s/\'$$//")',
"export HERON_VERSION=$$(echo $$HERON_VERSION | grep \"[0-9]*\\.[0-9]*\\.[0-9]*\")",
- 'export HERON_VERSION=$$([[ ! -z $$HERON_VERSION_EXT ]] && echo $$HERON_VERSION_EXT || echo $$HERON_VERSION)',
'export HERON_VERSION=$$([[ -z $$HERON_VERSION ]] && echo "0.0.0" || echo $$HERON_VERSION)',
"mkdir -p $$TMP_DIR $$HELM_DIR heron-charts",
"cp $(SRCS) $$HELM_DIR",