Skip to content

Commit 178c97d

Browse files
authored
Merge pull request #31 from renderedtext/default_image
feat(controller): allow default image to be specified
2 parents b7438eb + d7b5161 commit 178c97d

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

charts/controller/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.2.2
18+
version: 0.2.3
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

charts/controller/templates/_helpers.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@ Expand the name of the default pod spec config map.
120120
{{- $startupParameters = append $startupParameters "--kubernetes-allowed-images" }}
121121
{{- $startupParameters = append $startupParameters .Values.agent.allowedImages }}
122122
{{- end }}
123+
{{- if .Values.agent.defaultImage }}
124+
{{- $startupParameters = append $startupParameters "--kubernetes-default-image" }}
125+
{{- $startupParameters = append $startupParameters .Values.agent.defaultImage }}
126+
{{- end }}
123127
{{- join " " $startupParameters }}
124128
{{- end }}
125129

charts/controller/values.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ imagePullPolicy: IfNotPresent
1717

1818
agent:
1919
image: semaphoreci/agent
20-
version: v2.2.28
20+
version: v2.3.0
2121
logLevel: "info"
2222

2323
# By default, the controller creates a pod spec which will be used
@@ -44,6 +44,9 @@ agent:
4444
# See: https://github.com/semaphoreci/agent/blob/master/docs/kubernetes-executor.md#restricting-images-used-in-jobs
4545
allowedImages: ""
4646

47+
# See: https://github.com/semaphoreci/agent/blob/master/docs/kubernetes-executor.md#default-image-used-in-jobs
48+
defaultImage: ""
49+
4750
# How many jobs the controller will keep running in parallel
4851
parallelism: 10
4952

0 commit comments

Comments
 (0)