Cloud Build: Remove substitution_option.

kubernetes · Aug 10, 2024 · 9458294 · 9458294
1 parent 4ac9666
commit 9458294
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 27 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,3 @@
-options:
-  substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env: