Merge pull request #1868 from saschagrunert/image-auth-fix

Fix GCR authentication for base images
kubernetes · Jan 22, 2021 · 77cec6b · 77cec6b
2 parents 4d30c63 + 97a8b16
commit 77cec6b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/images/build/debian-base/cloudbuild.yaml b/images/build/debian-base/cloudbuild.yaml
@@ -5,7 +5,7 @@ options:
   machineType: 'N1_HIGHCPU_8'
 steps:
   - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f'
-    entrypoint: make
+    entrypoint: bash
     dir: ./images/build/debian-base
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
@@ -18,7 +18,10 @@ steps:
       - CONFIG=$_CONFIG
       - HOME=/root  # for docker buildx
     args:
-      - all-push
+    - -c
+    - |
+      gcloud auth configure-docker && \
+      make all-push
 
 substitutions:
   # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and

diff --git a/images/build/debian-hyperkube-base/cloudbuild.yaml b/images/build/debian-hyperkube-base/cloudbuild.yaml
@@ -5,15 +5,18 @@ options:
   machineType: 'N1_HIGHCPU_8'
 steps:
   - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200824-5d057db'
-    entrypoint: make
+    entrypoint: bash
     dir: ./images/build/debian-hyperkube-base
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
       - REGISTRY=gcr.io/$PROJECT_ID
       - IMAGE=gcr.io/$PROJECT_ID/debian-hyperkube-base
       - HOME=/root  # for docker buildx
     args:
-      - all-push
+    - -c
+    - |
+      gcloud auth configure-docker && \
+      make all-push
 
 tags:
 - 'debian-hyperkube-base'
diff --git a/images/build/debian-iptables/cloudbuild.yaml b/images/build/debian-iptables/cloudbuild.yaml
@@ -5,7 +5,7 @@ options:
   machineType: 'N1_HIGHCPU_8'
 steps:
   - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f'
-    entrypoint: make
+    entrypoint: bash
     dir: ./images/build/debian-iptables
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
@@ -19,7 +19,10 @@ steps:
       - IPTABLES_VERSION=$_IPTABLES_VERSION
       - HOME=/root  # for docker buildx
     args:
-      - all-push
+    - -c
+    - |
+      gcloud auth configure-docker && \
+      make all-push
 
 substitutions:
   # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and