From 18a9484ecfb02b2381e4e43f6c824ba6f175dc17 Mon Sep 17 00:00:00 2001
From: Cees-Jan Kiewiet <github@ceesjankiewiet.nl>
Date: Sat, 8 Jun 2024 20:26:04 +0200
Subject: [PATCH] Fix subchart issues

---
 charts/mammatus/Chart.yaml                |  4 +--
 charts/mammatus/templates/_pod.yaml       |  4 +--
 charts/mammatus/templates/cronjobs.yaml   |  2 +-
 charts/mammatus/templates/deployment.yaml |  2 +-
 charts/mammatus/values.yaml               | 30 +++++++++++------------
 ct.yaml                                   |  2 +-
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/charts/mammatus/Chart.yaml b/charts/mammatus/Chart.yaml
index ea4b3cc..8fee977 100644
--- a/charts/mammatus/Chart.yaml
+++ b/charts/mammatus/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: mammatus
 description: MammatusPHP Chart
 type: application
-version: 0.0.1
-appVersion: 0.0.1
+version: 0.0.2
+appVersion: 0.0.2
 maintainers:
   - name: WyriHaximus
     email: helm@ceesjankiewiet.nl
diff --git a/charts/mammatus/templates/_pod.yaml b/charts/mammatus/templates/_pod.yaml
index f6ec44f..6c65611 100644
--- a/charts/mammatus/templates/_pod.yaml
+++ b/charts/mammatus/templates/_pod.yaml
@@ -2,7 +2,7 @@
 {{- define "mammatus.pod" -}}
 containers:
   - name: {{ .name }}
-    image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
+    image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
     imagePullPolicy: {{ .Values.image.pullPolicy }}
     command:
       - php
@@ -25,7 +25,7 @@ containers:
 {{- define "mammatus.env" -}}
 env:
   - name: RELEASE_TAG
-    value: {{ .Chart.AppVersion }}
+    value: {{ .Values.image.tag }}
   - name: POD_NAME
     valueFrom:
       fieldRef:
diff --git a/charts/mammatus/templates/cronjobs.yaml b/charts/mammatus/templates/cronjobs.yaml
index 167ca11..e2995f6 100644
--- a/charts/mammatus/templates/cronjobs.yaml
+++ b/charts/mammatus/templates/cronjobs.yaml
@@ -1,4 +1,4 @@
-{{- range .Values.mammatus.cronjobs }}
+{{- range .Values.cronjobs }}
 ---
 apiVersion: batch/v1
 kind: CronJob
diff --git a/charts/mammatus/templates/deployment.yaml b/charts/mammatus/templates/deployment.yaml
index 8048bbb..1be2dec 100644
--- a/charts/mammatus/templates/deployment.yaml
+++ b/charts/mammatus/templates/deployment.yaml
@@ -1,4 +1,4 @@
-{{- range .Values.mammatus.deployments }}
+{{- range .Values.deployments }}
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/mammatus/values.yaml b/charts/mammatus/values.yaml
index 1ecb84f..3044269 100644
--- a/charts/mammatus/values.yaml
+++ b/charts/mammatus/values.yaml
@@ -1,18 +1,17 @@
-mammatus:
-  cronjobs: []
-#    - name: some_job
-#      class: Some\Class\FQCN
-#      schedule: "0 3 * * *"
-  deployments: []
-#    - name: some_worker
-#      command: mammatus-queue
-#      arguments:
-#        - Some\Class\FQCN
-#    - name: some_service
-#      command: mammatus-vhost
-#      arguments:
-#        - Some\Class\FQCN
-#      post: 666
+cronjobs: []
+#  - name: some_job
+#    class: Some\Class\FQCN
+#    schedule: "0 3 * * *"
+deployments: []
+#  - name: some_worker
+#    command: mammatus-queue
+#    arguments:
+#      - Some\Class\FQCN
+#  - name: some_service
+#    command: mammatus-vhost
+#    arguments:
+#      - Some\Class\FQCN
+#    post: 666
 
 env: {}
 #  key: value
@@ -23,6 +22,7 @@ secrets: []
 image:
   repository: ghcr.io/LOGIN/REPO
   pullPolicy: IfNotPresent
+  tag: dev
 
 resources:
   cpu: 100m
diff --git a/ct.yaml b/ct.yaml
index 64230c7..c1f7f3c 100644
--- a/ct.yaml
+++ b/ct.yaml
@@ -3,5 +3,5 @@ target-branch: main
 chart-dirs:
   - charts
 chart-repos:
-  - "WyriHaximusNet=https://helm.wyrihaximus.net"
+  - "MammatusPHP=https://mammatusphp.github.io/helm-charts/"
 debug: true