From: Adam A.G. Shamblin Date: Fri, 5 Feb 2021 22:57:29 +0000 (-0700) Subject: Update to use a helm chart X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=3939665014427c6711b3a8a76bf76992cb24250a;p=letters.git Update to use a helm chart --- diff --git a/charts/letters/.helmignore b/charts/letters/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/charts/letters/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/letters/Chart.yaml b/charts/letters/Chart.yaml new file mode 100644 index 0000000..cb040b1 --- /dev/null +++ b/charts/letters/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: letters +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. +# It is recommended to use it with quotes. +appVersion: "1.16.0" diff --git a/charts/letters/templates/NOTES.txt b/charts/letters/templates/NOTES.txt new file mode 100644 index 0000000..eda5c70 --- /dev/null +++ b/charts/letters/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "letters.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.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 --namespace {{ .Release.Namespace }} svc -w {{ include "letters.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "letters.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "letters.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/charts/letters/templates/_helpers.tpl b/charts/letters/templates/_helpers.tpl new file mode 100644 index 0000000..3687822 --- /dev/null +++ b/charts/letters/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "letters.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +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). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "letters.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "letters.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "letters.labels" -}} +helm.sh/chart: {{ include "letters.chart" . }} +{{ include "letters.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "letters.selectorLabels" -}} +app.kubernetes.io/name: {{ include "letters.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "letters.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "letters.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/charts/letters/templates/deployment.yaml b/charts/letters/templates/deployment.yaml new file mode 100644 index 0000000..8793f12 --- /dev/null +++ b/charts/letters/templates/deployment.yaml @@ -0,0 +1,61 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "letters.fullname" . }} + labels: + {{- include "letters.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "letters.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "letters.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "letters.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: 80 + protocol: TCP + livenessProbe: + httpGet: + path: / + port: http + readinessProbe: + httpGet: + path: / + port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/letters/templates/service.yaml b/charts/letters/templates/service.yaml new file mode 100644 index 0000000..3565bb0 --- /dev/null +++ b/charts/letters/templates/service.yaml @@ -0,0 +1,21 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "letters.fullname" . }} + labels: + {{- include "letters.labels" . | nindent 4 }} + annotations: + {{- range $key, $val := .Values.service.annotations }} + {{ $key }}: {{ $val | quote }} + {{- end }} +spec: + type: {{ .Values.service.type }} + ports: + {{- range .Values.service.ports }} + - name: {{ .name }} + protocol: {{ .protocol }} + port: {{ .port }} + targetPort: {{ .targetPort }} + {{- end }} + selector: + {{- include "letters.selectorLabels" . | nindent 4 }} diff --git a/charts/letters/templates/serviceaccount.yaml b/charts/letters/templates/serviceaccount.yaml new file mode 100644 index 0000000..834c14c --- /dev/null +++ b/charts/letters/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "letters.serviceAccountName" . }} + labels: + {{- include "letters.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/charts/letters/templates/tests/test-connection.yaml b/charts/letters/templates/tests/test-connection.yaml new file mode 100644 index 0000000..fb01189 --- /dev/null +++ b/charts/letters/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "letters.fullname" . }}-test-connection" + labels: + {{- include "letters.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "letters.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/charts/letters/values.yaml b/charts/letters/values.yaml new file mode 100644 index 0000000..142b4e1 --- /dev/null +++ b/charts/letters/values.yaml @@ -0,0 +1,76 @@ +# Default values for letters. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: vexingworkshop/letters + pullPolicy: Always + tag: "latest" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +service: + type: LoadBalancer + annotations: + service.beta.kubernetes.io/do-loadbalancer-algorithm: "least_connections" + service.beta.kubernetes.io/do-loadbalancer-healthcheck-protocol: "http" + service.beta.kubernetes.io/do-loadbalancer-healthcheck-path: "/" + service.beta.kubernetes.io/do-loadbalancer-healthcheck-check-interval-seconds: "3" + service.beta.kubernetes.io/do-loadbalancer-healthcheck-response-timeout-seconds: "5" + service.beta.kubernetes.io/do-loadbalancer-healthcheck-unhealthy-threshold: "3" + service.beta.kubernetes.io/do-loadbalancer-healthcheck-healthy-threshold: "5" + service.beta.kubernetes.io/do-loadbalancer-protocol: "http" + service.beta.kubernetes.io/do-loadbalancer-algorithm: "round_robin" + service.beta.kubernetes.io/do-loadbalancer-certificate-id: "28d85d51-a9dd-441b-8f23-299847e1eb85" + service.beta.kubernetes.io/do-loadbalancer-redirect-http-to-https: "true" + ports: + - name: http + protocol: TCP + port: 80 + targetPort: 80 + - name: https + protocol: TCP + port: 443 + targetPort: 80 + + +ingress: + enabled: false + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: [] + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/hack/k8s/deployment.yaml b/hack/k8s/deployment.yaml deleted file mode 100644 index 42829c8..0000000 --- a/hack/k8s/deployment.yaml +++ /dev/null @@ -1,50 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: letters - annotations: - service.beta.kubernetes.io/do-loadbalancer-algorithm: "least_connections" - service.beta.kubernetes.io/do-loadbalancer-healthcheck-protocol: "http" - service.beta.kubernetes.io/do-loadbalancer-healthcheck-path: "/" - service.beta.kubernetes.io/do-loadbalancer-healthcheck-check-interval-seconds: "3" - service.beta.kubernetes.io/do-loadbalancer-healthcheck-response-timeout-seconds: "5" - service.beta.kubernetes.io/do-loadbalancer-healthcheck-unhealthy-threshold: "3" - service.beta.kubernetes.io/do-loadbalancer-healthcheck-healthy-threshold: "5" - service.beta.kubernetes.io/do-loadbalancer-protocol: "http" - service.beta.kubernetes.io/do-loadbalancer-algorithm: "round_robin" - service.beta.kubernetes.io/do-loadbalancer-certificate-id: "3792d0ca-7583-4f01-a7bf-69704f48129f" - service.beta.kubernetes.io/do-loadbalancer-redirect-http-to-https: "true" -spec: - type: LoadBalancer - selector: - app: letters - ports: - - name: http - protocol: TCP - port: 80 - targetPort: 80 - - name: https - protocol: TCP - port: 443 - targetPort: 80 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: letters-deployment -spec: - replicas: 1 - selector: - matchLabels: - app: letters - template: - metadata: - labels: - app: letters - spec: - containers: - - name: letters - image: vexingworkshop/letters:latest - imagePullPolicy: Always - ports: - - containerPort: 80