kube-cross: Fix image pushing job failures #1202
Conversation
kube-cross images are being pushed successfully via Prow, but the job is currently failing due to the 'images' check in cloudbuild.yaml (which is expecting the image tag that would've only existed when the builds were being done from k/k). Here we: - remove the failing 'images' check If an image push fails, the Prow job will fail anyway - s/KUBE_CROSS_VERSION/VERSION - match the TAG logic with gcbuilder's getVersion() git describe - pass _GIT_TAG and _PULL_BASE_REF to the GCB environment Signed-off-by: Stephen Augustus <[email protected]>
k8s-ci-robot
added
cncf-cla: yes
|
@justaugustus: Adding label: Reasons for blocking this PR:[Changes to certain release tools can affect our ability to test, build, and release Kubernetes. This PR must be explicitly approved by SIG Release repo admins.] 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. |
k8s-ci-robot
added
do-not-merge/blocked-paths
k8s-ci-robot
added
the
approved
There are no changes to the Dockerfile, but the surrounding Makefile and cloudbuild.yaml changes will cause a new manifest to be built, so we should bump the tag. Signed-off-by: Stephen Augustus <[email protected]>
k8s-ci-robot
added
size/M
justaugustus
changed the title
k8s-ci-robot
removed
the
do-not-merge/work-in-progress
justaugustus
removed
the
do-not-merge/blocked-paths
| @@ -18,8 +18,8 @@ STAGING_REGISTRY?=gcr.io/k8s-staging-build-image | |||
| PROD_REGISTRY?=us.gcr.io/k8s-artifacts-prod/build-image | |||
| IMAGE=kube-cross | |||
|
|
|||
| TAG?=kubernetes-$(shell git describe --tags --match='v*' --abbrev=14) | |||
| KUBE_CROSS_VERSION=$(shell cat VERSION) | |||
| TAG?=$(shell git describe --tags --always --dirty) | |||
There was a problem hiding this comment.
we should probably leave --abbrev=14 in
There was a problem hiding this comment.
otherwise the sha suffix will not be of the same length everytime
There was a problem hiding this comment.
@dims -- I did that to more closely match the tag that the image builder spits out: https://github.com/kubernetes/test-infra/blob/4fd8fb189fc644bc995da1f73a0991751a367745/images/builder/main.go#L49
There was a problem hiding this comment.
Ultimately, the tag we care about here is VERSION; TAG is more of a sanity check so we have an idea of what we're promoting compared to VERSION.
There was a problem hiding this comment.
we'll know soon enough if something breaks i guess
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dims, justaugustus 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:
Approvers can indicate their approval by writing |
What type of PR is this?
/kind bug failing-test
What this PR does / why we need it:
kube-cross: Fix image pushing job failures
kube-cross images are being pushed successfully via Prow, but the job is
currently failing due to the 'images' check in
cloudbuild.yaml(which isexpecting the image tag that would've only existed when the builds were
being done from k/k).
Here we:
If an image push fails, the Prow job will fail anyway
KUBE_CROSS_VERSION/VERSIONTAGlogic with gcbuilder'sgetVersion()git describe_GIT_TAGand_PULL_BASE_REFto the GCB environmentkube-cross: Bump to v1.13.9-2
There are no changes to the Dockerfile, but the surrounding Makefile and
cloudbuild.yaml changes will cause a new manifest to be built, so we
should bump the tag.
Signed-off-by: Stephen Augustus [email protected]
Which issue(s) this PR fixes:
Fixes https://github.com/kubernetes/kubernetes/issues/89293
Does this PR introduce a user-facing change?