Skip to content
This repository was archived by the owner on Oct 22, 2024. It is now read-only.

Commit ab4e6ca

Browse files
pohlypohly
authored
Merge pull request #1084 from pohly/update-sidecars
deploy: update to provisioner v3.2.1 and registrar v2.5.1
2 parents 57c1ace + ca5524a commit ab4e6ca

File tree

105 files changed

+6804
-1067
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+6804
-1067
lines changed

‎Jenkinsfile‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ pipeline {
189189
// (more tests, runs longer, thus gets to use the existing worker)
190190
stage('Testing') {
191191
parallel {
192-
stage('1.22') {
192+
stage('1.25') {
193193
steps {
194194
// Skip production, i.e. run testing.
195-
TestInVM("", "", "fedora", "", "1.22", "Top.Level..[[:alpha:]]*-production[[:space:]]", "")
195+
TestInVM("", "", "fedora", "", "1.25", "Top.Level..[[:alpha:]]*-production[[:space:]]", "")
196196
}
197197
}
198198

199199
// When adding or removing coverage workers, update the "Code Coverage" step below!
200-
stage('coverage-1.22') {
200+
stage('coverage-1.25') {
201201
when {
202202
beforeAgent true
203203
not { changeRequest() }
@@ -206,12 +206,24 @@ pipeline {
206206
label "pmem-csi"
207207
}
208208
steps {
209-
TestInVM("fedora-coverage-1.22", "coverage-", "fedora", "", "1.22", "", "${env.COVERAGE_SKIP}")
209+
TestInVM("fedora-coverage-1.25", "coverage-", "fedora", "", "1.25", "", "${env.COVERAGE_SKIP}")
210210
}
211211
}
212212

213213
// All others set up their own worker.
214-
stage('1.21') {
214+
stage('1.24') {
215+
when {
216+
beforeAgent true
217+
not { changeRequest() }
218+
}
219+
agent {
220+
label "pmem-csi"
221+
}
222+
steps {
223+
TestInVM("fedora-1.24", "", "fedora", "", "1.24", "", "")
224+
}
225+
}
226+
stage('1.23') {
215227
when {
216228
beforeAgent true
217229
not { changeRequest() }
@@ -220,10 +232,10 @@ pipeline {
220232
label "pmem-csi"
221233
}
222234
steps {
223-
TestInVM("fedora-1.21", "", "fedora", "", "1.21", "", "")
235+
TestInVM("fedora-1.23", "", "fedora", "", "1.23", "", "")
224236
}
225237
}
226-
stage('1.20') {
238+
stage('1.22') {
227239
when {
228240
beforeAgent true
229241
not { changeRequest() }
@@ -232,19 +244,19 @@ pipeline {
232244
label "pmem-csi"
233245
}
234246
steps {
235-
TestInVM("fedora-1.20", "", "fedora", "", "1.20", "", "")
247+
TestInVM("fedora-1.22", "", "fedora", "", "1.22", "", "")
236248
}
237249
}
238-
stage('1.19') {
250+
stage('1.21') {
239251
agent {
240252
label "pmem-csi"
241253
}
242254
steps {
243255
// Skip testing, i.e. run production.
244-
TestInVM("fedora-1.19", "", "fedora", "", "1.19", "Top.Level..[[:alpha:]]*-testing[[:space:]]", "")
256+
TestInVM("fedora-1.21", "", "fedora", "", "1.21", "Top.Level..[[:alpha:]]*-testing[[:space:]]", "")
245257
}
246258
}
247-
stage('coverage-1.19') {
259+
stage('coverage-1.21') {
248260
when {
249261
beforeAgent true
250262
not { changeRequest() }
@@ -253,7 +265,7 @@ pipeline {
253265
label "pmem-csi"
254266
}
255267
steps {
256-
TestInVM("fedora-coverage-1.19", "coverage-", "fedora", "", "1.19", "", "${env.COVERAGE_SKIP}")
268+
TestInVM("fedora-coverage-1.21", "coverage-", "fedora", "", "1.21", "", "${env.COVERAGE_SKIP}")
257269
}
258270
}
259271
}
@@ -334,8 +346,8 @@ git push origin HEAD:master
334346
}
335347
steps {
336348
// Restore <cluster>-coverage.out files.
337-
unstash '1.22-coverage'
338-
unstash '1.19-coverage'
349+
unstash '1.25-coverage'
350+
unstash '1.21-coverage'
339351

340352
// Merge and convert to Cobertura XML.
341353
sh "${RunInBuilder()} ${env.BUILD_CONTAINER} make _work/gocovmerge _work/gocover-cobertura"
@@ -587,6 +599,8 @@ void TestInVM(worker, coverage, distro, distroVersion, kubernetesVersion, skipIf
587599
testrun=\$(echo '${distro}-${distroVersion}-${coverage}${kubernetesVersion}' | sed -e s/--*/-/g | tr . _ ) && \
588600
make test_e2e TEST_E2E_REPORT_DIR=${WORKSPACE}/build/reports.tmp/\$testrun \
589601
TEST_E2E_SKIP=${skipAlways}@\$(if [ \"${env.CHANGE_ID}\" ] && [ \"${env.CHANGE_ID}\" != null ]; then echo \\\\[Slow\\\\]@${skipIfPR}; fi) \
602+
TEST_E2E_TIMEOUT=${TestTimeoutHours()-1}h \
603+
TEST_E2E_ARGS=-ginkgo.no-color \
590604
') 2>&1 | tee joblog-${BUILD_TAG}-test-${coverage}${kubernetesVersion}.log | grep --line-buffered -E -e 'checking for test|Passed|FAIL:|^ERROR' \
591605
"
592606
} } finally {

‎Makefile‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -178,19 +178,14 @@ KUSTOMIZE_KUBERNETES_OUTPUT = \
178178
deploy/kubernetes-X.XX/pmem-csi-lvm-testing.yaml=deploy/kustomize/kubernetes-base-lvm-testing$(KUSTOMIZE_COVERAGE_SUFFIX) \
179179

180180
# Kubernetes versions derived from kubernetes-base.
181-
#
182-
# Once we drop support for 1.19, all the remaining versions can
183-
# be moved back here and the changes for storage capacity
184-
# tracking can be moved into kubernetes-base and
185-
# kubernetes-1.20 removed.
186181
KUSTOMIZE_KUBERNETES_VERSIONS = \
187-
1.19 \
188-
1.20
189-
KUSTOMIZE += $(foreach version,$(KUSTOMIZE_KUBERNETES_VERSIONS),$(subst X.XX,$(version),$(KUSTOMIZE_KUBERNETES_OUTPUT)))
182+
1.21 \
183+
1.22 \
184+
1.23 \
185+
1.24 \
186+
1.25 \
190187

191-
# Deployments that have storage capacity tracking enabled, using the v1beta1 API.
192-
KUSTOMIZE += $(subst kubernetes-base,kubernetes-1.21,$(subst X.XX,1.21,$(KUSTOMIZE_KUBERNETES_OUTPUT)))
193-
KUSTOMIZE += $(subst kubernetes-base,kubernetes-1.21,$(subst X.XX,1.22,$(KUSTOMIZE_KUBERNETES_OUTPUT)))
188+
KUSTOMIZE += $(foreach version,$(KUSTOMIZE_KUBERNETES_VERSIONS),$(subst X.XX,$(version),$(KUSTOMIZE_KUBERNETES_OUTPUT)))
194189

195190
KUSTOMIZE += deploy/common/pmem-storageclass-default.yaml=deploy/kustomize/storageclass
196191
KUSTOMIZE += deploy/common/pmem-storageclass-ext4.yaml=deploy/kustomize/storageclass-ext4

‎deploy/crd/pmem-csi.intel.com_pmemcsideployments.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# This file was generated by controller-gen v0.8.0 via 'make operator-generate-crd'
2+
23
---
34
apiVersion: apiextensions.k8s.io/v1
45
kind: CustomResourceDefinition
56
metadata:
67
annotations:
7-
controller-gen.kubebuilder.io/version: v0.8.0
8+
controller-gen.kubebuilder.io/version: v0.7.0
89
creationTimestamp: null
910
name: pmemcsideployments.pmem-csi.intel.com
1011
spec:

‎deploy/kubernetes-1.21/direct/pmem-csi.yaml‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@ metadata:
3232
name: pmem-csi-intel-com-external-provisioner-cfg
3333
namespace: pmem-csi
3434
rules:
35-
- apiGroups:
36-
- ""
37-
resources:
38-
- endpoints
39-
verbs:
40-
- get
41-
- watch
42-
- list
43-
- delete
44-
- update
45-
- create
4635
- apiGroups:
4736
- coordination.k8s.io
4837
resources:
@@ -533,7 +522,7 @@ spec:
533522
env:
534523
- name: PMEM_CSI_DRIVER_NAME
535524
value: pmem-csi.intel.com
536-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
525+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
537526
imagePullPolicy: IfNotPresent
538527
name: driver-registrar
539528
resources:
@@ -557,8 +546,8 @@ spec:
557546
- --timeout=5m
558547
- --default-fstype=ext4
559548
- --worker-threads=5
560-
- --metrics-address=:10011
561549
- --enable-capacity
550+
- --metrics-address=:10011
562551
env:
563552
- name: NODE_NAME
564553
valueFrom:
@@ -573,7 +562,7 @@ spec:
573562
valueFrom:
574563
fieldRef:
575564
fieldPath: metadata.name
576-
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
565+
image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
577566
imagePullPolicy: IfNotPresent
578567
livenessProbe:
579568
failureThreshold: 6

‎deploy/kubernetes-1.21/direct/testing/pmem-csi.yaml‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@ metadata:
3232
name: pmem-csi-intel-com-external-provisioner-cfg
3333
namespace: pmem-csi
3434
rules:
35-
- apiGroups:
36-
- ""
37-
resources:
38-
- endpoints
39-
verbs:
40-
- get
41-
- watch
42-
- list
43-
- delete
44-
- update
45-
- create
4635
- apiGroups:
4736
- coordination.k8s.io
4837
resources:
@@ -536,7 +525,7 @@ spec:
536525
env:
537526
- name: PMEM_CSI_DRIVER_NAME
538527
value: pmem-csi.intel.com
539-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
528+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
540529
imagePullPolicy: IfNotPresent
541530
name: driver-registrar
542531
resources:
@@ -560,9 +549,9 @@ spec:
560549
- --timeout=5m
561550
- --default-fstype=ext4
562551
- --worker-threads=5
552+
- --enable-capacity
563553
- --metrics-address=:10011
564554
- -v=5
565-
- --enable-capacity
566555
env:
567556
- name: NODE_NAME
568557
valueFrom:
@@ -577,7 +566,7 @@ spec:
577566
valueFrom:
578567
fieldRef:
579568
fieldPath: metadata.name
580-
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
569+
image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
581570
imagePullPolicy: IfNotPresent
582571
livenessProbe:
583572
failureThreshold: 6

‎deploy/kubernetes-1.21/lvm/pmem-csi.yaml‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@ metadata:
3232
name: pmem-csi-intel-com-external-provisioner-cfg
3333
namespace: pmem-csi
3434
rules:
35-
- apiGroups:
36-
- ""
37-
resources:
38-
- endpoints
39-
verbs:
40-
- get
41-
- watch
42-
- list
43-
- delete
44-
- update
45-
- create
4635
- apiGroups:
4736
- coordination.k8s.io
4837
resources:
@@ -533,7 +522,7 @@ spec:
533522
env:
534523
- name: PMEM_CSI_DRIVER_NAME
535524
value: pmem-csi.intel.com
536-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
525+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
537526
imagePullPolicy: IfNotPresent
538527
name: driver-registrar
539528
resources:
@@ -557,8 +546,8 @@ spec:
557546
- --timeout=5m
558547
- --default-fstype=ext4
559548
- --worker-threads=5
560-
- --metrics-address=:10011
561549
- --enable-capacity
550+
- --metrics-address=:10011
562551
env:
563552
- name: NODE_NAME
564553
valueFrom:
@@ -573,7 +562,7 @@ spec:
573562
valueFrom:
574563
fieldRef:
575564
fieldPath: metadata.name
576-
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
565+
image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
577566
imagePullPolicy: IfNotPresent
578567
livenessProbe:
579568
failureThreshold: 6

‎deploy/kubernetes-1.21/lvm/testing/pmem-csi.yaml‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@ metadata:
3232
name: pmem-csi-intel-com-external-provisioner-cfg
3333
namespace: pmem-csi
3434
rules:
35-
- apiGroups:
36-
- ""
37-
resources:
38-
- endpoints
39-
verbs:
40-
- get
41-
- watch
42-
- list
43-
- delete
44-
- update
45-
- create
4635
- apiGroups:
4736
- coordination.k8s.io
4837
resources:
@@ -536,7 +525,7 @@ spec:
536525
env:
537526
- name: PMEM_CSI_DRIVER_NAME
538527
value: pmem-csi.intel.com
539-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
528+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
540529
imagePullPolicy: IfNotPresent
541530
name: driver-registrar
542531
resources:
@@ -560,9 +549,9 @@ spec:
560549
- --timeout=5m
561550
- --default-fstype=ext4
562551
- --worker-threads=5
552+
- --enable-capacity
563553
- --metrics-address=:10011
564554
- -v=5
565-
- --enable-capacity
566555
env:
567556
- name: NODE_NAME
568557
valueFrom:
@@ -577,7 +566,7 @@ spec:
577566
valueFrom:
578567
fieldRef:
579568
fieldPath: metadata.name
580-
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
569+
image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
581570
imagePullPolicy: IfNotPresent
582571
livenessProbe:
583572
failureThreshold: 6

‎deploy/kubernetes-1.21/pmem-csi-direct-testing.yaml‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@ metadata:
3232
name: pmem-csi-intel-com-external-provisioner-cfg
3333
namespace: pmem-csi
3434
rules:
35-
- apiGroups:
36-
- ""
37-
resources:
38-
- endpoints
39-
verbs:
40-
- get
41-
- watch
42-
- list
43-
- delete
44-
- update
45-
- create
4635
- apiGroups:
4736
- coordination.k8s.io
4837
resources:
@@ -536,7 +525,7 @@ spec:
536525
env:
537526
- name: PMEM_CSI_DRIVER_NAME
538527
value: pmem-csi.intel.com
539-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
528+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1
540529
imagePullPolicy: IfNotPresent
541530
name: driver-registrar
542531
resources:
@@ -560,9 +549,9 @@ spec:
560549
- --timeout=5m
561550
- --default-fstype=ext4
562551
- --worker-threads=5
552+
- --enable-capacity
563553
- --metrics-address=:10011
564554
- -v=5
565-
- --enable-capacity
566555
env:
567556
- name: NODE_NAME
568557
valueFrom:
@@ -577,7 +566,7 @@ spec:
577566
valueFrom:
578567
fieldRef:
579568
fieldPath: metadata.name
580-
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
569+
image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
581570
imagePullPolicy: IfNotPresent
582571
livenessProbe:
583572
failureThreshold: 6

0 commit comments

Comments
 (0)