From f76e9be8d6a0fed34c7623a1e07fb1b405628bb1 Mon Sep 17 00:00:00 2001 From: k8s-infra-cherrypick-robot <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com> Date: Sun, 11 Aug 2024 01:05:23 -0700 Subject: [PATCH] Cloud Build: Fix substitutions. (#11759) Prow hands in some substitutions via arguments we need to ignore. Co-authored-by: Marco Ebert --- cloudbuild.yaml | 5 +++-- images/cfssl/cloudbuild.yaml | 3 +++ images/custom-error-pages/cloudbuild.yaml | 3 +++ images/ext-auth-example-authsvc/cloudbuild.yaml | 3 +++ images/fastcgi-helloserver/cloudbuild.yaml | 3 +++ images/go-grpc-greeter-server/cloudbuild.yaml | 3 +++ images/httpbun/cloudbuild.yaml | 3 +++ images/kube-webhook-certgen/cloudbuild.yaml | 3 +++ images/nginx-1.25/cloudbuild.yaml | 2 ++ images/nginx/cloudbuild.yaml | 2 ++ images/opentelemetry/cloudbuild.yaml | 2 ++ images/test-runner/cloudbuild.yaml | 3 +++ 12 files changed, 33 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 265947b8bf..4948387205 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -1,5 +1,6 @@ -substitutions: - _PULL_BASE_SHA: "12345" +options: + # Ignore Prow provided substitutions. + substitution_option: ALLOW_LOOSE steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: diff --git a/images/cfssl/cloudbuild.yaml b/images/cfssl/cloudbuild.yaml index 8ddb220135..6b5b0fc1b3 100644 --- a/images/cfssl/cloudbuild.yaml +++ b/images/cfssl/cloudbuild.yaml @@ -1,3 +1,6 @@ +options: + # Ignore Prow provided substitutions. + substitution_option: ALLOW_LOOSE steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: diff --git a/images/custom-error-pages/cloudbuild.yaml b/images/custom-error-pages/cloudbuild.yaml index bc1a3dc915..772a7697f7 100644 --- a/images/custom-error-pages/cloudbuild.yaml +++ b/images/custom-error-pages/cloudbuild.yaml @@ -1,3 +1,6 @@ +options: + # Ignore Prow provided substitutions. + substitution_option: ALLOW_LOOSE steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: diff --git a/images/ext-auth-example-authsvc/cloudbuild.yaml b/images/ext-auth-example-authsvc/cloudbuild.yaml index 4ce8d75d3c..09535a5a64 100644 --- a/images/ext-auth-example-authsvc/cloudbuild.yaml +++ b/images/ext-auth-example-authsvc/cloudbuild.yaml @@ -1,3 +1,6 @@ +options: + # Ignore Prow provided substitutions. + substitution_option: ALLOW_LOOSE steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: diff --git a/images/fastcgi-helloserver/cloudbuild.yaml b/images/fastcgi-helloserver/cloudbuild.yaml index a74fcfddc0..5fb3e33180 100644 --- a/images/fastcgi-helloserver/cloudbuild.yaml +++ b/images/fastcgi-helloserver/cloudbuild.yaml @@ -1,3 +1,6 @@ +options: + # Ignore Prow provided substitutions. + substitution_option: ALLOW_LOOSE steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: diff --git a/images/go-grpc-greeter-server/cloudbuild.yaml b/images/go-grpc-greeter-server/cloudbuild.yaml index 4ae3139bd4..44e0bef8b8 100644 --- a/images/go-grpc-greeter-server/cloudbuild.yaml +++ b/images/go-grpc-greeter-server/cloudbuild.yaml @@ -1,3 +1,6 @@ +options: + # Ignore Prow provided substitutions. + substitution_option: ALLOW_LOOSE steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: diff --git a/images/httpbun/cloudbuild.yaml b/images/httpbun/cloudbuild.yaml index e718d319f1..3d26625314 100644 --- a/images/httpbun/cloudbuild.yaml +++ b/images/httpbun/cloudbuild.yaml @@ -1,3 +1,6 @@ +options: + # Ignore Prow provided substitutions. + substitution_option: ALLOW_LOOSE steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: diff --git a/images/kube-webhook-certgen/cloudbuild.yaml b/images/kube-webhook-certgen/cloudbuild.yaml index 33f181add9..8bf139423c 100644 --- a/images/kube-webhook-certgen/cloudbuild.yaml +++ b/images/kube-webhook-certgen/cloudbuild.yaml @@ -1,3 +1,6 @@ +options: + # Ignore Prow provided substitutions. + substitution_option: ALLOW_LOOSE steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: diff --git a/images/nginx-1.25/cloudbuild.yaml b/images/nginx-1.25/cloudbuild.yaml index c03425a5a6..d8bb1f2a9e 100644 --- a/images/nginx-1.25/cloudbuild.yaml +++ b/images/nginx-1.25/cloudbuild.yaml @@ -1,6 +1,8 @@ options: # Increase machine type for multi-arch builds. machineType: E2_HIGHCPU_32 + # Ignore Prow provided substitutions. + substitution_option: ALLOW_LOOSE steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: diff --git a/images/nginx/cloudbuild.yaml b/images/nginx/cloudbuild.yaml index 871110162e..a5ec1abd8c 100644 --- a/images/nginx/cloudbuild.yaml +++ b/images/nginx/cloudbuild.yaml @@ -1,6 +1,8 @@ options: # Increase machine type for multi-arch builds. machineType: E2_HIGHCPU_32 + # Ignore Prow provided substitutions. + substitution_option: ALLOW_LOOSE steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: diff --git a/images/opentelemetry/cloudbuild.yaml b/images/opentelemetry/cloudbuild.yaml index 95fdabac92..98281d8ef0 100644 --- a/images/opentelemetry/cloudbuild.yaml +++ b/images/opentelemetry/cloudbuild.yaml @@ -1,6 +1,8 @@ options: # Increase machine type for multi-arch builds. machineType: E2_HIGHCPU_8 + # Ignore Prow provided substitutions. + substitution_option: ALLOW_LOOSE steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: diff --git a/images/test-runner/cloudbuild.yaml b/images/test-runner/cloudbuild.yaml index cd8d73e983..6efe5eeaf5 100644 --- a/images/test-runner/cloudbuild.yaml +++ b/images/test-runner/cloudbuild.yaml @@ -1,3 +1,6 @@ +options: + # Ignore Prow provided substitutions. + substitution_option: ALLOW_LOOSE steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: