Skip to content

Commit b449117

Browse files
authored
Add imagePullPolicy configuration support for the browser container in BrowserConfig
#5
1 parent c2556f3 commit b449117

File tree

7 files changed

+922
-177
lines changed

7 files changed

+922
-177
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ Supported fields include:
191191
- `labels`, `annotations`
192192
- `env`
193193
- `resources`
194+
- `imagePullPolicy`
194195
- `volumes`, `volumeMounts`
195196
- `nodeSelector`, `affinity`, `tolerations`
196197
- `hostAliases`

apis/browserconfig/v1/browser_config.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ type Template struct {
4545
// Resources defines CPU/memory requests and limits for the main container.
4646
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
4747

48+
//ImagePullPolicy defines container image pull policy
49+
ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
50+
4851
// Volumes defines pod volumes.
4952
Volumes *[]corev1.Volume `json:"volumes,omitempty"`
5053

@@ -128,6 +131,7 @@ type BrowserVersionConfigSpec struct {
128131
Annotations *map[string]string `json:"annotations,omitempty"`
129132
Env *[]corev1.EnvVar `json:"env,omitempty"`
130133
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
134+
ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
131135
Volumes *[]corev1.Volume `json:"volumes,omitempty"`
132136
VolumeMounts *[]corev1.VolumeMount `json:"volumeMounts,omitempty"`
133137
NodeSelector *map[string]string `json:"nodeSelector,omitempty"`
@@ -185,6 +189,9 @@ func (b *BrowserVersionConfigSpec) mergeWithSpec(t *BrowserConfigSpec) {
185189
b.Annotations = mergeMapPtr(t.Template.Annotations, b.Annotations)
186190
b.Env = mergeEnvPtr(t.Template.Env, b.Env)
187191
b.Resources = firstNonNilResource(t.Template.Resources, b.Resources)
192+
if b.ImagePullPolicy == "" {
193+
b.ImagePullPolicy = t.Template.ImagePullPolicy
194+
}
188195
b.Volumes = mergeVolumePtr(t.Template.Volumes, b.Volumes)
189196

190197
b.NodeSelector = mergeMapPtr(t.Template.NodeSelector, b.NodeSelector)

0 commit comments

Comments
 (0)