Skip to content

Commit

Permalink
Merge pull request #23587 from spiffxp/use-k8s-infra-canary-images
Browse files Browse the repository at this point in the history
config/jobs: use community hosted images for more jobs
  • Loading branch information
k8s-ci-robot authored Sep 14, 2021
2 parents 8f940dd + 5fad4e0 commit 9d13210
Show file tree
Hide file tree
Showing 82 changed files with 274 additions and 338 deletions.
5 changes: 1 addition & 4 deletions config/jobs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ than needed, and will be periodically bumped by PRs. These are sources of
technical debt that are often not very well maintained. Use at your own risk,
eg:

- [pull-community-verify] uses `gcr.io/k8s-testimages/gcloud-in-go:v20190125`
to run `make verify`, which ends up invoking some `bash` scripts, which use
commands like `git` and `go`. The `gcloud` dependency is not needed at all.
- [periodic-kubernetes-e2e-packages-pushed] uses `gcr.io/k8s-testimages/kubekins:latest-master`
- [periodic-kubernetes-e2e-packages-pushed] uses `gcr.io/k8s-staging-test-infra/kubekins:latest-master`
to run `./tests/e2e/packages/verify_packages_published.sh` which ends up
running `apt-get` and `yum` commands. Perhaps a `debian` image would be
better.
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/cadvisor/cadvisor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ periodics:
preset-dind-enabled: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/bootstrap:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/bootstrap:v20210913-fc7c4e84f6
args:
- --repo=github.com/google/cadvisor
- --root=/go/src
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/image-pushing/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20190906-d5d7ce3
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down
4 changes: 2 additions & 2 deletions config/jobs/image-pushing/k8s-staging-apisnoop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand All @@ -35,7 +35,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/image-pushing/k8s-staging-boskos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down
6 changes: 3 additions & 3 deletions config/jobs/image-pushing/k8s-staging-cloud-provider-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down Expand Up @@ -50,7 +50,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down Expand Up @@ -80,7 +80,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down
4 changes: 2 additions & 2 deletions config/jobs/image-pushing/k8s-staging-cloud-provider-gcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down Expand Up @@ -48,7 +48,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/image-pushing/k8s-staging-cluster-addons.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down
24 changes: 12 additions & 12 deletions config/jobs/image-pushing/k8s-staging-cluster-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand All @@ -39,7 +39,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand All @@ -64,7 +64,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand All @@ -88,7 +88,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand All @@ -112,7 +112,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand All @@ -136,7 +136,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand All @@ -160,7 +160,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand All @@ -183,7 +183,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down Expand Up @@ -214,7 +214,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand All @@ -237,7 +237,7 @@ periodics:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down Expand Up @@ -269,7 +269,7 @@ periodics:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down Expand Up @@ -301,7 +301,7 @@ periodics:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/image-pushing/k8s-staging-cri-tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/image-pushing/k8s-staging-descheduler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/image-pushing/k8s-staging-dns.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ postsubmits:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down
4 changes: 2 additions & 2 deletions config/jobs/image-pushing/k8s-staging-e2e-test-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ for image in "${IMAGES[@]}"; do
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down Expand Up @@ -141,7 +141,7 @@ periodics:
spec:
serviceAccountName: gcb-builder
containers:
- image: gcr.io/k8s-testimages/image-builder:v20210910-b5a7cb2
- image: gcr.io/k8s-staging-test-infra/image-builder:v20210913-fc7c4e84f6
command:
- /run.sh
args:
Expand Down
Loading

0 comments on commit 9d13210

Please sign in to comment.