Skip to content

Commit 026677f

Browse files
wlynchtekton-robot
wlynch
authored and
tekton-robot
committed
Replace google/cloud-sdk with GCR equivalent.
With the recent changes to DockerHub (https://www.docker.com/blog/scaling-docker-to-serve-millions-more-developers-network-egress/), there will soon be quotas for image pulls. While we're not sure how this will effect all of our dependencies, for google/cloud-sdk Google maintains images in both DockerHub and GCR (https://cloud.google.com/sdk/docs/downloads-docker), so we can use the GCR version as a drop-in replacement and not worry about how the new quota changes may affect us. tl;dr replaces google/cloud-sdk => gcr.io/google.com/cloudsdktool/cloud-sdk
1 parent 49d4b5a commit 026677f

File tree

14 files changed

+52
-52
lines changed

14 files changed

+52
-52
lines changed

‎config/controller.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ spec:
6969
"-pr-image", "ko://github.com/tektoncd/pipeline/cmd/pullrequest-init",
7070
"-build-gcs-fetcher-image", "ko://github.com/tektoncd/pipeline/vendor/github.com/GoogleCloudPlatform/cloud-builders/gcs-fetcher/cmd/gcs-fetcher",
7171

72-
# This is google/cloud-sdk:302.0.0-slim
73-
"-gsutil-image", "google/cloud-sdk@sha256:27b2c22bf259d9bc1a291e99c63791ba0c27a04d2db0a43241ba0f1f20f4067f",
72+
# This is gcr.io/google.com/cloudsdktool/cloud-sdk:302.0.0-slim
73+
"-gsutil-image", "gcr.io/google.com/cloudsdktool/cloud-sdk@sha256:27b2c22bf259d9bc1a291e99c63791ba0c27a04d2db0a43241ba0f1f20f4067f",
7474
# The shell image must be root in order to create directories and copy files to PVCs.
7575
# gcr.io/distroless/base:debug-nonroot as of July 23, 2020
7676
"-shell-image", "gcr.io/distroless/base@sha256:60f5ffe6fc481e9102747b043b3873a01893a5a8138f970c5f5fc06fb7494656"

‎pkg/apis/resource/v1alpha1/storage/artifact_bucket_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var (
4343
SecretKey: "serviceaccount",
4444
}},
4545
ShellImage: "busybox",
46-
GsutilImage: "google/cloud-sdk",
46+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
4747
}
4848
)
4949

@@ -56,7 +56,7 @@ func TestBucketGetCopyFromContainerSpec(t *testing.T) {
5656
Command: []string{"mkdir", "-p", "/workspace/destination"},
5757
}}, {Container: corev1.Container{
5858
Name: "artifact-copy-from-workspace-mz4c7",
59-
Image: "google/cloud-sdk",
59+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
6060
Command: []string{"gsutil"},
6161
Args: []string{"cp", "-P", "-r", "gs://fake-bucket/src-path/*", "/workspace/destination"},
6262
Env: []corev1.EnvVar{{Name: "GOOGLE_APPLICATION_CREDENTIALS", Value: fmt.Sprintf("/var/bucketsecret/%s/serviceaccount", secretName)}},
@@ -73,7 +73,7 @@ func TestBucketGetCopyToContainerSpec(t *testing.T) {
7373
names.TestingSeed()
7474
want := []v1alpha1.Step{{Container: corev1.Container{
7575
Name: "artifact-copy-to-workspace-9l9zj",
76-
Image: "google/cloud-sdk",
76+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
7777
Command: []string{"gsutil"},
7878
Args: []string{"cp", "-P", "-r", "src-path", "gs://fake-bucket/workspace/destination"},
7979
Env: []corev1.EnvVar{{Name: "GOOGLE_APPLICATION_CREDENTIALS", Value: fmt.Sprintf("/var/bucketsecret/%s/serviceaccount", secretName)}},

‎pkg/apis/resource/v1alpha1/storage/build_gcs_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var images = pipeline.Images{
3737
CredsImage: "override-with-creds:latest",
3838
KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",
3939
ShellImage: "busybox",
40-
GsutilImage: "google/cloud-sdk",
40+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
4141
BuildGCSFetcherImage: "gcr.io/cloud-builders/gcs-fetcher:latest",
4242
PRImage: "override-with-pr:latest",
4343
ImageDigestExporterImage: "override-with-imagedigest-exporter-image:latest",

‎pkg/apis/resource/v1alpha1/storage/gcs_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestValidNewGCSResource(t *testing.T) {
9898
FieldName: "GOOGLE_APPLICATION_CREDENTIALS",
9999
}},
100100
ShellImage: "busybox",
101-
GsutilImage: "google/cloud-sdk",
101+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
102102
}
103103

104104
gcsRes, err := storage.NewGCSResource("test-resource", images, pr)
@@ -167,7 +167,7 @@ func TestGetInputSteps(t *testing.T) {
167167
SecretKey: "key.json",
168168
}},
169169
ShellImage: "busybox",
170-
GsutilImage: "google/cloud-sdk",
170+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
171171
},
172172
wantSteps: []v1beta1.Step{{Container: corev1.Container{
173173
Name: "create-dir-gcs-valid-9l9zj",
@@ -183,7 +183,7 @@ gsutil rsync -d -r gs://some-bucket /workspace
183183
`,
184184
Container: corev1.Container{
185185
Name: "fetch-gcs-valid-mz4c7",
186-
Image: "google/cloud-sdk",
186+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
187187
Env: []corev1.EnvVar{{
188188
Name: "GOOGLE_APPLICATION_CREDENTIALS",
189189
Value: "/var/secret/secretName/key.json",
@@ -209,7 +209,7 @@ gsutil rsync -d -r gs://some-bucket /workspace
209209
FieldName: "GOOGLE_APPLICATION_CREDENTIALS",
210210
}},
211211
ShellImage: "busybox",
212-
GsutilImage: "google/cloud-sdk",
212+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
213213
},
214214
wantSteps: []v1beta1.Step{{Container: corev1.Container{
215215
Name: "create-dir-gcs-valid-mssqb",
@@ -225,7 +225,7 @@ gsutil cp gs://some-bucket /workspace
225225
`,
226226
Container: corev1.Container{
227227
Name: "fetch-gcs-valid-78c5n",
228-
Image: "google/cloud-sdk",
228+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
229229
Env: []corev1.EnvVar{{
230230
Name: "GOOGLE_APPLICATION_CREDENTIALS",
231231
Value: "/var/secret/secretName/key.json",
@@ -269,11 +269,11 @@ func TestGetOutputTaskModifier(t *testing.T) {
269269
FieldName: "GOOGLE_APPLICATION_CREDENTIALS",
270270
SecretKey: "key.json",
271271
}},
272-
GsutilImage: "google/cloud-sdk",
272+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
273273
},
274274
wantSteps: []v1beta1.Step{{Container: corev1.Container{
275275
Name: "upload-gcs-valid-9l9zj",
276-
Image: "google/cloud-sdk",
276+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
277277
Command: []string{"gsutil"},
278278
Args: []string{"rsync", "-d", "-r", "/workspace/", "gs://some-bucket"},
279279
Env: []corev1.EnvVar{{Name: "GOOGLE_APPLICATION_CREDENTIALS", Value: "/var/secret/secretName/key.json"}},
@@ -296,11 +296,11 @@ func TestGetOutputTaskModifier(t *testing.T) {
296296
SecretName: "secretName",
297297
FieldName: "GOOGLE_APPLICATION_CREDENTIALS",
298298
}},
299-
GsutilImage: "google/cloud-sdk",
299+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
300300
},
301301
wantSteps: []v1beta1.Step{{Container: corev1.Container{
302302
Name: "upload-gcs-valid-mz4c7",
303-
Image: "google/cloud-sdk",
303+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
304304
Command: []string{"gsutil"},
305305
Args: []string{"cp", "/workspace/*", "gs://some-bucket"},
306306
Env: []corev1.EnvVar{
@@ -317,11 +317,11 @@ func TestGetOutputTaskModifier(t *testing.T) {
317317
Name: "gcs-valid",
318318
Location: "gs://some-bucket",
319319
TypeDir: false,
320-
GsutilImage: "google/cloud-sdk",
320+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
321321
},
322322
wantSteps: []v1beta1.Step{{Container: corev1.Container{
323323
Name: "upload-gcs-valid-mssqb",
324-
Image: "google/cloud-sdk",
324+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
325325
Command: []string{"gsutil"},
326326
Args: []string{"cp", "/workspace/*", "gs://some-bucket"},
327327
}}},

‎pkg/artifacts/artifact_storage_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var (
4343
CredsImage: "override-with-creds:latest",
4444
KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",
4545
ShellImage: "busybox",
46-
GsutilImage: "google/cloud-sdk",
46+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
4747
BuildGCSFetcherImage: "gcr.io/cloud-builders/gcs-fetcher:latest",
4848
PRImage: "override-with-pr:latest",
4949
ImageDigestExporterImage: "override-with-imagedigest-exporter-image:latest",
@@ -211,7 +211,7 @@ func TestInitializeArtifactStorage(t *testing.T) {
211211
SecretName: "secret1",
212212
}},
213213
ShellImage: "busybox",
214-
GsutilImage: "google/cloud-sdk",
214+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
215215
},
216216
}, {
217217
desc: "location empty",
@@ -256,7 +256,7 @@ func TestInitializeArtifactStorage(t *testing.T) {
256256
expectedArtifactStorage: &storage.ArtifactBucket{
257257
Location: "gs://fake-bucket",
258258
ShellImage: "busybox",
259-
GsutilImage: "google/cloud-sdk",
259+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
260260
},
261261
}, {
262262
desc: "valid bucket with boto config",
@@ -270,7 +270,7 @@ func TestInitializeArtifactStorage(t *testing.T) {
270270
expectedArtifactStorage: &storage.ArtifactBucket{
271271
Location: "s3://fake-bucket",
272272
ShellImage: "busybox",
273-
GsutilImage: "google/cloud-sdk",
273+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
274274
Secrets: []resourcev1alpha1.SecretParam{{
275275
FieldName: "BOTO_CONFIG",
276276
SecretKey: "sakey",
@@ -524,7 +524,7 @@ func TestGetArtifactStorageWithConfig(t *testing.T) {
524524
SecretName: "secret1",
525525
}},
526526
ShellImage: "busybox",
527-
GsutilImage: "google/cloud-sdk",
527+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
528528
},
529529
}, {
530530
desc: "location empty",

‎pkg/reconciler/pipelinerun/pipelinerun_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ var (
6969
CredsImage: "override-with-creds:latest",
7070
KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",
7171
ShellImage: "busybox",
72-
GsutilImage: "google/cloud-sdk",
72+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
7373
BuildGCSFetcherImage: "gcr.io/cloud-builders/gcs-fetcher:latest",
7474
PRImage: "override-with-pr:latest",
7575
ImageDigestExporterImage: "override-with-imagedigest-exporter-image:latest",

‎pkg/reconciler/taskrun/resources/apply_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var (
3939
CredsImage: "override-with-creds:latest",
4040
KubeconfigWriterImage: "override-with-kubeconfig-writer-image:latest",
4141
ShellImage: "busybox",
42-
GsutilImage: "google/cloud-sdk",
42+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
4343
BuildGCSFetcherImage: "gcr.io/cloud-tbs/gcs-fetcher:latest",
4444
PRImage: "override-with-pr:latest",
4545
ImageDigestExporterImage: "override-with-imagedigest-exporter-image:latest",

‎pkg/reconciler/taskrun/resources/input_resource_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var (
4141
CredsImage: "override-with-creds:latest",
4242
KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",
4343
ShellImage: "busybox",
44-
GsutilImage: "google/cloud-sdk",
44+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
4545
BuildGCSFetcherImage: "gcr.io/cloud-builders/gcs-fetcher:latest",
4646
PRImage: "override-with-pr:latest",
4747
ImageDigestExporterImage: "override-with-imagedigest-exporter-image:latest",
@@ -683,7 +683,7 @@ gsutil cp gs://fake-bucket/rules.zip /workspace/gcs-dir
683683
`,
684684
Container: corev1.Container{
685685
Name: "fetch-storage1-mz4c7",
686-
Image: "google/cloud-sdk",
686+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
687687
},
688688
}},
689689
Resources: &v1beta1.TaskResources{
@@ -1075,7 +1075,7 @@ gsutil cp gs://fake-bucket/rules.zip /workspace/gcs-input-resource
10751075
`,
10761076
Container: corev1.Container{
10771077
Name: "fetch-gcs-input-resource-mz4c7",
1078-
Image: "google/cloud-sdk",
1078+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
10791079
},
10801080
}},
10811081
Resources: &v1beta1.TaskResources{
@@ -1145,7 +1145,7 @@ gsutil rsync -d -r gs://fake-bucket/rules.zip /workspace/gcs-input-resource
11451145
`,
11461146
Container: corev1.Container{
11471147
Name: "fetch-storage-gcs-keys-mz4c7",
1148-
Image: "google/cloud-sdk",
1148+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
11491149
VolumeMounts: []corev1.VolumeMount{
11501150
{Name: "volume-storage-gcs-keys-secret-name", MountPath: "/var/secret/secret-name"},
11511151
},
@@ -1300,7 +1300,7 @@ func TestAddStepsToTaskWithBucketFromConfigMap(t *testing.T) {
13001300
Command: []string{"mkdir", "-p", "/workspace/gitspace"},
13011301
}}, {Container: corev1.Container{
13021302
Name: "artifact-copy-from-gitspace-mz4c7",
1303-
Image: "google/cloud-sdk",
1303+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
13041304
Command: []string{"gsutil"},
13051305
Args: []string{"cp", "-P", "-r", "gs://fake-bucket/prev-task-path/*", "/workspace/gitspace"},
13061306
Env: gcsEnv,
@@ -1344,7 +1344,7 @@ func TestAddStepsToTaskWithBucketFromConfigMap(t *testing.T) {
13441344
Command: []string{"mkdir", "-p", "/workspace/gcs-dir"},
13451345
}}, {Container: corev1.Container{
13461346
Name: "artifact-copy-from-workspace-78c5n",
1347-
Image: "google/cloud-sdk",
1347+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
13481348
Command: []string{"gsutil"},
13491349
Args: []string{"cp", "-P", "-r", "gs://fake-bucket/prev-task-path/*", "/workspace/gcs-dir"},
13501350
Env: gcsEnv,
@@ -1396,7 +1396,7 @@ func TestAddStepsToTaskWithBucketFromConfigMap(t *testing.T) {
13961396
Command: []string{"mkdir", "-p", "/workspace/gcs-dir"},
13971397
}}, {Container: corev1.Container{
13981398
Name: "artifact-copy-from-workspace-l22wn",
1399-
Image: "google/cloud-sdk",
1399+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
14001400
Command: []string{"gsutil"},
14011401
Args: []string{"cp", "-P", "-r", "gs://fake-bucket/prev-task-path/*", "/workspace/gcs-dir"},
14021402
Env: gcsEnv,
@@ -1407,7 +1407,7 @@ func TestAddStepsToTaskWithBucketFromConfigMap(t *testing.T) {
14071407
Command: []string{"mkdir", "-p", "/workspace/gcs-dir"},
14081408
}}, {Container: corev1.Container{
14091409
Name: "artifact-copy-from-workspace2-j2tds",
1410-
Image: "google/cloud-sdk",
1410+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
14111411
Command: []string{"gsutil"},
14121412
Args: []string{"cp", "-P", "-r", "gs://fake-bucket/prev-task-path2/*", "/workspace/gcs-dir"},
14131413
Env: gcsEnv,

‎pkg/reconciler/taskrun/resources/output_resource_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ func TestValidOutputResources(t *testing.T) {
486486
}},
487487
{Container: corev1.Container{
488488
Name: "upload-source-gcs-78c5n",
489-
Image: "google/cloud-sdk",
489+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
490490
VolumeMounts: []corev1.VolumeMount{{
491491
Name: "volume-source-gcs-sname",
492492
MountPath: "/var/secret/sname",
@@ -576,7 +576,7 @@ func TestValidOutputResources(t *testing.T) {
576576
}},
577577
{Container: corev1.Container{
578578
Name: "upload-source-gcs-78c5n",
579-
Image: "google/cloud-sdk",
579+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
580580
VolumeMounts: []corev1.VolumeMount{{
581581
Name: "volume-source-gcs-sname", MountPath: "/var/secret/sname",
582582
}},
@@ -647,7 +647,7 @@ func TestValidOutputResources(t *testing.T) {
647647
}},
648648
{Container: corev1.Container{
649649
Name: "upload-source-gcs-mz4c7",
650-
Image: "google/cloud-sdk",
650+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
651651
VolumeMounts: []corev1.VolumeMount{{
652652
Name: "volume-source-gcs-sname", MountPath: "/var/secret/sname",
653653
}},
@@ -708,7 +708,7 @@ func TestValidOutputResources(t *testing.T) {
708708
}},
709709
{Container: corev1.Container{
710710
Name: "upload-source-gcs-mz4c7",
711-
Image: "google/cloud-sdk",
711+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
712712
VolumeMounts: []corev1.VolumeMount{{
713713
Name: "volume-source-gcs-sname", MountPath: "/var/secret/sname",
714714
}},
@@ -1000,7 +1000,7 @@ func TestValidOutputResourcesWithBucketStorage(t *testing.T) {
10001000
Command: []string{"mkdir", "-p", "/workspace/output/source-workspace"},
10011001
}}, {Container: corev1.Container{
10021002
Name: "artifact-copy-to-source-git-mz4c7",
1003-
Image: "google/cloud-sdk",
1003+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
10041004
Command: []string{"gsutil"},
10051005
Args: []string{"cp", "-P", "-r", "/workspace/output/source-workspace", "gs://fake-bucket/pipeline-task-name"},
10061006
}}},
@@ -1051,7 +1051,7 @@ func TestValidOutputResourcesWithBucketStorage(t *testing.T) {
10511051
Command: []string{"mkdir", "-p", "/workspace/output/source-workspace"},
10521052
}}, {Container: corev1.Container{
10531053
Name: "artifact-copy-to-source-git-mz4c7",
1054-
Image: "google/cloud-sdk",
1054+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
10551055
Command: []string{"gsutil"},
10561056
Args: []string{"cp", "-P", "-r", "/workspace/output/source-workspace", "gs://fake-bucket/pipeline-task-name"},
10571057
}}},
@@ -1448,7 +1448,7 @@ func TestInputOutputBucketResources(t *testing.T) {
14481448
}},
14491449
{Container: corev1.Container{
14501450
Name: "artifact-copy-from-source-workspace-mz4c7",
1451-
Image: "google/cloud-sdk",
1451+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
14521452
Command: []string{"gsutil"},
14531453
Args: []string{
14541454
"cp",
@@ -1467,7 +1467,7 @@ func TestInputOutputBucketResources(t *testing.T) {
14671467
}},
14681468
{Container: corev1.Container{
14691469
Name: "upload-source-gcs-bucket-78c5n",
1470-
Image: "google/cloud-sdk",
1470+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
14711471
VolumeMounts: nil,
14721472
Command: []string{"gsutil"},
14731473
Args: []string{"rsync", "-d", "-r", "/workspace/output/source-workspace", "gs://some-bucket"},
@@ -1562,7 +1562,7 @@ func TestInputOutputBucketResources(t *testing.T) {
15621562
}},
15631563
{Container: corev1.Container{
15641564
Name: "artifact-copy-from-source-workspace-78c5n",
1565-
Image: "google/cloud-sdk",
1565+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
15661566
Command: []string{"gsutil"},
15671567
Args: []string{
15681568
"cp",
@@ -1588,7 +1588,7 @@ func TestInputOutputBucketResources(t *testing.T) {
15881588
}},
15891589
{Container: corev1.Container{
15901590
Name: "artifact-copy-from-source-workspace-2-mz4c7",
1591-
Image: "google/cloud-sdk",
1591+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
15921592
Command: []string{"gsutil"},
15931593
Args: []string{"cp", "-P", "-r", "gs://fake-bucket/pipeline-task-path-2/*", "/workspace/faraway-disk-2"},
15941594
Env: []corev1.EnvVar{
@@ -1600,7 +1600,7 @@ func TestInputOutputBucketResources(t *testing.T) {
16001600
VolumeMounts: []corev1.VolumeMount{{Name: "volume-bucket-sname", MountPath: "/var/bucketsecret/sname"}},
16011601
}}, {Container: corev1.Container{
16021602
Name: "upload-source-gcs-bucket-3-j2tds",
1603-
Image: "google/cloud-sdk",
1603+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
16041604
Command: []string{"gsutil"},
16051605
Args: []string{"rsync", "-d", "-r", "/workspace/output/source-workspace-3", "gs://some-bucket-3"},
16061606
}},
@@ -1677,7 +1677,7 @@ func TestInputOutputBucketResources(t *testing.T) {
16771677
}},
16781678
{Container: corev1.Container{
16791679
Name: "upload-source-gcs-bucket-mz4c7",
1680-
Image: "google/cloud-sdk",
1680+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
16811681
Command: []string{"gsutil"},
16821682
Args: []string{
16831683
"rsync",
@@ -1689,7 +1689,7 @@ func TestInputOutputBucketResources(t *testing.T) {
16891689
}},
16901690
{Container: corev1.Container{
16911691
Name: "upload-source-gcs-bucket-2-78c5n",
1692-
Image: "google/cloud-sdk",
1692+
Image: "gcr.io/google.com/cloudsdktool/cloud-sdk",
16931693
VolumeMounts: nil,
16941694
Command: []string{"gsutil"},
16951695
Args: []string{"rsync", "-d", "-r", "/workspace/output/source-workspace-2", "gs://some-bucket-2"},

‎pkg/reconciler/taskrun/taskrun_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ var (
7777
CredsImage: "override-with-creds:latest",
7878
KubeconfigWriterImage: "override-with-kubeconfig-writer:latest",
7979
ShellImage: "busybox",
80-
GsutilImage: "google/cloud-sdk",
80+
GsutilImage: "gcr.io/google.com/cloudsdktool/cloud-sdk",
8181
BuildGCSFetcherImage: "gcr.io/cloud-builders/gcs-fetcher:latest",
8282
PRImage: "override-with-pr:latest",
8383
ImageDigestExporterImage: "override-with-imagedigest-exporter-image:latest",

0 commit comments

Comments
 (0)