Merge pull request #1141 from justaugustus/kcb-image

images: Update k8s-cloud-builder to use the new kube-cross location
kubernetes · Mar 1, 2020 · a81356f · a81356f
2 parents c92b814 + c54aa86
commit a81356f
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 14 deletions.
diff --git a/anago b/anago
@@ -519,8 +519,8 @@ local_kube_cross () {
   local local_image
   local docker_image
 
-  docker_image="${GCRIO_PATH_PROD}/kube-cross"
-  version="$(cat "${TREE_ROOT}/build/build-image/cross/VERSION")"
+  docker_image="${KUBE_CROSS_IMAGE}"
+  version="$(cat "${TREE_ROOT}/${KUBE_CROSS_CONFIG_LOCATION}/VERSION")"
   image="${docker_image}:${version}"
   local_image="${docker_image}:local"
 
@@ -531,7 +531,7 @@ local_kube_cross () {
   else
     logecho -n "Building docker image ${image}: "
     logrun -s docker build --cache-from "$docker_image" -t "$image" \
-                           -t "$local_image" "${TREE_ROOT}/build/build-image/cross/"
+                           -t "$local_image" "${TREE_ROOT}/${KUBE_CROSS_CONFIG_LOCATION}/"
   fi
 }
 

diff --git a/gcb/build/cloudbuild.yaml b/gcb/build/cloudbuild.yaml
@@ -19,21 +19,21 @@ steps:
   - ${_RELEASE_TOOL_REPO}
   waitFor: [ '-' ]
 
-- name: 'gcr.io/$PROJECT_ID/k8s-cloud-builder'
+- name: 'gcr.io/k8s-staging-release-test/k8s-cloud-builder:v1.13.8-1'
   id: prepare
   dir: 'go/src/k8s.io/kubernetes'
   args:
   - make
   - clean
 
-- name: 'gcr.io/$PROJECT_ID/k8s-cloud-builder'
+- name: 'gcr.io/k8s-staging-release-test/k8s-cloud-builder:v1.13.8-1'
   id: build
   dir: 'go/src/k8s.io/kubernetes'
   args:
   - make
   - "${_RELEASE_TYPE}"
 
-- name: 'gcr.io/$PROJECT_ID/k8s-cloud-builder'
+- name: 'gcr.io/k8s-staging-release-test/k8s-cloud-builder:v1.13.8-1'
   id: push-build
   dir: 'go/src/k8s.io/kubernetes'
   args:

diff --git a/gcb/patch-announce/cloudbuild.yaml b/gcb/patch-announce/cloudbuild.yaml
@@ -39,7 +39,7 @@ steps:
   - "--branch=${_RELEASE_GIT_BRANCH}"
 
 - id: prepare-and-send
-  name: "gcr.io/${PROJECT_ID}/k8s-cloud-builder"
+  name: "gcr.io/k8s-staging-release-test/k8s-cloud-builder:v1.13.8-1"
   env:
   - "SENDER_NAME=${_SENDER_NAME}"
   - "SENDER_EMAIL=${_SENDER_EMAIL}"

diff --git a/gcb/release/cloudbuild.yaml b/gcb/release/cloudbuild.yaml
@@ -24,7 +24,7 @@ steps:
   - "--branch=${_TOOL_BRANCH}"
   - "https://github.com/${_TOOL_ORG}/${_TOOL_REPO}"
 
-- name: k8s.gcr.io/kube-cross:${_KUBE_CROSS_VERSION}
+- name: us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:${_KUBE_CROSS_VERSION}
   dir: "go/src/k8s.io/release"
   env:
   - "GOPATH=/workspace/go"
@@ -35,7 +35,7 @@ steps:
   args:
   - "./compile-release-tools"
 
-- name: gcr.io/$PROJECT_ID/k8s-cloud-builder
+- name: gcr.io/k8s-staging-release-test/k8s-cloud-builder:${_KUBE_CROSS_VERSION}
   dir: "go/src/k8s.io/release"
   env:
   - "TOOL_ORG=${_TOOL_ORG}"

diff --git a/gcb/stage/cloudbuild.yaml b/gcb/stage/cloudbuild.yaml
@@ -24,7 +24,7 @@ steps:
   - "--branch=${_TOOL_BRANCH}"
   - "https://github.com/${_TOOL_ORG}/${_TOOL_REPO}"
 
-- name: k8s.gcr.io/kube-cross:${_KUBE_CROSS_VERSION}
+- name: us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:${_KUBE_CROSS_VERSION}
   dir: "go/src/k8s.io/release"
   env:
   - "GOPATH=/workspace/go"
@@ -35,7 +35,7 @@ steps:
   args:
   - "./compile-release-tools"
 
-- name: gcr.io/$PROJECT_ID/k8s-cloud-builder
+- name: gcr.io/k8s-staging-release-test/k8s-cloud-builder:${_KUBE_CROSS_VERSION}
   dir: "go/src/k8s.io/release"
   env:
   - "TOOL_ORG=${_TOOL_ORG}"
@@ -58,7 +58,7 @@ steps:
   - "--basedir=/workspace"
   - "--tmpdir=/workspace/tmp"
 
-- name: k8s.gcr.io/kube-cross:local
+- name: us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:local
   dir: "go/src/k8s.io/release"
   env:
   - "TOOL_ORG=${_TOOL_ORG}"
@@ -79,7 +79,7 @@ steps:
   - "--basedir=/workspace"
   - "--tmpdir=/workspace/tmp"
 
-- name: gcr.io/$PROJECT_ID/k8s-cloud-builder
+- name: gcr.io/k8s-staging-release-test/k8s-cloud-builder:${_KUBE_CROSS_VERSION}
   dir: "go/src/k8s.io/release"
   env:
   - "TOOL_ORG=${_TOOL_ORG}"

diff --git a/images/k8s-cloud-builder/Dockerfile b/images/k8s-cloud-builder/Dockerfile
@@ -18,7 +18,7 @@
 ARG DEBIAN_FRONTEND=noninteractive
 
 ##------------------------------------------------------------
-FROM k8s.gcr.io/kube-cross:v1.13.4-1
+FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.13.8-1
 
 RUN apt-get -q update
 

diff --git a/lib/releaselib.sh b/lib/releaselib.sh
@@ -27,6 +27,10 @@ readonly PROD_BUCKET="kubernetes-release"
 readonly TEST_BUCKET="kubernetes-release-gcb"
 readonly CI_BUCKET="kubernetes-release-dev"
 
+readonly KUBE_CROSS_REGISTRY="us.gcr.io/k8s-artifacts-prod/build-image"
+readonly KUBE_CROSS_IMAGE="${KUBE_CROSS_REGISTRY}/kube-cross"
+readonly KUBE_CROSS_CONFIG_LOCATION="build/build-image/cross"
+
 # Set a globally usable variable for the changelog directory since we've been
 # piecemeal search/replace-ing this and missing some cases.
 readonly CHANGELOG_DIR="CHANGELOG"