Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ Supported fields include:
- `labels`, `annotations`
- `env`
- `resources`
- `imagePullPolicy`
- `volumes`, `volumeMounts`
- `nodeSelector`, `affinity`, `tolerations`
- `hostAliases`
Expand Down
7 changes: 7 additions & 0 deletions apis/browserconfig/v1/browser_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ type Template struct {
// Resources defines CPU/memory requests and limits for the main container.
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`

//ImagePullPolicy defines container image pull policy
ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`

// Volumes defines pod volumes.
Volumes *[]corev1.Volume `json:"volumes,omitempty"`

Expand Down Expand Up @@ -128,6 +131,7 @@ type BrowserVersionConfigSpec struct {
Annotations *map[string]string `json:"annotations,omitempty"`
Env *[]corev1.EnvVar `json:"env,omitempty"`
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
Volumes *[]corev1.Volume `json:"volumes,omitempty"`
VolumeMounts *[]corev1.VolumeMount `json:"volumeMounts,omitempty"`
NodeSelector *map[string]string `json:"nodeSelector,omitempty"`
Expand Down Expand Up @@ -185,6 +189,9 @@ func (b *BrowserVersionConfigSpec) mergeWithSpec(t *BrowserConfigSpec) {
b.Annotations = mergeMapPtr(t.Template.Annotations, b.Annotations)
b.Env = mergeEnvPtr(t.Template.Env, b.Env)
b.Resources = firstNonNilResource(t.Template.Resources, b.Resources)
if b.ImagePullPolicy == "" {
b.ImagePullPolicy = t.Template.ImagePullPolicy
}
b.Volumes = mergeVolumePtr(t.Template.Volumes, b.Volumes)

b.NodeSelector = mergeMapPtr(t.Template.NodeSelector, b.NodeSelector)
Expand Down
Loading