diff --git a/README.md b/README.md index 3714f0208b1..45a04c1ac08 100644 --- a/README.md +++ b/README.md @@ -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| @@ -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 | diff --git a/build.env b/build.env index 37f249f0f70..f4fd02adc84 100644 --- a/build.env +++ b/build.env @@ -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 diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index a1109eec941..9def84ad1b6 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -117,7 +117,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.12-canary + tag: v3.12.2 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 26d8bc4ae52..914acb9a68d 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -146,7 +146,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.12-canary + tag: v3.12.2 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 941de8e86c3..64da63017d5 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -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" @@ -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)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index 593b3744633..5ecd39b022f 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -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" @@ -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)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml index d64280301f0..e7cd26d1728 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -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" @@ -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)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index 6c92c768917..b27da9209fc 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin.yaml @@ -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" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index af567009875..b7e59b429fb 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -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" @@ -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" @@ -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)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 6cdf8d8aeaf..ed2202b9441 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -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" @@ -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)" diff --git a/docs/ceph-csi-upgrade.md b/docs/ceph-csi-upgrade.md index ea2af77d15e..3d8f55f09cd 100644 --- a/docs/ceph-csi-upgrade.md +++ b/docs/ceph-csi-upgrade.md @@ -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 diff --git a/docs/metrics.md b/docs/metrics.md index 8f19c8d2bc7..c4f45b0a52e 100644 --- a/docs/metrics.md +++ b/docs/metrics.md @@ -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 diff --git a/examples/rbd/storageclass.yaml b/examples/rbd/storageclass.yaml index 601a6696af4..5d2fc5ebae7 100644 --- a/examples/rbd/storageclass.yaml +++ b/examples/rbd/storageclass.yaml @@ -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 diff --git a/internal/health-checker/checker.go b/internal/health-checker/checker.go index 5eef779b5a5..14322b2d3df 100644 --- a/internal/health-checker/checker.go +++ b/internal/health-checker/checker.go @@ -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 diff --git a/internal/util/crushlocation_test.go b/internal/util/crushlocation_test.go index 4eced910c2f..4567de35191 100644 --- a/internal/util/crushlocation_test.go +++ b/internal/util/crushlocation_test.go @@ -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{