From 35d2dd8c0350c8034f5a5d518a6271e610c42ee2 Mon Sep 17 00:00:00 2001 From: Flea Flicker Date: Fri, 27 Mar 2026 17:24:01 +0000 Subject: [PATCH 01/15] Add Helm chart scaffold with Chart.yaml, values.yaml, and helpers --- charts/groombook/.helmignore | 10 ++ charts/groombook/Chart.yaml | 22 ++++ charts/groombook/templates/_helpers.tpl | 121 +++++++++++++++++++++ charts/groombook/values.yaml | 134 ++++++++++++++++++++++++ 4 files changed, 287 insertions(+) create mode 100644 charts/groombook/.helmignore create mode 100644 charts/groombook/Chart.yaml create mode 100644 charts/groombook/templates/_helpers.tpl create mode 100644 charts/groombook/values.yaml diff --git a/charts/groombook/.helmignore b/charts/groombook/.helmignore new file mode 100644 index 0000000..db05a8e --- /dev/null +++ b/charts/groombook/.helmignore @@ -0,0 +1,10 @@ +.DS_Store +*.swp +*.bak +*.tmp +*.orig +*~ +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/groombook/Chart.yaml b/charts/groombook/Chart.yaml new file mode 100644 index 0000000..8a57063 --- /dev/null +++ b/charts/groombook/Chart.yaml @@ -0,0 +1,22 @@ +apiVersion: v2 +name: groombook +description: Open source pet grooming business management & CRM +type: application +version: 0.1.0 +appVersion: "2026.03.19-ea54506" +home: https://groombook.github.io +sources: + - https://github.com/groombook/groombook +maintainers: + - name: GroomBook + url: https://github.com/groombook +keywords: + - groombook + - pet-grooming + - scheduling + - crm +dependencies: + - name: postgresql + version: "16.x.x" + repository: https://charts.bitnami.com/bitnami + condition: postgresql.integrated.enabled diff --git a/charts/groombook/templates/_helpers.tpl b/charts/groombook/templates/_helpers.tpl new file mode 100644 index 0000000..e900656 --- /dev/null +++ b/charts/groombook/templates/_helpers.tpl @@ -0,0 +1,121 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "groombook.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +*/}} +{{- define "groombook.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 "groombook.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "groombook.labels" -}} +helm.sh/chart: {{ include "groombook.chart" . }} +{{ include "groombook.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "groombook.selectorLabels" -}} +app.kubernetes.io/name: {{ include "groombook.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Component labels (extends common labels with component name) +*/}} +{{- define "groombook.componentLabels" -}} +{{ include "groombook.labels" . }} +app.kubernetes.io/component: {{ .component }} +{{- end }} + +{{/* +Component selector labels +*/}} +{{- define "groombook.componentSelectorLabels" -}} +{{ include "groombook.selectorLabels" . }} +app.kubernetes.io/component: {{ .component }} +{{- end }} + +{{/* +Service account name +*/}} +{{- define "groombook.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "groombook.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} + +{{/* +API image reference +*/}} +{{- define "groombook.apiImage" -}} +{{- printf "%s:%s" .Values.api.image.repository (default .Chart.AppVersion .Values.api.image.tag) }} +{{- end }} + +{{/* +Web image reference +*/}} +{{- define "groombook.webImage" -}} +{{- printf "%s:%s" .Values.web.image.repository (default .Chart.AppVersion .Values.web.image.tag) }} +{{- end }} + +{{/* +Migrate image reference +*/}} +{{- define "groombook.migrateImage" -}} +{{- printf "%s:%s" .Values.migrate.image.repository (default .Chart.AppVersion .Values.migrate.image.tag) }} +{{- end }} + +{{/* +Database URL — differs by postgresql.mode +Integrated: construct from Bitnami subchart values +Operator: read from credentialsSecret +*/}} +{{- define "groombook.databaseSecretName" -}} +{{- if eq .Values.postgresql.mode "operator" }} +{{- required "postgresql.operator.credentialsSecret is required in operator mode" .Values.postgresql.operator.credentialsSecret }} +{{- else }} +{{- include "groombook.fullname" . }}-db-credentials +{{- end }} +{{- end }} + +{{/* +Database URL secret key +*/}} +{{- define "groombook.databaseSecretKey" -}} +{{- if eq .Values.postgresql.mode "operator" -}} +uri +{{- else -}} +database-url +{{- end -}} +{{- end }} diff --git a/charts/groombook/values.yaml b/charts/groombook/values.yaml new file mode 100644 index 0000000..783ed38 --- /dev/null +++ b/charts/groombook/values.yaml @@ -0,0 +1,134 @@ +# -- API deployment +api: + image: + repository: ghcr.io/groombook/api + tag: "" # defaults to chart appVersion + pullPolicy: IfNotPresent + replicas: 1 + resources: + requests: + cpu: 100m + memory: 128Mi + limits: + cpu: 500m + memory: 512Mi + env: + nodeEnv: production + authDisabled: false + corsOrigin: "" + oidcIssuer: "" + oidcAudience: groombook + port: "3000" + service: + type: ClusterIP + port: 3000 + +# -- Web deployment (nginx) +web: + image: + repository: ghcr.io/groombook/web + tag: "" # defaults to chart appVersion + pullPolicy: IfNotPresent + replicas: 1 + resources: + requests: + cpu: 50m + memory: 64Mi + limits: + cpu: 200m + memory: 128Mi + service: + type: ClusterIP + port: 80 + +# -- Database migration job (runs as pre-install/pre-upgrade hook) +migrate: + enabled: true + image: + repository: ghcr.io/groombook/api + tag: "" # same image as api + pullPolicy: IfNotPresent + backoffLimit: 3 + +# -- PostgreSQL configuration +postgresql: + # Choose deployment mode: 'integrated' uses Bitnami subchart, 'operator' creates a CNPG Cluster CR + mode: integrated + integrated: + enabled: true # set to false if mode is 'operator' + auth: + database: groombook + username: groombook + password: "" # auto-generated if empty + existingSecret: "" + primary: + persistence: + size: 8Gi + operator: + instances: 3 + storage: + size: 10Gi + storageClass: "" + bootstrap: + database: groombook + owner: groombook + credentialsSecret: "" # must pre-exist with key 'uri' + monitoring: + enabled: true + +# -- DragonflyDB (cache/pub-sub) — optional, disabled by default +dragonfly: + enabled: false + # Choose deployment mode: 'integrated' deploys a StatefulSet, 'operator' creates a Dragonfly CR + mode: integrated + integrated: + image: + repository: docker.dragonflydb.io/dragonflydb/dragonfly + tag: latest + pullPolicy: IfNotPresent + replicas: 1 + resources: + requests: + cpu: 100m + memory: 128Mi + limits: + cpu: 500m + memory: 512Mi + storage: + size: 1Gi + storageClass: "" + service: + type: ClusterIP + port: 6379 + operator: + replicas: 1 + resources: {} + +# -- Ingress configuration +ingress: + enabled: false + className: "" + annotations: {} + hosts: + - host: groombook.example.com + paths: + - path: / + pathType: Prefix + service: web + - path: /api + pathType: Prefix + service: api + tls: [] + +# -- Service account +serviceAccount: + create: true + name: "" + annotations: {} + +# -- Global image pull secrets +imagePullSecrets: [] + +# -- Override chart name +nameOverride: "" +fullnameOverride: "" -- 2.52.0 From cfdf0186bb7da0d0639e13c7620fbedc4658004e Mon Sep 17 00:00:00 2001 From: Flea Flicker Date: Fri, 27 Mar 2026 17:25:30 +0000 Subject: [PATCH 02/15] Add API deployment, service, and db-credentials secret templates --- .../groombook/templates/api-deployment.yaml | 70 +++++++++++++++++++ charts/groombook/templates/api-service.yaml | 17 +++++ .../templates/db-credentials-secret.yaml | 11 +++ 3 files changed, 98 insertions(+) create mode 100644 charts/groombook/templates/api-deployment.yaml create mode 100644 charts/groombook/templates/api-service.yaml create mode 100644 charts/groombook/templates/db-credentials-secret.yaml diff --git a/charts/groombook/templates/api-deployment.yaml b/charts/groombook/templates/api-deployment.yaml new file mode 100644 index 0000000..8e118d4 --- /dev/null +++ b/charts/groombook/templates/api-deployment.yaml @@ -0,0 +1,70 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "groombook.fullname" . }}-api + labels: + {{- include "groombook.labels" . | nindent 4 }} + app.kubernetes.io/component: api +spec: + replicas: {{ .Values.api.replicas }} + selector: + matchLabels: + {{- include "groombook.selectorLabels" . | nindent 6 }} + app.kubernetes.io/component: api + template: + metadata: + labels: + {{- include "groombook.selectorLabels" . | nindent 8 }} + app.kubernetes.io/component: api + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "groombook.serviceAccountName" . }} + containers: + - name: api + image: {{ include "groombook.apiImage" . }} + imagePullPolicy: {{ .Values.api.image.pullPolicy }} + ports: + - containerPort: 3000 + name: http + protocol: TCP + env: + - name: PORT + value: {{ .Values.api.env.port | quote }} + - name: NODE_ENV + value: {{ .Values.api.env.nodeEnv | quote }} + - name: AUTH_DISABLED + value: {{ .Values.api.env.authDisabled | quote }} + {{- if .Values.api.env.corsOrigin }} + - name: CORS_ORIGIN + value: {{ .Values.api.env.corsOrigin | quote }} + {{- end }} + {{- if .Values.api.env.oidcIssuer }} + - name: OIDC_ISSUER + value: {{ .Values.api.env.oidcIssuer | quote }} + {{- end }} + {{- if .Values.api.env.oidcAudience }} + - name: OIDC_AUDIENCE + value: {{ .Values.api.env.oidcAudience | quote }} + {{- end }} + - name: DATABASE_URL + valueFrom: + secretKeyRef: + name: {{ include "groombook.databaseSecretName" . }} + key: {{ include "groombook.databaseSecretKey" . }} + resources: + {{- toYaml .Values.api.resources | nindent 12 }} + readinessProbe: + httpGet: + path: /health + port: 3000 + initialDelaySeconds: 10 + periodSeconds: 10 + livenessProbe: + httpGet: + path: /health + port: 3000 + initialDelaySeconds: 15 + periodSeconds: 30 \ No newline at end of file diff --git a/charts/groombook/templates/api-service.yaml b/charts/groombook/templates/api-service.yaml new file mode 100644 index 0000000..231e8ca --- /dev/null +++ b/charts/groombook/templates/api-service.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "groombook.fullname" . }}-api + labels: + {{- include "groombook.labels" . | nindent 4 }} + app.kubernetes.io/component: api +spec: + type: {{ .Values.api.service.type }} + selector: + {{- include "groombook.selectorLabels" . | nindent 4 }} + app.kubernetes.io/component: api + ports: + - port: {{ .Values.api.service.port }} + targetPort: 3000 + protocol: TCP + name: http \ No newline at end of file diff --git a/charts/groombook/templates/db-credentials-secret.yaml b/charts/groombook/templates/db-credentials-secret.yaml new file mode 100644 index 0000000..bb35344 --- /dev/null +++ b/charts/groombook/templates/db-credentials-secret.yaml @@ -0,0 +1,11 @@ +{{- if eq .Values.postgresql.mode "integrated" }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "groombook.fullname" . }}-db-credentials + labels: + {{- include "groombook.labels" . | nindent 4 }} +type: Opaque +stringData: + database-url: {{ printf "postgres://%s:%s@%s-postgresql:5432/%s" .Values.postgresql.integrated.auth.username (default (randAlphaNum 16) .Values.postgresql.integrated.auth.password) (include "groombook.fullname" .) .Values.postgresql.integrated.auth.database | quote }} +{{- end }} \ No newline at end of file -- 2.52.0 From b78787a9e16fb735084dfb64e8c2e64e7a388ee3 Mon Sep 17 00:00:00 2001 From: "groombook-engineer[bot]" <269742240+groombook-engineer[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 17:29:40 +0000 Subject: [PATCH 03/15] Add migrate-job Helm hook --- charts/groombook/templates/migrate-job.yaml | 38 +++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 charts/groombook/templates/migrate-job.yaml diff --git a/charts/groombook/templates/migrate-job.yaml b/charts/groombook/templates/migrate-job.yaml new file mode 100644 index 0000000..ef8d151 --- /dev/null +++ b/charts/groombook/templates/migrate-job.yaml @@ -0,0 +1,38 @@ +{{- if .Values.migrate.enabled }} +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ include "groombook.fullname" . }}-migrate + labels: + {{- include "groombook.labels" . | nindent 4 }} + app.kubernetes.io/component: migrate + annotations: + "helm.sh/hook": pre-install,pre-upgrade + "helm.sh/hook-weight": "1" + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded +spec: + backoffLimit: {{ .Values.migrate.backoffLimit }} + template: + metadata: + labels: + {{- include "groombook.selectorLabels" . | nindent 8 }} + app.kubernetes.io/component: migrate + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + restartPolicy: OnFailure + containers: + - name: migrate + image: {{ include "groombook.migrateImage" . }} + imagePullPolicy: {{ .Values.migrate.image.pullPolicy }} + command: ["pnpm", "db:migrate"] + env: + - name: DATABASE_URL + valueFrom: + secretKeyRef: + name: {{ include "groombook.databaseSecretName" . }} + key: {{ include "groombook.databaseSecretKey" . }} +{{- end }} + -- 2.52.0 From 8842ad6a9d0e1f0db957f70dc851b946674389e6 Mon Sep 17 00:00:00 2001 From: "groombook-engineer[bot]" <269742240+groombook-engineer[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 17:30:08 +0000 Subject: [PATCH 04/15] Add CNPG Cluster CR template --- charts/groombook/templates/cnpg-cluster.yaml | 28 ++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 charts/groombook/templates/cnpg-cluster.yaml diff --git a/charts/groombook/templates/cnpg-cluster.yaml b/charts/groombook/templates/cnpg-cluster.yaml new file mode 100644 index 0000000..922f866 --- /dev/null +++ b/charts/groombook/templates/cnpg-cluster.yaml @@ -0,0 +1,28 @@ +{{- if eq .Values.postgresql.mode "operator" }} +apiVersion: postgresql.cnpg.io/v1 +kind: Cluster +metadata: + name: {{ include "groombook.fullname" . }}-postgres + labels: + {{- include "groombook.labels" . | nindent 4 }} +spec: + instances: {{ .Values.postgresql.operator.instances }} + storage: + size: {{ .Values.postgresql.operator.storage.size }} + {{- if .Values.postgresql.operator.storage.storageClass }} + storageClass: {{ .Values.postgresql.operator.storage.storageClass }} + {{- end }} + bootstrap: + initdb: + database: {{ .Values.postgresql.operator.bootstrap.database }} + owner: {{ .Values.postgresql.operator.bootstrap.owner }} + {{- if .Values.postgresql.operator.credentialsSecret }} + secret: + name: {{ .Values.postgresql.operator.credentialsSecret }} + {{- end }} + {{- if .Values.postgresql.operator.monitoring.enabled }} + monitoring: + enablePodMonitor: true + {{- end }} +{{- end }} + -- 2.52.0 From 224af2e1ec3e1864e12b669005090b7e7de553c4 Mon Sep 17 00:00:00 2001 From: "groombook-engineer[bot]" <269742240+groombook-engineer[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 17:30:09 +0000 Subject: [PATCH 05/15] Add DragonflyDB StatefulSet template --- .../templates/dragonfly-statefulset.yaml | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 charts/groombook/templates/dragonfly-statefulset.yaml diff --git a/charts/groombook/templates/dragonfly-statefulset.yaml b/charts/groombook/templates/dragonfly-statefulset.yaml new file mode 100644 index 0000000..53425a9 --- /dev/null +++ b/charts/groombook/templates/dragonfly-statefulset.yaml @@ -0,0 +1,46 @@ +{{- if and .Values.dragonfly.enabled (eq .Values.dragonfly.mode "integrated") }} +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: {{ include "groombook.fullname" . }}-dragonfly + labels: + {{- include "groombook.labels" . | nindent 4 }} + app.kubernetes.io/component: dragonfly +spec: + serviceName: {{ include "groombook.fullname" . }}-dragonfly + replicas: {{ .Values.dragonfly.integrated.replicas }} + selector: + matchLabels: + {{- include "groombook.selectorLabels" . | nindent 6 }} + app.kubernetes.io/component: dragonfly + template: + metadata: + labels: + {{- include "groombook.selectorLabels" . | nindent 8 }} + app.kubernetes.io/component: dragonfly + spec: + containers: + - name: dragonfly + image: {{ printf "%s:%s" .Values.dragonfly.integrated.image.repository .Values.dragonfly.integrated.image.tag }} + imagePullPolicy: {{ .Values.dragonfly.integrated.image.pullPolicy }} + ports: + - containerPort: 6379 + name: redis + protocol: TCP + resources: + {{- toYaml .Values.dragonfly.integrated.resources | nindent 12 }} + {{- if .Values.dragonfly.integrated.storage.size }} + volumeClaimTemplates: + - metadata: + name: data + spec: + accessModes: ["ReadWriteOnce"] + {{- if .Values.dragonfly.integrated.storage.storageClass }} + storageClassName: {{ .Values.dragonfly.integrated.storage.storageClass }} + {{- end }} + resources: + requests: + storage: {{ .Values.dragonfly.integrated.storage.size }} + {{- end }} +{{- end }} + -- 2.52.0 From ec176425979ce91f4991d205cb43221380ec857b Mon Sep 17 00:00:00 2001 From: "groombook-engineer[bot]" <269742240+groombook-engineer[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 17:30:10 +0000 Subject: [PATCH 06/15] Add DragonflyDB Service template --- .../templates/dragonfly-service.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 charts/groombook/templates/dragonfly-service.yaml diff --git a/charts/groombook/templates/dragonfly-service.yaml b/charts/groombook/templates/dragonfly-service.yaml new file mode 100644 index 0000000..f8eb7e4 --- /dev/null +++ b/charts/groombook/templates/dragonfly-service.yaml @@ -0,0 +1,20 @@ +{{- if and .Values.dragonfly.enabled (eq .Values.dragonfly.mode "integrated") }} +apiVersion: v1 +kind: Service +metadata: + name: {{ include "groombook.fullname" . }}-dragonfly + labels: + {{- include "groombook.labels" . | nindent 4 }} + app.kubernetes.io/component: dragonfly +spec: + type: {{ .Values.dragonfly.integrated.service.type }} + selector: + {{- include "groombook.selectorLabels" . | nindent 4 }} + app.kubernetes.io/component: dragonfly + ports: + - port: {{ .Values.dragonfly.integrated.service.port }} + targetPort: 6379 + protocol: TCP + name: redis +{{- end }} + -- 2.52.0 From bf92039876333e45f68e2c8a20c50a2fe3a95f5e Mon Sep 17 00:00:00 2001 From: "groombook-engineer[bot]" <269742240+groombook-engineer[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 17:30:10 +0000 Subject: [PATCH 07/15] Add DragonflyDB Operator CR template --- charts/groombook/templates/dragonfly-cr.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 charts/groombook/templates/dragonfly-cr.yaml diff --git a/charts/groombook/templates/dragonfly-cr.yaml b/charts/groombook/templates/dragonfly-cr.yaml new file mode 100644 index 0000000..a572cc0 --- /dev/null +++ b/charts/groombook/templates/dragonfly-cr.yaml @@ -0,0 +1,15 @@ +{{- if and .Values.dragonfly.enabled (eq .Values.dragonfly.mode "operator") }} +apiVersion: dragonflydb.io/v1alpha1 +kind: Dragonfly +metadata: + name: {{ include "groombook.fullname" . }}-dragonfly + labels: + {{- include "groombook.labels" . | nindent 4 }} +spec: + replicas: {{ .Values.dragonfly.operator.replicas }} + {{- with .Values.dragonfly.operator.resources }} + resources: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} + -- 2.52.0 From 09dc3c792be8fa29b2faaea6b7a843b80881beee Mon Sep 17 00:00:00 2001 From: "groombook-engineer[bot]" <269742240+groombook-engineer[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 17:34:35 +0000 Subject: [PATCH 08/15] Add web-deployment Helm template --- .../groombook/templates/web-deployment.yaml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 charts/groombook/templates/web-deployment.yaml diff --git a/charts/groombook/templates/web-deployment.yaml b/charts/groombook/templates/web-deployment.yaml new file mode 100644 index 0000000..9652811 --- /dev/null +++ b/charts/groombook/templates/web-deployment.yaml @@ -0,0 +1,47 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "groombook.fullname" . }}-web + labels: + {{- include "groombook.labels" . | nindent 4 }} + app.kubernetes.io/component: web +spec: + replicas: {{ .Values.web.replicas }} + selector: + matchLabels: + {{- include "groombook.selectorLabels" . | nindent 6 }} + app.kubernetes.io/component: web + template: + metadata: + labels: + {{- include "groombook.selectorLabels" . | nindent 8 }} + app.kubernetes.io/component: web + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "groombook.serviceAccountName" . }} + containers: + - name: web + image: {{ include "groombook.webImage" . }} + imagePullPolicy: {{ .Values.web.image.pullPolicy }} + ports: + - containerPort: 80 + name: http + protocol: TCP + resources: + {{- toYaml .Values.web.resources | nindent 12 }} + readinessProbe: + httpGet: + path: / + port: 80 + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + httpGet: + path: / + port: 80 + initialDelaySeconds: 10 + periodSeconds: 30 + -- 2.52.0 From c0c6ed64be9957a5728217ad55925af038511b2c Mon Sep 17 00:00:00 2001 From: "groombook-engineer[bot]" <269742240+groombook-engineer[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 17:34:43 +0000 Subject: [PATCH 09/15] Add web-service Helm template --- charts/groombook/templates/web-service.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 charts/groombook/templates/web-service.yaml diff --git a/charts/groombook/templates/web-service.yaml b/charts/groombook/templates/web-service.yaml new file mode 100644 index 0000000..f9da1be --- /dev/null +++ b/charts/groombook/templates/web-service.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "groombook.fullname" . }}-web + labels: + {{- include "groombook.labels" . | nindent 4 }} + app.kubernetes.io/component: web +spec: + type: {{ .Values.web.service.type }} + selector: + {{- include "groombook.selectorLabels" . | nindent 4 }} + app.kubernetes.io/component: web + ports: + - port: {{ .Values.web.service.port }} + targetPort: 80 + protocol: TCP + name: http + -- 2.52.0 From 3481faedf2f7990532b34bda7638a3ead2497992 Mon Sep 17 00:00:00 2001 From: "groombook-engineer[bot]" <269742240+groombook-engineer[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 17:35:36 +0000 Subject: [PATCH 10/15] Add ingress Helm template --- charts/groombook/templates/ingress.yaml | 42 +++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 charts/groombook/templates/ingress.yaml diff --git a/charts/groombook/templates/ingress.yaml b/charts/groombook/templates/ingress.yaml new file mode 100644 index 0000000..36c1674 --- /dev/null +++ b/charts/groombook/templates/ingress.yaml @@ -0,0 +1,42 @@ +{{- if .Values.ingress.enabled }} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ include "groombook.fullname" . }} + labels: + {{- include "groombook.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if .Values.ingress.className }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- toYaml .Values.ingress.tls | nindent 4 }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + pathType: {{ .pathType }} + backend: + service: + {{- if eq .service "api" }} + name: {{ include "groombook.fullname" $ }}-api + port: + number: {{ $.Values.api.service.port }} + {{- else }} + name: {{ include "groombook.fullname" $ }}-web + port: + number: {{ $.Values.web.service.port }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} + -- 2.52.0 From 0a117e8c4a3905045b3b1e4018ca806f0623e0e7 Mon Sep 17 00:00:00 2001 From: "groombook-engineer[bot]" <269742240+groombook-engineer[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 17:35:36 +0000 Subject: [PATCH 11/15] Add serviceaccount Helm template --- charts/groombook/templates/serviceaccount.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 charts/groombook/templates/serviceaccount.yaml diff --git a/charts/groombook/templates/serviceaccount.yaml b/charts/groombook/templates/serviceaccount.yaml new file mode 100644 index 0000000..4b2a0b3 --- /dev/null +++ b/charts/groombook/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +{{- if .Values.serviceAccount.create }} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "groombook.serviceAccountName" . }} + labels: + {{- include "groombook.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} + -- 2.52.0 From 1ba397c4fbe97285f79a80c0fdab2e0e5834a9b0 Mon Sep 17 00:00:00 2001 From: "groombook-engineer[bot]" <269742240+groombook-engineer[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 17:36:17 +0000 Subject: [PATCH 12/15] Test write to .github --- .github/test-file.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/test-file.txt diff --git a/.github/test-file.txt b/.github/test-file.txt new file mode 100644 index 0000000..d670460 --- /dev/null +++ b/.github/test-file.txt @@ -0,0 +1 @@ +test content -- 2.52.0 From 21322ad74ee0d5f0c8eae59ee021eb33873ff5d4 Mon Sep 17 00:00:00 2001 From: "groombook-engineer[bot]" <269742240+groombook-engineer[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 17:36:24 +0000 Subject: [PATCH 13/15] Remove test file --- .github/test-file.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/test-file.txt diff --git a/.github/test-file.txt b/.github/test-file.txt deleted file mode 100644 index d670460..0000000 --- a/.github/test-file.txt +++ /dev/null @@ -1 +0,0 @@ -test content -- 2.52.0 From bb75b3237c3638e3b5b9a20fbe99c38277108bbd Mon Sep 17 00:00:00 2001 From: Flea Flicker Date: Fri, 27 Mar 2026 17:57:57 +0000 Subject: [PATCH 14/15] chore: remove Bitnami dependency and add native PostgreSQL StatefulSet Replaces Bitnami postgresql subchart with native StatefulSet + Service using official postgres:16 image. Updates values.yaml schema, adds postgresql-statefulset.yaml, postgresql-service.yaml, and fixes db-credentials-secret.yaml to use shared password variable. Co-Authored-By: Paperclip --- charts/groombook/Chart.yaml | 5 -- charts/groombook/templates/_helpers.tpl | 2 +- .../templates/db-credentials-secret.yaml | 6 +- .../templates/postgresql-service.yaml | 19 +++++ .../templates/postgresql-statefulset.yaml | 72 +++++++++++++++++++ charts/groombook/values.yaml | 10 +-- 6 files changed, 101 insertions(+), 13 deletions(-) create mode 100644 charts/groombook/templates/postgresql-service.yaml create mode 100644 charts/groombook/templates/postgresql-statefulset.yaml diff --git a/charts/groombook/Chart.yaml b/charts/groombook/Chart.yaml index 8a57063..131b413 100644 --- a/charts/groombook/Chart.yaml +++ b/charts/groombook/Chart.yaml @@ -15,8 +15,3 @@ keywords: - pet-grooming - scheduling - crm -dependencies: - - name: postgresql - version: "16.x.x" - repository: https://charts.bitnami.com/bitnami - condition: postgresql.integrated.enabled diff --git a/charts/groombook/templates/_helpers.tpl b/charts/groombook/templates/_helpers.tpl index e900656..9c97648 100644 --- a/charts/groombook/templates/_helpers.tpl +++ b/charts/groombook/templates/_helpers.tpl @@ -98,7 +98,7 @@ Migrate image reference {{/* Database URL — differs by postgresql.mode -Integrated: construct from Bitnami subchart values +Integrated: construct from chart-managed PostgreSQL credentials Operator: read from credentialsSecret */}} {{- define "groombook.databaseSecretName" -}} diff --git a/charts/groombook/templates/db-credentials-secret.yaml b/charts/groombook/templates/db-credentials-secret.yaml index bb35344..6ef46d5 100644 --- a/charts/groombook/templates/db-credentials-secret.yaml +++ b/charts/groombook/templates/db-credentials-secret.yaml @@ -1,4 +1,5 @@ {{- if eq .Values.postgresql.mode "integrated" }} +{{- $password := default (randAlphaNum 16) .Values.postgresql.integrated.auth.password }} apiVersion: v1 kind: Secret metadata: @@ -7,5 +8,6 @@ metadata: {{- include "groombook.labels" . | nindent 4 }} type: Opaque stringData: - database-url: {{ printf "postgres://%s:%s@%s-postgresql:5432/%s" .Values.postgresql.integrated.auth.username (default (randAlphaNum 16) .Values.postgresql.integrated.auth.password) (include "groombook.fullname" .) .Values.postgresql.integrated.auth.database | quote }} -{{- end }} \ No newline at end of file + postgresql-password: {{ $password | quote }} + database-url: {{ printf "postgres://%s:%s@%s-postgresql:5432/%s" .Values.postgresql.integrated.auth.username $password (include "groombook.fullname" .) .Values.postgresql.integrated.auth.database | quote }} +{{- end }} diff --git a/charts/groombook/templates/postgresql-service.yaml b/charts/groombook/templates/postgresql-service.yaml new file mode 100644 index 0000000..524831b --- /dev/null +++ b/charts/groombook/templates/postgresql-service.yaml @@ -0,0 +1,19 @@ +{{- if eq .Values.postgresql.mode "integrated" }} +apiVersion: v1 +kind: Service +metadata: + name: {{ include "groombook.fullname" . }}-postgresql + labels: + {{- include "groombook.labels" . | nindent 4 }} + app.kubernetes.io/component: postgresql +spec: + type: ClusterIP + selector: + {{- include "groombook.selectorLabels" . | nindent 4 }} + app.kubernetes.io/component: postgresql + ports: + - port: 5432 + targetPort: 5432 + protocol: TCP + name: postgresql +{{- end }} diff --git a/charts/groombook/templates/postgresql-statefulset.yaml b/charts/groombook/templates/postgresql-statefulset.yaml new file mode 100644 index 0000000..090680b --- /dev/null +++ b/charts/groombook/templates/postgresql-statefulset.yaml @@ -0,0 +1,72 @@ +{{- if eq .Values.postgresql.mode "integrated" }} +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: {{ include "groombook.fullname" . }}-postgresql + labels: + {{- include "groombook.labels" . | nindent 4 }} + app.kubernetes.io/component: postgresql +spec: + serviceName: {{ include "groombook.fullname" . }}-postgresql + replicas: 1 + selector: + matchLabels: + {{- include "groombook.selectorLabels" . | nindent 6 }} + app.kubernetes.io/component: postgresql + template: + metadata: + labels: + {{- include "groombook.selectorLabels" . | nindent 8 }} + app.kubernetes.io/component: postgresql + spec: + containers: + - name: postgresql + image: {{ .Values.postgresql.integrated.image }} + imagePullPolicy: IfNotPresent + ports: + - containerPort: 5432 + name: postgresql + protocol: TCP + env: + - name: POSTGRES_DB + value: {{ .Values.postgresql.integrated.auth.database | quote }} + - name: POSTGRES_USER + value: {{ .Values.postgresql.integrated.auth.username | quote }} + - name: POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: {{ include "groombook.fullname" . }}-db-credentials + key: postgresql-password + - name: PGDATA + value: /var/lib/postgresql/data/pgdata + volumeMounts: + - name: data + mountPath: /var/lib/postgresql/data + readinessProbe: + exec: + command: + - pg_isready + - -U + - {{ .Values.postgresql.integrated.auth.username | quote }} + initialDelaySeconds: 10 + periodSeconds: 10 + livenessProbe: + exec: + command: + - pg_isready + - -U + - {{ .Values.postgresql.integrated.auth.username | quote }} + initialDelaySeconds: 30 + periodSeconds: 30 + volumeClaimTemplates: + - metadata: + name: data + spec: + accessModes: ["ReadWriteOnce"] + {{- if .Values.postgresql.integrated.storage.storageClass }} + storageClassName: {{ .Values.postgresql.integrated.storage.storageClass }} + {{- end }} + resources: + requests: + storage: {{ .Values.postgresql.integrated.storage.size }} +{{- end }} diff --git a/charts/groombook/values.yaml b/charts/groombook/values.yaml index 783ed38..5f888a5 100644 --- a/charts/groombook/values.yaml +++ b/charts/groombook/values.yaml @@ -52,18 +52,18 @@ migrate: # -- PostgreSQL configuration postgresql: - # Choose deployment mode: 'integrated' uses Bitnami subchart, 'operator' creates a CNPG Cluster CR + # Choose deployment mode: 'integrated' deploys a native PostgreSQL StatefulSet, 'operator' creates a CNPG Cluster CR mode: integrated integrated: - enabled: true # set to false if mode is 'operator' + image: postgres:16 + storage: + size: 10Gi + storageClass: "" auth: database: groombook username: groombook password: "" # auto-generated if empty existingSecret: "" - primary: - persistence: - size: 8Gi operator: instances: 3 storage: -- 2.52.0 From 68257cf0893546fb718755626a9e8c564d4ad13b Mon Sep 17 00:00:00 2001 From: The Dogfather Date: Fri, 27 Mar 2026 18:09:07 +0000 Subject: [PATCH 15/15] Add Helm chart release GitHub Action workflow Adds .github/workflows/helm-release.yml that packages the Helm chart and pushes it to groombook/groombook.github.io on pushes to main when charts/ changes. Uses CHART_REPO_TOKEN secret for cross-repo push access. Co-Authored-By: Paperclip --- .github/workflows/helm-release.yml | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .github/workflows/helm-release.yml diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml new file mode 100644 index 0000000..5f91899 --- /dev/null +++ b/.github/workflows/helm-release.yml @@ -0,0 +1,54 @@ +name: Release Helm Chart + +on: + push: + branches: [main] + paths: + - 'charts/**' + +jobs: + release: + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Checkout groombook + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Checkout groombook.github.io + uses: actions/checkout@v4 + with: + repository: groombook/groombook.github.io + path: gh-pages + token: ${{ secrets.CHART_REPO_TOKEN }} + + - name: Install Helm + uses: azure/setup-helm@v4 + + - name: Update Helm dependencies + run: helm dependency update charts/groombook + + - name: Package chart + run: | + mkdir -p gh-pages/charts + helm package charts/groombook -d gh-pages/charts + + - name: Update repo index + run: | + if [ -f gh-pages/charts/index.yaml ]; then + helm repo index gh-pages/charts --merge gh-pages/charts/index.yaml --url https://groombook.github.io/charts + else + helm repo index gh-pages/charts --url https://groombook.github.io/charts + fi + + - name: Push to groombook.github.io + run: | + cd gh-pages + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + git add charts/ + git diff --staged --quiet && echo 'No chart changes' && exit 0 + git commit -m "Update Helm chart repository" + git push -- 2.52.0