Skip to content

Commit

Permalink
Switch some builds to k8s-staging-test-infra images.
Browse files Browse the repository at this point in the history
  • Loading branch information
michelle192837 committed Jul 19, 2024
1 parent 054aea2 commit 97f819c
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
14 changes: 7 additions & 7 deletions .ko.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Distroless images:
# defaultBaseImage: gcr.io/distroless/static:nonroot
baseImageOverrides:
k8s.io/test-infra/robots/issue-creator: gcr.io/k8s-prow/alpine:v20240129-a0a4e743bf
k8s.io/test-infra/testgrid/cmd/configurator: gcr.io/k8s-prow/alpine:v20240129-a0a4e743bf
k8s.io/test-infra/label_sync: gcr.io/k8s-prow/alpine:v20240129-a0a4e743bf
k8s.io/test-infra/robots/commenter: gcr.io/k8s-prow/alpine:v20240129-a0a4e743bf
k8s.io/test-infra/robots/pr-creator: gcr.io/k8s-prow/git:v20240129-a0a4e743bf
k8s.io/test-infra/gcsweb/cmd/gcsweb: gcr.io/k8s-prow/alpine:v20240129-a0a4e743bf
k8s.io/test-infra/gencred: gcr.io/k8s-prow/alpine:v20240129-a0a4e743bf
k8s.io/test-infra/robots/issue-creator: gcr.io/k8s-staging-test-infra/alpine:v20240716-28236d8b05
k8s.io/test-infra/testgrid/cmd/configurator: gcr.io/k8s-staging-test-infra/alpine:v20240716-28236d8b05
k8s.io/test-infra/label_sync: gcr.io/k8s-staging-test-infra/alpine:v20240716-28236d8b05
k8s.io/test-infra/robots/commenter: gcr.io/k8s-staging-test-infra/alpine:v20240716-28236d8b05
k8s.io/test-infra/robots/pr-creator: gcr.io/k8s-staging-test-infra/git:v20240716-28236d8b05
k8s.io/test-infra/gcsweb/cmd/gcsweb: gcr.io/k8s-staging-test-infra/alpine:v20240716-28236d8b05
k8s.io/test-infra/gencred: gcr.io/k8s-staging-test-infra/alpine:v20240716-28236d8b05

# https://pkg.go.dev/cmd/link
# -s: omit symbol/debug info
Expand Down
4 changes: 2 additions & 2 deletions config/jobs/image-pushing/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ images:
### Makefile build example
If your build process is driven by a Makefile or similar, you can use GCB to
invoke that. We provide the [`gcr.io/k8s-testimages/gcb-docker-gcloud` image][gcb-docker-gcloud],
invoke that. We provide the [`gcr.io/k8s-staging-test-infra/gcb-docker-gcloud` image][gcb-docker-gcloud],
which contains components that are likely to be useful for your builds. A sample
`cloudbuild.yaml` using `make` to build and push might look like this:

Expand All @@ -92,7 +92,7 @@ timeout: 1200s
options:
substitution_option: ALLOW_LOOSE
steps:
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20190906-745fed4'
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20190906-745fed4'
entrypoint: make
env:
- DOCKER_CLI_EXPERIMENTAL=enabled
Expand Down
4 changes: 2 additions & 2 deletions images/alpine/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
steps:
- name: gcr.io/k8s-testimages/gcb-docker-gcloud
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud
entrypoint: /buildx-entrypoint
args:
- build
Expand All @@ -9,7 +9,7 @@ steps:
- --push
- .
dir: .
- name: gcr.io/k8s-testimages/gcb-docker-gcloud
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud
entrypoint: gcloud
args:
- container
Expand Down
4 changes: 2 additions & 2 deletions images/git-custom-k8s-auth/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
steps:
- name: gcr.io/k8s-testimages/gcb-docker-gcloud
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud
entrypoint: /buildx-entrypoint
args:
- build
Expand All @@ -11,7 +11,7 @@ steps:
- --push
- .
dir: .
- name: gcr.io/k8s-testimages/gcb-docker-gcloud
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud
entrypoint: gcloud
args:
- container
Expand Down
2 changes: 1 addition & 1 deletion images/git/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Use this image when you want to use `git` and `alpine` as a base in a job.
## contents

- base:
- `gcr.io/k8s-prow/alpine:v20240108-a28886d2bd`
- `alpine`
- directories:
- `/github_known_hosts` holds the [`github-known-hosts`](/images/git/github-known-hosts) file copied during image build
- `/etc/ssh/ssh_config` contains [`ssh-config`](/images/git/ssh-config) file copied during image build
Expand Down
4 changes: 2 additions & 2 deletions images/git/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
steps:
- name: gcr.io/k8s-testimages/gcb-docker-gcloud
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud
entrypoint: /buildx-entrypoint
args:
- build
Expand All @@ -9,7 +9,7 @@ steps:
- --push
- .
dir: .
- name: gcr.io/k8s-testimages/gcb-docker-gcloud
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud
entrypoint: gcloud
args:
- container
Expand Down
2 changes: 1 addition & 1 deletion kettle/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ include ../Makefile.base.mk
# Makefile.base.mk requires REPO_ROOT to be set
REPO_ROOT:=${CURDIR}/..

IMG = gcr.io/k8s-testimages/kettle
IMG = gcr.io/k8s-staging-test-infra/kettle
TAG := $(shell date +v%Y%m%d)-$(shell git describe --tags --always --dirty)

# These are the usual GKE variables.
Expand Down

0 comments on commit 97f819c

Please sign in to comment.