From 53e28ff20cc530b9ada2173fbbd64d48338583ba Mon Sep 17 00:00:00 2001 From: May Zhang Date: Wed, 3 Mar 2021 13:07:29 -0800 Subject: [PATCH] feat: update helm samples to use helm3 (#78) * helm3 guestbook * helm3 blue-green * helm3 dependencies * helm3 plugin * helm3 plugin * helm3 plugin * helm3 apps * helm3 dependency * helm3 dependency * helm3 dependency * helm3 fix readme --- apps/Chart.yaml | 24 ++++++++++++++++--- blue-green/Chart.yaml | 24 ++++++++++++++++--- helm-dependency/Chart.yaml | 29 ++++++++++++++++++++++- helm-dependency/requirements.yaml | 4 ---- helm-guestbook/Chart.yaml | 24 ++++++++++++++++--- plugins/kustomized-helm/Chart.yaml | 27 +++++++++++++++++++++ plugins/kustomized-helm/README.md | 4 ++-- plugins/kustomized-helm/requirements.yaml | 4 ---- 8 files changed, 120 insertions(+), 20 deletions(-) delete mode 100644 helm-dependency/requirements.yaml delete mode 100644 plugins/kustomized-helm/requirements.yaml diff --git a/apps/Chart.yaml b/apps/Chart.yaml index 3510e2a..a59772c 100644 --- a/apps/Chart.yaml +++ b/apps/Chart.yaml @@ -1,5 +1,23 @@ -apiVersion: v1 -appVersion: "1.0" -description: Applications +apiVersion: v2 name: applications +description: Applications + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +appVersion: "1.0" diff --git a/blue-green/Chart.yaml b/blue-green/Chart.yaml index 0e6f934..6fac831 100644 --- a/blue-green/Chart.yaml +++ b/blue-green/Chart.yaml @@ -1,5 +1,23 @@ -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for Kubernetes +apiVersion: v2 name: helm-guestbook +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +appVersion: "1.0" diff --git a/helm-dependency/Chart.yaml b/helm-dependency/Chart.yaml index 59ca9a9..6e3c2bb 100644 --- a/helm-dependency/Chart.yaml +++ b/helm-dependency/Chart.yaml @@ -1 +1,28 @@ -name: wordpress \ No newline at end of file +apiVersion: v2 +name: wordpress +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +appVersion: "1.0" + +dependencies: +- name: wordpress + version: 9.0.3 + repository: https://charts.helm.sh/stable \ No newline at end of file diff --git a/helm-dependency/requirements.yaml b/helm-dependency/requirements.yaml deleted file mode 100644 index c56eac5..0000000 --- a/helm-dependency/requirements.yaml +++ /dev/null @@ -1,4 +0,0 @@ -dependencies: -- name: wordpress - version: 5.0.2 - repository: https://charts.helm.sh/stable diff --git a/helm-guestbook/Chart.yaml b/helm-guestbook/Chart.yaml index 0e6f934..6fac831 100644 --- a/helm-guestbook/Chart.yaml +++ b/helm-guestbook/Chart.yaml @@ -1,5 +1,23 @@ -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart for Kubernetes +apiVersion: v2 name: helm-guestbook +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +appVersion: "1.0" diff --git a/plugins/kustomized-helm/Chart.yaml b/plugins/kustomized-helm/Chart.yaml index bb298f2..946f402 100644 --- a/plugins/kustomized-helm/Chart.yaml +++ b/plugins/kustomized-helm/Chart.yaml @@ -1 +1,28 @@ +apiVersion: v2 name: guestbook +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +appVersion: "1.0" + +dependencies: +- name: helm-guestbook + version: 0.1.0 + repository: file://../../helm-guestbook \ No newline at end of file diff --git a/plugins/kustomized-helm/README.md b/plugins/kustomized-helm/README.md index ddc7505..e93b202 100644 --- a/plugins/kustomized-helm/README.md +++ b/plugins/kustomized-helm/README.md @@ -12,10 +12,10 @@ Use following steps to try the application: - name: kustomized-helm init: command: ["/bin/sh", "-c"] - args: ["helm init --client-only && helm dependency build"] + args: ["helm dependency build"] generate: command: [sh, -c] - args: ["helm template . > all.yaml && kustomize build"] + args: ["helm template --release-name release-name . > all.yaml && kustomize build"] ``` * create application using `kustomized-helm` as a config management plugin name: diff --git a/plugins/kustomized-helm/requirements.yaml b/plugins/kustomized-helm/requirements.yaml deleted file mode 100644 index c199804..0000000 --- a/plugins/kustomized-helm/requirements.yaml +++ /dev/null @@ -1,4 +0,0 @@ -dependencies: -- name: helm-guestbook - version: 0.1.0 - repository: file://../../helm-guestbook