Externalize Affinity Assistant image

Container images should not be hardcoded.
This commit externalize what image should be used for the Affinity Assistant.

/kind misc

cmd/controller/main.go

@@ -36,8 +36,9 @@ const (
 var (
  entrypointImage = flag.String("entrypoint-image", "override-with-entrypoint:latest",
  "The container image containing our entrypoint binary.")
- nopImage = flag.String("nop-image", "tianon/true", "The container image used to stop sidecars")
- gitImage = flag.String("git-image", "override-with-git:latest",
+ nopImage = flag.String("nop-image", "tianon/true", "The container image used to stop sidecars")
+ affinityAssistantImage = flag.String("affinity-assistant-image", "nginx", "The container image used for the Affinity Assistant")
+ gitImage = flag.String("git-image", "override-with-git:latest",
  "The container image containing our Git binary.")
  credsImage = flag.String("creds-image", "override-with-creds:latest",
  "The container image for preparing our Build's credentials.")
@@ -60,6 +61,7 @@ func main() {
  images := pipeline.Images{
  EntrypointImage: *entrypointImage,
  NopImage: *nopImage,
+ AffinityAssistantImage: *affinityAssistantImage,
  GitImage: *gitImage,
  CredsImage: *credsImage,
  KubeconfigWriterImage: *kubeconfigWriterImage,

config/controller.yaml

@@ -66,6 +66,11 @@ spec:
  "-pr-image", "github.com/tektoncd/pipeline/cmd/pullrequest-init",
  "-build-gcs-fetcher-image", "github.com/tektoncd/pipeline/vendor/github.com/GoogleCloudPlatform/cloud-builders/gcs-fetcher/cmd/gcs-fetcher",
 
+ # This image is used as a placeholder pod, the Affinity Assistant
+ # TODO(#2640) We may want to create a custom, minimal binary
+ # As of June 8, 2020, tag 1.19.0
+ "-affinity-assistant-image", "nginx@sha256:c870bf53de0357813af37b9500cb1c2ff9fb4c00120d5fe1d75c21591293c34d",
+
  # These images are pulled from Dockerhub, by digest, as of May 19, 2020.
  # As of May 29, 2020 new sha for nop image
  "-nop-image", "tianon/true@sha256:009cce421096698832595ce039aa13fa44327d96beedb84282a69d3dbcf5a81b",

pkg/apis/pipeline/images.go

@@ -23,6 +23,8 @@ type Images struct {
  EntrypointImage string
  // NopImage is the container image used to kill sidecars.
  NopImage string
+ // AffinityAssistantImage is the container image used for the Affinity Assistant.
+ AffinityAssistantImage string
  // GitImage is the container image with Git that we use to implement the Git source step.
  GitImage string
  // CredsImage is the container image used to initialize credentials before the build runs.

pkg/apis/resource/v1alpha1/storage/build_gcs_test.go

@@ -33,6 +33,7 @@ import (
 var images = pipeline.Images{
  EntrypointImage: "override-with-entrypoint:latest",
  NopImage: "tianon/true",
+ AffinityAssistantImage: "nginx",
  GitImage: "override-with-git:latest",
  CredsImage: "override-with-creds:latest",
  KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",

pkg/artifacts/artifact_storage_test.go

@@ -39,6 +39,7 @@ var (
  images = pipeline.Images{
  EntrypointImage: "override-with-entrypoint:latest",
  NopImage: "tianon/true",
+ AffinityAssistantImage: "nginx",
  GitImage: "override-with-git:latest",
  CredsImage: "override-with-creds:latest",
  KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",

pkg/reconciler/pipelinerun/affinity_assistant.go

@@ -56,7 +56,8 @@ func (c *Reconciler) createAffinityAssistants(wb []v1alpha1.WorkspaceBinding, pr
  claimName := getClaimName(w, pr.GetOwnerReference())
  switch {
  case apierrors.IsNotFound(err):
- _, err := c.KubeClientSet.AppsV1().StatefulSets(namespace).Create(affinityAssistantStatefulSet(affinityAssistantName, pr, claimName))
+ affinityAssistantStatefulSet := affinityAssistantStatefulSet(affinityAssistantName, pr, claimName, c.Images.AffinityAssistantImage)
+ _, err := c.KubeClientSet.AppsV1().StatefulSets(namespace).Create(affinityAssistantStatefulSet)
  if err != nil {
  errs = append(errs, fmt.Errorf("failed to create StatefulSet %s: %s", affinityAssistantName, err))
  }
@@ -113,7 +114,7 @@ func getStatefulSetLabels(pr *v1beta1.PipelineRun, affinityAssistantName string)
  return labels
 }
 
-func affinityAssistantStatefulSet(name string, pr *v1beta1.PipelineRun, claimName string) *appsv1.StatefulSet {
+func affinityAssistantStatefulSet(name string, pr *v1beta1.PipelineRun, claimName string, affinityAssistantImage string) *appsv1.StatefulSet {
  // We want a singleton pod
  replicas := int32(1)
 
@@ -130,10 +131,8 @@ func affinityAssistantStatefulSet(name string, pr *v1beta1.PipelineRun, claimNam
  }
 
  containers := []corev1.Container{{
- Name: "affinity-assistant",
-
- //TODO(#2640) We may want to create a custom, minimal binary
- Image: "nginx",
+ Name: "affinity-assistant",
+ Image: affinityAssistantImage,
 
  // Set requests == limits to get QoS class _Guaranteed_.
  // See https://kubernetes.io/docs/tasks/configure-pod-container/quality-service-pod/#create-a-pod-that-gets-assigned-a-qos-class-of-guaranteed

pkg/reconciler/pipelinerun/affinity_assistant_test.go

@@ -105,7 +105,7 @@ func TestThatCustomTolerationsAndNodeSelectorArePropagatedToAffinityAssistant(t
  },
  }
 
- stsWithTolerationsAndNodeSelector := affinityAssistantStatefulSet("test-assistant", prWithCustomPodTemplate, "mypvc")
+ stsWithTolerationsAndNodeSelector := affinityAssistantStatefulSet("test-assistant", prWithCustomPodTemplate, "mypvc", "nginx")
 
  if len(stsWithTolerationsAndNodeSelector.Spec.Template.Spec.Tolerations) != 1 {
  t.Errorf("expected Tolerations in the StatefulSet")
@@ -125,7 +125,7 @@ func TestThatTheAffinityAssistantIsWithoutNodeSelectorAndTolerations(t *testing.
  Spec: v1beta1.PipelineRunSpec{},
  }
 
- stsWithoutTolerationsAndNodeSelector := affinityAssistantStatefulSet("test-assistant", prWithoutCustomPodTemplate, "mypvc")
+ stsWithoutTolerationsAndNodeSelector := affinityAssistantStatefulSet("test-assistant", prWithoutCustomPodTemplate, "mypvc", "nginx")
 
  if len(stsWithoutTolerationsAndNodeSelector.Spec.Template.Spec.Tolerations) != 0 {
  t.Errorf("unexpected Tolerations in the StatefulSet")

pkg/reconciler/pipelinerun/pipelinerun_test.go

@@ -58,6 +58,7 @@ var (
  images = pipeline.Images{
  EntrypointImage: "override-with-entrypoint:latest",
  NopImage: "tianon/true",
+ AffinityAssistantImage: "nginx",
  GitImage: "override-with-git:latest",
  CredsImage: "override-with-creds:latest",
  KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",

pkg/reconciler/taskrun/resources/apply_test.go

@@ -36,6 +36,7 @@ var (
  images = pipeline.Images{
  EntrypointImage: "override-with-entrypoint:latest",
  NopImage: "tianon/true",
+ AffinityAssistantImage: "nginx",
  GitImage: "override-with-git:latest",
  CredsImage: "override-with-creds:latest",
  KubeconfigWriterImage: "override-with-kubeconfig-writer-image:latest",

pkg/reconciler/taskrun/resources/input_resource_test.go

@@ -38,6 +38,7 @@ var (
  images = pipeline.Images{
  EntrypointImage: "override-with-entrypoint:latest",
  NopImage: "tianon/true",
+ AffinityAssistantImage: "nginx",
  GitImage: "override-with-git:latest",
  CredsImage: "override-with-creds:latest",
  KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",

pkg/reconciler/taskrun/taskrun_test.go

@@ -67,6 +67,7 @@ var (
  images = pipeline.Images{
  EntrypointImage: "override-with-entrypoint:latest",
  NopImage: "tianon/true",
+ AffinityAssistantImage: "nginx",
  GitImage: "override-with-git:latest",
  CredsImage: "override-with-creds:latest",
  KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",