kubernetes-csi: test snapshotter and resizer with different Kubernete…

…s versions Both are now part of all csi-driver-host-path deployments for Kubernetes 1.13 and later and their functionality may differ depending the Kubernetes version. Therefore it makes sense to enable the full test matrix instead of testing with just one Kubernetes version.
kubernetes · Sep 18, 2019 · 5829c83 · 5829c83
1 parent 9aa1dfc
commit 5829c83
Show file tree

Hide file tree

Showing 3 changed files with 356 additions and 40 deletions.
diff --git a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml
@@ -2,7 +2,7 @@
 
 presubmits:
   kubernetes-csi/external-resizer:
-  - name: pull-kubernetes-csi-external-resizer
+  - name: pull-kubernetes-csi-external-resizer-1-14-on-kubernetes-1-14
     always_run: true
     optional: false
     decorate: true
@@ -12,10 +12,6 @@ presubmits:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
-    annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: pull-kubernetes-csi-external-resizer
-      description: Kubernetes-CSI pull non-alpha job in external-resizer
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -25,6 +21,15 @@ presubmits:
         args:
         - ./.prow.sh
         env:
+        # We pick some version for which there are pre-built images for kind.
+        # Update only when the newer version is known to not cause issues,
+        # otherwise presubmit jobs may start to fail for reasons that are
+        # unrelated to the PR. Testing against the latest Kubernetes is covered
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "1.14.0"
+        - name: CSI_PROW_KUBERNETES_DEPLOYMENT
+          value: "1.14"
         - name: CSI_PROW_TESTS
           value: "sanity serial parallel"
         # docker-in-docker needs privileged mode
@@ -33,7 +38,43 @@ presubmits:
         resources:
           requests:
             cpu: 2000m
-  - name: pull-kubernetes-csi-external-resizer-unit
+  - name: pull-kubernetes-csi-external-resizer-1-14-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.
+    always_run: false
+    optional: true
+    decorate: true
+    skip_report: false
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190917-d326d2a-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "latest"
+        - name: CSI_PROW_TESTS
+          value: "sanity serial parallel"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
+  - name: pull-kubernetes-csi-external-resizer-1-15-on-kubernetes-1-15
     always_run: true
     optional: false
     decorate: true
@@ -43,10 +84,6 @@ presubmits:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
-    annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: pull-kubernetes-csi-external-resizer-unit
-      description: Kubernetes-CSI pull unit job in external-resizer
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -56,16 +93,61 @@ presubmits:
         args:
         - ./.prow.sh
         env:
+        # We pick some version for which there are pre-built images for kind.
+        # Update only when the newer version is known to not cause issues,
+        # otherwise presubmit jobs may start to fail for reasons that are
+        # unrelated to the PR. Testing against the latest Kubernetes is covered
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "1.15.0"
+        - name: CSI_PROW_KUBERNETES_DEPLOYMENT
+          value: "1.15"
         - name: CSI_PROW_TESTS
-          value: "unit"
+          value: "sanity serial parallel"
         # docker-in-docker needs privileged mode
         securityContext:
           privileged: true
         resources:
           requests:
             cpu: 2000m
-  - name: pull-kubernetes-csi-external-resizer-alpha
-    always_run: true
+  - name: pull-kubernetes-csi-external-resizer-1-15-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.
+    always_run: false
+    optional: true
+    decorate: true
+    skip_report: false
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190917-d326d2a-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "latest"
+        - name: CSI_PROW_TESTS
+          value: "sanity serial parallel"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
+  - name: pull-kubernetes-csi-external-resizer-alpha-1-15-on-kubernetes-1-15
+    always_run: false
     optional: true
     decorate: true
     skip_report: false
@@ -74,10 +156,6 @@ presubmits:
       preset-service-account: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
-    annotations:
-      testgrid-dashboards: sig-storage-csi
-      testgrid-tab-name: pull-kubernetes-csi-external-resizer-alpha
-      description: Kubernetes-CSI pull alpha job in external-resizer
     spec:
       containers:
       # We need this image because it has Docker in Docker and go.
@@ -87,6 +165,15 @@ presubmits:
         args:
         - ./.prow.sh
         env:
+        # We pick some version for which there are pre-built images for kind.
+        # Update only when the newer version is known to not cause issues,
+        # otherwise presubmit jobs may start to fail for reasons that are
+        # unrelated to the PR. Testing against the latest Kubernetes is covered
+        # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary).
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "1.15.0"
+        - name: CSI_PROW_KUBERNETES_DEPLOYMENT
+          value: "1.15"
         - name: CSI_PROW_TESTS
           value: "serial-alpha parallel-alpha"
         # docker-in-docker needs privileged mode
@@ -95,3 +182,70 @@ presubmits:
         resources:
           requests:
             cpu: 2000m
+  - name: pull-kubernetes-csi-external-resizer-alpha-1-15-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.
+    always_run: false
+    optional: true
+    decorate: true
+    skip_report: false
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190917-d326d2a-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_KUBERNETES_VERSION
+          value: "latest"
+        - name: CSI_PROW_TESTS
+          value: "serial-alpha parallel-alpha"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m
+  - name: pull-kubernetes-csi-external-resizer-unit
+    always_run: true
+    decorate: true
+    skip_report: false
+    skip_branches: []
+    labels:
+      preset-service-account: "true"
+      preset-dind-enabled: "true"
+      preset-bazel-remote-cache-enabled: "true"
+      preset-kind-volume-mounts: "true"
+    spec:
+      containers:
+      # We need this image because it has Docker in Docker and go.
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190917-d326d2a-master
+        command:
+        - runner.sh
+        args:
+        - ./.prow.sh
+        env:
+        - name: CSI_PROW_TESTS
+          value: "unit"
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
+      resources:
+        requests:
+          # these are both a bit below peak usage during build
+          # this is mostly for building kubernetes
+          memory: "9000Mi"
+          # during the tests more like 3-20m is used
+          cpu: 2000m