Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: prepare for 3.12.2 release #4822

Merged
merged 2 commits into from
Sep 6, 2024
Merged

build: prepare for 3.12.2 release #4822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6914427
build: prepare for 3.12.2 release
Madhu-1 Sep 6, 2024
dd05b76
doc: fix codespell problem
Madhu-1 Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ environments.

| Ceph CSI Version | Container Orchestrator Name | Version Tested |
| -----------------| --------------------------- | -------------------|
| v3.12.2 | Kubernetes | v1.29, v1.30, v1.31|
| v3.12.1 | Kubernetes | v1.29, v1.30, v1.31|
| v3.12.0 | Kubernetes | v1.29, v1.30, v1.31|
| v3.11.0 | Kubernetes | v1.26, v1.27, v1.28, v1.29|

Expand Down Expand Up @@ -128,6 +130,8 @@ in the Kubernetes documentation.
| Ceph CSI Release/Branch | Container image name | Image Tag |
| ----------------------- | ---------------------------- | --------- |
| devel (Branch) | quay.io/cephcsi/cephcsi | canary |
| v3.12.2 (Release) | quay.io/cephcsi/cephcsi | v3.12.2 |
| v3.12.1 (Release) | quay.io/cephcsi/cephcsi | v3.12.1 |
| v3.12.0 (Release) | quay.io/cephcsi/cephcsi | v3.12.0 |
| v3.11.0 (Release) | quay.io/cephcsi/cephcsi | v3.11.0 |

Expand Down
2 changes: 1 addition & 1 deletion build.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# get proporly expanded.
#
# cephcsi image version
CSI_IMAGE_VERSION=v3.12-canary
CSI_IMAGE_VERSION=v3.12.2

# cephcsi upgrade version
CSI_UPGRADE_VERSION=v3.11.0
Expand Down
2 changes: 1 addition & 1 deletion charts/ceph-csi-cephfs/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ nodeplugin:
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v3.12-canary
tag: v3.12.2
pullPolicy: IfNotPresent
resources: {}

Expand Down
2 changes: 1 addition & 1 deletion charts/ceph-csi-rbd/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ nodeplugin:
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v3.12-canary
tag: v3.12.2
pullPolicy: IfNotPresent
resources: {}

Expand Down
4 changes: 2 additions & 2 deletions deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
priorityClassName: system-cluster-critical
containers:
- name: csi-cephfsplugin
image: quay.io/cephcsi/cephcsi:v3.12-canary
image: quay.io/cephcsi/cephcsi:v3.12.2
args:
- "--nodeid=$(NODE_ID)"
- "--type=cephfs"
Expand Down Expand Up @@ -142,7 +142,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:v3.12-canary
image: quay.io/cephcsi/cephcsi:v3.12.2
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
4 changes: 2 additions & 2 deletions deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
capabilities:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
image: quay.io/cephcsi/cephcsi:v3.12-canary
image: quay.io/cephcsi/cephcsi:v3.12.2
args:
- "--nodeid=$(NODE_ID)"
- "--type=cephfs"
Expand Down Expand Up @@ -124,7 +124,7 @@ spec:
securityContext:
privileged: true
allowPrivilegeEscalation: true
image: quay.io/cephcsi/cephcsi:v3.12-canary
image: quay.io/cephcsi/cephcsi:v3.12.2
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
4 changes: 2 additions & 2 deletions deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
topologyKey: "kubernetes.io/hostname"
containers:
- name: csi-nfsplugin
image: quay.io/cephcsi/cephcsi:v3.12-canary
image: quay.io/cephcsi/cephcsi:v3.12.2
args:
- "--nodeid=$(NODE_ID)"
- "--type=nfs"
Expand Down Expand Up @@ -120,7 +120,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:v3.12-canary
image: quay.io/cephcsi/cephcsi:v3.12.2
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
2 changes: 1 addition & 1 deletion deploy/nfs/kubernetes/csi-nfsplugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
capabilities:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
image: quay.io/cephcsi/cephcsi:v3.12-canary
image: quay.io/cephcsi/cephcsi:v3.12.2
args:
- "--nodeid=$(NODE_ID)"
- "--type=nfs"
Expand Down
6 changes: 3 additions & 3 deletions deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
priorityClassName: system-cluster-critical
containers:
- name: csi-rbdplugin
image: quay.io/cephcsi/cephcsi:v3.12-canary
image: quay.io/cephcsi/cephcsi:v3.12.2
args:
- "--nodeid=$(NODE_ID)"
- "--type=rbd"
Expand Down Expand Up @@ -172,7 +172,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-rbdplugin-controller
image: quay.io/cephcsi/cephcsi:v3.12-canary
image: quay.io/cephcsi/cephcsi:v3.12.2
args:
- "--type=controller"
- "--v=5"
Expand All @@ -193,7 +193,7 @@ spec:
- name: ceph-config
mountPath: /etc/ceph/
- name: liveness-prometheus
image: quay.io/cephcsi/cephcsi:v3.12-canary
image: quay.io/cephcsi/cephcsi:v3.12.2
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
4 changes: 2 additions & 2 deletions deploy/rbd/kubernetes/csi-rbdplugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
capabilities:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
image: quay.io/cephcsi/cephcsi:v3.12-canary
image: quay.io/cephcsi/cephcsi:v3.12.2
args:
- "--nodeid=$(NODE_ID)"
- "--pluginpath=/var/lib/kubelet/plugins"
Expand Down Expand Up @@ -134,7 +134,7 @@ spec:
securityContext:
privileged: true
allowPrivilegeEscalation: true
image: quay.io/cephcsi/cephcsi:v3.12-canary
image: quay.io/cephcsi/cephcsi:v3.12.2
args:
- "--type=liveness"
- "--endpoint=$(CSI_ENDPOINT)"
Expand Down
4 changes: 2 additions & 2 deletions docs/ceph-csi-upgrade.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,12 @@ For example, upgrading from 3.10 to 3.12 is not recommended.
[release notes](https://github.com/ceph/ceph-csi/releases/tag/v3.12.0) before
proceeding further.**

git checkout v3.12.1 tag
git checkout v3.12.2 tag

```bash
git clone https://github.com/ceph/ceph-csi.git
cd ./ceph-csi
git checkout v3.12.1
git checkout v3.12.2
```

```console
Expand Down
4 changes: 2 additions & 2 deletions docs/metrics.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ curl -X GET http://10.109.65.142:8080/metrics 2>/dev/null | grep csi
csi_liveness 1
```

Promethues can be deployed through the promethues operator described [here](https://coreos.com/operators/prometheus/docs/latest/user-guides/getting-started.html).
The [service-monitor](../deploy/service-monitor.yaml) will tell promethues how
Prometheus can be deployed through the prometheus operator described [here](https://coreos.com/operators/prometheus/docs/latest/user-guides/getting-started.html).
The [service-monitor](../deploy/service-monitor.yaml) will tell prometheus how
to pull metrics out of CSI.

Each CSI pod has a service to expose the endpoint to prometheus. By default, rbd
Expand Down
2 changes: 1 addition & 1 deletion examples/rbd/storageclass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ parameters:
# "file": Enable file encryption on the mounted filesystem
# "block": Encrypt RBD block device
# When unspecified assume type "block". "file" and "block" are
# mutally exclusive.
# mutually exclusive.
# encryptionType: "block"

# (optional) Use external key management system for encryption passphrases by
Expand Down
2 changes: 1 addition & 1 deletion internal/health-checker/checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ type checker struct {
// timeout contains the delay (interval + timeout)
timeout time.Duration

// mutex protects against concurrent access to healty, err and
// mutex protects against concurrent access to healthy, err and
// lastUpdate
mutex *sync.RWMutex

Expand Down
2 changes: 1 addition & 1 deletion internal/util/crushlocation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func Test_getCrushLocationMap(t *testing.T) {
want: map[string]string{"zone": "zone1"},
},
{
name: "multuple matching crushlocation and node labels",
name: "multiple matching crushlocation and node labels",
args: input{
crushLocationLabels: "topology.io/zone,topology.io/rack",
nodeLabels: map[string]string{
Expand Down