Merge pull request #983 from pohly/kubernetes-1.21-support

deploy: test with Kubernetes 1.21 instead of 1.18

Jenkinsfile

@@ -174,45 +174,48 @@ pipeline {
 
         // Some stages are skipped entirely when testing PRs, the
         // others skip certain tests in that case:
-        // - production deployment is only tested with Kubernetes 1.16
-        //   and testing deployment only with Kubernetes 1.18
+        // - production deployment is tested on the oldest supported Kubernetes
+        //   (less tests, runs faster)
+        // - testing deployment is tested on the newest supported Kubernetes
+        //   (more tests, runs longer, thus gets to use the existing worker)
         stage('Testing') {
             parallel {
-                // This runs most tests and thus gets to use the initial worker immediately.
-                stage('1.20') {
+                stage('1.21') {
                     options {
                         timeout(time: 12, unit: "HOURS")
                     }
                     steps {
-                        TestInVM("", "fedora", "", "1.20", "Top.Level..[[:alpha:]]*-production[[:space:]]")
+                        // Skip production, i.e. run testing.
+                        TestInVM("", "fedora", "", "1.21", "Top.Level..[[:alpha:]]*-production[[:space:]]")
                     }
                 }
 
                 // All others set up their own worker.
-                stage('1.19') {
+                stage('1.20') {
+                    when {
+		        beforeAgent true
+		        not { changeRequest() }
+                    }
                     options {
                         timeout(time: 12, unit: "HOURS")
                     }
                     agent {
                         label "pmem-csi"
                     }
                     steps {
-                        TestInVM("fedora-1.19", "fedora", "", "1.19", "Top.Level..[[:alpha:]]*-production[[:space:]]")
+                        TestInVM("fedora-1.20", "fedora", "", "1.20", "")
                     }
                 }
-                stage('1.18') {
-                    when {
-		        beforeAgent true
-		        not { changeRequest() }
-                    }
+                stage('1.19') {
                     options {
                         timeout(time: 12, unit: "HOURS")
                     }
                     agent {
                         label "pmem-csi"
                     }
                     steps {
-                        TestInVM("fedora-1.18", "fedora", "", "1.18", "")
+                        // Skip testing, i.e. run production.
+                        TestInVM("fedora-1.19", "fedora", "", "1.19",  "Top.Level..[[:alpha:]]*-testing[[:space:]]")
                     }
                 }
             }

Makefile

@@ -166,16 +166,19 @@ KUSTOMIZE_KUBERNETES_OUTPUT = \
     deploy/kubernetes-X.XX/pmem-csi-direct-testing.yaml=deploy/kustomize/kubernetes-base-direct-coverage \
     deploy/kubernetes-X.XX/pmem-csi-lvm-testing.yaml=deploy/kustomize/kubernetes-base-lvm-coverage \
 
+# Kubernetes versions derived from kubernetes-base.
+#
+# Once we drop support for 1.19, all the remaining versions can
+# be moved back here and the changes for storage capacity
+# tracking can be moved into kubernetes-base and
+# kubernetes-1.20 removed.
 KUSTOMIZE_KUBERNETES_VERSIONS = \
-    1.18 \
     1.19 \
-    1.20 \
-
+    1.20
 KUSTOMIZE += $(foreach version,$(KUSTOMIZE_KUBERNETES_VERSIONS),$(subst X.XX,$(version),$(KUSTOMIZE_KUBERNETES_OUTPUT)))
 
-# Special case Kubernetes 1.19 with alpha features:
-# use different base.
-KUSTOMIZE += $(subst kubernetes-base,kubernetes-1.19-alpha,$(subst X.XX,1.19-alpha,$(KUSTOMIZE_KUBERNETES_OUTPUT)))
+# Deployments that have storage capacity tracking enabled, using the v1beta1 API.
+KUSTOMIZE += $(subst kubernetes-base,kubernetes-1.21,$(subst X.XX,1.21,$(KUSTOMIZE_KUBERNETES_OUTPUT)))
 
 KUSTOMIZE += deploy/common/pmem-storageclass-default.yaml=deploy/kustomize/storageclass
 KUSTOMIZE += deploy/common/pmem-storageclass-ext4.yaml=deploy/kustomize/storageclass-ext4