Merge pull request #3147 from BenTheElder/latest-builds

improve post merge image builds
kubernetes-sigs · Mar 30, 2023 · 48f316c · 48f316c
2 parents 066bb82 + 91ac084
commit 48f316c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/images/haproxy/cloudbuild.yaml b/images/haproxy/cloudbuild.yaml
@@ -1,6 +1,7 @@
 # See https://cloud.google.com/cloud-build/docs/build-config
 options:
   substitution_option: ALLOW_LOOSE
+  machineType: N1_HIGHCPU_8
 steps:
 - name: gcr.io/k8s-testimages/krte:latest-master
   entrypoint: make

diff --git a/images/kindnetd/Dockerfile b/images/kindnetd/Dockerfile
@@ -24,6 +24,6 @@ COPY . .
 RUN CGO_ENABLED=0 go build -o ./kindnetd ./cmd/kindnetd
 
 # build real kindnetd image
-FROM registry.k8s.io/build-image/distroless-iptables:v0.2.1
+FROM registry.k8s.io/build-image/distroless-iptables:v0.2.2
 COPY --from=0 --chown=root:root ./go/src/kindnetd /bin/kindnetd
 CMD ["/bin/kindnetd"]
diff --git a/images/kindnetd/cloudbuild.yaml b/images/kindnetd/cloudbuild.yaml
@@ -1,7 +1,7 @@
 # See https://cloud.google.com/cloud-build/docs/build-config
 options:
   substitution_option: ALLOW_LOOSE
-  machineType: N1_HIGHCPU_8
+  machineType: N1_HIGHCPU_32
 steps:
 - name: gcr.io/k8s-testimages/krte:latest-master
   entrypoint: make

diff --git a/images/local-path-helper/cloudbuild.yaml b/images/local-path-helper/cloudbuild.yaml
@@ -1,6 +1,7 @@
 # See https://cloud.google.com/cloud-build/docs/build-config
 options:
   substitution_option: ALLOW_LOOSE
+  machineType: N1_HIGHCPU_8
 steps:
 - name: gcr.io/k8s-testimages/krte:latest-master
   entrypoint: make

diff --git a/images/local-path-provisioner/cloudbuild.yaml b/images/local-path-provisioner/cloudbuild.yaml
@@ -1,6 +1,7 @@
 # See https://cloud.google.com/cloud-build/docs/build-config
 options:
   substitution_option: ALLOW_LOOSE
+  machineType: N1_HIGHCPU_8
 steps:
 - name: gcr.io/k8s-testimages/krte:latest-master
   entrypoint: make