feat(kratos): support skaffold image format (#291)

ory · Jun 29, 2021 · c92de53 · c92de53
1 parent 863cf58
commit c92de53
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 6 deletions.
diff --git a/helm/charts/kratos/templates/_helpers.tpl b/helm/charts/kratos/templates/_helpers.tpl
@@ -91,3 +91,26 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
+
+{{/*
+Generate image
+*/}}
+{{- define "kratos.image" -}}
+{{- if eq "string" ( typeOf .Values.image ) }}
+{{- printf "%s" .Values.image -}}
+{{- else -}}
+{{- printf "%s:%s" .Values.image.repository .Values.image.tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Generate imagePullPolicy
+*/}}
+{{- define "kratos.imagePullPolicy" -}}
+{{- if eq "string" ( typeOf .Values.image ) }}
+{{- printf "%s" .Values.imagePullPolicy -}}
+{{- else -}}
+{{- printf "%s" .Values.image.pullPolicy -}}
+{{- end -}}
+{{- end -}}
+
diff --git a/helm/charts/kratos/templates/deployment.yaml b/helm/charts/kratos/templates/deployment.yaml
@@ -63,8 +63,8 @@ spec:
       automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ include "kratos.image" . }}
+          imagePullPolicy: {{ include "kratos.imagePullPolicy" . }}
           command: ["kratos"]
           args: [
             "serve",

diff --git a/helm/charts/kratos/templates/job-migration.yaml b/helm/charts/kratos/templates/job-migration.yaml
@@ -27,8 +27,8 @@ spec:
       automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
       containers:
       - name: {{ .Chart.Name }}-automigrate
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        image: {{ include "kratos.image" . }}
+        imagePullPolicy: {{ include "kratos.imagePullPolicy" . }}
         command: ["kratos"]
         args: ["migrate", "sql", "-e", "--yes"]
         env:

diff --git a/helm/charts/kratos/templates/statefulset-mail.yaml b/helm/charts/kratos/templates/statefulset-mail.yaml
@@ -30,8 +30,8 @@ spec:
     spec:
       containers:
         - name: {{ include "kratos.fullname" . }}-courier
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ include "kratos.image" . }}
+          imagePullPolicy: {{ include "kratos.imagePullPolicy" . }}
           args: [ "courier", "watch", "--config", "/etc/config/kratos.yaml" ]
           volumeMounts:
             - name: {{ include "kratos.fullname" . }}-config-volume

diff --git a/helm/charts/kratos/values.yaml b/helm/charts/kratos/values.yaml
@@ -12,6 +12,9 @@ image:
   repository: oryd/kratos
   tag: v0.6.3-alpha.1
   pullPolicy: IfNotPresent
+# Alternative format
+# image: oryd/kratos:v0.6.3-alpha.1
+# imagePullPolicy: Always
 
 imagePullSecrets: []
 nameOverride: ""