Add support for Helm v3

This adds support for Helm v3.
- 'helm init' and initialization is no longer required
- 'chartmuseum' is used as a drop-in replacement for 'helm serv'
- all Charts require the tag: apiVersion: v1 (or v2)

This updates nginx-ingress chart to specify apiVersion.

Change-Id: I6d084dafccbbc192ba5e1f5a998540e2728c9e22
Story: 2007000
Task: 39328
Depends-On: https://review.opendev.org/719962
Signed-off-by: Jim Gauld <james.gauld@windriver.com>
This commit is contained in:
Jim Gauld 2020-04-09 11:31:15 -04:00
parent c6147a836a
commit ebc6c72214
3 changed files with 30 additions and 42 deletions

View File

@ -31,6 +31,7 @@ Patch11: 0011-Fix-Elasticsearch-readiness-probe-http-endpoint.patch
Patch12: 0012-Add-logstash-ingress.patch Patch12: 0012-Add-logstash-ingress.patch
BuildRequires: helm BuildRequires: helm
BuildRequires: chartmuseum
%description %description
Monitor Helm elasticsearch charts Monitor Helm elasticsearch charts
@ -50,28 +51,9 @@ Monitor Helm elasticsearch charts
%patch12 -p1 %patch12 -p1
%build %build
# initialize helm and build the toolkit
# helm init --client-only does not work if there is no networking
# The following commands do essentially the same as: helm init
%define helm_home %{getenv:HOME}/.helm
mkdir %{helm_home}
mkdir %{helm_home}/repository
mkdir %{helm_home}/repository/cache
mkdir %{helm_home}/repository/local
mkdir %{helm_home}/plugins
mkdir %{helm_home}/starters
mkdir %{helm_home}/cache
mkdir %{helm_home}/cache/archive
# Stage a repository file that only has a local repo
cp %{SOURCE1} %{helm_home}/repository/repositories.yaml
# Stage a local repo index that can be updated by the build
cp %{SOURCE2} %{helm_home}/repository/local/index.yaml
# Host a server for the charts # Host a server for the charts
helm serve --repo-path . & chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="." &
helm repo rm local sleep 2
helm repo add local http://localhost:8879/charts helm repo add local http://localhost:8879/charts
# Create the tgz files # Create the tgz files

View File

@ -35,8 +35,10 @@ Patch14: 0014-Add-rbac-replicasets-to-apps-apigroup-commit-1717e2d.patch
Patch15: 0015-script-flexibility.patch Patch15: 0015-script-flexibility.patch
Patch16: 0016-use-main-container-image-for-initcontainer.patch Patch16: 0016-use-main-container-image-for-initcontainer.patch
Patch17: 0017-stable-nginx-ingress-allow-nodePort-for-tcp-udp-serv.patch Patch17: 0017-stable-nginx-ingress-allow-nodePort-for-tcp-udp-serv.patch
Patch18: 0018-Update-nginx-ingress-chart-for-Helm-v3.patch
BuildRequires: helm BuildRequires: helm
BuildRequires: chartmuseum
%description %description
Monitor Helm charts Monitor Helm charts
@ -60,30 +62,12 @@ Monitor Helm charts
%patch15 -p1 %patch15 -p1
%patch16 -p1 %patch16 -p1
%patch17 -p1 %patch17 -p1
%patch18 -p1
%build %build
# initialize helm and build the toolkit
# helm init --client-only does not work if there is no networking
# The following commands do essentially the same as: helm init
%define helm_home %{getenv:HOME}/.helm
mkdir %{helm_home}
mkdir %{helm_home}/repository
mkdir %{helm_home}/repository/cache
mkdir %{helm_home}/repository/local
mkdir %{helm_home}/plugins
mkdir %{helm_home}/starters
mkdir %{helm_home}/cache
mkdir %{helm_home}/cache/archive
# Stage a repository file that only has a local repo
cp %{SOURCE1} %{helm_home}/repository/repositories.yaml
# Stage a local repo index that can be updated by the build
cp %{SOURCE2} %{helm_home}/repository/local/index.yaml
# Host a server for the charts # Host a server for the charts
helm serve --repo-path . & chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="." &
helm repo rm local sleep 2
helm repo add local http://localhost:8879/charts helm repo add local http://localhost:8879/charts
# Create the tgz files # Create the tgz files

View File

@ -0,0 +1,22 @@
From 8f31965ee80e72ef57b50481c2eec6ba30d89d13 Mon Sep 17 00:00:00 2001
From: Jim Gauld <james.gauld@windriver.com>
Date: Thu, 9 Apr 2020 10:50:50 -0400
Subject: [PATCH] Update nginx-ingress chart for Helm v3
Signed-off-by: Jim Gauld <james.gauld@windriver.com>
---
stable/nginx-ingress/Chart.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml
index a9d64ed..6574c3f 100644
--- a/stable/nginx-ingress/Chart.yaml
+++ b/stable/nginx-ingress/Chart.yaml
@@ -1,3 +1,4 @@
+apiVersion: v1
name: nginx-ingress
version: 1.4.0
appVersion: 0.23.0
--
1.8.3.1