Add image tag definition in buildrun spec

[xiujuan95]

Fix issue:#150

If imageURL exists in build and buildRun spec simultaneously, then the imageURL in build spec will be overwrote using the imageURL in buildRun spec. Finally, built image will be push into the imageURL in buildRun.

• Add e2e test for above scenario. E2E test passed:

Ran 16 of 21 Specs in 698.229 seconds
SUCCESS! -- 16 Passed | 0 Failed | 0 Pending | 5 Skipped


Ginkgo ran 1 suite in 12m9.653532807s
Test Suite Passed

• Besides, for testing locally, we need to define a new environment parameter TEST_IMAGE_REPO_BUILDRUN .

So now, if you want to run e2e test locally, you must export TEST_IMAGE_REPO_BUILDRUN first.

• Below is an example, build and buildrun both have image url definition:

apiVersion: build.dev/v1alpha1
kind: Build
metadata:
  name: build-image-tag
spec:
  source:
    url: https://github.com/sbose78/taxi
  strategy:
    name: kaniko
    kind: ClusterBuildStrategy
  resources:
    limits:
      cpu: "500m"
      memory: "1Gi"
  output:
    image: us.icr.io/zoe_namespace/imagev1

apiVersion: build.dev/v1alpha1
kind: BuildRun
metadata:
  name: buildrun-image-tag
spec:
  buildRef:
    name: build-image-tag
  output:
    image: us.icr.io/zoe_namespace/imagev2

And then the spec of taskrun should be:

apiVersion: tekton.dev/v1beta1li$ k get tr buildrun-image-tag-8j8j4 -o yaml
kind: TaskRun
metadata:
  annotations:
    pipeline.tekton.dev/release: devel
  creationTimestamp: "2020-05-27T09:09:52Z"
  generateName: buildrun-image-tag-
  generation: 1
  labels:
    app.kubernetes.io/managed-by: tekton-pipelines
    build.build.dev/generation: "1"
    build.build.dev/name: build-image-tag
    buildrun.build.dev/generation: "1"
    buildrun.build.dev/name: buildrun-image-tag
  name: buildrun-image-tag-8j8j4
  namespace: default
  ownerReferences:
  - apiVersion: build.dev/v1alpha1
    blockOwnerDeletion: true
    controller: true
    kind: BuildRun
    name: buildrun-image-tag
    uid: 3e5e662e-bbd1-41f0-bf5f-0a6eceb53356
  resourceVersion: "3540868"
  selfLink: /apis/tekton.dev/v1beta1/namespaces/default/taskruns/buildrun-image-tag-8j8j4
  uid: 88073643-4a6f-4f76-bc3b-8f4a2cf7447b
spec:
  resources:
    inputs:
    - name: source
      resourceSpec:
        params:
        - name: url
          value: https://github.com/sbose78/taxi
        - name: revision
          value: master
        type: git
    outputs:
    - name: image
      resourceSpec:
        params:
        - name: url
          value: us.icr.io/zoe_namespace/imagev2
        type: image
  serviceAccountName: pipeline
  taskSpec:
    params:
    - default: docker.io/centos/nodejs-8-centos7
      description: Image containing the build tools/logic
      name: BUILDER_IMAGE
      type: string
    - default: Dockerfile
      description: Path to the Dockerfile
      name: DOCKERFILE
      type: string
    - default: .
      description: The root of the code
      name: PATH_CONTEXT
      type: string
    resources:
      inputs:
      - name: source
        type: git
      outputs:
      - name: image
        type: image
    steps:
    - args:
      - --skip-tls-verify=true
      - --dockerfile=$(inputs.params.DOCKERFILE)
      - --context=/workspace/source/$(inputs.params.PATH_CONTEXT)
      - --destination=$(outputs.resources.image.url)
      command:
      - /kaniko/executor
      env:
      - name: DOCKER_CONFIG
        value: /tekton/home/.docker
      image: gcr.io/kaniko-project/executor:latest
      name: step-build-and-push
      resources:
        limits:
          cpu: 500m
          memory: 1Gi
      securityContext:
        capabilities:
          add:
          - CHOWN
          - DAC_OVERRIDE
          - FOWNER
          - SETGID
          - SETUID
        runAsUser: 0
  timeout: 1h0m0s
status:

[openshift-ci-robot]

Hi @xiujuan95. Thanks for your PR.

I'm waiting for a redhat-developer member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[SaschaSchwarze0]

Hi @openshift-ci-robot, you just requested a review from me. Please be aware that I am on vacation and come back June 2nd.

[xiujuan95]

@zhangtbj @qu1queee Pls also help review, thanks a lot!

[qu1queee]

/assign @qu1queee

[sbose78]

Are you overriding output image credentials too?

[xiujuan95]

Are you overriding output image credentials too?

@sbose78 No, I just change the output image url, I don't overwrite the credentials

[qu1queee]

@xiujuan95 hi, thanks for the PR. I have a very minor request for change, the rest is actually a more general questions, where I think we do not need the e2e tests, and is enough with the unit tests you wrote. Feel free to challenge this.

[otaviof]

/ok-to-test

[xiujuan95]

@xiujuan95 hi, thanks for the PR. I have a very minor request for change, the rest is actually a more general questions, where I think we do not need the e2e tests, and is enough with the unit tests you wrote. Feel free to challenge this.

@qu1queee Thanks for your review! Yes, about this opinion, I agree with you, I have modified it. And also I add imageURL definition doc in buildRun. Pls help review again, thanks a lot!

[qu1queee]

LGTM! Thanks

[qu1queee]

/lgtm

[qu1queee]

/approve

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qu1queee

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [qu1queee]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment