Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kubernete-CSI: set snapshot CRD version #19939

Merged
merged 2 commits into from
Nov 16, 2020
Merged

Kubernete-CSI: set snapshot CRD version #19939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1145b61
kubernetes-csi: move manual csi-driver-nfs job
pohly Nov 13, 2020
440de3d
kubernetes-csi: set snapshotter version
pohly Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ presubmits:
- runner.sh
args:
- ./.prow.sh
env:
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
# docker-in-docker needs privileged mode
securityContext:
privileged: true
Expand Down
46 changes: 46 additions & 0 deletions config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ presubmits:
value: "1.17"
- name: CSI_PROW_DRIVER_VERSION
value: "v1.4.0"
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
- name: CSI_PROW_TESTS
value: "sanity serial parallel"
# docker-in-docker needs privileged mode
Expand Down Expand Up @@ -74,6 +76,8 @@ presubmits:
value: "latest"
- name: CSI_PROW_DRIVER_VERSION
value: "v1.4.0"
- name: CSI_SNAPSHOTTER_VERSION
value: "master"
- name: CSI_PROW_TESTS
value: "sanity serial parallel"
# docker-in-docker needs privileged mode
Expand Down Expand Up @@ -120,6 +124,8 @@ presubmits:
value: "1.18"
- name: CSI_PROW_DRIVER_VERSION
value: "v1.4.0"
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
- name: CSI_PROW_TESTS
value: "sanity serial parallel"
# docker-in-docker needs privileged mode
Expand Down Expand Up @@ -158,6 +164,8 @@ presubmits:
value: "latest"
- name: CSI_PROW_DRIVER_VERSION
value: "v1.4.0"
- name: CSI_SNAPSHOTTER_VERSION
value: "master"
- name: CSI_PROW_TESTS
value: "sanity serial parallel"
# docker-in-docker needs privileged mode
Expand Down Expand Up @@ -204,6 +212,8 @@ presubmits:
value: "1.19"
- name: CSI_PROW_DRIVER_VERSION
value: "v1.4.0"
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
- name: CSI_PROW_TESTS
value: "sanity serial parallel"
# docker-in-docker needs privileged mode
Expand Down Expand Up @@ -242,6 +252,8 @@ presubmits:
value: "latest"
- name: CSI_PROW_DRIVER_VERSION
value: "v1.4.0"
- name: CSI_SNAPSHOTTER_VERSION
value: "master"
- name: CSI_PROW_TESTS
value: "sanity serial parallel"
# docker-in-docker needs privileged mode
Expand Down Expand Up @@ -288,6 +300,8 @@ presubmits:
value: "1.19"
- name: CSI_PROW_DRIVER_VERSION
value: "v1.4.0"
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
- name: CSI_PROW_TESTS
value: "serial-alpha parallel-alpha"
# docker-in-docker needs privileged mode
Expand Down Expand Up @@ -326,6 +340,8 @@ presubmits:
value: "latest"
- name: CSI_PROW_DRIVER_VERSION
value: "v1.4.0"
- name: CSI_SNAPSHOTTER_VERSION
value: "master"
- name: CSI_PROW_TESTS
value: "serial-alpha parallel-alpha"
# docker-in-docker needs privileged mode
Expand Down Expand Up @@ -403,6 +419,8 @@ periodics:
env:
- name: CSI_PROW_KUBERNETES_VERSION
value: "release-1.17"
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
- name: CSI_PROW_BUILD_JOB
value: "false"
- name: CSI_PROW_DEPLOYMENT
Expand Down Expand Up @@ -443,6 +461,8 @@ periodics:
env:
- name: CSI_PROW_KUBERNETES_VERSION
value: "release-1.18"
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
- name: CSI_PROW_BUILD_JOB
value: "false"
- name: CSI_PROW_DEPLOYMENT
Expand Down Expand Up @@ -483,6 +503,8 @@ periodics:
env:
- name: CSI_PROW_KUBERNETES_VERSION
value: "release-1.19"
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
- name: CSI_PROW_BUILD_JOB
value: "false"
- name: CSI_PROW_DEPLOYMENT
Expand Down Expand Up @@ -523,6 +545,8 @@ periodics:
env:
- name: CSI_PROW_KUBERNETES_VERSION
value: "latest"
- name: CSI_SNAPSHOTTER_VERSION
value: "master"
- name: CSI_PROW_BUILD_JOB
value: "false"
- name: CSI_PROW_DEPLOYMENT
Expand Down Expand Up @@ -563,6 +587,8 @@ periodics:
env:
- name: CSI_PROW_KUBERNETES_VERSION
value: "release-1.18"
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
- name: CSI_PROW_BUILD_JOB
value: "false"
- name: CSI_PROW_DEPLOYMENT
Expand Down Expand Up @@ -603,6 +629,8 @@ periodics:
env:
- name: CSI_PROW_KUBERNETES_VERSION
value: "release-1.19"
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
- name: CSI_PROW_BUILD_JOB
value: "false"
- name: CSI_PROW_DEPLOYMENT
Expand Down Expand Up @@ -643,6 +671,8 @@ periodics:
env:
- name: CSI_PROW_KUBERNETES_VERSION
value: "latest"
- name: CSI_SNAPSHOTTER_VERSION
value: "master"
- name: CSI_PROW_BUILD_JOB
value: "false"
- name: CSI_PROW_DEPLOYMENT
Expand Down Expand Up @@ -683,6 +713,8 @@ periodics:
env:
- name: CSI_PROW_KUBERNETES_VERSION
value: "release-1.19"
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
- name: CSI_PROW_BUILD_JOB
value: "false"
- name: CSI_PROW_DEPLOYMENT
Expand Down Expand Up @@ -723,6 +755,8 @@ periodics:
env:
- name: CSI_PROW_KUBERNETES_VERSION
value: "latest"
- name: CSI_SNAPSHOTTER_VERSION
value: "master"
- name: CSI_PROW_BUILD_JOB
value: "false"
- name: CSI_PROW_DEPLOYMENT
Expand Down Expand Up @@ -763,6 +797,8 @@ periodics:
env:
- name: CSI_PROW_KUBERNETES_VERSION
value: "release-1.19"
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
- name: CSI_PROW_BUILD_JOB
value: "false"
- name: CSI_PROW_DEPLOYMENT
Expand Down Expand Up @@ -808,6 +844,8 @@ periodics:
# Replace images....
- name: CSI_PROW_HOSTPATH_CANARY
value: "canary"
- name: CSI_SNAPSHOTTER_VERSION
value: "master"
# ... but the RBAC rules only when testing on master.
# The other jobs test against the unmodified deployment for
# that Kubernetes version, i.e. with the original RBAC rules.
Expand Down Expand Up @@ -854,6 +892,8 @@ periodics:
# Replace images....
- name: CSI_PROW_HOSTPATH_CANARY
value: "canary"
- name: CSI_SNAPSHOTTER_VERSION
value: "master"
# ... but the RBAC rules only when testing on master.
# The other jobs test against the unmodified deployment for
# that Kubernetes version, i.e. with the original RBAC rules.
Expand Down Expand Up @@ -900,6 +940,8 @@ periodics:
# Replace images....
- name: CSI_PROW_HOSTPATH_CANARY
value: "canary"
- name: CSI_SNAPSHOTTER_VERSION
value: "master"
# ... but the RBAC rules only when testing on master.
# The other jobs test against the unmodified deployment for
# that Kubernetes version, i.e. with the original RBAC rules.
Expand Down Expand Up @@ -946,6 +988,8 @@ periodics:
# Replace images....
- name: CSI_PROW_HOSTPATH_CANARY
value: "canary"
- name: CSI_SNAPSHOTTER_VERSION
value: "master"
# ... but the RBAC rules only when testing on master.
# The other jobs test against the unmodified deployment for
# that Kubernetes version, i.e. with the original RBAC rules.
Expand Down Expand Up @@ -992,6 +1036,8 @@ periodics:
# Replace images....
- name: CSI_PROW_HOSTPATH_CANARY
value: "canary"
- name: CSI_SNAPSHOTTER_VERSION
value: "master"
# ... but the RBAC rules only when testing on master.
# The other jobs test against the unmodified deployment for
# that Kubernetes version, i.e. with the original RBAC rules.
Expand Down
3 changes: 3 additions & 0 deletions config/jobs/kubernetes-csi/csi-driver-iscsi/csi-driver-iscsi-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ presubmits:
- runner.sh
args:
- ./.prow.sh
env:
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
# docker-in-docker needs privileged mode
securityContext:
privileged: true
Expand Down
50 changes: 3 additions & 47 deletions config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,56 +23,12 @@ presubmits:
- runner.sh
args:
- ./.prow.sh
env:
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
# docker-in-docker needs privileged mode
securityContext:
privileged: true
resources:
requests:
cpu: 2000m
- name: pull-csi-driver-nfs-e2e
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change required for the snapshot CRD version changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to fix a mistake from someone's prior PR, see the first commit in this PR: 1145b61

decorate: true
always_run: true
path_alias: sigs.k8s.io/csi-driver-nfs
branches:
- master
labels:
preset-service-account: "true"
preset-azure-cred: "true"
preset-dind-enabled: "true"
extra_refs:
- org: kubernetes
repo: kubernetes
base_ref: master
path_alias: k8s.io/kubernetes
workdir: true
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20201111-a263fd7-master
command:
- runner.sh
- kubetest
args:
# Generic e2e test args
- --test
- --up
- --down
- --dump=$(ARTIFACTS)
# Azure-specific test args
- --provider=skeleton
- --deployment=aksengine
- --aksengine-admin-username=azureuser
- --aksengine-creds=$(AZURE_CREDENTIALS)
- --aksengine-orchestratorRelease=1.17
- --aksengine-location=eastus2
- --aksengine-public-key=$(AZURE_SSH_PUBLIC_KEY_FILE)
- --aksengine-template-url=https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/test/e2e/manifest/linux.json
- --aksengine-download-url=https://aka.ms/aks-engine/aks-engine-k8s-e2e.tar.gz
# Specific test args
- --test-csi-driver-nfs
securityContext:
privileged: true
annotations:
testgrid-dashboards: sig-storage-csi-other
testgrid-tab-name: pull-csi-driver-nfs-e2e
description: "Run E2E tests for NFS CSI driver."
testgrid-num-columns-recent: '30'
49 changes: 49 additions & 0 deletions config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-unmanaged.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# manually defined jobs

presubmits:
kubernetes-csi/csi-driver-nfs:
- name: pull-csi-driver-nfs-sanity
Expand Down Expand Up @@ -25,3 +27,50 @@ presubmits:
testgrid-tab-name: pull-csi-driver-nfs-sanity
description: "Run sanity tests for NFS CSI driver."
testgrid-num-columns-recent: '30'
- name: pull-csi-driver-nfs-e2e
decorate: true
always_run: true
path_alias: sigs.k8s.io/csi-driver-nfs
branches:
- master
labels:
preset-service-account: "true"
preset-azure-cred: "true"
preset-dind-enabled: "true"
extra_refs:
- org: kubernetes
repo: kubernetes
base_ref: master
path_alias: k8s.io/kubernetes
workdir: true
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20201111-a263fd7-master
command:
- runner.sh
- kubetest
args:
# Generic e2e test args
- --test
- --up
- --down
- --dump=$(ARTIFACTS)
# Azure-specific test args
- --provider=skeleton
- --deployment=aksengine
- --aksengine-admin-username=azureuser
- --aksengine-creds=$(AZURE_CREDENTIALS)
- --aksengine-orchestratorRelease=1.17
- --aksengine-location=eastus2
- --aksengine-public-key=$(AZURE_SSH_PUBLIC_KEY_FILE)
- --aksengine-template-url=https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/test/e2e/manifest/linux.json
- --aksengine-download-url=https://aka.ms/aks-engine/aks-engine-k8s-e2e.tar.gz
# Specific test args
- --test-csi-driver-nfs
securityContext:
privileged: true
annotations:
testgrid-dashboards: sig-storage-csi-other
testgrid-tab-name: pull-csi-driver-nfs-e2e
description: "Run E2E tests for NFS CSI driver."
testgrid-num-columns-recent: '30'
3 changes: 3 additions & 0 deletions config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ presubmits:
- runner.sh
args:
- ./.prow.sh
env:
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
# docker-in-docker needs privileged mode
securityContext:
privileged: true
Expand Down
3 changes: 3 additions & 0 deletions config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ presubmits:
- runner.sh
args:
- ./.prow.sh
env:
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
# docker-in-docker needs privileged mode
securityContext:
privileged: true
Expand Down
3 changes: 3 additions & 0 deletions config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ presubmits:
- runner.sh
args:
- ./.prow.sh
env:
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
# docker-in-docker needs privileged mode
securityContext:
privileged: true
Expand Down
3 changes: 3 additions & 0 deletions config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ presubmits:
- runner.sh
args:
- ./.prow.sh
env:
- name: CSI_SNAPSHOTTER_VERSION
value: "v3.0.2"
# docker-in-docker needs privileged mode
securityContext:
privileged: true
Expand Down
Loading