From 3c74acdbccc31c081cca3339a3b9d915e1c2e052 Mon Sep 17 00:00:00 2001
From: Jonathan Gazeley <me@jonathangazeley.com>
Date: Thu, 21 Dec 2023 09:02:45 +0000
Subject: [PATCH 1/5] Helm create

---
 charts/liturgical-colour/.helmignore          | 23 +++++
 charts/liturgical-colour/Chart.yaml           | 24 +++++
 charts/liturgical-colour/templates/NOTES.txt  | 22 +++++
 .../liturgical-colour/templates/_helpers.tpl  | 62 ++++++++++++
 .../templates/deployment.yaml                 | 72 ++++++++++++++
 charts/liturgical-colour/templates/hpa.yaml   | 32 ++++++
 .../liturgical-colour/templates/ingress.yaml  | 61 ++++++++++++
 .../liturgical-colour/templates/service.yaml  | 15 +++
 .../templates/serviceaccount.yaml             | 13 +++
 .../templates/tests/test-connection.yaml      | 15 +++
 charts/liturgical-colour/values.yaml          | 98 +++++++++++++++++++
 11 files changed, 437 insertions(+)
 create mode 100644 charts/liturgical-colour/.helmignore
 create mode 100644 charts/liturgical-colour/Chart.yaml
 create mode 100644 charts/liturgical-colour/templates/NOTES.txt
 create mode 100644 charts/liturgical-colour/templates/_helpers.tpl
 create mode 100644 charts/liturgical-colour/templates/deployment.yaml
 create mode 100644 charts/liturgical-colour/templates/hpa.yaml
 create mode 100644 charts/liturgical-colour/templates/ingress.yaml
 create mode 100644 charts/liturgical-colour/templates/service.yaml
 create mode 100644 charts/liturgical-colour/templates/serviceaccount.yaml
 create mode 100644 charts/liturgical-colour/templates/tests/test-connection.yaml
 create mode 100644 charts/liturgical-colour/values.yaml

diff --git a/charts/liturgical-colour/.helmignore b/charts/liturgical-colour/.helmignore
new file mode 100644
index 00000000..0e8a0eb3
--- /dev/null
+++ b/charts/liturgical-colour/.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/liturgical-colour/Chart.yaml b/charts/liturgical-colour/Chart.yaml
new file mode 100644
index 00000000..65a12389
--- /dev/null
+++ b/charts/liturgical-colour/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: liturgical-colour
+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/liturgical-colour/templates/NOTES.txt b/charts/liturgical-colour/templates/NOTES.txt
new file mode 100644
index 00000000..ac4623cd
--- /dev/null
+++ b/charts/liturgical-colour/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 "liturgical-colour.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 "liturgical-colour.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "liturgical-colour.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 "liturgical-colour.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/liturgical-colour/templates/_helpers.tpl b/charts/liturgical-colour/templates/_helpers.tpl
new file mode 100644
index 00000000..ab32c57b
--- /dev/null
+++ b/charts/liturgical-colour/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "liturgical-colour.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 "liturgical-colour.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 "liturgical-colour.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "liturgical-colour.labels" -}}
+helm.sh/chart: {{ include "liturgical-colour.chart" . }}
+{{ include "liturgical-colour.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "liturgical-colour.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "liturgical-colour.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "liturgical-colour.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "liturgical-colour.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/charts/liturgical-colour/templates/deployment.yaml b/charts/liturgical-colour/templates/deployment.yaml
new file mode 100644
index 00000000..537fada3
--- /dev/null
+++ b/charts/liturgical-colour/templates/deployment.yaml
@@ -0,0 +1,72 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "liturgical-colour.fullname" . }}
+  labels:
+    {{- include "liturgical-colour.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "liturgical-colour.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "liturgical-colour.labels" . | nindent 8 }}
+	{{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "liturgical-colour.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: {{ .Values.service.port }}
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+      {{- with .Values.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- 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/liturgical-colour/templates/hpa.yaml b/charts/liturgical-colour/templates/hpa.yaml
new file mode 100644
index 00000000..2d81366a
--- /dev/null
+++ b/charts/liturgical-colour/templates/hpa.yaml
@@ -0,0 +1,32 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "liturgical-colour.fullname" . }}
+  labels:
+    {{- include "liturgical-colour.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "liturgical-colour.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/charts/liturgical-colour/templates/ingress.yaml b/charts/liturgical-colour/templates/ingress.yaml
new file mode 100644
index 00000000..8fa72e49
--- /dev/null
+++ b/charts/liturgical-colour/templates/ingress.yaml
@@ -0,0 +1,61 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "liturgical-colour.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "liturgical-colour.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
+            backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
+          {{- end }}
+    {{- end }}
+{{- end }}
diff --git a/charts/liturgical-colour/templates/service.yaml b/charts/liturgical-colour/templates/service.yaml
new file mode 100644
index 00000000..8647d807
--- /dev/null
+++ b/charts/liturgical-colour/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "liturgical-colour.fullname" . }}
+  labels:
+    {{- include "liturgical-colour.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "liturgical-colour.selectorLabels" . | nindent 4 }}
diff --git a/charts/liturgical-colour/templates/serviceaccount.yaml b/charts/liturgical-colour/templates/serviceaccount.yaml
new file mode 100644
index 00000000..33598c61
--- /dev/null
+++ b/charts/liturgical-colour/templates/serviceaccount.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "liturgical-colour.serviceAccountName" . }}
+  labels:
+    {{- include "liturgical-colour.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
+{{- end }}
diff --git a/charts/liturgical-colour/templates/tests/test-connection.yaml b/charts/liturgical-colour/templates/tests/test-connection.yaml
new file mode 100644
index 00000000..7fed8d28
--- /dev/null
+++ b/charts/liturgical-colour/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "liturgical-colour.fullname" . }}-test-connection"
+  labels:
+    {{- include "liturgical-colour.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['{{ include "liturgical-colour.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/charts/liturgical-colour/values.yaml b/charts/liturgical-colour/values.yaml
new file mode 100644
index 00000000..a6faa6c9
--- /dev/null
+++ b/charts/liturgical-colour/values.yaml
@@ -0,0 +1,98 @@
+# Default values for liturgical-colour.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: nginx
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Automatically mount a ServiceAccount's API credentials?
+  automount: 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: ""
+
+podAnnotations: {}
+podLabels: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  className: ""
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+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
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+# Additional volumes on the output Deployment definition.
+volumes: []
+# - name: foo
+#   secret:
+#     secretName: mysecret
+#     optional: false
+
+# Additional volumeMounts on the output Deployment definition.
+volumeMounts: []
+# - name: foo
+#   mountPath: "/etc/foo"
+#   readOnly: true
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}

From 5cbaf51e5a4f438ead3b178c3fb3f3c2ab5e427f Mon Sep 17 00:00:00 2001
From: Jonathan Gazeley <me@jonathangazeley.com>
Date: Thu, 21 Dec 2023 09:06:03 +0000
Subject: [PATCH 2/5] Drop autoscaling

---
 .../templates/deployment.yaml                 |  2 --
 charts/liturgical-colour/templates/hpa.yaml   | 32 -------------------
 charts/liturgical-colour/values.yaml          |  7 ----
 3 files changed, 41 deletions(-)
 delete mode 100644 charts/liturgical-colour/templates/hpa.yaml

diff --git a/charts/liturgical-colour/templates/deployment.yaml b/charts/liturgical-colour/templates/deployment.yaml
index 537fada3..c7cf34a7 100644
--- a/charts/liturgical-colour/templates/deployment.yaml
+++ b/charts/liturgical-colour/templates/deployment.yaml
@@ -5,9 +5,7 @@ metadata:
   labels:
     {{- include "liturgical-colour.labels" . | nindent 4 }}
 spec:
-  {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
-  {{- end }}
   selector:
     matchLabels:
       {{- include "liturgical-colour.selectorLabels" . | nindent 6 }}
diff --git a/charts/liturgical-colour/templates/hpa.yaml b/charts/liturgical-colour/templates/hpa.yaml
deleted file mode 100644
index 2d81366a..00000000
--- a/charts/liturgical-colour/templates/hpa.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-{{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "liturgical-colour.fullname" . }}
-  labels:
-    {{- include "liturgical-colour.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "liturgical-colour.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
diff --git a/charts/liturgical-colour/values.yaml b/charts/liturgical-colour/values.yaml
index a6faa6c9..541c8a7b 100644
--- a/charts/liturgical-colour/values.yaml
+++ b/charts/liturgical-colour/values.yaml
@@ -71,13 +71,6 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
 # Additional volumes on the output Deployment definition.
 volumes: []
 # - name: foo

From f2bc1ee6586af958c34fdd67ddce7e2767e08fbd Mon Sep 17 00:00:00 2001
From: Jonathan Gazeley <me@jonathangazeley.com>
Date: Thu, 21 Dec 2023 09:20:29 +0000
Subject: [PATCH 3/5] Minimal chart

---
 charts/liturgical-colour/Chart.yaml  | 23 ++++++++++++++++++++---
 charts/liturgical-colour/values.yaml |  4 ++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/charts/liturgical-colour/Chart.yaml b/charts/liturgical-colour/Chart.yaml
index 65a12389..c301a652 100644
--- a/charts/liturgical-colour/Chart.yaml
+++ b/charts/liturgical-colour/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: liturgical-colour
-description: A Helm chart for Kubernetes
+description: A simple app to display the current liturgical colour of the Church of England
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -15,10 +15,27 @@ 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
+version: 0.0.1
 
 # 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"
+appVersion: "0.0.1"
+keywords:
+  - liturgical
+  - calendar
+  - church
+  - anglican
+home: https://github.com/djjudas21/charts/tree/master/charts/liturgical-colour
+icon: https://www.churchofengland.org/themes/custom/cofe/favicon.ico
+sources:
+  - https://github.com/djjudas21/liturgical-colour-app
+  - https://hub.docker.com/r/djjudas21/liturgical-colour-app
+maintainers:
+  - name: djjudas21
+    email: djjudas21@users.noreply.github.com
+annotations:
+  artifacthub.io/changes: |-
+    - kind: changed
+      description: Initial release
diff --git a/charts/liturgical-colour/values.yaml b/charts/liturgical-colour/values.yaml
index 541c8a7b..63d722d3 100644
--- a/charts/liturgical-colour/values.yaml
+++ b/charts/liturgical-colour/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: nginx
+  repository: djjudas21/liturgical-colour-app
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -41,7 +41,7 @@ securityContext: {}
 
 service:
   type: ClusterIP
-  port: 80
+  port: 5000
 
 ingress:
   enabled: false

From 3f1a0ce6a7f44246b00a8e162806a886b982f84d Mon Sep 17 00:00:00 2001
From: Jonathan Gazeley <me@jonathangazeley.com>
Date: Thu, 21 Dec 2023 09:22:07 +0000
Subject: [PATCH 4/5] Drop volumes

---
 charts/liturgical-colour/templates/deployment.yaml |  8 --------
 charts/liturgical-colour/values.yaml               | 13 -------------
 2 files changed, 21 deletions(-)

diff --git a/charts/liturgical-colour/templates/deployment.yaml b/charts/liturgical-colour/templates/deployment.yaml
index c7cf34a7..91964940 100644
--- a/charts/liturgical-colour/templates/deployment.yaml
+++ b/charts/liturgical-colour/templates/deployment.yaml
@@ -48,14 +48,6 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-          {{- with .Values.volumeMounts }}
-          volumeMounts:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-      {{- with .Values.volumes }}
-      volumes:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/liturgical-colour/values.yaml b/charts/liturgical-colour/values.yaml
index 63d722d3..2a332975 100644
--- a/charts/liturgical-colour/values.yaml
+++ b/charts/liturgical-colour/values.yaml
@@ -71,19 +71,6 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
-# Additional volumes on the output Deployment definition.
-volumes: []
-# - name: foo
-#   secret:
-#     secretName: mysecret
-#     optional: false
-
-# Additional volumeMounts on the output Deployment definition.
-volumeMounts: []
-# - name: foo
-#   mountPath: "/etc/foo"
-#   readOnly: true
-
 nodeSelector: {}
 
 tolerations: []

From 942c31700c847a14f059809e9df38ece68deaf62 Mon Sep 17 00:00:00 2001
From: Jonathan Gazeley <me@jonathangazeley.com>
Date: Thu, 21 Dec 2023 10:21:29 +0000
Subject: [PATCH 5/5] Drop tests because they don't work

---
 .github/linters/ct.yaml                           |  1 +
 .../templates/tests/test-connection.yaml          | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 charts/liturgical-colour/templates/tests/test-connection.yaml

diff --git a/.github/linters/ct.yaml b/.github/linters/ct.yaml
index cdb1b362..df65b95b 100644
--- a/.github/linters/ct.yaml
+++ b/.github/linters/ct.yaml
@@ -17,3 +17,4 @@ excluded-charts:
   - autonodelabel
   - openssh-server
   - connectbox-exporter
+  - liturgical-colour
diff --git a/charts/liturgical-colour/templates/tests/test-connection.yaml b/charts/liturgical-colour/templates/tests/test-connection.yaml
deleted file mode 100644
index 7fed8d28..00000000
--- a/charts/liturgical-colour/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "liturgical-colour.fullname" . }}-test-connection"
-  labels:
-    {{- include "liturgical-colour.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "liturgical-colour.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never