From 1145b61d36404380468a184c2722363a8908a6fd Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 13 Nov 2020 12:48:37 +0100 Subject: [PATCH 1/2] kubernetes-csi: move manual csi-driver-nfs job Commit 0ad87abe66781c4e9d0f055e6e8871ae5a91b447 added a manually defined job to a file that gets overrwritten by gen-jobs.sh. The manual job has to be in a separate file. --- .../csi-driver-nfs/csi-driver-nfs-config.yaml | 47 ------------------ .../csi-driver-nfs-unmanaged.yaml | 49 +++++++++++++++++++ 2 files changed, 49 insertions(+), 47 deletions(-) diff --git a/config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-config.yaml b/config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-config.yaml index d0d87ea7b27d..a4eb79e1a0bb 100644 --- a/config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-config.yaml +++ b/config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-config.yaml @@ -29,50 +29,3 @@ presubmits: resources: requests: cpu: 2000m - - 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' diff --git a/config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-unmanaged.yaml b/config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-unmanaged.yaml index 8500e9c1902f..b3831461bf64 100644 --- a/config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-unmanaged.yaml +++ b/config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-unmanaged.yaml @@ -1,3 +1,5 @@ +# manually defined jobs + presubmits: kubernetes-csi/csi-driver-nfs: - name: pull-csi-driver-nfs-sanity @@ -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' From 440de3d0674e326a0f0a1bfb7eb1c226c2833531 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 13 Nov 2020 12:50:37 +0100 Subject: [PATCH 2/2] kubernetes-csi: set snapshotter version Some jobs need the "master" version of the snapshotter CRD and controller. For others it makes sense to select the version that gets tested in the Prow job instead of having to bump the prow.sh script in all affected repos. The caveat is that all future versions of external-snapshotter must install through exactly the YAML files that are currently used by prow.sh: https://github.com/kubernetes-csi/csi-release-tools/blob/5d874cce4e649dfd254d01b9b44179ffa72aee75/prow.sh#L702-L722 --- .../csi-driver-flex-config.yaml | 3 ++ .../csi-driver-host-path-config.yaml | 46 +++++++++++++++++++ .../csi-driver-iscsi-config.yaml | 3 ++ .../csi-driver-nfs/csi-driver-nfs-config.yaml | 3 ++ .../csi-lib-utils/csi-lib-utils-config.yaml | 3 ++ .../csi-proxy/csi-proxy-config.yaml | 3 ++ .../csi-release-tools-config.yaml | 3 ++ .../csi-test/csi-test-config.yaml | 3 ++ .../external-attacher-config.yaml | 16 +++++++ .../external-health-monitor-config.yaml | 3 ++ .../external-provisioner-config.yaml | 16 +++++++ .../external-resizer-config.yaml | 16 +++++++ .../external-snapshotter-config.yaml | 16 +++++++ config/jobs/kubernetes-csi/gen-jobs.sh | 33 ++++++++++++- .../livenessprobe/livenessprobe-config.yaml | 16 +++++++ .../node-driver-registrar-config.yaml | 16 +++++++ 16 files changed, 198 insertions(+), 1 deletion(-) diff --git a/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml b/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml index 4d5ddd0cf004..7ebb550cf247 100644 --- a/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml +++ b/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml @@ -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 diff --git a/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml b/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml index 155f3aabe992..e286ba4409e7 100644 --- a/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml +++ b/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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. @@ -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. @@ -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. @@ -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. @@ -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. diff --git a/config/jobs/kubernetes-csi/csi-driver-iscsi/csi-driver-iscsi-config.yaml b/config/jobs/kubernetes-csi/csi-driver-iscsi/csi-driver-iscsi-config.yaml index 7048ea985a9c..fcc325119b2f 100644 --- a/config/jobs/kubernetes-csi/csi-driver-iscsi/csi-driver-iscsi-config.yaml +++ b/config/jobs/kubernetes-csi/csi-driver-iscsi/csi-driver-iscsi-config.yaml @@ -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 diff --git a/config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-config.yaml b/config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-config.yaml index a4eb79e1a0bb..0f961898cda6 100644 --- a/config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-config.yaml +++ b/config/jobs/kubernetes-csi/csi-driver-nfs/csi-driver-nfs-config.yaml @@ -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 diff --git a/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml b/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml index b046142e8578..a2a2c9674b05 100644 --- a/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml +++ b/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml @@ -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 diff --git a/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml b/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml index c63a2b2becdc..fa8eba151417 100644 --- a/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml +++ b/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml @@ -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 diff --git a/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml b/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml index 7bde1be4de35..1f5944b83d47 100644 --- a/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml +++ b/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml @@ -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 diff --git a/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml b/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml index bfd7ea9a20a6..e71410a902bd 100644 --- a/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml +++ b/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml @@ -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 diff --git a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml index a69cb94c5d7d..3d2aed3608ab 100644 --- a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml +++ b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/config/jobs/kubernetes-csi/external-health-monitor/external-health-monitor-config.yaml b/config/jobs/kubernetes-csi/external-health-monitor/external-health-monitor-config.yaml index c7b0a5e1ad57..15be8d2fce6b 100644 --- a/config/jobs/kubernetes-csi/external-health-monitor/external-health-monitor-config.yaml +++ b/config/jobs/kubernetes-csi/external-health-monitor/external-health-monitor-config.yaml @@ -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 diff --git a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml index 5ecabb9235b1..11ca7b8b5d92 100644 --- a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml +++ b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml index 9930d1865054..898b7455521d 100644 --- a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml +++ b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml index 6aa0ca34473b..61196f5256c0 100644 --- a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml +++ b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/config/jobs/kubernetes-csi/gen-jobs.sh b/config/jobs/kubernetes-csi/gen-jobs.sh index 9643cd3f492f..d0eda5dfb406 100755 --- a/config/jobs/kubernetes-csi/gen-jobs.sh +++ b/config/jobs/kubernetes-csi/gen-jobs.sh @@ -47,7 +47,7 @@ latest_stable_k8s_minor_version="1.19" hostpath_driver_version="v1.4.0" # We need this image because it has Docker in Docker and go. -dind_image="gcr.io/k8s-testimages/kubekins-e2e:v20200916-8dd1247-master" +dind_image="gcr.io/k8s-testimages/kubekins-e2e:v20201111-a263fd7-master" # All kubernetes-csi repos which are part of the hostpath driver example. # For these repos we generate the full test matrix. For each entry here @@ -277,6 +277,24 @@ pull_alwaysrun() { fi } +snapshotter_version() { + local kubernetes="$1" + local canary="$2" + + if [ "$kubernetes" = "latest" ] || [ "$canary" = "canary" ]; then + # Kubernetes master and canary images may need a more recent + # snapshot controller and/or CRD than the ones from the latest + # stable release. + echo '"master"' + else + # All other jobs test against the latest stable snapshotter + # release. Additional jobs could be created to cover version + # skew, if desired. + echo '"v3.0.2"' + fi +} + + for repo in $hostpath_example_repos; do mkdir -p "$base/$repo" cat >"$base/$repo/$repo-config.yaml" <