From 9458294ed5c04a48a365aa62fcbb8353f94a02dc Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Sun, 11 Aug 2024 00:17:54 +0200 Subject: [PATCH] Cloud Build: Remove `substitution_option`. --- cloudbuild.yaml | 12 ++++-------- images/cfssl/cloudbuild.yaml | 2 -- images/custom-error-pages/cloudbuild.yaml | 2 -- images/ext-auth-example-authsvc/cloudbuild.yaml | 2 -- images/fastcgi-helloserver/cloudbuild.yaml | 2 -- images/go-grpc-greeter-server/cloudbuild.yaml | 2 -- images/httpbun/cloudbuild.yaml | 2 -- images/kube-webhook-certgen/cloudbuild.yaml | 2 -- images/nginx-1.25/cloudbuild.yaml | 1 - images/nginx/cloudbuild.yaml | 1 - images/opentelemetry/cloudbuild.yaml | 1 - images/test-runner/cloudbuild.yaml | 2 -- 12 files changed, 4 insertions(+), 27 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index a6b70a52d..265947b8b 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -1,18 +1,14 @@ -options: - substitution_option: ALLOW_LOOSE +substitutions: + _PULL_BASE_SHA: "12345" steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: - REGISTRY=gcr.io/k8s-staging-ingress-nginx - REPO_INFO=https://github.com/kubernetes/ingress-nginx - - COMMIT_SHA=$_PULL_BASE_SHA - - BUILD_ID=$BUILD_ID + - COMMIT_SHA=${_PULL_BASE_SHA} + - BUILD_ID=${BUILD_ID} entrypoint: bash args: - -c - gcloud auth configure-docker && make release -substitutions: - _GIT_TAG: "12345" - _PULL_BASE_REF: main - _PULL_BASE_SHA: "12345" timeout: 1800s diff --git a/images/cfssl/cloudbuild.yaml b/images/cfssl/cloudbuild.yaml index dc5dc71a5..8ddb22013 100644 --- a/images/cfssl/cloudbuild.yaml +++ b/images/cfssl/cloudbuild.yaml @@ -1,5 +1,3 @@ -options: - 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 0a2e2067c..bc1a3dc91 100644 --- a/images/custom-error-pages/cloudbuild.yaml +++ b/images/custom-error-pages/cloudbuild.yaml @@ -1,5 +1,3 @@ -options: - 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 ef8d569dd..4ce8d75d3 100644 --- a/images/ext-auth-example-authsvc/cloudbuild.yaml +++ b/images/ext-auth-example-authsvc/cloudbuild.yaml @@ -1,5 +1,3 @@ -options: - 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 24a23018c..a74fcfddc 100644 --- a/images/fastcgi-helloserver/cloudbuild.yaml +++ b/images/fastcgi-helloserver/cloudbuild.yaml @@ -1,5 +1,3 @@ -options: - 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 257725e61..4ae3139bd 100644 --- a/images/go-grpc-greeter-server/cloudbuild.yaml +++ b/images/go-grpc-greeter-server/cloudbuild.yaml @@ -1,5 +1,3 @@ -options: - 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 5ec59df8f..e718d319f 100644 --- a/images/httpbun/cloudbuild.yaml +++ b/images/httpbun/cloudbuild.yaml @@ -1,5 +1,3 @@ -options: - 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 5f48154ee..33f181add 100644 --- a/images/kube-webhook-certgen/cloudbuild.yaml +++ b/images/kube-webhook-certgen/cloudbuild.yaml @@ -1,5 +1,3 @@ -options: - 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 4dc8ab2dc..c03425a5a 100644 --- a/images/nginx-1.25/cloudbuild.yaml +++ b/images/nginx-1.25/cloudbuild.yaml @@ -1,5 +1,4 @@ options: - substitution_option: ALLOW_LOOSE # Increase machine type for multi-arch builds. machineType: E2_HIGHCPU_32 steps: diff --git a/images/nginx/cloudbuild.yaml b/images/nginx/cloudbuild.yaml index 687f76228..871110162 100644 --- a/images/nginx/cloudbuild.yaml +++ b/images/nginx/cloudbuild.yaml @@ -1,5 +1,4 @@ options: - substitution_option: ALLOW_LOOSE # Increase machine type for multi-arch builds. machineType: E2_HIGHCPU_32 steps: diff --git a/images/opentelemetry/cloudbuild.yaml b/images/opentelemetry/cloudbuild.yaml index 4cf071c09..95fdabac9 100644 --- a/images/opentelemetry/cloudbuild.yaml +++ b/images/opentelemetry/cloudbuild.yaml @@ -1,5 +1,4 @@ options: - substitution_option: ALLOW_LOOSE # Increase machine type for multi-arch builds. machineType: E2_HIGHCPU_8 steps: diff --git a/images/test-runner/cloudbuild.yaml b/images/test-runner/cloudbuild.yaml index b09800c90..cd8d73e98 100644 --- a/images/test-runner/cloudbuild.yaml +++ b/images/test-runner/cloudbuild.yaml @@ -1,5 +1,3 @@ -options: - substitution_option: ALLOW_LOOSE steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9 env: