Skip to content

Commit 10acee9

Browse files
authored
Merge pull request #2266 from spiffxp/use-k8s-infra-gcb-docker-gcloud
use k8s-staging-test-infra/gcb-docker-gcloud
2 parents f7421c8 + 6490e87 commit 10acee9

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed

cmd/gcbuilder/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
EXTRA_ARG =
1616

1717
push-prod:
18-
bazel run //images/builder -- $(EXTRA_ARG) --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch images/builder
18+
bazel run //images/builder -- $(EXTRA_ARG) --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb images/builder
1919

2020
push:
2121
bazel run //images/builder -- $(EXTRA_ARG) --allow-dirty images/builder

cmd/gcbuilder/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
# Used by gcr.io/k8s-testimages/image-builder.
16+
# Used by gcr.io/k8s-staging-test-infra/image-builder.
1717
# See ci-runner.sh for the version prow uses to build and run on the fly.
1818

1919
set -e

cmd/krel/cmd/testdata/changelog-v1.18.0-alpha.3/GetPullRequest-158.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"state": "closed",
66
"locked": false,
77
"title": "test images: Image Promoter fixes",
8-
"body": "\u003c!-- Thanks for sending a pull request! Here are some tips for you:\r\n\r\n1. If this is your first time, please read our contributor guidelines: https://git.k8s.io/community/contributors/guide#your-first-contribution and developer guide https://git.k8s.io/community/contributors/devel/development.md#development-guide\r\n2. Please label this pull request according to what type of issue you are addressing, especially if this is a release targeted pull request. For reference on required PR/issue labels, read here:\r\nhttps://git.k8s.io/community/contributors/devel/sig-release/release.md#issuepr-kind-label\r\n3. Ensure you have added or ran the appropriate tests for your PR: https://git.k8s.io/community/contributors/devel/sig-testing/testing.md\r\n4. If you want *faster* PR reviews, read how: https://git.k8s.io/community/contributors/guide/pull-requests.md#best-practices-for-faster-reviews\r\n5. If the PR is unfinished, see how to mark it: https://git.k8s.io/community/contributors/guide/pull-requests.md#marking-unfinished-pull-requests\r\n--\u003e\r\n\r\n**What type of PR is this?**\r\n\r\n/kind cleanup\r\n/sig testing\r\n/area conformance\r\n\r\n**What this PR does / why we need it**:\r\n\r\nPrior to the Image Centralization part 4 (https://github.com/kubernetes/kubernetes/pull/81170), a PR merged that enables the Image Promoter to run on the k/k test images.\r\n\r\nThe Image Promoter currently only builds the Conformance-related images, but the Image Centralization part 4 centralized some of those images into ``agnhost``, so they need to be removed from the ``conformance_images`` list.\r\n\r\nAdditionally, https://github.com/kubernetes/kubernetes/pull/81226 proposes ``mounttest-user`` image to be removed, and ``RunAsUser`` to be used in tests instead. This was proposed here: https://github.com/kubernetes/kubernetes/issues/76342\r\n\r\nThe image used by the Image Promoter (``gcr.io/k8s-testimages/gcb-docker-gcloud:v20190906-745fed4``) is based on busybox, and thus, the sed binary is actually busybox. ``image-util.sh`` calls ``kube::util::ensure-gnu-sed`` several times, which ensures that a GNU sed binary exists (it checks by greping GNU in its --help output). Obviously, it won't match the busybox sed binary. But the sed usage in ``image-util.sh`` is fairly simple, and the busybox sed is sufficient.\r\n\r\nBumps image versions for: ``jessie-dnsutils``, ``nonewprivs``, ``resource-consumer``, ``sample-apiserver``. These images are included in the ``conformance_images`` that are being built by the Image Promoter, so we're bumping them just to make sure we're not breaking anything and cause all the CIs to fall. We're going to bump the image versions used in tests in a subsequent PR. The image version was not bumped for: ``agnhost``, ``kitten``, ``nautilus``, as they were already bumped by the Image Centralization part 4 PR.\r\n\r\n**Which issue(s) this PR fixes**:\r\n\u003c!--\r\n*Automatically closes linked issue when PR is merged.\r\nUsage: `Fixes #\u003cissue number\u003e`, or `Fixes (paste link of issue)`.\r\n_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_*\r\n--\u003e\r\nRelated: #76342\r\nRelated: #81226\r\nRelated: #81170\r\nRelated: #87251\r\n\r\n**Special notes for your reviewer**:\r\n\r\n**Does this PR introduce a user-facing change?**:\r\n\u003c!--\r\nIf no, just write \"NONE\" in the release-note block below.\r\nIf yes, a release note is required:\r\nEnter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string \"action required\".\r\n\r\nFor more information on release notes see: https://git.k8s.io/community/contributors/guide/release-notes.md\r\n--\u003e\r\n```release-note\r\nNONE\r\n```\r\n\r\n**Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.**:\r\n\r\n\u003c!--\r\nThis section can be blank if this pull request does not require a release note.\r\n\r\nWhen adding links which point to resources within git repositories, like\r\nKEPs or supporting documentation, please reference a specific commit and avoid\r\nlinking directly to the master branch. This ensures that links reference a\r\nspecific point in time, rather than a document that may change over time.\r\n\r\nSee here for guidance on getting permanent links to files: https://help.github.com/en/articles/getting-permanent-links-to-files\r\n\r\nPlease use the following format for linking documentation:\r\n- [KEP]: \u003clink\u003e\r\n- [Usage]: \u003clink\u003e\r\n- [Other doc]: \u003clink\u003e\r\n--\u003e\r\n```docs\r\n\r\n```\r\n",
8+
"body": "\u003c!-- Thanks for sending a pull request! Here are some tips for you:\r\n\r\n1. If this is your first time, please read our contributor guidelines: https://git.k8s.io/community/contributors/guide#your-first-contribution and developer guide https://git.k8s.io/community/contributors/devel/development.md#development-guide\r\n2. Please label this pull request according to what type of issue you are addressing, especially if this is a release targeted pull request. For reference on required PR/issue labels, read here:\r\nhttps://git.k8s.io/community/contributors/devel/sig-release/release.md#issuepr-kind-label\r\n3. Ensure you have added or ran the appropriate tests for your PR: https://git.k8s.io/community/contributors/devel/sig-testing/testing.md\r\n4. If you want *faster* PR reviews, read how: https://git.k8s.io/community/contributors/guide/pull-requests.md#best-practices-for-faster-reviews\r\n5. If the PR is unfinished, see how to mark it: https://git.k8s.io/community/contributors/guide/pull-requests.md#marking-unfinished-pull-requests\r\n--\u003e\r\n\r\n**What type of PR is this?**\r\n\r\n/kind cleanup\r\n/sig testing\r\n/area conformance\r\n\r\n**What this PR does / why we need it**:\r\n\r\nPrior to the Image Centralization part 4 (https://github.com/kubernetes/kubernetes/pull/81170), a PR merged that enables the Image Promoter to run on the k/k test images.\r\n\r\nThe Image Promoter currently only builds the Conformance-related images, but the Image Centralization part 4 centralized some of those images into ``agnhost``, so they need to be removed from the ``conformance_images`` list.\r\n\r\nAdditionally, https://github.com/kubernetes/kubernetes/pull/81226 proposes ``mounttest-user`` image to be removed, and ``RunAsUser`` to be used in tests instead. This was proposed here: https://github.com/kubernetes/kubernetes/issues/76342\r\n\r\nThe image used by the Image Promoter (``gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20190906-745fed4``) is based on busybox, and thus, the sed binary is actually busybox. ``image-util.sh`` calls ``kube::util::ensure-gnu-sed`` several times, which ensures that a GNU sed binary exists (it checks by greping GNU in its --help output). Obviously, it won't match the busybox sed binary. But the sed usage in ``image-util.sh`` is fairly simple, and the busybox sed is sufficient.\r\n\r\nBumps image versions for: ``jessie-dnsutils``, ``nonewprivs``, ``resource-consumer``, ``sample-apiserver``. These images are included in the ``conformance_images`` that are being built by the Image Promoter, so we're bumping them just to make sure we're not breaking anything and cause all the CIs to fall. We're going to bump the image versions used in tests in a subsequent PR. The image version was not bumped for: ``agnhost``, ``kitten``, ``nautilus``, as they were already bumped by the Image Centralization part 4 PR.\r\n\r\n**Which issue(s) this PR fixes**:\r\n\u003c!--\r\n*Automatically closes linked issue when PR is merged.\r\nUsage: `Fixes #\u003cissue number\u003e`, or `Fixes (paste link of issue)`.\r\n_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_*\r\n--\u003e\r\nRelated: #76342\r\nRelated: #81226\r\nRelated: #81170\r\nRelated: #87251\r\n\r\n**Special notes for your reviewer**:\r\n\r\n**Does this PR introduce a user-facing change?**:\r\n\u003c!--\r\nIf no, just write \"NONE\" in the release-note block below.\r\nIf yes, a release note is required:\r\nEnter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string \"action required\".\r\n\r\nFor more information on release notes see: https://git.k8s.io/community/contributors/guide/release-notes.md\r\n--\u003e\r\n```release-note\r\nNONE\r\n```\r\n\r\n**Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.**:\r\n\r\n\u003c!--\r\nThis section can be blank if this pull request does not require a release note.\r\n\r\nWhen adding links which point to resources within git repositories, like\r\nKEPs or supporting documentation, please reference a specific commit and avoid\r\nlinking directly to the master branch. This ensures that links reference a\r\nspecific point in time, rather than a document that may change over time.\r\n\r\nSee here for guidance on getting permanent links to files: https://help.github.com/en/articles/getting-permanent-links-to-files\r\n\r\nPlease use the following format for linking documentation:\r\n- [KEP]: \u003clink\u003e\r\n- [Usage]: \u003clink\u003e\r\n- [Other doc]: \u003clink\u003e\r\n--\u003e\r\n```docs\r\n\r\n```\r\n",
99
"created_at": "2020-01-14T10:39:04Z",
1010
"updated_at": "2020-01-23T00:30:52Z",
1111
"closed_at": "2020-01-23T00:30:51Z",
@@ -530,4 +530,4 @@
530530
}
531531
},
532532
"LastPage": 0
533-
}
533+
}

cmd/vulndash/cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ options:
1010
machineType: 'N1_HIGHCPU_8'
1111

1212
steps:
13-
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
13+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20210917-12df099d55'
1414
entrypoint: 'bash'
1515
dir: ./cmd/vulndash
1616
env:

dependencies.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -464,20 +464,20 @@ dependencies:
464464
match: "IMAGE_VERSION: '(bullseye|buster)-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
465465

466466
# Build environments
467-
- name: "gcr.io/k8s-testimages/gcb-docker-gcloud"
468-
version: v20210722-085d930
467+
- name: "gcr.io/k8s-staging-test-infra/gcb-docker-gcloud"
468+
version: v20210917-12df099d55
469469
refPaths:
470470
- path: cmd/vulndash/cloudbuild.yaml
471-
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
471+
match: "name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{10}'"
472472
- path: images/build/cross/cloudbuild.yaml
473-
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
473+
match: "name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{10}'"
474474
- path: images/build/debian-base/cloudbuild.yaml
475-
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
475+
match: "name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{10}'"
476476
- path: images/build/debian-iptables/cloudbuild.yaml
477-
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
477+
match: "name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{10}'"
478478
- path: images/build/go-runner/cloudbuild.yaml
479-
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
479+
match: "name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{10}'"
480480
- path: images/build/setcap/cloudbuild.yaml
481-
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
481+
match: "name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{10}'"
482482
- path: images/releng/k8s-ci-builder/cloudbuild.yaml
483-
match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'"
483+
match: "name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{10}'"

images/build/cross/cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ options:
55
substitution_option: ALLOW_LOOSE
66

77
steps:
8-
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
8+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20210917-12df099d55'
99
entrypoint: 'bash'
1010
dir: ./images/build/cross
1111
env:

images/build/debian-base/cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ options:
66
machineType: 'N1_HIGHCPU_8'
77

88
steps:
9-
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
9+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20210917-12df099d55'
1010
entrypoint: bash
1111
dir: ./images/build/debian-base
1212
env:

images/build/debian-iptables/cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ options:
66
machineType: 'N1_HIGHCPU_8'
77

88
steps:
9-
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
9+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20210917-12df099d55'
1010
entrypoint: bash
1111
dir: ./images/build/debian-iptables
1212
env:

images/build/go-runner/cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ steps:
1818
- 'distroless-cosign.pub' # From https://github.com/GoogleContainerTools/distroless/blob/main/cosign.pub
1919
- 'gcr.io/distroless/$_DISTROLESS_IMAGE'
2020

21-
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
21+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20210917-12df099d55'
2222
entrypoint: 'bash'
2323
dir: ./images/build/go-runner
2424
env:

images/build/setcap/cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ options:
66
machineType: 'N1_HIGHCPU_8'
77

88
steps:
9-
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
9+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20210917-12df099d55'
1010
entrypoint: bash
1111
dir: ./images/build/setcap
1212
env:

images/releng/k8s-ci-builder/cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ options:
1111

1212
steps:
1313
# TODO: Update image version
14-
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930'
14+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20210917-12df099d55'
1515
entrypoint: 'bash'
1616
dir: ./images/releng/k8s-ci-builder
1717
env:

0 commit comments

Comments
 (0)