Skip to content

support for custom st2actionrunner images via values.yaml #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 13, 2022
Merged

support for custom st2actionrunner images via values.yaml #141

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3fe9592
initial commit to support custom st2action runner images via values.yaml
Sheshagiri Jul 15, 2020
26d4214
added a seperate template function to handle custom st2actionrunner l…
Sheshagiri Jul 16, 2020
142ef88
Merge branch 'master' into Sheshagiri/master
cognifloyd Jul 9, 2022
1286d78
drop st2actionrunnerImageRepository helper
cognifloyd Jul 9, 2022
13c6501
use include instead of template
cognifloyd Jul 10, 2022
f6c3a69
fix tpl vars
cognifloyd Jul 10, 2022
9754d66
add changelog entry
cognifloyd Jul 11, 2022
073ec4d
add image tests and fix a couple typos
cognifloyd Jul 11, 2022
a3bd690
Merge branch 'master' into master
cognifloyd Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,19 @@ stackstorm
{{- end -}}
{{- end -}}

# Generate Docker image repository for st2actionrunner: Private 'docker.stackstorm.com' for Enterprise vs Public Docker Hub 'stackstorm' for FOSS version
{{- define "st2actionrunnerImageRepository" -}}
Copy link
Member

@arm4b arm4b Jul 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For simplicity reasons, it would be easier to avoid custom template for st2actionrunner, if possible. I saw the previous version, wondering if that worked good?

{{- if required "Missing context '.Values.enterprise.enabled'!" .Values.enterprise.enabled -}}
docker.stackstorm.com
{{- else if .Values.image.repository -}}
{{ .Values.image.repository }}
{{- else if .Values.st2actionrunner.image.repository -}}
{{ .Values.st2actionrunner.image.repository }}
{{- else -}}
stackstorm
{{- end -}}
{{- end -}}

{{/*
Create the name of the stackstorm-ha service account to use
*/}}
Expand Down
7 changes: 5 additions & 2 deletions templates/deployments.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,6 +1045,9 @@ spec:
{{- if .Values.st2.packs.image.pullSecret }}
- name: {{ .Values.st2.packs.image.pullSecret }}
{{- end }}
{{- if .Values.st2actionrunner.image.pullSecret }}
- name: {{ .Values.st2actionrunner.image.pullSecret }}
{{- end }}
{{- if .Values.st2.packs.image.repository }}
initContainers:
# Merge packs and virtualenvs from st2actionrunner with those from the st2.packs image
Expand Down Expand Up @@ -1079,8 +1082,8 @@ spec:
{{- end }}
containers:
- name: st2actionrunner{{ template "enterpriseSuffix" . }}
image: "{{ template "imageRepository" . }}/st2actionrunner{{ template "enterpriseSuffix" . }}:{{ .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
image: "{{ template "st2actionrunnerImageRepository" . }}/{{ .Values.st2actionrunner.image.name | default "st2actionrunner" }}{{ template "enterpriseSuffix" . }}:{{ .Values.st2actionrunner.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.st2actionrunner.image.imagePullPolicy | default .Values.image.pullPolicy }}
# TODO: Add liveness/readiness probes (#3)
#livenessProbe:
#readinessProbe:
Expand Down
8 changes: 8 additions & 0 deletions values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,14 @@ st2notifier:
st2actionrunner:
replicas: 5
# TODO: Find out recommended/default resources for this specific service (#5)
image: {}
# Uncomment the following block to use your own at2actionrunner docker image
#repository: your-remote-docker-registry.io
#name: st2actionrunner
#tag: latest
#pullPolicy: Always
# Optional name of the imagePullSecret if your custom action runner image is hosted by a private Docker registry behind the auth
#pullSecret: st2actionrunner-auth
resources: {}
annotations: {}
# Additional advanced settings to control pod/deployment placement
Expand Down