Skip to content

Commit 1286d78

Browse files
committed
drop st2actionrunnerImageRepository helper
1 parent 142ef88 commit 1286d78

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

templates/_helpers.tpl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,6 @@ stackstorm
4747
{{- end -}}
4848
{{- end -}}
4949

50-
# Generate Docker image repository for st2actionrunner: Private 'docker.stackstorm.com' for Enterprise vs Public Docker Hub 'stackstorm' for FOSS version
51-
{{- define "st2actionrunnerImageRepository" -}}
52-
{{- if required "Missing context '.Values.enterprise.enabled'!" .Values.enterprise.enabled -}}
53-
docker.stackstorm.com
54-
{{- else if .Values.image.repository -}}
55-
{{ .Values.image.repository }}
56-
{{- else if .Values.st2actionrunner.image.repository -}}
57-
{{ .Values.st2actionrunner.image.repository }}
58-
{{- else -}}
59-
stackstorm
60-
{{- end -}}
61-
{{- end -}}
62-
6350
{{/*
6451
Create the name of the stackstorm-ha service account to use
6552
*/}}

templates/deployments.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,9 @@ spec:
13031303
{{- end }}
13041304
containers:
13051305
- name: st2actionrunner
1306-
image: '{{ template "st2actionrunnerImageRepository" . }}/{{ .Values.st2actionrunner.image.name | default "st2actionrunner" }}:{{ tpl (.Values.st2actionrunner.image.tag | default .Values.image.tag) . }}'
1306+
{{- with .Values.st2actionrunner }}
1307+
image: '{{ .image.respository | default (template "stackstorm-ha.imageRepository" $) }}/{{ .image.name | default "st2actionrunner" }}:{{ tpl (.image.tag | default $.Values.image.tag) . }}'
1308+
{{- end }}
13071309
imagePullPolicy: {{ .Values.st2actionrunner.image.imagePullPolicy | default .Values.image.pullPolicy }}
13081310
{{- with default .Values.securityContext .Values.st2actionrunner.securityContext }}
13091311
securityContext: {{- toYaml . | nindent 10 }}

0 commit comments

Comments
 (0)