Skip to content

Commit

Permalink
Merge pull request #34003 from gnufied/backup-resizer-job-changes
Browse files Browse the repository at this point in the history
Remove 1.29 from csi sidecar jobs and make all resizer jobs optional
  • Loading branch information
k8s-ci-robot authored Dec 20, 2024
2 parents 8634ab4 + ceabce6 commit 2ca6e55
Show file tree
Hide file tree
Showing 10 changed files with 431 additions and 388 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ presubmits:
annotations:
testgrid-dashboards: sig-storage-csi-other
testgrid-tab-name: pull-csi-release-tools-in-csi-test
description: Kubernetes-CSI pull job in repo csi-release-tools for csi-test, using deployment 1.30 on Kubernetes 1.30
description: Kubernetes-CSI pull job in repo csi-release-tools for csi-test, using deployment 1.31 on Kubernetes 1.31
spec:
containers:
# We need this image because it has Docker in Docker and go.
Expand Down Expand Up @@ -94,7 +94,7 @@ presubmits:
annotations:
testgrid-dashboards: sig-storage-csi-other
testgrid-tab-name: pull-csi-release-tools-in-external-provisioner
description: Kubernetes-CSI pull job in repo csi-release-tools for external-provisioner, using deployment 1.30 on Kubernetes 1.30
description: Kubernetes-CSI pull job in repo csi-release-tools for external-provisioner, using deployment 1.31 on Kubernetes 1.31
spec:
containers:
# We need this image because it has Docker in Docker and go.
Expand All @@ -117,9 +117,9 @@ presubmits:
- name: PULL_TEST_REPO_DIR
value: /home/prow/go/src/github.com/kubernetes-csi/external-provisioner
- name: CSI_PROW_KUBERNETES_VERSION
value: "1.30.0"
value: "1.31.0"
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
value: "1.30"
value: "1.31"
- name: CSI_PROW_DRIVER_VERSION
value: "v1.15.0"
- name: CSI_PROW_TESTS
Expand All @@ -145,7 +145,7 @@ presubmits:
annotations:
testgrid-dashboards: sig-storage-csi-other
testgrid-tab-name: pull-csi-release-tools-in-external-snapshotter
description: Kubernetes-CSI pull job in repo csi-release-tools for external-snapshotter, using deployment 1.30 on Kubernetes 1.30
description: Kubernetes-CSI pull job in repo csi-release-tools for external-snapshotter, using deployment 1.31 on Kubernetes 1.31
spec:
containers:
# We need this image because it has Docker in Docker and go.
Expand All @@ -168,9 +168,9 @@ presubmits:
- name: PULL_TEST_REPO_DIR
value: /home/prow/go/src/github.com/kubernetes-csi/external-snapshotter
- name: CSI_PROW_KUBERNETES_VERSION
value: "1.30.0"
value: "1.31.0"
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
value: "1.30"
value: "1.31"
- name: CSI_PROW_DRIVER_VERSION
value: "v1.15.0"
- name: CSI_PROW_TESTS
Expand All @@ -196,7 +196,7 @@ presubmits:
annotations:
testgrid-dashboards: sig-storage-csi-other
testgrid-tab-name: pull-csi-release-tools-in-csi-driver-host-path
description: Kubernetes-CSI pull job in repo csi-release-tools for csi-driver-host-path, using deployment 1.30 on Kubernetes 1.30
description: Kubernetes-CSI pull job in repo csi-release-tools for csi-driver-host-path, using deployment 1.31 on Kubernetes 1.31
spec:
containers:
# We need this image because it has Docker in Docker and go.
Expand All @@ -219,9 +219,9 @@ presubmits:
- name: PULL_TEST_REPO_DIR
value: /home/prow/go/src/github.com/kubernetes-csi/csi-driver-host-path
- name: CSI_PROW_KUBERNETES_VERSION
value: "1.30.0"
value: "1.31.0"
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
value: "1.30"
value: "1.31"
- name: CSI_PROW_DRIVER_VERSION
value: "v1.15.0"
- name: CSI_PROW_TESTS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

presubmits:
kubernetes-csi/external-attacher:
- name: pull-kubernetes-csi-external-attacher-1-29-on-kubernetes-1-29
- name: pull-kubernetes-csi-external-attacher-1-30-on-kubernetes-1-30
cluster: eks-prow-build-cluster
always_run: true
# TODO: pull_optional can have external-attacher removed once special case for resizer is removed
optional: false
decorate: true
skip_report: false
Expand All @@ -15,8 +16,8 @@ presubmits:
preset-kind-volume-mounts: "true"
annotations:
testgrid-dashboards: sig-storage-csi-external-attacher
testgrid-tab-name: 1-29-on-kubernetes-1-29
description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.29 on Kubernetes 1.29
testgrid-tab-name: 1-30-on-kubernetes-1-30
description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.30 on Kubernetes 1.30
spec:
containers:
# We need this image because it has Docker in Docker and go.
Expand All @@ -32,9 +33,9 @@ presubmits:
# unrelated to the PR. Testing against the latest Kubernetes is covered
# by periodic jobs (see https://testgrid.k8s.io/sig-storage-csi-ci#Summary).
- name: CSI_PROW_KUBERNETES_VERSION
value: "1.29.0"
value: "1.30.0"
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
value: "1.29"
value: "1.30"
- name: CSI_PROW_DEPLOYMENT_SUFFIX
value: ""
- name: CSI_PROW_DRIVER_VERSION
Expand All @@ -53,7 +54,7 @@ presubmits:
limits:
memory: "9Gi"
cpu: 4
- name: pull-kubernetes-csi-external-attacher-1-29-on-kubernetes-master
- name: pull-kubernetes-csi-external-attacher-1-30-on-kubernetes-master
# Explicitly needs to be started with /test.
# This cannot be enabled by default because there's always the risk
# that something changes in master which breaks the pre-merge check.
Expand All @@ -68,8 +69,8 @@ presubmits:
preset-kind-volume-mounts: "true"
annotations:
testgrid-dashboards: sig-storage-csi-external-attacher
testgrid-tab-name: 1-29-on-kubernetes-master
description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.29 on Kubernetes master
testgrid-tab-name: 1-30-on-kubernetes-master
description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.30 on Kubernetes master
spec:
containers:
# We need this image because it has Docker in Docker and go.
Expand Down Expand Up @@ -99,9 +100,10 @@ presubmits:
limits:
memory: "9Gi"
cpu: 4
- name: pull-kubernetes-csi-external-attacher-1-30-on-kubernetes-1-30
- name: pull-kubernetes-csi-external-attacher-1-31-on-kubernetes-1-31
cluster: eks-prow-build-cluster
always_run: true
# TODO: pull_optional can have external-attacher removed once special case for resizer is removed
optional: false
decorate: true
skip_report: false
Expand All @@ -112,8 +114,8 @@ presubmits:
preset-kind-volume-mounts: "true"
annotations:
testgrid-dashboards: sig-storage-csi-external-attacher
testgrid-tab-name: 1-30-on-kubernetes-1-30
description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.30 on Kubernetes 1.30
testgrid-tab-name: 1-31-on-kubernetes-1-31
description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.31 on Kubernetes 1.31
spec:
containers:
# We need this image because it has Docker in Docker and go.
Expand All @@ -129,9 +131,9 @@ presubmits:
# unrelated to the PR. Testing against the latest Kubernetes is covered
# by periodic jobs (see https://testgrid.k8s.io/sig-storage-csi-ci#Summary).
- name: CSI_PROW_KUBERNETES_VERSION
value: "1.30.0"
value: "1.31.0"
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
value: "1.30"
value: "1.31"
- name: CSI_PROW_DEPLOYMENT_SUFFIX
value: ""
- name: CSI_PROW_DRIVER_VERSION
Expand All @@ -150,7 +152,7 @@ presubmits:
limits:
memory: "9Gi"
cpu: 4
- name: pull-kubernetes-csi-external-attacher-1-30-on-kubernetes-master
- name: pull-kubernetes-csi-external-attacher-1-31-on-kubernetes-master
# Explicitly needs to be started with /test.
# This cannot be enabled by default because there's always the risk
# that something changes in master which breaks the pre-merge check.
Expand All @@ -165,8 +167,8 @@ presubmits:
preset-kind-volume-mounts: "true"
annotations:
testgrid-dashboards: sig-storage-csi-external-attacher
testgrid-tab-name: 1-30-on-kubernetes-master
description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.30 on Kubernetes master
testgrid-tab-name: 1-31-on-kubernetes-master
description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.31 on Kubernetes master
spec:
containers:
# We need this image because it has Docker in Docker and go.
Expand Down Expand Up @@ -196,9 +198,10 @@ presubmits:
limits:
memory: "9Gi"
cpu: 4
- name: pull-kubernetes-csi-external-attacher-1-31-on-kubernetes-1-31
- name: pull-kubernetes-csi-external-attacher-1-32-on-kubernetes-1-32
cluster: eks-prow-build-cluster
always_run: true
# TODO: pull_optional can have external-attacher removed once special case for resizer is removed
optional: true
decorate: true
skip_report: false
Expand All @@ -209,8 +212,8 @@ presubmits:
preset-kind-volume-mounts: "true"
annotations:
testgrid-dashboards: sig-storage-csi-external-attacher
testgrid-tab-name: 1-31-on-kubernetes-1-31
description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.31 on Kubernetes 1.31
testgrid-tab-name: 1-32-on-kubernetes-1-32
description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.32 on Kubernetes 1.32
spec:
containers:
# We need this image because it has Docker in Docker and go.
Expand All @@ -226,9 +229,9 @@ presubmits:
# unrelated to the PR. Testing against the latest Kubernetes is covered
# by periodic jobs (see https://testgrid.k8s.io/sig-storage-csi-ci#Summary).
- name: CSI_PROW_KUBERNETES_VERSION
value: "1.31.0"
value: "1.32.0"
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
value: "1.31"
value: "1.32"
- name: CSI_PROW_DEPLOYMENT_SUFFIX
value: ""
- name: CSI_PROW_DRIVER_VERSION
Expand All @@ -247,7 +250,7 @@ presubmits:
limits:
memory: "9Gi"
cpu: 4
- name: pull-kubernetes-csi-external-attacher-1-31-on-kubernetes-master
- name: pull-kubernetes-csi-external-attacher-1-32-on-kubernetes-master
# Explicitly needs to be started with /test.
# This cannot be enabled by default because there's always the risk
# that something changes in master which breaks the pre-merge check.
Expand All @@ -262,8 +265,8 @@ presubmits:
preset-kind-volume-mounts: "true"
annotations:
testgrid-dashboards: sig-storage-csi-external-attacher
testgrid-tab-name: 1-31-on-kubernetes-master
description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.31 on Kubernetes master
testgrid-tab-name: 1-32-on-kubernetes-master
description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.32 on Kubernetes master
spec:
containers:
# We need this image because it has Docker in Docker and go.
Expand Down Expand Up @@ -293,9 +296,10 @@ presubmits:
limits:
memory: "9Gi"
cpu: 4
- name: pull-kubernetes-csi-external-attacher-alpha-1-30-on-kubernetes-1-30
- name: pull-kubernetes-csi-external-attacher-alpha-1-31-on-kubernetes-1-31
cluster: eks-prow-build-cluster
always_run: false
# TODO: pull_optional can have external-attacher removed once special case for resizer is removed
optional: true
decorate: true
skip_report: false
Expand All @@ -306,8 +310,8 @@ presubmits:
preset-kind-volume-mounts: "true"
annotations:
testgrid-dashboards: sig-storage-csi-external-attacher
testgrid-tab-name: alpha-1-30-on-kubernetes-1-30
description: Kubernetes-CSI pull job in repo external-attacher for alpha tests, using deployment 1.30 on Kubernetes 1.30
testgrid-tab-name: alpha-1-31-on-kubernetes-1-31
description: Kubernetes-CSI pull job in repo external-attacher for alpha tests, using deployment 1.31 on Kubernetes 1.31
spec:
containers:
# We need this image because it has Docker in Docker and go.
Expand All @@ -323,9 +327,9 @@ presubmits:
# unrelated to the PR. Testing against the latest Kubernetes is covered
# by periodic jobs (see https://testgrid.k8s.io/sig-storage-csi-ci#Summary).
- name: CSI_PROW_KUBERNETES_VERSION
value: "1.30.0"
value: "1.31.0"
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
value: "1.30"
value: "1.31"
- name: CSI_PROW_DEPLOYMENT_SUFFIX
value: ""
- name: CSI_PROW_DRIVER_VERSION
Expand Down
Loading

0 comments on commit 2ca6e55

Please sign in to comment.