diff --git a/docs/variables.md b/docs/variables.md index 2c75b907737..cbbe7c2be3e 100644 --- a/docs/variables.md +++ b/docs/variables.md @@ -127,6 +127,7 @@ variable via `resources.inputs..` or | --- | ----- | | `Task` | `spec.steps[].name` | | `Task` | `spec.steps[].image` | +| `Task` | `spec.steps[].imagePullPolicy` | | `Task` | `spec.steps[].env.value` | | `Task` | `spec.steps[].env.valuefrom.secretkeyref.name` | | `Task` | `spec.steps[].env.valuefrom.secretkeyref.key` | @@ -150,6 +151,7 @@ variable via `resources.inputs..` or | `Task` | `spec.volumes[].csi.volumeattributes.* `| | `Task` | `spec.sidecars[].name` | | `Task` | `spec.sidecars[].image` | +| `Task` | `spec.sidecars[].imagePullPolicy` | | `Task` | `spec.sidecars[].env.value` | | `Task` | `spec.sidecars[].env.valuefrom.secretkeyref.name` | | `Task` | `spec.sidecars[].env.valuefrom.secretkeyref.key` | diff --git a/pkg/apis/pipeline/v1beta1/container_replacements.go b/pkg/apis/pipeline/v1beta1/container_replacements.go index 900845ed4c0..cd0da192478 100644 --- a/pkg/apis/pipeline/v1beta1/container_replacements.go +++ b/pkg/apis/pipeline/v1beta1/container_replacements.go @@ -24,6 +24,7 @@ import ( func ApplyContainerReplacements(step *corev1.Container, stringReplacements map[string]string, arrayReplacements map[string][]string) { step.Name = substitution.ApplyReplacements(step.Name, stringReplacements) step.Image = substitution.ApplyReplacements(step.Image, stringReplacements) + step.ImagePullPolicy = corev1.PullPolicy(substitution.ApplyReplacements(string(step.ImagePullPolicy), stringReplacements)) // Use ApplyArrayReplacements here, as additional args may be added via an array parameter. var newArgs []string diff --git a/pkg/apis/pipeline/v1beta1/container_replacements_test.go b/pkg/apis/pipeline/v1beta1/container_replacements_test.go index 9c81d50309f..a8bf535465c 100644 --- a/pkg/apis/pipeline/v1beta1/container_replacements_test.go +++ b/pkg/apis/pipeline/v1beta1/container_replacements_test.go @@ -34,11 +34,12 @@ func TestApplyContainerReplacements(t *testing.T) { } s := corev1.Container{ - Name: "$(replace.me)", - Image: "$(replace.me)", - Command: []string{"$(array.replace.me)"}, - Args: []string{"$(array.replace.me)"}, - WorkingDir: "$(replace.me)", + Name: "$(replace.me)", + Image: "$(replace.me)", + ImagePullPolicy: "$(replace.me)", + Command: []string{"$(array.replace.me)"}, + Args: []string{"$(array.replace.me)"}, + WorkingDir: "$(replace.me)", EnvFrom: []corev1.EnvFromSource{{ ConfigMapRef: &corev1.ConfigMapEnvSource{ LocalObjectReference: corev1.LocalObjectReference{ @@ -77,11 +78,12 @@ func TestApplyContainerReplacements(t *testing.T) { } expected := corev1.Container{ - Name: "replaced!", - Image: "replaced!", - Command: []string{"val1", "val2"}, - Args: []string{"val1", "val2"}, - WorkingDir: "replaced!", + Name: "replaced!", + Image: "replaced!", + ImagePullPolicy: "replaced!", + Command: []string{"val1", "val2"}, + Args: []string{"val1", "val2"}, + WorkingDir: "replaced!", EnvFrom: []corev1.EnvFromSource{{ ConfigMapRef: &corev1.ConfigMapEnvSource{ LocalObjectReference: corev1.LocalObjectReference{