Merge pull request rook#14566 from travisn/k8s-1.31

core: Support k8s versions 1.26 through 1.31
red-hat-storage · Aug 13, 2024 · 9b5beb1 · 9b5beb1
2 parents 5cf75d8 + e157bb5
commit 9b5beb1
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 27 deletions.
diff --git a/.github/workflows/integration-test-helm-suite.yaml b/.github/workflows/integration-test-helm-suite.yaml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.25.16", "v1.30.0"]
+        kubernetes-versions: ["v1.26.15", "v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/integration-test-keystone-auth-suite.yaml b/.github/workflows/integration-test-keystone-auth-suite.yaml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.25.16", "v1.28.4"]
+        kubernetes-versions: ["v1.26.15", "v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/integration-test-mgr-suite.yaml b/.github/workflows/integration-test-mgr-suite.yaml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.30.0"]
+        kubernetes-versions: ["v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/integration-test-multi-cluster-suite.yaml b/.github/workflows/integration-test-multi-cluster-suite.yaml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.30.0"]
+        kubernetes-versions: ["v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/integration-test-object-suite.yaml b/.github/workflows/integration-test-object-suite.yaml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.25.16", "v1.30.0"]
+        kubernetes-versions: ["v1.26.15", "v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/integration-test-smoke-suite.yaml b/.github/workflows/integration-test-smoke-suite.yaml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.25.16", "v1.30.0"]
+        kubernetes-versions: ["v1.26.15", "v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/integration-test-upgrade-suite.yaml b/.github/workflows/integration-test-upgrade-suite.yaml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.25.16", "v1.30.0"]
+        kubernetes-versions: ["v1.26.15", "v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -72,7 +72,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.25.16", "v1.30.0"]
+        kubernetes-versions: ["v1.26.15", "v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/integration-tests-on-release.yaml b/.github/workflows/integration-tests-on-release.yaml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.25.16", "v1.27.13", "v1.28.9", "v1.30.0"]
+        kubernetes-versions: ["v1.26.15", "v1.28.12", "v1.29.7", "v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -61,7 +61,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.25.16", "v1.27.13", "v1.28.9", "v1.30.0"]
+        kubernetes-versions: ["v1.26.15", "v1.28.12", "v1.29.7", "v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -102,7 +102,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.25.16", "v1.27.13", "v1.28.9", "v1.30.0"]
+        kubernetes-versions: ["v1.26.15", "v1.28.12", "v1.29.7", "v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -140,7 +140,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.25.16", "v1.27.13", "v1.28.9", "v1.30.0"]
+        kubernetes-versions: ["v1.26.15", "v1.28.12", "v1.29.7", "v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -178,7 +178,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.25.16", "v1.27.13", "v1.28.9", "v1.30.0"]
+        kubernetes-versions: ["v1.26.15", "v1.28.12", "v1.29.7", "v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -219,7 +219,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kubernetes-versions: ["v1.25.16", "v1.30.0"]
+        kubernetes-versions: ["v1.26.15", "v1.31.0"]
     steps:
       - name: checkout
         uses: actions/checkout@v4

diff --git a/.mergify.yml b/.mergify.yml
@@ -274,17 +274,17 @@ pull_request_rules:
       - "check-success=canary-tests / encryption-pvc-kms-ibm-kp (quay.io/ceph/ceph:v18)"
       - "check-success=canary-tests / multus-cluster-network (quay.io/ceph/ceph:v18)"
       - "check-success=canary-tests / csi-hostnetwork-disabled (quay.io/ceph/ceph:v18)"
-      - "check-success=TestCephSmokeSuite (v1.25.16)"
-      - "check-success=TestCephSmokeSuite (v1.30.0)"
-      - "check-success=TestCephHelmSuite (v1.25.16)"
-      - "check-success=TestCephHelmSuite (v1.30.0)"
-      - "check-success=TestCephMultiClusterDeploySuite (v1.30.0)"
-      - "check-success=TestCephObjectSuite (v1.25.16)"
-      - "check-success=TestCephObjectSuite (v1.30.0)"
-      - "check-success=TestCephUpgradeSuite (v1.25.16)"
-      - "check-success=TestCephUpgradeSuite (v1.30.0)"
-      - "check-success=TestHelmUpgradeSuite (v1.25.16)"
-      - "check-success=TestHelmUpgradeSuite (v1.30.0)"
+      - "check-success=TestCephSmokeSuite (v1.26.15)"
+      - "check-success=TestCephSmokeSuite (v1.31.0)"
+      - "check-success=TestCephHelmSuite (v1.26.15)"
+      - "check-success=TestCephHelmSuite (v1.31.0)"
+      - "check-success=TestCephMultiClusterDeploySuite (v1.31.0)"
+      - "check-success=TestCephObjectSuite (v1.26.15)"
+      - "check-success=TestCephObjectSuite (v1.31.0)"
+      - "check-success=TestCephUpgradeSuite (v1.26.15)"
+      - "check-success=TestCephUpgradeSuite (v1.31.0)"
+      - "check-success=TestHelmUpgradeSuite (v1.26.15)"
+      - "check-success=TestHelmUpgradeSuite (v1.31.0)"
     actions:
       merge:
         method: merge

diff --git a/Documentation/Getting-Started/Prerequisites/prerequisites.md b/Documentation/Getting-Started/Prerequisites/prerequisites.md
@@ -7,7 +7,7 @@ and Rook is granted the required privileges (see below for more information).
 
 ## Kubernetes Version
 
-Kubernetes versions **v1.25** through **v1.30** are supported.
+Kubernetes versions **v1.26** through **v1.31** are supported.
 
 ## CPU Architecture
 

diff --git a/Documentation/Getting-Started/quickstart.md b/Documentation/Getting-Started/quickstart.md
@@ -12,7 +12,7 @@ This guide will walk through the basic setup of a Ceph cluster and enable K8s ap
 
 ## Kubernetes Version
 
-Kubernetes versions **v1.25** through **v1.30** are supported.
+Kubernetes versions **v1.26** through **v1.31** are supported.
 
 ## CPU Architecture
 

diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md
@@ -16,10 +16,12 @@
     `spec.hosting` configurations are set. Use the new `spec.hosting.advertiseEndpoint` config to
     define required behavior as
     [documented](../Storage-Configuration/Object-Storage-RGW/object-storage.md#object-store-endpoint).
+- Minimum version of Kubernetes supported is increased to K8s v1.26.
 
 ## Features
 
 - Added support for Ceph Squid (v19)
 - Allow updating the device class of OSDs, if `allowDeviceClassUpdate: true` is set
 - CephObjectStore support for keystone authentication for S3 and Swift
     (see [#9088](https://github.com/rook/rook/issues/9088)).
+- Support K8s versions v1.26 through v1.31.