Merge pull request #105 from cybozu-go/charts/mantle/use-app-version-…

…by-default charts/mantle: change `image:` so that mantle can work right out of the box
cybozu-go · Jan 24, 2025 · dcbc367 · dcbc367
2 parents aadd150 + 184bd87
commit dcbc367
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 4 deletions.
diff --git a/charts/mantle/templates/deployment.yaml b/charts/mantle/templates/deployment.yaml
@@ -37,7 +37,9 @@ spec:
               drop:
               - "ALL"
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- with .Values.image.pullPolicy }}
+          imagePullPolicy: {{ . }}
+          {{- end }}
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/charts/mantle/values.yaml b/charts/mantle/values.yaml
@@ -1,9 +1,9 @@
 replicaCount: 1
 
 image:
-  repository: controller
-  pullPolicy: IfNotPresent
-  tag: latest
+  repository: ghcr.io/cybozu-go/mantle
+  pullPolicy:
+  tag: # {{ .Chart.AppVersion }}
 
 imagePullSecrets: []
 nameOverride: ""

diff --git a/test/e2e/testdata/values-mantle-primary-template.yaml b/test/e2e/testdata/values-mantle-primary-template.yaml
@@ -1,3 +1,8 @@
+image:
+  repository: controller
+  pullPolicy: IfNotPresent
+  tag: latest
+
 controller:
   role: primary
   mantleServiceEndpoint: {ENDPOINT}

diff --git a/test/e2e/testdata/values-mantle-secondary-template.yaml b/test/e2e/testdata/values-mantle-secondary-template.yaml
@@ -1,3 +1,8 @@
+image:
+  repository: controller
+  pullPolicy: IfNotPresent
+  tag: latest
+
 controller:
   role: secondary
   mantleServiceEndpoint: ":58080"

diff --git a/test/e2e/testdata/values-mantle1.yaml b/test/e2e/testdata/values-mantle1.yaml
@@ -1,3 +1,8 @@
+image:
+  repository: controller
+  pullPolicy: IfNotPresent
+  tag: latest
+
 controller:
   overwriteMBCSchedule: "* * * * *"
   gcInterval: 1s
diff --git a/test/e2e/testdata/values-mantle2.yaml b/test/e2e/testdata/values-mantle2.yaml
@@ -1,2 +1,7 @@
+image:
+  repository: controller
+  pullPolicy: IfNotPresent
+  tag: latest
+
 controller:
   gcInterval: 1s