deploy: add support for Kubernetes 1.22

The PMEM-CSI deployment itself is the same as for 1.21. Some test code which used StorageV1beta1.CSIDriver had to be updated to StorageV1 because 1.22 no longer has the older API. (cherry picked from commit 08e4286)
intel · Nov 17, 2021 · 5575aff · 5575aff
1 parent 08505ea
commit 5575aff
Show file tree

Hide file tree

Showing 20 changed files with 6,238 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -180,17 +180,29 @@ pipeline {
         //   (more tests, runs longer, thus gets to use the existing worker)
         stage('Testing') {
             parallel {
-                stage('1.21') {
+                stage('1.22') {
                     options {
                         timeout(time: 12, unit: "HOURS")
                     }
                     steps {
                         // Skip production, i.e. run testing.
-                        TestInVM("", "fedora", "", "1.21", "Top.Level..[[:alpha:]]*-production[[:space:]]")
+                        TestInVM("", "fedora", "", "1.22", "Top.Level..[[:alpha:]]*-production[[:space:]]")
                     }
                 }
 
                 // All others set up their own worker.
+                stage('1.21') {
+                    when {
+		        beforeAgent true
+		        not { changeRequest() }
+                    }
+                    agent {
+                        label "pmem-csi"
+                    }
+                    steps {
+                        TestInVM("fedora-1.21", "fedora", "", "1.21", "")
+                    }
+                }
                 stage('1.20') {
                     when {
 		        beforeAgent true

diff --git a/Makefile b/Makefile
@@ -179,6 +179,7 @@ KUSTOMIZE += $(foreach version,$(KUSTOMIZE_KUBERNETES_VERSIONS),$(subst X.XX,$(v
 
 # 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 += $(subst kubernetes-base,kubernetes-1.21,$(subst X.XX,1.22,$(KUSTOMIZE_KUBERNETES_OUTPUT)))
 
 KUSTOMIZE += deploy/common/pmem-storageclass-default.yaml=deploy/kustomize/storageclass
 KUSTOMIZE += deploy/common/pmem-storageclass-ext4.yaml=deploy/kustomize/storageclass-ext4

diff --git a/README.md b/README.md
@@ -39,6 +39,8 @@ versions:
 | 1.18               |                                | supported
 | 1.19               |                                | supported
 | 1.20               |                                | supported
+| 1.21               |                                | supported
+| 1.22               |                                | supported
 
 <sup>1</sup> Several relevant features are only available in alpha
 quality in Kubernetes 1.13 and the combination of skip attach and

diff --git a/deploy/kubernetes-1.22/direct/kustomization.yaml b/deploy/kubernetes-1.22/direct/kustomization.yaml
@@ -0,0 +1 @@
+resources: [ pmem-csi.yaml ]