From 6593f4ad42ca8e5f0c20c3df347e1361dce49dab Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Sat, 25 May 2019 17:44:28 -0500 Subject: [PATCH] =?UTF-8?q?Chart=20=E2=86=92=20chart?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As per https://helm.sh/docs/chart_best_practices/#usage-of-the-words-helm-tiller-and-chart --- slides/k8s/extending-api.md | 2 +- slides/k8s/gitworkflows.md | 2 +- slides/k8s/kustomize.md | 6 +++--- slides/k8s/lastwords-admin.md | 2 +- slides/k8s/namespaces.md | 2 +- slides/k8s/prometheus.md | 10 +++++----- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/slides/k8s/extending-api.md b/slides/k8s/extending-api.md index e8a4cf99..2a266e04 100644 --- a/slides/k8s/extending-api.md +++ b/slides/k8s/extending-api.md @@ -61,7 +61,7 @@ There are many possibilities! - creates a new custom type, `Remote`, exposing a git+ssh server - - deploy by pushing YAML or Helm Charts to that remote + - deploy by pushing YAML or Helm charts to that remote - Replacing built-in types with CRDs diff --git a/slides/k8s/gitworkflows.md b/slides/k8s/gitworkflows.md index a009ea69..4bccea72 100644 --- a/slides/k8s/gitworkflows.md +++ b/slides/k8s/gitworkflows.md @@ -234,6 +234,6 @@ (see the [documentation](https://github.com/hasura/gitkube/blob/master/docs/remote.md) for more details) -- Gitkube can also deploy Helm Charts +- Gitkube can also deploy Helm charts (instead of raw YAML files) diff --git a/slides/k8s/kustomize.md b/slides/k8s/kustomize.md index b45f0491..953424c4 100644 --- a/slides/k8s/kustomize.md +++ b/slides/k8s/kustomize.md @@ -14,15 +14,15 @@ ## Differences with Helm -- Helm Charts use placeholders `{{ like.this }}` +- Helm charts use placeholders `{{ like.this }}` - Kustomize "bases" are standard Kubernetes YAML - It is possible to use an existing set of YAML as a Kustomize base -- As a result, writing a Helm Chart is more work ... +- As a result, writing a Helm chart is more work ... -- ... But Helm Charts are also more powerful; e.g. they can: +- ... But Helm charts are also more powerful; e.g. they can: - use flags to conditionally include resources or blocks diff --git a/slides/k8s/lastwords-admin.md b/slides/k8s/lastwords-admin.md index 5bd12285..4fbde579 100644 --- a/slides/k8s/lastwords-admin.md +++ b/slides/k8s/lastwords-admin.md @@ -120,7 +120,7 @@ - Team "build" ships ready-to-run manifests - (YAML, Helm Charts, Kustomize ...) + (YAML, Helm charts, Kustomize ...) - Team "run" adjusts some parameters and monitors the application diff --git a/slides/k8s/namespaces.md b/slides/k8s/namespaces.md index 3dbd13c9..c1ba9a5a 100644 --- a/slides/k8s/namespaces.md +++ b/slides/k8s/namespaces.md @@ -170,7 +170,7 @@ ## Deploy DockerCoins with Helm -*Follow these instructions if you previously created a Helm Chart.* +*Follow these instructions if you previously created a Helm chart.* .exercise[ diff --git a/slides/k8s/prometheus.md b/slides/k8s/prometheus.md index f0cb2a92..b78b1884 100644 --- a/slides/k8s/prometheus.md +++ b/slides/k8s/prometheus.md @@ -190,11 +190,11 @@ We need to: --- -## Helm Charts to the rescue +## Helm charts to the rescue -- To make our lives easier, we are going to use a Helm Chart +- To make our lives easier, we are going to use a Helm chart -- The Helm Chart will take care of all the steps explained above +- The Helm chart will take care of all the steps explained above (including some extra features that we don't need, but won't hurt) @@ -254,13 +254,13 @@ class: extra-details (a "release" is a unique name given to an app deployed with Helm) -- `stable/prometheus` → ... of the Chart `prometheus` in repo `stable` +- `stable/prometheus` → ... of the chart `prometheus` in repo `stable` - `--install` → if the app doesn't exist, create it - `--namespace kube-system` → put it in that specific namespace -- And set the following *values* when rendering the Chart's templates: +- And set the following *values* when rendering the chart's templates: - `server.service.type=NodePort` → expose the Prometheus server with a NodePort - `server.service.nodePort=30090` → set the specific NodePort number to use