From 1586f26adea552048c29f8ac55eb191ca37b5afd Mon Sep 17 00:00:00 2001 From: Yahav Biran Date: Thu, 4 Jan 2018 21:21:45 -0800 Subject: [PATCH] "Adopting to https://github.com/kubernetes/charts format per bacongobbler" --- docs/examples/guestbook/Chart.yaml | 7 +- docs/examples/guestbook/README.md | 68 ++++++++++++++++++ .../examples/guestbook/charts/redis-1.1.4.tgz | Bin 0 -> 5671 bytes docs/examples/guestbook/requirements.lock | 6 ++ docs/examples/guestbook/requirements.yaml | 7 ++ docs/examples/guestbook/templates/NOTES.txt | 12 ++-- .../examples/guestbook/templates/_helpers.tpl | 7 +- .../guestbook/templates/deployment.yaml | 52 ++++++++++++++ .../templates/frontend-deployment.yaml | 39 ---------- .../guestbook/templates/frontend-service.yaml | 17 ----- .../examples/guestbook/templates/ingress.yaml | 32 +++++++++ .../templates/redis-master-deployment.yaml | 29 -------- .../templates/redis-master-service.yaml | 19 ----- .../templates/redis-slave-deployment.yaml | 32 --------- .../templates/redis-slave-service.yaml | 18 ----- .../examples/guestbook/templates/service.yaml | 19 +++++ docs/examples/guestbook/values.yaml | 51 +++++-------- 17 files changed, 215 insertions(+), 200 deletions(-) create mode 100644 docs/examples/guestbook/README.md create mode 100644 docs/examples/guestbook/charts/redis-1.1.4.tgz create mode 100644 docs/examples/guestbook/requirements.lock create mode 100644 docs/examples/guestbook/requirements.yaml create mode 100644 docs/examples/guestbook/templates/deployment.yaml delete mode 100644 docs/examples/guestbook/templates/frontend-deployment.yaml delete mode 100644 docs/examples/guestbook/templates/frontend-service.yaml create mode 100644 docs/examples/guestbook/templates/ingress.yaml delete mode 100644 docs/examples/guestbook/templates/redis-master-deployment.yaml delete mode 100644 docs/examples/guestbook/templates/redis-master-service.yaml delete mode 100644 docs/examples/guestbook/templates/redis-slave-deployment.yaml delete mode 100644 docs/examples/guestbook/templates/redis-slave-service.yaml create mode 100644 docs/examples/guestbook/templates/service.yaml diff --git a/docs/examples/guestbook/Chart.yaml b/docs/examples/guestbook/Chart.yaml index 3d69bfb04..62b6cf0bf 100644 --- a/docs/examples/guestbook/Chart.yaml +++ b/docs/examples/guestbook/Chart.yaml @@ -1,9 +1,4 @@ apiVersion: v1 +description: A guestbook Helm chart for Kubernetes. name: guestbook version: 0.1.0 -description: Guestbook Helm chart for Kubernetes. -sources: - - https://github.com/kubernetes/kubernetes/tree/master/examples/guestbook -maintainers: - - name: Yahav Biran - - email: ybiran@colostate.edu diff --git a/docs/examples/guestbook/README.md b/docs/examples/guestbook/README.md new file mode 100644 index 000000000..dc4cd41bd --- /dev/null +++ b/docs/examples/guestbook/README.md @@ -0,0 +1,68 @@ +# Guestbook + +[Guestbook](https://github.com/kubernetes/examples/tree/master/guestbook) is a simple, multi-tier PHP-based web application that uses redis chart. +## TL;DR; + +```console +$ helm install stable/guestbook +``` + +## Introduction + +This chart bootstraps a [guestbook](https://github.com/kubernetes/examples/tree/master/guestbook) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + +It also packages the [Bitnami Redis chart](https://github.com/kubernetes/charts/tree/master/stable/redis) which is required for bootstrapping a Redis deployment for the caching requirements of the guestbook application. + +## Prerequisites + +- Kubernetes 1.4+ with Beta APIs enabled +- PV provisioner support in the underlying infrastructure + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```console +$ helm install --name my-release stable/guestbook +``` + +The command deploys the guestbook on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. + +> **Tip**: List all releases using `helm list` + +## Uninstalling the Chart + +To uninstall/delete the `my-release` deployment: + +```console +$ helm delete my-release +``` + +The command removes all the Kubernetes components associated with the chart and deletes the release. + +## Configuration + +The following tables lists the configurable parameters of the WordPress chart and their default values. + +| Parameter | Description | Default | +| ------------------------------- | ------------------------------- | ---------------------------------------------------------- | +| `image` | apapche-php image | `google-samples/gb-frontend:{VERSION}` | +| `imagePullPolicy` | Image pull policy | `IfNotPresent` | +| `nodeSelector` | Node labels for pod assignment | `{}` | + +The above parameters map to the env variables defined in [bitnami/wordpress](http://github.com/bitnami/bitnami-docker-wordpress). For more information please refer to the [bitnami/wordpress](http://github.com/bitnami/bitnami-docker-wordpress) image documentation. + +Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, + +```console +$ helm install --name my-release \ + --set redis.usePassword=false \ + stable/guestbook +``` + +```console +$ helm install --name my-release -f values.yaml stable/guestbook +``` + +> **Tip**: You can use the default [values.yaml](values.yaml) + diff --git a/docs/examples/guestbook/charts/redis-1.1.4.tgz b/docs/examples/guestbook/charts/redis-1.1.4.tgz new file mode 100644 index 0000000000000000000000000000000000000000..a000e0fec494df5663edf3cc5d7ccba7e6a0a4f9 GIT binary patch literal 5671 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 Ne*tm%GS2{b005{~76||V literal 0 HcmV?d00001 diff --git a/docs/examples/guestbook/requirements.lock b/docs/examples/guestbook/requirements.lock new file mode 100644 index 000000000..d2e8910c5 --- /dev/null +++ b/docs/examples/guestbook/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: redis + repository: https://kubernetes-charts.storage.googleapis.com/ + version: 1.1.4 +digest: sha256:ca7a601363b96fed2bf4774ef8fbc5cdbdb91a0fb5bc083192072e39eee844ae +generated: 2017-12-31T21:26:54.89952-08:00 diff --git a/docs/examples/guestbook/requirements.yaml b/docs/examples/guestbook/requirements.yaml new file mode 100644 index 000000000..2c222e728 --- /dev/null +++ b/docs/examples/guestbook/requirements.yaml @@ -0,0 +1,7 @@ +dependencies: +- name: redis + version: 1.1.4 + repository: https://kubernetes-charts.storage.googleapis.com/ + condition: redis.enabled + tags: + - redis-database diff --git a/docs/examples/guestbook/templates/NOTES.txt b/docs/examples/guestbook/templates/NOTES.txt index 6f6a5060d..8317fa08d 100644 --- a/docs/examples/guestbook/templates/NOTES.txt +++ b/docs/examples/guestbook/templates/NOTES.txt @@ -4,14 +4,16 @@ http://{{ . }} {{- end }} {{- else if contains "NodePort" .Values.service.frontend.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "gbhelm.fullname" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "guestbook.fullname" . }}) export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo http://$NODE_IP:$NODE_PORT {{- else if contains "LoadBalancer" .Values.service.frontend.type }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get svc -w {{ template "gbhelm.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "gbhelm.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + You can watch the status of by running 'kubectl get svc -w {{ template "guestbook.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "guestbook.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') echo http://$SERVICE_IP:{{ .Values.service.externalPort }} -{{- else if contains "ClusterIP" .Values.service.frontend.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "gbhelm.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "guestbook.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }} {{- end }} diff --git a/docs/examples/guestbook/templates/_helpers.tpl b/docs/examples/guestbook/templates/_helpers.tpl index 3d9b261e2..bb1d9afcd 100644 --- a/docs/examples/guestbook/templates/_helpers.tpl +++ b/docs/examples/guestbook/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "gbhelm.name" -}} +{{- define "guestbook.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -10,7 +10,10 @@ Expand the name of the chart. 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 "gbhelm.fullname" -}} +{{- define "guestbook.fullname" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- define "redis.fullname" -}} +{{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}} +{{- end -}} diff --git a/docs/examples/guestbook/templates/deployment.yaml b/docs/examples/guestbook/templates/deployment.yaml new file mode 100644 index 000000000..e0f599f7b --- /dev/null +++ b/docs/examples/guestbook/templates/deployment.yaml @@ -0,0 +1,52 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: {{ template "guestbook.fullname" . }} + labels: + app: {{ template "guestbook.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + replicas: {{ .Values.replicaCount }} + template: + metadata: + labels: + app: {{ template "guestbook.name" . }} + release: {{ .Release.Name }} + spec: + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - containerPort: {{ .Values.service.frontend.internalPort }} + livenessProbe: + httpGet: + path: / + port: {{ .Values.service.frontend.internalPort }} + readinessProbe: + httpGet: + path: / + port: {{ .Values.service.frontend.internalPort }} + resources: +{{ toYaml .Values.resources | indent 12 }} + {{- if .Values.nodeSelector }} + nodeSelector: +{{ toYaml .Values.nodeSelector | indent 8 }} + {{- end }} + env: + - name: {{"GET_HOSTS_FROM"}} + value: {{"env"}} + - name: {{"REDIS_MASTER_SERVICE_HOST"}} + {{- if .Values.redis.enabled }} + value: {{ template "redis.fullname" . }} + {{- else }} + value: {{ .Values.externalDatabase.host | quote }} + {{- end }} + - name: {{"REDIS_SLAVE_SERVICE_HOST"}} + {{- if .Values.redis.enabled }} + value: {{ template "redis.fullname" . }} + {{- else }} + value: {{ .Values.externalDatabase.host | quote }} + {{- end }} diff --git a/docs/examples/guestbook/templates/frontend-deployment.yaml b/docs/examples/guestbook/templates/frontend-deployment.yaml deleted file mode 100644 index 7701c078d..000000000 --- a/docs/examples/guestbook/templates/frontend-deployment.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: {{ "frontend" }} - labels: - app: {{ template "gbhelm.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - replicas: {{ "1" }} - template: - metadata: - labels: - app: {{ "guestbook" }} - tier: {{"frontend"}} - release: {{ .Release.Name }} - spec: - containers: - - name: {{ "php-redis" }} - image: "{{ .Values.image.frontend_deployment.repository }}:{{ .Values.image.frontend_deployment.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - containerPort: {{ .Values.service.frontend.port }} - livenessProbe: - httpGet: - path: / - port: {{ .Values.service.frontend.port }} - readinessProbe: - httpGet: - path: / - port: {{ .Values.service.frontend.port }} - resources: - requests: - cpu: {{"100m"}} - memory: {{"100Mi"}} - env: - - name: {{"GET_HOSTS_FROM"}} - value: {{"dns"}} diff --git a/docs/examples/guestbook/templates/frontend-service.yaml b/docs/examples/guestbook/templates/frontend-service.yaml deleted file mode 100644 index a61d1bb7c..000000000 --- a/docs/examples/guestbook/templates/frontend-service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ "frontend" }} - labels: - app: {{ "guestbook" }} - tier: {{ "frontend" }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - type: {{ .Values.service.frontend.type }} - ports: - - port: {{.Values.service.frontend.port}} - selector: - app: {{.Values.service.frontend.selector.app}} - tier: {{.Values.service.frontend.selector.tier}} diff --git a/docs/examples/guestbook/templates/ingress.yaml b/docs/examples/guestbook/templates/ingress.yaml new file mode 100644 index 000000000..108b2f03d --- /dev/null +++ b/docs/examples/guestbook/templates/ingress.yaml @@ -0,0 +1,32 @@ +{{- if .Values.ingress.enabled -}} +{{- $serviceName := include "guestbook.fullname" . -}} +{{- $servicePort := .Values.service.externalPort -}} +apiVersion: extensions/v1beta1 +kind: Ingress +metadata: + name: {{ template "guestbook.fullname" . }} + labels: + app: {{ template "guestbook.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + annotations: + {{- range $key, $value := .Values.ingress.annotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} +spec: + rules: + {{- range $host := .Values.ingress.hosts }} + - host: {{ $host }} + http: + paths: + - path: / + backend: + serviceName: {{ $serviceName }} + servicePort: {{ $servicePort }} + {{- end -}} + {{- if .Values.ingress.tls }} + tls: +{{ toYaml .Values.ingress.tls | indent 4 }} + {{- end -}} +{{- end -}} diff --git a/docs/examples/guestbook/templates/redis-master-deployment.yaml b/docs/examples/guestbook/templates/redis-master-deployment.yaml deleted file mode 100644 index fa60f9f10..000000000 --- a/docs/examples/guestbook/templates/redis-master-deployment.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: {{ "redis-master" }} - labels: - app: {{ template "gbhelm.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - replicas: {{ "1" }} - template: - metadata: - labels: - app: {{ "redis" }} - tier: {{"backend"}} - role: {{"master"}} - release: {{ .Release.Name }} - spec: - containers: - - name: {{ "master" }} - image: "{{ .Values.image.redis_master.repository }}:{{ .Values.image.redis_master.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - containerPort: {{ "6379" }} - resources: - requests: - cpu: {{"100m"}} - memory: {{"100Mi"}} diff --git a/docs/examples/guestbook/templates/redis-master-service.yaml b/docs/examples/guestbook/templates/redis-master-service.yaml deleted file mode 100644 index cc4aa5717..000000000 --- a/docs/examples/guestbook/templates/redis-master-service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ "redis-master" }} - labels: - app: {{ "redis" }} - role: {{ "master" }} - tier: {{ "backend" }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - ports: - - port: {{ .Values.service.redis_master.port }} - targetPort: {{ .Values.service.redis_master.targetPort }} - selector: - app: {{ .Values.service.redis_master.selector.app}} - role: {{ .Values.service.redis_master.selector.role }} - tier: {{ .Values.service.redis_master.selector.tier }} diff --git a/docs/examples/guestbook/templates/redis-slave-deployment.yaml b/docs/examples/guestbook/templates/redis-slave-deployment.yaml deleted file mode 100644 index fa313d623..000000000 --- a/docs/examples/guestbook/templates/redis-slave-deployment.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: {{ "redis-slave" }} - labels: - app: {{ template "gbhelm.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - replicas: {{ "1" }} - template: - metadata: - labels: - app: {{ "redis" }} - tier: {{"backend"}} - role: {{"slave"}} - release: {{ .Release.Name }} - spec: - containers: - - name: {{ "slave" }} - image: "{{ .Values.image.redis_slave.repository }}:{{ .Values.image.redis_slave.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - containerPort: {{ "6379" }} - resources: - requests: - cpu: {{"100m"}} - memory: {{"100Mi"}} - env: - - name: {{"GET_HOSTS_FROM"}} - value: {{"dns"}} diff --git a/docs/examples/guestbook/templates/redis-slave-service.yaml b/docs/examples/guestbook/templates/redis-slave-service.yaml deleted file mode 100644 index bc128ec5f..000000000 --- a/docs/examples/guestbook/templates/redis-slave-service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ "redis-slave" }} - labels: - app: {{ "redis" }} - role: {{ "slave" }} - tier: {{ "backend" }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - ports: - - port: {{.Values.service.redis_slave.port}} - selector: - app: {{.Values.service.redis_slave.selector.app}} - role: {{.Values.service.redis_slave.selector.role}} - tier: {{.Values.service.redis_slave.selector.tier}} diff --git a/docs/examples/guestbook/templates/service.yaml b/docs/examples/guestbook/templates/service.yaml new file mode 100644 index 000000000..55aa34e48 --- /dev/null +++ b/docs/examples/guestbook/templates/service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ template "guestbook.fullname" . }} + labels: + app: {{ template "guestbook.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + type: {{ .Values.service.frontend.type }} + ports: + - port: {{ .Values.service.frontend.externalPort }} + targetPort: {{ .Values.service.frontend.internalPort }} + protocol: TCP + name: {{ .Values.service.name }} + selector: + app: {{ template "guestbook.name" . }} + release: {{ .Release.Name }} diff --git a/docs/examples/guestbook/values.yaml b/docs/examples/guestbook/values.yaml index ffa694fdf..de89ccca4 100644 --- a/docs/examples/guestbook/values.yaml +++ b/docs/examples/guestbook/values.yaml @@ -1,43 +1,24 @@ -# Default values for mychart. +# Default values for guestbook. # This is a YAML-formatted file. # Declare variables to be passed into your templates. replicaCount: 1 image: - frontend_deployment: - repository: gcr.io/google-samples/gb-frontend - tag: v4 - redis_master: - repository: gcr.io/google_containers/redis - tag: e2e - redis_slave: - repository: gcr.io/google_samples/gb-redisslave - tag: v1 + repository: gcr.io/google-samples/gb-frontend + tag: v4 pullPolicy: IfNotPresent service: frontend: type: LoadBalancer - port: 80 + externalPort: 80 + internalPort: 80 selector: app: guestbook tier: frontend - redis_master: - port: 6379 - targetPort: 6379 - selector: - app: redis - role: master - tier: backend - redis_slave: - port: 6379 - selector: - app: redis - role: slave - tier: backend ingress: enabled: false # Used to create an Ingress record. - hosts: - - chart-example.local + #hosts: + # - chart-example.local annotations: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" @@ -46,14 +27,18 @@ ingress: # - secretName: chart-example-tls # hosts: # - chart-example.local -resources: {} +resources: # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi +redis: + enabled: true +externalDatabase: + host: localhost