Merge pull request #17496 from justaugustus/k8s-base-images

releng: Fix args for debian-{base,iptables} and pause image builds
kubernetes · May 4, 2020 · 609f0d4 · 609f0d4
2 parents 13d70e5 + ea941e7
commit 609f0d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/config/jobs/image-pushing/k8s-staging-build-image.yaml b/config/jobs/image-pushing/k8s-staging-build-image.yaml
@@ -18,8 +18,8 @@ postsubmits:
             args:
               - --project=k8s-staging-build-image
               - --scratch-bucket=gs://k8s-staging-build-image-gcb
-              - --gcb-config=build/debian-base/cloudbuild.yaml
-              - .
+              - --build-dir=.
+              - build/debian-base
             env:
               - name: LOG_TO_STDOUT
                 value: "y"
@@ -44,8 +44,8 @@ postsubmits:
             args:
               - --project=k8s-staging-build-image
               - --scratch-bucket=gs://k8s-staging-build-image-gcb
-              - --gcb-config=build/debian-iptables/cloudbuild.yaml
-              - .
+              - --build-dir=.
+              - build/debian-iptables
             env:
               - name: LOG_TO_STDOUT
                 value: "y"

diff --git a/config/jobs/image-pushing/k8s-staging-kubernetes.yaml b/config/jobs/image-pushing/k8s-staging-kubernetes.yaml
@@ -10,16 +10,16 @@ postsubmits:
       branches:
         - ^master$
       spec:
-        serviceAccountName: deployer # TODO(fejta): use pusher
+        serviceAccountName: gcb-builder
         containers:
           - image: gcr.io/k8s-testimages/image-builder:v20200422-c760048
             command:
               - /run.sh
             args:
               - --project=k8s-staging-kubernetes
               - --scratch-bucket=gs://k8s-staging-kubernetes-gcb
-              - --gcb-config=build/pause/cloudbuild.yaml
-              - .
+              - --build-dir=.
+              - build/pause
             env:
               - name: LOG_TO_STDOUT
                 value: "y"