Skip to content

Commit f24e7c6

Browse files
Revert "Bumped up key dependencies and pinned Cloud Build image to the last version with Docker preinstalled"
This reverts commit 698f8bb accidentally pushed to main without proper review.
1 parent 698f8bb commit f24e7c6

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

ci/cloudbuild/release-and-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ options:
2424
machineType: "N1_HIGHCPU_8"
2525

2626
substitutions:
27-
_CLOUDSDK_IMAGE: "gcr.io/google.com/cloudsdktool/cloud-sdk:528.0.0-alpine"
27+
_CLOUDSDK_IMAGE: "gcr.io/google.com/cloudsdktool/cloud-sdk:alpine"
2828
_RELEASE_BUCKET: ""
2929
_EXPORT_BUCKET: ""
3030
_EXPORT_JOB_NAME: ""

ci/cloudbuild/scheduled/reap-gke-clusters/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM gcr.io/google.com/cloudsdktool/cloud-sdk:528.0.0-alpine
15+
FROM gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
1616
WORKDIR /scripts
1717
COPY . .

ci/cloudbuild/scheduled/reap-gke-clusters/build-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
images: ["gcr.io/${PROJECT_ID}/reap-gke-clusters"]
2424
steps:
2525
- id: create script container
26-
name: gcr.io/google.com/cloudsdktool/cloud-sdk:528.0.0-alpine
26+
name: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
2727
dir: /workspace/reap-gke-clusters
2828
entrypoint: docker
2929
args: ["build", "-t", "gcr.io/${PROJECT_ID}/reap-gke-clusters", "."]

ci/cloudbuild/test-many.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ steps:
3939
- id: run test scenarios
4040
timeout: 7200s
4141
entrypoint: python3
42-
name: gcr.io/google.com/cloudsdktool/cloud-sdk:528.0.0-alpine
42+
name: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
4343
args:
4444
- ci/cloudbuild/scripts/run_tests.py
4545
- ${_FULL_RELEASE_BUCKET}

ci/cloudbuild/test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ substitutions:
102102
_SELF_SIGNED_CERTS_BROKER_URL: ''
103103

104104
_KO_IMAGE: 'gcr.io/kf-releases/ko:latest'
105-
_CLOUDSDK_IMAGE: "gcr.io/google.com/cloudsdktool/cloud-sdk:528.0.0-alpine"
106-
_GOLANG_IMAGE: 'golang:1.25'
105+
_CLOUDSDK_IMAGE: "gcr.io/google.com/cloudsdktool/cloud-sdk:alpine"
106+
_GOLANG_IMAGE: 'golang:1.24'
107107

108108
steps:
109109
- id: check substitutions

ci/cloudbuild/unit-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ timeout: 7200s
2424
options:
2525
machineType: "E2_HIGHCPU_8"
2626
substitutions:
27-
_GOLANG_IMAGE: "golang:1.25"
27+
_GOLANG_IMAGE: "golang:1.24"
2828

2929
steps:
3030
- id: verify build

cmd/generate-release/scripts/install-asm.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ else
3333
echo "gcloud CLI is already available, skipping installation"
3434
fi
3535

36-
curl https://storage.googleapis.com/csm-artifacts/asm/asmcli_1.27 >asmcli
36+
curl https://storage.googleapis.com/csm-artifacts/asm/asmcli_1.25 >asmcli
3737
chmod +x asmcli
3838

3939
gcloud container clusters get-credentials "${CLUSTER_NAME}" \
@@ -67,5 +67,5 @@ else
6767
kubectl label namespace asm-gateways istio-injection- istio.io/rev="$REVISION" --overwrite
6868
fi
6969

70-
# https://github.com/GoogleCloudPlatform/anthos-service-mesh-packages/tree/release-1.27/samples/gateways/istio-ingressgateway
70+
# https://github.com/GoogleCloudPlatform/anthos-service-mesh-packages/tree/release-1.25/samples/gateways/istio-ingressgateway
7171
kubectl apply -n asm-gateways -f out/samples/gateways/istio-ingressgateway/

pkg/kf/commands/dependencies/dependencies.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func newDependencies() []dependency {
108108
// dep matrix right now is fairly impossible. To ensure we still
109109
// testing against the right version though, we are going to hard
110110
// code this.
111-
ResolveVersion: staticVersionResolver("v1.3.2"),
111+
ResolveVersion: staticVersionResolver("v0.70.0"),
112112
ResolveURL: func(version string) (string, error) {
113113
const URL = "https://github.com/tektoncd/pipeline/releases/download/%s/release.yaml"
114114
return fmt.Sprintf(URL, version), nil
@@ -120,7 +120,7 @@ func newDependencies() []dependency {
120120
InfoURL: "https://cloud.google.com/service-mesh/docs/gke-install-overview",
121121
// This version is fetched from the asmcli script. It needs to be
122122
// updated by hand until we have a programtic way to fetch it.
123-
ResolveVersion: staticVersionResolver("1.27.1-asm.2+config1"),
123+
ResolveVersion: staticVersionResolver("1.25.0-asm.8+config1"),
124124
ResolveURL: func(version string) (string, error) {
125125
const URL = "https://github.com/GoogleCloudPlatform/anthos-service-mesh-packages/releases/tag/%s"
126126
return fmt.Sprintf(URL, version), nil

0 commit comments

Comments
 (0)