diff --git a/Jenkinsfile b/Jenkinsfile index 4730a63de9..d24c51d07e 100644 --- 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 -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 index 06d8976c91..32cd8cf331 100644 --- 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 index 3edf88a3bb..bb5841a524 100644 --- 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 index a70f8df04a..661d3cff6d 100644 --- 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 index 3413ba547c..2cb71513fd 100644 --- 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 index 63a898f15b..44e94397da 100644 --- 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 index a70f8df04a..661d3cff6d 100644 --- 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 index 3edf88a3bb..bb5841a524 100644 --- 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 index 63a898f15b..44e94397da 100644 --- 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 index 3413ba547c..2cb71513fd 100644 --- 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 index 3edf88a3bb..bb5841a524 100644 --- 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 index a70f8df04a..661d3cff6d 100644 --- 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 index 3413ba547c..2cb71513fd 100644 --- 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 index 63a898f15b..44e94397da 100644 --- 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 index a70f8df04a..661d3cff6d 100644 --- 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 index 3edf88a3bb..bb5841a524 100644 --- 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 index 63a898f15b..44e94397da 100644 --- 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 index 3413ba547c..2cb71513fd 100644 --- 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/deploy/kubernetes-1.19/direct/kustomization.yaml b/deploy/kubernetes-1.23/direct/kustomization.yaml similarity index 100% rename from deploy/kubernetes-1.19/direct/kustomization.yaml rename to deploy/kubernetes-1.23/direct/kustomization.yaml diff --git a/deploy/kubernetes-1.19/direct/pmem-csi.yaml b/deploy/kubernetes-1.23/direct/pmem-csi.yaml similarity index 98% rename from deploy/kubernetes-1.19/direct/pmem-csi.yaml rename to deploy/kubernetes-1.23/direct/pmem-csi.yaml index 49406f3f28..bb5841a524 100644 --- a/deploy/kubernetes-1.19/direct/pmem-csi.yaml +++ b/deploy/kubernetes-1.23/direct/pmem-csi.yaml @@ -546,6 +546,7 @@ spec: - --timeout=5m - --default-fstype=ext4 - --worker-threads=5 + - --enable-capacity - --metrics-address=:10011 env: - name: NODE_NAME @@ -553,6 +554,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: @@ -713,6 +722,7 @@ metadata: spec: attachRequired: false podInfoOnMount: true + storageCapacity: true volumeLifecycleModes: - Persistent - Ephemeral diff --git a/deploy/kubernetes-1.19/direct/testing/kustomization.yaml b/deploy/kubernetes-1.23/direct/testing/kustomization.yaml similarity index 100% rename from deploy/kubernetes-1.19/direct/testing/kustomization.yaml rename to deploy/kubernetes-1.23/direct/testing/kustomization.yaml diff --git a/deploy/kubernetes-1.20/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.23/direct/testing/pmem-csi.yaml similarity index 98% rename from deploy/kubernetes-1.20/direct/testing/pmem-csi.yaml rename to deploy/kubernetes-1.23/direct/testing/pmem-csi.yaml index 8392f597b8..661d3cff6d 100644 --- a/deploy/kubernetes-1.20/direct/testing/pmem-csi.yaml +++ b/deploy/kubernetes-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/deploy/kubernetes-1.19/lvm/kustomization.yaml b/deploy/kubernetes-1.23/lvm/kustomization.yaml similarity index 100% rename from deploy/kubernetes-1.19/lvm/kustomization.yaml rename to deploy/kubernetes-1.23/lvm/kustomization.yaml diff --git a/deploy/kubernetes-1.20/lvm/pmem-csi.yaml b/deploy/kubernetes-1.23/lvm/pmem-csi.yaml similarity index 98% rename from deploy/kubernetes-1.20/lvm/pmem-csi.yaml rename to deploy/kubernetes-1.23/lvm/pmem-csi.yaml index 357ea391d4..2cb71513fd 100644 --- a/deploy/kubernetes-1.20/lvm/pmem-csi.yaml +++ b/deploy/kubernetes-1.23/lvm/pmem-csi.yaml @@ -546,6 +546,7 @@ spec: - --timeout=5m - --default-fstype=ext4 - --worker-threads=5 + - --enable-capacity - --metrics-address=:10011 env: - name: NODE_NAME @@ -553,6 +554,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: @@ -713,6 +722,7 @@ metadata: spec: attachRequired: false podInfoOnMount: true + storageCapacity: true volumeLifecycleModes: - Persistent - Ephemeral diff --git a/deploy/kubernetes-1.19/lvm/testing/kustomization.yaml b/deploy/kubernetes-1.23/lvm/testing/kustomization.yaml similarity index 100% rename from deploy/kubernetes-1.19/lvm/testing/kustomization.yaml rename to deploy/kubernetes-1.23/lvm/testing/kustomization.yaml diff --git a/deploy/kubernetes-1.20/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.23/lvm/testing/pmem-csi.yaml similarity index 98% rename from deploy/kubernetes-1.20/lvm/testing/pmem-csi.yaml rename to deploy/kubernetes-1.23/lvm/testing/pmem-csi.yaml index 4ed26fc309..44e94397da 100644 --- a/deploy/kubernetes-1.20/lvm/testing/pmem-csi.yaml +++ b/deploy/kubernetes-1.23/lvm/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/deploy/kubernetes-1.19/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.23/pmem-csi-direct-testing.yaml similarity index 98% rename from deploy/kubernetes-1.19/pmem-csi-direct-testing.yaml rename to deploy/kubernetes-1.23/pmem-csi-direct-testing.yaml index 8392f597b8..661d3cff6d 100644 --- a/deploy/kubernetes-1.19/pmem-csi-direct-testing.yaml +++ b/deploy/kubernetes-1.23/pmem-csi-direct-testing.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/deploy/kubernetes-1.19/pmem-csi-direct.yaml b/deploy/kubernetes-1.23/pmem-csi-direct.yaml similarity index 98% rename from deploy/kubernetes-1.19/pmem-csi-direct.yaml rename to deploy/kubernetes-1.23/pmem-csi-direct.yaml index 49406f3f28..bb5841a524 100644 --- a/deploy/kubernetes-1.19/pmem-csi-direct.yaml +++ b/deploy/kubernetes-1.23/pmem-csi-direct.yaml @@ -546,6 +546,7 @@ spec: - --timeout=5m - --default-fstype=ext4 - --worker-threads=5 + - --enable-capacity - --metrics-address=:10011 env: - name: NODE_NAME @@ -553,6 +554,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: @@ -713,6 +722,7 @@ metadata: spec: attachRequired: false podInfoOnMount: true + storageCapacity: true volumeLifecycleModes: - Persistent - Ephemeral diff --git a/deploy/kubernetes-1.20/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.23/pmem-csi-lvm-testing.yaml similarity index 98% rename from deploy/kubernetes-1.20/pmem-csi-lvm-testing.yaml rename to deploy/kubernetes-1.23/pmem-csi-lvm-testing.yaml index 4ed26fc309..44e94397da 100644 --- a/deploy/kubernetes-1.20/pmem-csi-lvm-testing.yaml +++ b/deploy/kubernetes-1.23/pmem-csi-lvm-testing.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/deploy/kubernetes-1.20/pmem-csi-lvm.yaml b/deploy/kubernetes-1.23/pmem-csi-lvm.yaml similarity index 98% rename from deploy/kubernetes-1.20/pmem-csi-lvm.yaml rename to deploy/kubernetes-1.23/pmem-csi-lvm.yaml index 357ea391d4..2cb71513fd 100644 --- a/deploy/kubernetes-1.20/pmem-csi-lvm.yaml +++ b/deploy/kubernetes-1.23/pmem-csi-lvm.yaml @@ -546,6 +546,7 @@ spec: - --timeout=5m - --default-fstype=ext4 - --worker-threads=5 + - --enable-capacity - --metrics-address=:10011 env: - name: NODE_NAME @@ -553,6 +554,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: @@ -713,6 +722,7 @@ metadata: spec: attachRequired: false podInfoOnMount: true + storageCapacity: true volumeLifecycleModes: - Persistent - Ephemeral diff --git a/deploy/kubernetes-1.20/direct/kustomization.yaml b/deploy/kubernetes-1.24/direct/kustomization.yaml similarity index 100% rename from deploy/kubernetes-1.20/direct/kustomization.yaml rename to deploy/kubernetes-1.24/direct/kustomization.yaml diff --git a/deploy/kubernetes-1.20/direct/pmem-csi.yaml b/deploy/kubernetes-1.24/direct/pmem-csi.yaml similarity index 98% rename from deploy/kubernetes-1.20/direct/pmem-csi.yaml rename to deploy/kubernetes-1.24/direct/pmem-csi.yaml index 49406f3f28..bb5841a524 100644 --- a/deploy/kubernetes-1.20/direct/pmem-csi.yaml +++ b/deploy/kubernetes-1.24/direct/pmem-csi.yaml @@ -546,6 +546,7 @@ spec: - --timeout=5m - --default-fstype=ext4 - --worker-threads=5 + - --enable-capacity - --metrics-address=:10011 env: - name: NODE_NAME @@ -553,6 +554,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: @@ -713,6 +722,7 @@ metadata: spec: attachRequired: false podInfoOnMount: true + storageCapacity: true volumeLifecycleModes: - Persistent - Ephemeral diff --git a/deploy/kubernetes-1.20/direct/testing/kustomization.yaml b/deploy/kubernetes-1.24/direct/testing/kustomization.yaml similarity index 100% rename from deploy/kubernetes-1.20/direct/testing/kustomization.yaml rename to deploy/kubernetes-1.24/direct/testing/kustomization.yaml diff --git a/deploy/kubernetes-1.19/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.24/direct/testing/pmem-csi.yaml similarity index 98% rename from deploy/kubernetes-1.19/direct/testing/pmem-csi.yaml rename to deploy/kubernetes-1.24/direct/testing/pmem-csi.yaml index 8392f597b8..661d3cff6d 100644 --- a/deploy/kubernetes-1.19/direct/testing/pmem-csi.yaml +++ b/deploy/kubernetes-1.24/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/deploy/kubernetes-1.20/lvm/kustomization.yaml b/deploy/kubernetes-1.24/lvm/kustomization.yaml similarity index 100% rename from deploy/kubernetes-1.20/lvm/kustomization.yaml rename to deploy/kubernetes-1.24/lvm/kustomization.yaml diff --git a/deploy/kubernetes-1.19/lvm/pmem-csi.yaml b/deploy/kubernetes-1.24/lvm/pmem-csi.yaml similarity index 98% rename from deploy/kubernetes-1.19/lvm/pmem-csi.yaml rename to deploy/kubernetes-1.24/lvm/pmem-csi.yaml index 357ea391d4..2cb71513fd 100644 --- a/deploy/kubernetes-1.19/lvm/pmem-csi.yaml +++ b/deploy/kubernetes-1.24/lvm/pmem-csi.yaml @@ -546,6 +546,7 @@ spec: - --timeout=5m - --default-fstype=ext4 - --worker-threads=5 + - --enable-capacity - --metrics-address=:10011 env: - name: NODE_NAME @@ -553,6 +554,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: @@ -713,6 +722,7 @@ metadata: spec: attachRequired: false podInfoOnMount: true + storageCapacity: true volumeLifecycleModes: - Persistent - Ephemeral diff --git a/deploy/kubernetes-1.20/lvm/testing/kustomization.yaml b/deploy/kubernetes-1.24/lvm/testing/kustomization.yaml similarity index 100% rename from deploy/kubernetes-1.20/lvm/testing/kustomization.yaml rename to deploy/kubernetes-1.24/lvm/testing/kustomization.yaml diff --git a/deploy/kubernetes-1.19/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.24/lvm/testing/pmem-csi.yaml similarity index 98% rename from deploy/kubernetes-1.19/lvm/testing/pmem-csi.yaml rename to deploy/kubernetes-1.24/lvm/testing/pmem-csi.yaml index 4ed26fc309..44e94397da 100644 --- a/deploy/kubernetes-1.19/lvm/testing/pmem-csi.yaml +++ b/deploy/kubernetes-1.24/lvm/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/deploy/kubernetes-1.20/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.24/pmem-csi-direct-testing.yaml similarity index 98% rename from deploy/kubernetes-1.20/pmem-csi-direct-testing.yaml rename to deploy/kubernetes-1.24/pmem-csi-direct-testing.yaml index 8392f597b8..661d3cff6d 100644 --- a/deploy/kubernetes-1.20/pmem-csi-direct-testing.yaml +++ b/deploy/kubernetes-1.24/pmem-csi-direct-testing.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/deploy/kubernetes-1.20/pmem-csi-direct.yaml b/deploy/kubernetes-1.24/pmem-csi-direct.yaml similarity index 98% rename from deploy/kubernetes-1.20/pmem-csi-direct.yaml rename to deploy/kubernetes-1.24/pmem-csi-direct.yaml index 49406f3f28..bb5841a524 100644 --- a/deploy/kubernetes-1.20/pmem-csi-direct.yaml +++ b/deploy/kubernetes-1.24/pmem-csi-direct.yaml @@ -546,6 +546,7 @@ spec: - --timeout=5m - --default-fstype=ext4 - --worker-threads=5 + - --enable-capacity - --metrics-address=:10011 env: - name: NODE_NAME @@ -553,6 +554,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: @@ -713,6 +722,7 @@ metadata: spec: attachRequired: false podInfoOnMount: true + storageCapacity: true volumeLifecycleModes: - Persistent - Ephemeral diff --git a/deploy/kubernetes-1.19/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.24/pmem-csi-lvm-testing.yaml similarity index 98% rename from deploy/kubernetes-1.19/pmem-csi-lvm-testing.yaml rename to deploy/kubernetes-1.24/pmem-csi-lvm-testing.yaml index 4ed26fc309..44e94397da 100644 --- a/deploy/kubernetes-1.19/pmem-csi-lvm-testing.yaml +++ b/deploy/kubernetes-1.24/pmem-csi-lvm-testing.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/deploy/kubernetes-1.19/pmem-csi-lvm.yaml b/deploy/kubernetes-1.24/pmem-csi-lvm.yaml similarity index 98% rename from deploy/kubernetes-1.19/pmem-csi-lvm.yaml rename to deploy/kubernetes-1.24/pmem-csi-lvm.yaml index 357ea391d4..2cb71513fd 100644 --- a/deploy/kubernetes-1.19/pmem-csi-lvm.yaml +++ b/deploy/kubernetes-1.24/pmem-csi-lvm.yaml @@ -546,6 +546,7 @@ spec: - --timeout=5m - --default-fstype=ext4 - --worker-threads=5 + - --enable-capacity - --metrics-address=:10011 env: - name: NODE_NAME @@ -553,6 +554,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: @@ -713,6 +722,7 @@ metadata: spec: attachRequired: false podInfoOnMount: true + storageCapacity: true volumeLifecycleModes: - Persistent - Ephemeral diff --git a/deploy/kustomize/driver/pmem-csi.yaml b/deploy/kustomize/driver/pmem-csi.yaml index 8ac52aa95e..401d489638 100644 --- a/deploy/kustomize/driver/pmem-csi.yaml +++ b/deploy/kustomize/driver/pmem-csi.yaml @@ -338,6 +338,7 @@ spec: - --timeout=5m - --default-fstype=ext4 # see https://github.com/kubernetes-csi/external-provisioner/issues/328#issuecomment-714801581 - --worker-threads=5 # We don't need much concurrency inside a node. + - --enable-capacity securityContext: readOnlyRootFilesystem: true resources: @@ -354,6 +355,15 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName + # For storage capacity tracking. + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name volumes: - name: socket-dir hostPath: diff --git a/deploy/kustomize/kubernetes-1.21-direct-coverage/kustomization.yaml b/deploy/kustomize/kubernetes-1.21-direct-coverage/kustomization.yaml deleted file mode 100644 index c036fe5e12..0000000000 --- a/deploy/kustomize/kubernetes-1.21-direct-coverage/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -bases: -- ../kubernetes-base-direct-coverage - -patches: -- ../patches/driverinfo-storage-capacity-patch.yaml - -patchesJson6902: -- target: - group: apps - version: v1 - kind: DaemonSet - name: pmem-csi-intel-com-node - path: ../patches/external-provisioner-storage-capacity-patch.yaml diff --git a/deploy/kustomize/kubernetes-1.21-direct-testing-coverage/kustomization.yaml b/deploy/kustomize/kubernetes-1.21-direct-testing-coverage/kustomization.yaml deleted file mode 100644 index 225f0f999b..0000000000 --- a/deploy/kustomize/kubernetes-1.21-direct-testing-coverage/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -bases: -- ../kubernetes-base-direct-testing-coverage - -patches: -- ../patches/driverinfo-storage-capacity-patch.yaml - -patchesJson6902: -- target: - group: apps - version: v1 - kind: DaemonSet - name: pmem-csi-intel-com-node - path: ../patches/external-provisioner-storage-capacity-patch.yaml diff --git a/deploy/kustomize/kubernetes-1.21-direct-testing/kustomization.yaml b/deploy/kustomize/kubernetes-1.21-direct-testing/kustomization.yaml deleted file mode 100644 index f9da581400..0000000000 --- a/deploy/kustomize/kubernetes-1.21-direct-testing/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -bases: -- ../kubernetes-base-direct-testing - -patches: -- ../patches/driverinfo-storage-capacity-patch.yaml - -patchesJson6902: -- target: - group: apps - version: v1 - kind: DaemonSet - name: pmem-csi-intel-com-node - path: ../patches/external-provisioner-storage-capacity-patch.yaml diff --git a/deploy/kustomize/kubernetes-1.21-direct/kustomization.yaml b/deploy/kustomize/kubernetes-1.21-direct/kustomization.yaml deleted file mode 100644 index 249eebb9d5..0000000000 --- a/deploy/kustomize/kubernetes-1.21-direct/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -bases: -- ../kubernetes-base-direct - -patches: -- ../patches/driverinfo-storage-capacity-patch.yaml - -patchesJson6902: -- target: - group: apps - version: v1 - kind: DaemonSet - name: pmem-csi-intel-com-node - path: ../patches/external-provisioner-storage-capacity-patch.yaml diff --git a/deploy/kustomize/kubernetes-1.21-lvm-coverage/kustomization.yaml b/deploy/kustomize/kubernetes-1.21-lvm-coverage/kustomization.yaml deleted file mode 100644 index ad27b11679..0000000000 --- a/deploy/kustomize/kubernetes-1.21-lvm-coverage/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -bases: -- ../kubernetes-base-lvm-coverage - -patches: -- ../patches/driverinfo-storage-capacity-patch.yaml - -patchesJson6902: -- target: - group: apps - version: v1 - kind: DaemonSet - name: pmem-csi-intel-com-node - path: ../patches/external-provisioner-storage-capacity-patch.yaml diff --git a/deploy/kustomize/kubernetes-1.21-lvm-testing-coverage/kustomization.yaml b/deploy/kustomize/kubernetes-1.21-lvm-testing-coverage/kustomization.yaml deleted file mode 100644 index e63c97fbb0..0000000000 --- a/deploy/kustomize/kubernetes-1.21-lvm-testing-coverage/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -bases: -- ../kubernetes-base-lvm-testing-coverage - -patches: -- ../patches/driverinfo-storage-capacity-patch.yaml - -patchesJson6902: -- target: - group: apps - version: v1 - kind: DaemonSet - name: pmem-csi-intel-com-node - path: ../patches/external-provisioner-storage-capacity-patch.yaml diff --git a/deploy/kustomize/kubernetes-1.21-lvm-testing/kustomization.yaml b/deploy/kustomize/kubernetes-1.21-lvm-testing/kustomization.yaml deleted file mode 100644 index a46a211eb8..0000000000 --- a/deploy/kustomize/kubernetes-1.21-lvm-testing/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -bases: -- ../kubernetes-base-lvm-testing - -patches: -- ../patches/driverinfo-storage-capacity-patch.yaml - -patchesJson6902: -- target: - group: apps - version: v1 - kind: DaemonSet - name: pmem-csi-intel-com-node - path: ../patches/external-provisioner-storage-capacity-patch.yaml diff --git a/deploy/kustomize/kubernetes-1.21-lvm/kustomization.yaml b/deploy/kustomize/kubernetes-1.21-lvm/kustomization.yaml deleted file mode 100644 index f51a927117..0000000000 --- a/deploy/kustomize/kubernetes-1.21-lvm/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -bases: -- ../kubernetes-base-lvm - -patches: -- ../patches/driverinfo-storage-capacity-patch.yaml - -patchesJson6902: -- target: - group: apps - version: v1 - kind: DaemonSet - name: pmem-csi-intel-com-node - path: ../patches/external-provisioner-storage-capacity-patch.yaml diff --git a/deploy/kustomize/kubernetes-no-metrics/driverinfo-beta.yaml b/deploy/kustomize/kubernetes-no-metrics/driverinfo-beta.yaml index e9caa3a6b4..7ae4fd52b6 100644 --- a/deploy/kustomize/kubernetes-no-metrics/driverinfo-beta.yaml +++ b/deploy/kustomize/kubernetes-no-metrics/driverinfo-beta.yaml @@ -5,6 +5,7 @@ metadata: spec: attachRequired: false podInfoOnMount: true + storageCapacity: true # beta in 1.21, GA in 1.23 volumeLifecycleModes: - Persistent - Ephemeral diff --git a/deploy/kustomize/patches/driverinfo-storage-capacity-patch.yaml b/deploy/kustomize/patches/driverinfo-storage-capacity-patch.yaml deleted file mode 100644 index b72b55c74b..0000000000 --- a/deploy/kustomize/patches/driverinfo-storage-capacity-patch.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: CSIDriver -metadata: - name: pmem-csi.intel.com -spec: - storageCapacity: true # Alpha feature! diff --git a/deploy/kustomize/patches/external-provisioner-storage-capacity-patch.yaml b/deploy/kustomize/patches/external-provisioner-storage-capacity-patch.yaml deleted file mode 100644 index b60cc6dfc2..0000000000 --- a/deploy/kustomize/patches/external-provisioner-storage-capacity-patch.yaml +++ /dev/null @@ -1,17 +0,0 @@ -- op: add - path: /spec/template/spec/containers/2/args/- - value: "--enable-capacity" -- op: add - path: /spec/template/spec/containers/2/env/- - value: - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace -- op: add - path: /spec/template/spec/containers/2/env/- - value: - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name diff --git a/pkg/pmem-csi-operator/controller/deployment/controller_driver.go b/pkg/pmem-csi-operator/controller/deployment/controller_driver.go index 0bbacd1c5d..da54cbcd2f 100644 --- a/pkg/pmem-csi-operator/controller/deployment/controller_driver.go +++ b/pkg/pmem-csi-operator/controller/deployment/controller_driver.go @@ -1530,7 +1530,6 @@ func (d *pmemCSIDeployment) getProvisionerContainer() corev1.Container { "--timeout=5m", "--default-fstype=ext4", "--worker-threads=5", - fmt.Sprintf("--metrics-address=:%d", provisionerMetricsPort), }, Env: []corev1.EnvVar{ { @@ -1583,6 +1582,10 @@ func (d *pmemCSIDeployment) getProvisionerContainer() corev1.Container { }, }...) } + + // Order must match the reference files (--enable-capacity before --metrics-address). + container.Args = append(container.Args, fmt.Sprintf("--metrics-address=:%d", provisionerMetricsPort)) + return container } diff --git a/test/e2e/versionskew/versionskew.go b/test/e2e/versionskew/versionskew.go index 393a39476a..c7ce6517d6 100644 --- a/test/e2e/versionskew/versionskew.go +++ b/test/e2e/versionskew/versionskew.go @@ -43,11 +43,8 @@ const ( ) func baseSupportsKubernetes(ver version.Version) bool { - switch ver { - // No exceptions at the moment. - default: - return true - } + // v1.0.x only supports Kubernetes 1.22, not 1.23 and higher. + return ver.CompareVersion(version.NewVersion(1, 22)) <= 0 } type skewTestSuite struct { diff --git a/test/setup-fedora-govm.sh b/test/setup-fedora-govm.sh index e5ef96e374..20f4ad8346 100755 --- a/test/setup-fedora-govm.sh +++ b/test/setup-fedora-govm.sh @@ -53,18 +53,12 @@ EOF # For the sake of reproducibility, use fixed versions. # List of latest packages can be generated on Fedora with: - # for v in 1.13 1.14 1.15 1.16 1.17 1.18 1.19 1.20 1.21 1.22; do echo -n " $v) packages+=\""; for i in kubelet kubeadm kubectl; do ver=$(sudo dnf --showduplicates list kubelet | grep " $v" | tail -n 1 | sed -e 's/.* \([0-9]*\.[0-9]*\.[0-9]*[^ ]*\).*/\1/'); echo -n " "; echo -n $i-$ver; done; echo '";;'; done + # for v in 1.21 1.22 1.23 1.24 1.25; do echo -n " $v) packages+=\""; for i in kubelet kubeadm kubectl; do ver=$(sudo dnf --showduplicates list kubelet | grep " $v" | tail -n 1 | sed -e 's/.* \([0-9]*\.[0-9]*\.[0-9]*[^ ]*\).*/\1/'); echo -n " "; echo -n $i-$ver; done; echo '";;'; done case ${TEST_KUBERNETES_VERSION} in - 1.13) packages+=" kubelet-1.13.12-0 kubeadm-1.13.12-0 kubectl-1.13.12-0";; - 1.14) packages+=" kubelet-1.14.10-0 kubeadm-1.14.10-0 kubectl-1.14.10-0";; - 1.15) packages+=" kubelet-1.15.12-0 kubeadm-1.15.12-0 kubectl-1.15.12-0";; - 1.16) packages+=" kubelet-1.16.15-0 kubeadm-1.16.15-0 kubectl-1.16.15-0";; - 1.17) packages+=" kubelet-1.17.17-0 kubeadm-1.17.17-0 kubectl-1.17.17-0";; - 1.18) packages+=" kubelet-1.18.19-0 kubeadm-1.18.19-0 kubectl-1.18.19-0";; - 1.19) packages+=" kubelet-1.19.11-0 kubeadm-1.19.11-0 kubectl-1.19.11-0";; - 1.20) packages+=" kubelet-1.20.7-0 kubeadm-1.20.7-0 kubectl-1.20.7-0";; - 1.21) packages+=" kubelet-1.21.1-0 kubeadm-1.21.1-0 kubectl-1.21.1-0";; - 1.22) packages+=" kubelet-1.22.3-0 kubeadm-1.22.3-0 kubectl-1.22.3-0";; + 1.21) packages+=" kubelet-1.21.14-0 kubeadm-1.21.14-0 kubectl-1.21.14-0";; + 1.22) packages+=" kubelet-1.22.12-0 kubeadm-1.22.12-0 kubectl-1.22.12-0";; + 1.23) packages+=" kubelet-1.23.9-0 kubeadm-1.23.9-0 kubectl-1.23.9-0";; + 1.24) packages+=" kubelet-1.24.3-0 kubeadm-1.24.3-0 kubectl-1.24.3-0";; *) echo >&2 "Kubernetes version ${TEST_KUBERNETES_VERSION} not supported, package list in $0 must be updated."; exit 1;; esac packages+=" --disableexcludes=kubernetes" diff --git a/test/setup-kubernetes.sh b/test/setup-kubernetes.sh index b7bc18cb6a..b9a3db1d03 100755 --- a/test/setup-kubernetes.sh +++ b/test/setup-kubernetes.sh @@ -122,7 +122,7 @@ EOF } EOF ;; - *) + v1.19*|v1.2[012]*) # https://github.com/kubernetes/kubernetes/blob/1afc53514032a44d091ae4a9f6e092171db9fe10/staging/src/k8s.io/kube-scheduler/config/v1beta1/types.go#L44-L96 sudo sh -c 'cat >/var/lib/scheduler/scheduler-config.yaml' < deployment @@ -173,13 +173,10 @@ fi : ${TEST_HAVE_OLM:=false} # Kubernetes feature gates to enable/disable. -# EndpointSlice is disabled because of https://github.com/kubernetes/kubernetes/issues/91287 (Kubernetes -# < 1.19) and because there were random connection failures to node ports during sanity -# testing (Kubernetes 1.19.0) +# +# Can be made version specific with code like +# $(case ${TEST_KUBERNETES_VERSION} in ...) echo '...=false,';; esac) \ : ${TEST_FEATURE_GATES:=\ -$(case ${TEST_KUBERNETES_VERSION} in 1.1[6-9]) echo 'EndpointSlice=false,';; esac)\ -$(case ${TEST_KUBERNETES_VERSION} in 1.1[8-9]) echo 'EndpointSliceProxying=false,';; esac)\ -$(case ${TEST_KUBERNETES_VERSION} in 1.19 | 1.20) echo 'GenericEphemeralVolume=true,';; esac)\ } # If non-empty, the version of Kata Containers which is to be installed diff --git a/test/test.make b/test/test.make index 9fbe93336e..ae094c7cc6 100644 --- a/test/test.make +++ b/test/test.make @@ -119,15 +119,11 @@ TEST_E2E_SKIP_ALL += direct.*binding.stress.test TEST_E2E_SKIP_1.23 += should.mount.multiple.PV.pointing.to.the.same.storage.on.the.same.node TEST_E2E_SKIP_1.22 += should.mount.multiple.PV.pointing.to.the.same.storage.on.the.same.node TEST_E2E_SKIP_1.21 += should.mount.multiple.PV.pointing.to.the.same.storage.on.the.same.node -TEST_E2E_SKIP_1.20 += should.mount.multiple.PV.pointing.to.the.same.storage.on.the.same.node -TEST_E2E_SKIP_1.19 += should.mount.multiple.PV.pointing.to.the.same.storage.on.the.same.node # Fails for Kubernetes <= 1.22 with an incorrect error (fixed later in Kubernetes 1.23): # Invalid value: "my-volume-0": can only use volume source type of PersistentVolumeClaim for block mode TEST_E2E_SKIP_1.22 += Generic.Ephemeral-volume..block.volmode TEST_E2E_SKIP_1.21 += Generic.Ephemeral-volume..block.volmode -TEST_E2E_SKIP_1.20 += Generic.Ephemeral-volume..block.volmode -TEST_E2E_SKIP_1.19 += Generic.Ephemeral-volume..block.volmode # Add all Kubernetes version-specific suppressions. TEST_E2E_SKIP_ALL += $(TEST_E2E_SKIP_$(shell cat _work/$(CLUSTER)/kubernetes.version))