Merge pull request #1084 from pohly/update-sidecars

deploy: update to provisioner v3.2.1 and registrar v2.5.1
intel · Sep 17, 2022 · ab4e6ca · ab4e6ca
2 parents 57c1ace + ca5524a
commit ab4e6ca
Show file tree

Hide file tree

Showing 105 changed files with 6,804 additions and 1,067 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.25') {
                     steps {
                         // Skip production, i.e. run testing.
-                        TestInVM("", "", "fedora", "", "1.22", "Top.Level..[[:alpha:]]*-production[[:space:]]", "")
+                        TestInVM("", "", "fedora", "", "1.25", "Top.Level..[[:alpha:]]*-production[[:space:]]", "")
                     }
                 }
 
                 // When adding or removing coverage workers, update the "Code Coverage" step below!
-                stage('coverage-1.22') {
+                stage('coverage-1.25') {
                     when {
 		        beforeAgent true
 		        not { changeRequest() }
@@ -206,12 +206,24 @@ pipeline {
                         label "pmem-csi"
                     }
                     steps {
-                        TestInVM("fedora-coverage-1.22", "coverage-", "fedora", "", "1.22", "", "${env.COVERAGE_SKIP}")
+                        TestInVM("fedora-coverage-1.25", "coverage-", "fedora", "", "1.25", "", "${env.COVERAGE_SKIP}")
                     }
                 }
 
                 // All others set up their own worker.
-                stage('1.21') {
+                stage('1.24') {
+                    when {
+		        beforeAgent true
+		        not { changeRequest() }
+                    }
+                    agent {
+                        label "pmem-csi"
+                    }
+                    steps {
+                        TestInVM("fedora-1.24", "", "fedora", "", "1.24", "", "")
+                    }
+                }
+                stage('1.23') {
                     when {
 		        beforeAgent true
 		        not { changeRequest() }
@@ -220,10 +232,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 +244,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 +265,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 +346,8 @@ git push origin HEAD:master
             }
             steps {
                 // Restore <cluster>-coverage.out files.
-                unstash '1.22-coverage'
-                unstash '1.19-coverage'
+                unstash '1.25-coverage'
+                unstash '1.21-coverage'
 
                 // Merge and convert to Cobertura XML.
                 sh "${RunInBuilder()} ${env.BUILD_CONTAINER} make _work/gocovmerge _work/gocover-cobertura"
@@ -587,6 +599,8 @@ void TestInVM(worker, coverage, distro, distroVersion, kubernetesVersion, skipIf
                            testrun=\$(echo '${distro}-${distroVersion}-${coverage}${kubernetesVersion}' | sed -e s/--*/-/g | tr . _ ) && \
                            make test_e2e TEST_E2E_REPORT_DIR=${WORKSPACE}/build/reports.tmp/\$testrun \
                                          TEST_E2E_SKIP=${skipAlways}@\$(if [ \"${env.CHANGE_ID}\" ] && [ \"${env.CHANGE_ID}\" != null ]; then echo \\\\[Slow\\\\]@${skipIfPR}; fi) \
+                                         TEST_E2E_TIMEOUT=${TestTimeoutHours()-1}h \
+                                         TEST_E2E_ARGS=-ginkgo.no-color \
                            ') 2>&1 | tee joblog-${BUILD_TAG}-test-${coverage}${kubernetesVersion}.log | grep --line-buffered -E -e 'checking for test|Passed|FAIL:|^ERROR' \
            "
     } } finally {

diff --git a/Makefile b/Makefile
@@ -178,19 +178,14 @@ 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 \
+    1.25 \
 
-# 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/crd/pmem-csi.intel.com_pmemcsideployments.yaml b/deploy/crd/pmem-csi.intel.com_pmemcsideployments.yaml
@@ -1,10 +1,11 @@
 # This file was generated by controller-gen v0.8.0 via 'make operator-generate-crd'
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.8.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: pmemcsideployments.pmem-csi.intel.com
 spec:

diff --git a/deploy/kubernetes-1.21/direct/pmem-csi.yaml b/deploy/kubernetes-1.21/direct/pmem-csi.yaml
@@ -32,17 +32,6 @@ metadata:
   name: pmem-csi-intel-com-external-provisioner-cfg
   namespace: pmem-csi
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - get
-  - watch
-  - list
-  - delete
-  - update
-  - create
 - apiGroups:
   - coordination.k8s.io
   resources:
@@ -533,7 +522,7 @@ spec:
         env:
         - name: PMEM_CSI_DRIVER_NAME
           value: pmem-csi.intel.com
-        image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
         imagePullPolicy: IfNotPresent
         name: driver-registrar
         resources:
@@ -557,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:
@@ -573,7 +562,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
+        image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 6

diff --git a/deploy/kubernetes-1.21/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.21/direct/testing/pmem-csi.yaml
@@ -32,17 +32,6 @@ metadata:
   name: pmem-csi-intel-com-external-provisioner-cfg
   namespace: pmem-csi
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - get
-  - watch
-  - list
-  - delete
-  - update
-  - create
 - apiGroups:
   - coordination.k8s.io
   resources:
@@ -536,7 +525,7 @@ spec:
         env:
         - name: PMEM_CSI_DRIVER_NAME
           value: pmem-csi.intel.com
-        image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
         imagePullPolicy: IfNotPresent
         name: driver-registrar
         resources:
@@ -560,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:
@@ -577,7 +566,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
+        image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 6

diff --git a/deploy/kubernetes-1.21/lvm/pmem-csi.yaml b/deploy/kubernetes-1.21/lvm/pmem-csi.yaml
@@ -32,17 +32,6 @@ metadata:
   name: pmem-csi-intel-com-external-provisioner-cfg
   namespace: pmem-csi
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - get
-  - watch
-  - list
-  - delete
-  - update
-  - create
 - apiGroups:
   - coordination.k8s.io
   resources:
@@ -533,7 +522,7 @@ spec:
         env:
         - name: PMEM_CSI_DRIVER_NAME
           value: pmem-csi.intel.com
-        image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
         imagePullPolicy: IfNotPresent
         name: driver-registrar
         resources:
@@ -557,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:
@@ -573,7 +562,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
+        image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 6

diff --git a/deploy/kubernetes-1.21/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.21/lvm/testing/pmem-csi.yaml
@@ -32,17 +32,6 @@ metadata:
   name: pmem-csi-intel-com-external-provisioner-cfg
   namespace: pmem-csi
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - get
-  - watch
-  - list
-  - delete
-  - update
-  - create
 - apiGroups:
   - coordination.k8s.io
   resources:
@@ -536,7 +525,7 @@ spec:
         env:
         - name: PMEM_CSI_DRIVER_NAME
           value: pmem-csi.intel.com
-        image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
         imagePullPolicy: IfNotPresent
         name: driver-registrar
         resources:
@@ -560,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:
@@ -577,7 +566,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
+        image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 6

diff --git a/deploy/kubernetes-1.21/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.21/pmem-csi-direct-testing.yaml
@@ -32,17 +32,6 @@ metadata:
   name: pmem-csi-intel-com-external-provisioner-cfg
   namespace: pmem-csi
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - endpoints
-  verbs:
-  - get
-  - watch
-  - list
-  - delete
-  - update
-  - create
 - apiGroups:
   - coordination.k8s.io
   resources:
@@ -536,7 +525,7 @@ spec:
         env:
         - name: PMEM_CSI_DRIVER_NAME
           value: pmem-csi.intel.com
-        image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
         imagePullPolicy: IfNotPresent
         name: driver-registrar
         resources:
@@ -560,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:
@@ -577,7 +566,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
+        image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 6