From 26d6d5ae15bdd43d6e27f285816a789e285c42b5 Mon Sep 17 00:00:00 2001 From: Zeqian Meng <1109697+ZeqianMeng@users.noreply.github.com> Date: Fri, 19 Sep 2025 15:17:00 +0200 Subject: [PATCH] Remove rbd e2e test image The Docker image for rbd e2e tests has been removed in the Kubernetes repo. --- .../k8s-staging-e2e-test-images.sh | 1 - .../k8s-staging-e2e-test-images.yaml | 42 ------------- .../prowjob_customresourcedefinition.yaml | 61 ------------------- 3 files changed, 104 deletions(-) diff --git a/config/jobs/image-pushing/k8s-staging-e2e-test-images.sh b/config/jobs/image-pushing/k8s-staging-e2e-test-images.sh index d718138d2937..f563c369c8ce 100755 --- a/config/jobs/image-pushing/k8s-staging-e2e-test-images.sh +++ b/config/jobs/image-pushing/k8s-staging-e2e-test-images.sh @@ -48,7 +48,6 @@ readonly IMAGES=( sample-apiserver sample-device-plugin volume/iscsi - volume/rbd volume/nfs volume/gluster windows-servercore-cache diff --git a/config/jobs/image-pushing/k8s-staging-e2e-test-images.yaml b/config/jobs/image-pushing/k8s-staging-e2e-test-images.yaml index a55d3ae2127a..1c3fcbc4b3f4 100644 --- a/config/jobs/image-pushing/k8s-staging-e2e-test-images.yaml +++ b/config/jobs/image-pushing/k8s-staging-e2e-test-images.yaml @@ -1304,48 +1304,6 @@ postsubmits: # We override that with the volume/iscsi image. - name: WHAT value: "volume/iscsi" - - name: post-kubernetes-push-e2e-volume-rbd-test-images - rerun_auth_config: - github_team_slugs: - - org: kubernetes - slug: release-managers - - org: kubernetes - slug: test-infra-admins - github_users: - - aojea - - chewong - - claudiubelu - - mkumatag - cluster: k8s-infra-prow-build-trusted - annotations: - testgrid-dashboards: sig-testing-images, sig-k8s-infra-gcb - decorate: true - # we only need to run if the test images have been changed. - run_if_changed: '^.go-version$|^test/images/[^/]+$|^test\/images\/volume\/rbd\/' - branches: - # TODO(releng): Remove once repo default branch has been renamed - - ^master$ - - ^main$ - spec: - serviceAccountName: gcb-builder - containers: - - image: gcr.io/k8s-staging-test-infra/image-builder:v20250914-3092127382 - command: - - /run.sh - args: - # this is the project GCB will run in, which is the same as the GCR - # images are pushed to. - - --project=k8s-staging-e2e-test-images - # This is the same as above, but with -gcb appended. - - --scratch-bucket=gs://k8s-staging-e2e-test-images-gcb - - --env-passthrough=PULL_BASE_REF,PULL_BASE_SHA,WHAT - - --build-dir=. - - test/images - env: - # By default, the E2E test image's WHAT is all-conformance. - # We override that with the volume/rbd image. - - name: WHAT - value: "volume/rbd" - name: post-kubernetes-push-e2e-volume-nfs-test-images rerun_auth_config: github_team_slugs: diff --git a/config/prow/cluster/prowjob-crd/prowjob_customresourcedefinition.yaml b/config/prow/cluster/prowjob-crd/prowjob_customresourcedefinition.yaml index 2c26068edec6..f982afa1a46e 100644 --- a/config/prow/cluster/prowjob-crd/prowjob_customresourcedefinition.yaml +++ b/config/prow/cluster/prowjob-crd/prowjob_customresourcedefinition.yaml @@ -7288,67 +7288,6 @@ spec: - registry - volume type: object - rbd: - description: 'rbd represents a Rados Block - Device mount on the host that shares a pod''s - lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md' - properties: - fsType: - description: 'fsType is the filesystem - type of the volume that you want to - mount. Tip: Ensure that the filesystem - type is supported by the host operating - system. Examples: "ext4", "xfs", "ntfs". - Implicitly inferred to be "ext4" if - unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd - TODO: how do we prevent errors in the - filesystem from compromising the machine' - type: string - image: - description: 'image is the rados image - name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' - type: string - keyring: - description: 'keyring is the path to key - ring for RBDUser. Default is /etc/ceph/keyring. - More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' - type: string - monitors: - description: 'monitors is a collection - of Ceph monitors. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' - items: - type: string - type: array - pool: - description: 'pool is the rados pool name. - Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' - type: string - readOnly: - description: 'readOnly here will force - the ReadOnly setting in VolumeMounts. - Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' - type: boolean - secretRef: - description: 'secretRef is name of the - authentication secret for RBDUser. If - provided overrides keyring. Default - is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' - properties: - name: - description: 'Name of the referent. - More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - TODO: Add other useful fields. apiVersion, - kind, uid?' - type: string - type: object - user: - description: 'user is the rados user name. - Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' - type: string - required: - - image - - monitors - type: object scaleIO: description: scaleIO represents a ScaleIO persistent volume attached and mounted on