test: remove Kubernetes 1.19/20, add 1.23/24

This is in preparation for making 1.21-25 the only supported Kubernetes versions. The main advantage will be that support for the scheduler extender can be removed. For now it's still there, but not enabled for 1.24 because the configuration API changed.
intel · Sep 14, 2022 · 1139525 · 1139525
1 parent b450165
commit 1139525
Show file tree

Hide file tree

Showing 61 changed files with 226 additions and 197 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -189,15 +189,15 @@ pipeline {
         //   (more tests, runs longer, thus gets to use the existing worker)
         stage('Testing') {
             parallel {
-                stage('1.22') {
+                stage('1.24') {
                     steps {
                         // Skip production, i.e. run testing.
-                        TestInVM("", "", "fedora", "", "1.22", "Top.Level..[[:alpha:]]*-production[[:space:]]", "")
+                        TestInVM("", "", "fedora", "", "1.24", "Top.Level..[[:alpha:]]*-production[[:space:]]", "")
                     }
                 }
 
                 // When adding or removing coverage workers, update the "Code Coverage" step below!
-                stage('coverage-1.22') {
+                stage('coverage-1.24') {
                     when {
 		        beforeAgent true
 		        not { changeRequest() }
@@ -206,12 +206,12 @@ pipeline {
                         label "pmem-csi"
                     }
                     steps {
-                        TestInVM("fedora-coverage-1.22", "coverage-", "fedora", "", "1.22", "", "${env.COVERAGE_SKIP}")
+                        TestInVM("fedora-coverage-1.24", "coverage-", "fedora", "", "1.24", "", "${env.COVERAGE_SKIP}")
                     }
                 }
 
                 // All others set up their own worker.
-                stage('1.21') {
+                stage('1.23') {
                     when {
 		        beforeAgent true
 		        not { changeRequest() }
@@ -220,10 +220,10 @@ pipeline {
                         label "pmem-csi"
                     }
                     steps {
-                        TestInVM("fedora-1.21", "", "fedora", "", "1.21", "", "")
+                        TestInVM("fedora-1.23", "", "fedora", "", "1.23", "", "")
                     }
                 }
-                stage('1.20') {
+                stage('1.22') {
                     when {
 		        beforeAgent true
 		        not { changeRequest() }
@@ -232,19 +232,19 @@ pipeline {
                         label "pmem-csi"
                     }
                     steps {
-                        TestInVM("fedora-1.20", "", "fedora", "", "1.20", "", "")
+                        TestInVM("fedora-1.22", "", "fedora", "", "1.22", "", "")
                     }
                 }
-                stage('1.19') {
+                stage('1.21') {
                     agent {
                         label "pmem-csi"
                     }
                     steps {
                         // Skip testing, i.e. run production.
-                        TestInVM("fedora-1.19", "", "fedora", "", "1.19",  "Top.Level..[[:alpha:]]*-testing[[:space:]]", "")
+                        TestInVM("fedora-1.21", "", "fedora", "", "1.21",  "Top.Level..[[:alpha:]]*-testing[[:space:]]", "")
                     }
                 }
-                stage('coverage-1.19') {
+                stage('coverage-1.21') {
                     when {
 		        beforeAgent true
 		        not { changeRequest() }
@@ -253,7 +253,7 @@ pipeline {
                         label "pmem-csi"
                     }
                     steps {
-                        TestInVM("fedora-coverage-1.19", "coverage-", "fedora", "", "1.19", "", "${env.COVERAGE_SKIP}")
+                        TestInVM("fedora-coverage-1.21", "coverage-", "fedora", "", "1.21", "", "${env.COVERAGE_SKIP}")
                     }
                 }
             }
@@ -334,8 +334,8 @@ git push origin HEAD:master
             }
             steps {
                 // Restore <cluster>-coverage.out files.
-                unstash '1.22-coverage'
-                unstash '1.19-coverage'
+                unstash '1.24-coverage'
+                unstash '1.21-coverage'
 
                 // Merge and convert to Cobertura XML.
                 sh "${RunInBuilder()} ${env.BUILD_CONTAINER} make _work/gocovmerge _work/gocover-cobertura"

diff --git a/Makefile b/Makefile
@@ -178,19 +178,13 @@ KUSTOMIZE_KUBERNETES_OUTPUT = \
     deploy/kubernetes-X.XX/pmem-csi-lvm-testing.yaml=deploy/kustomize/kubernetes-base-lvm-testing$(KUSTOMIZE_COVERAGE_SUFFIX) \
 
 # 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.19 \
-    1.20
-KUSTOMIZE += $(foreach version,$(KUSTOMIZE_KUBERNETES_VERSIONS),$(subst X.XX,$(version),$(KUSTOMIZE_KUBERNETES_OUTPUT)))
+    1.21 \
+    1.22 \
+    1.23 \
+    1.24 \
 
-# 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 += $(foreach version,$(KUSTOMIZE_KUBERNETES_VERSIONS),$(subst X.XX,$(version),$(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/deploy/kubernetes-1.21/direct/pmem-csi.yaml b/deploy/kubernetes-1.21/direct/pmem-csi.yaml
@@ -546,8 +546,8 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
-        - --metrics-address=:10011
         - --enable-capacity
+        - --metrics-address=:10011
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.21/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.21/direct/testing/pmem-csi.yaml
@@ -549,9 +549,9 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
+        - --enable-capacity
         - --metrics-address=:10011
         - -v=5
-        - --enable-capacity
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.21/lvm/pmem-csi.yaml b/deploy/kubernetes-1.21/lvm/pmem-csi.yaml
@@ -546,8 +546,8 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
-        - --metrics-address=:10011
         - --enable-capacity
+        - --metrics-address=:10011
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.21/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.21/lvm/testing/pmem-csi.yaml
@@ -549,9 +549,9 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
+        - --enable-capacity
         - --metrics-address=:10011
         - -v=5
-        - --enable-capacity
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.21/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.21/pmem-csi-direct-testing.yaml
@@ -549,9 +549,9 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
+        - --enable-capacity
         - --metrics-address=:10011
         - -v=5
-        - --enable-capacity
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.21/pmem-csi-direct.yaml b/deploy/kubernetes-1.21/pmem-csi-direct.yaml
@@ -546,8 +546,8 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
-        - --metrics-address=:10011
         - --enable-capacity
+        - --metrics-address=:10011
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.21/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.21/pmem-csi-lvm-testing.yaml
@@ -549,9 +549,9 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
+        - --enable-capacity
         - --metrics-address=:10011
         - -v=5
-        - --enable-capacity
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.21/pmem-csi-lvm.yaml b/deploy/kubernetes-1.21/pmem-csi-lvm.yaml
@@ -546,8 +546,8 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
-        - --metrics-address=:10011
         - --enable-capacity
+        - --metrics-address=:10011
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.22/direct/pmem-csi.yaml b/deploy/kubernetes-1.22/direct/pmem-csi.yaml
@@ -546,8 +546,8 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
-        - --metrics-address=:10011
         - --enable-capacity
+        - --metrics-address=:10011
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.22/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.22/direct/testing/pmem-csi.yaml
@@ -549,9 +549,9 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
+        - --enable-capacity
         - --metrics-address=:10011
         - -v=5
-        - --enable-capacity
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.22/lvm/pmem-csi.yaml b/deploy/kubernetes-1.22/lvm/pmem-csi.yaml
@@ -546,8 +546,8 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
-        - --metrics-address=:10011
         - --enable-capacity
+        - --metrics-address=:10011
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.22/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.22/lvm/testing/pmem-csi.yaml
@@ -549,9 +549,9 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
+        - --enable-capacity
         - --metrics-address=:10011
         - -v=5
-        - --enable-capacity
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.22/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.22/pmem-csi-direct-testing.yaml
@@ -549,9 +549,9 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
+        - --enable-capacity
         - --metrics-address=:10011
         - -v=5
-        - --enable-capacity
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.22/pmem-csi-direct.yaml b/deploy/kubernetes-1.22/pmem-csi-direct.yaml
@@ -546,8 +546,8 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
-        - --metrics-address=:10011
         - --enable-capacity
+        - --metrics-address=:10011
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.22/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.22/pmem-csi-lvm-testing.yaml
@@ -549,9 +549,9 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
+        - --enable-capacity
         - --metrics-address=:10011
         - -v=5
-        - --enable-capacity
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/deploy/kubernetes-1.22/pmem-csi-lvm.yaml b/deploy/kubernetes-1.22/pmem-csi-lvm.yaml
@@ -546,8 +546,8 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
-        - --metrics-address=:10011
         - --enable-capacity
+        - --metrics-address=:10011
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/...kubernetes-1.19/direct/kustomization.yaml → ...kubernetes-1.23/direct/kustomization.yaml b/...kubernetes-1.19/direct/kustomization.yaml → ...kubernetes-1.23/direct/kustomization.yaml
diff --git a/deploy/kubernetes-1.19/direct/pmem-csi.yaml → deploy/kubernetes-1.23/direct/pmem-csi.yaml b/deploy/kubernetes-1.19/direct/pmem-csi.yaml → deploy/kubernetes-1.23/direct/pmem-csi.yaml
@@ -546,13 +546,22 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
+        - --enable-capacity
         - --metrics-address=:10011
         env:
         - name: NODE_NAME
           valueFrom:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
@@ -713,6 +722,7 @@ metadata:
 spec:
   attachRequired: false
   podInfoOnMount: true
+  storageCapacity: true
   volumeLifecycleModes:
   - Persistent
   - Ephemeral
diff --git a/...es-1.19/direct/testing/kustomization.yaml → ...es-1.23/direct/testing/kustomization.yaml b/...es-1.19/direct/testing/kustomization.yaml → ...es-1.23/direct/testing/kustomization.yaml
diff --git a/...ernetes-1.20/direct/testing/pmem-csi.yaml → ...ernetes-1.23/direct/testing/pmem-csi.yaml b/...ernetes-1.20/direct/testing/pmem-csi.yaml → ...ernetes-1.23/direct/testing/pmem-csi.yaml
@@ -549,6 +549,7 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
+        - --enable-capacity
         - --metrics-address=:10011
         - -v=5
         env:
@@ -557,6 +558,14 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
@@ -787,6 +796,7 @@ metadata:
 spec:
   attachRequired: false
   podInfoOnMount: true
+  storageCapacity: true
   volumeLifecycleModes:
   - Persistent
   - Ephemeral
diff --git a/...oy/kubernetes-1.19/lvm/kustomization.yaml → ...oy/kubernetes-1.23/lvm/kustomization.yaml b/...oy/kubernetes-1.19/lvm/kustomization.yaml → ...oy/kubernetes-1.23/lvm/kustomization.yaml
diff --git a/deploy/kubernetes-1.20/lvm/pmem-csi.yaml → deploy/kubernetes-1.23/lvm/pmem-csi.yaml b/deploy/kubernetes-1.20/lvm/pmem-csi.yaml → deploy/kubernetes-1.23/lvm/pmem-csi.yaml
@@ -546,13 +546,22 @@ spec:
         - --timeout=5m
         - --default-fstype=ext4
         - --worker-threads=5
+        - --enable-capacity
         - --metrics-address=:10011
         env:
         - name: NODE_NAME
           valueFrom:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
@@ -713,6 +722,7 @@ metadata:
 spec:
   attachRequired: false
   podInfoOnMount: true
+  storageCapacity: true
   volumeLifecycleModes:
   - Persistent
   - Ephemeral
diff --git a/...netes-1.19/lvm/testing/kustomization.yaml → ...netes-1.23/lvm/testing/kustomization.yaml b/...netes-1.19/lvm/testing/kustomization.yaml → ...netes-1.23/lvm/testing/kustomization.yaml