Skip to content

Commit

Permalink
Merge pull request #587 from red-hat-storage/sync_us--master
Browse files Browse the repository at this point in the history
Syncing latest changes from upstream master for rook
  • Loading branch information
travisn committed Mar 8, 2024
2 parents a88fe5f + 4817a04 commit 503f0b3
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/canary-test-config/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ runs:
- name: Setup Minikube
shell: bash --noprofile --norc -eo pipefail -x {0}
run: |
tests/scripts/github-action-helper.sh install_minikube_with_none_driver v1.29.1
tests/scripts/github-action-helper.sh install_minikube_with_none_driver v1.29.2
- name: install deps
shell: bash --noprofile --norc -eo pipefail -x {0}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/golangci-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.21.5"
go-version: "1.21"
check-latest: true
- name: govulncheck
uses: golang/govulncheck-action@v1
2 changes: 1 addition & 1 deletion .github/workflows/integration-test-helm-suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-versions: ["v1.24.17", "v1.29.1"]
kubernetes-versions: ["v1.25.16", "v1.29.2"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/integration-test-mgr-suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-versions: ["v1.29.1"]
kubernetes-versions: ["v1.29.2"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand All @@ -36,7 +36,6 @@ jobs:
with:
use-tmate: ${{ secrets.USE_TMATE }}


- name: setup cluster resources
uses: ./.github/workflows/integration-test-config-latest-k8s
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-versions: ["v1.29.1"]
kubernetes-versions: ["v1.29.2"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-test-object-suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-versions: ["v1.24.17", "v1.29.1"]
kubernetes-versions: ["v1.25.16", "v1.29.2"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-test-smoke-suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-versions: ["v1.24.17", "v1.29.1"]
kubernetes-versions: ["v1.25.16", "v1.29.2"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration-test-upgrade-suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-versions: ["v1.24.17", "v1.29.1"]
kubernetes-versions: ["v1.25.16", "v1.29.2"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-versions: ["v1.24.17", "v1.29.1"]
kubernetes-versions: ["v1.25.16", "v1.29.2"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/integration-tests-on-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-versions: ["v1.24.17", "v1.25.16", "v1.27.10", "v1.29.1"]
kubernetes-versions: ["v1.25.16", "v1.27.11", "v1.28.7", "v1.29.2"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-versions: ["v1.24.17", "v1.25.16", "v1.27.10", "v1.29.1"]
kubernetes-versions: ["v1.25.16", "v1.27.11", "v1.28.7", "v1.29.2"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-versions: ["v1.24.17", "v1.25.16", "v1.27.10", "v1.29.1"]
kubernetes-versions: ["v1.25.16", "v1.27.11", "v1.28.7", "v1.29.2"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-versions: ["v1.24.17", "v1.25.16", "v1.27.10", "v1.29.1"]
kubernetes-versions: ["v1.25.16", "v1.27.11", "v1.28.7", "v1.29.2"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-versions: ["v1.24.17", "v1.26.11", "v1.29.1"]
kubernetes-versions: ["v1.25.16", "v1.27.11", "v1.28.7", "v1.29.2"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -216,7 +216,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kubernetes-versions: ["v1.24.17", "v1.29.1"]
kubernetes-versions: ["v1.25.16", "v1.29.2"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
5 changes: 3 additions & 2 deletions Documentation/CRDs/Cluster/ceph-cluster-crd.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,9 @@ Configure the network that will be enabled for the cluster and services.
See the kernel requirements above for encryption.

!!! caution
Changing networking configuration after a Ceph cluster has been deployed is NOT
supported and will result in a non-functioning cluster.
Changing networking configuration after a Ceph cluster has been deployed is only supported for
the network encryption settings. Changing other network settings is *NOT* supported and will
likely result in a non-functioning cluster.

#### Provider

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ and Rook is granted the required privileges (see below for more information).

## Kubernetes Version

Kubernetes versions **v1.24** through **v1.29** are supported.
Kubernetes versions **v1.25** through **v1.29** are supported.

## CPU Architecture

Expand Down
2 changes: 1 addition & 1 deletion Documentation/Getting-Started/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.24** through **v1.29** are supported.
Kubernetes versions **v1.25** through **v1.29** are supported.

## CPU Architecture

Expand Down
2 changes: 1 addition & 1 deletion PendingReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ read affinity setting in cephCluster CR (CSIDriverOptions section) in [PR](https
- Impact: This results in the unintended network configurations, with pods using the host networking instead of pod networking.
## Features

- Kubernetes versions **v1.24** through **v1.29** are supported.
- Kubernetes versions **v1.25** through **v1.29** are supported.
- Ceph daemon pods using the `default` service account now use a new `rook-ceph-default` service account.
- The feature support for VolumeSnapshotGroup has been added to the RBD and CephFS CSI driver.

0 comments on commit 503f0b3

Please sign in to comment.