diff --git a/.github/workflows/pull-request-commentor.yaml b/.github/workflows/pull-request-commentor.yaml index 1b17150b2d0..6f681412474 100644 --- a/.github/workflows/pull-request-commentor.yaml +++ b/.github/workflows/pull-request-commentor.yaml @@ -18,16 +18,16 @@ jobs: strategy: matrix: - branch: [release-v3.8, release-v3.9, devel] + branch: [release-v3.9, release-v3.10, devel] k8s: ["1.25", "1.26", "1.27", "1.28"] exclude: # the next Ceph-CSI version will not be tested with old Kubernetes - k8s: "1.25" branch: "devel" + - k8s: "1.25" + branch: "release-v3.10" # Ceph-CSI <= 3.9 was released before Kubernetes 1.28 - - k8s: "1.28" - branch: "release-v3.8" - k8s: "1.28" branch: "release-v3.9" diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index f93d0a89fbc..3c1f8cf6155 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -2,19 +2,6 @@ ## Breaking Changes -- Removed the deprecated grpc metrics flag's in [PR](https://github.com/ceph/ceph-csi/pull/4225) - -- Support for pre-creation of cephFS subvolumegroup before creating subvolume - is removed in [PR](https://github.com/ceph/ceph-csi/pull/4195) - ## Features -- Support for configuring read affinity for individuals cluster within the ceph-csi-config - ConfigMap in [PR](https://github.com/ceph/ceph-csi/pull/4165) - -- Support for CephFS kernel and fuse mount options per cluster in [PR](https://github.com/ceph/ceph-csi/pull/4245) - ## NOTE - -- Support is limited to only the active Ceph releases. Support for EOLed Ceph - releases are removed [PR](https://github.com/ceph/ceph-csi/pull/4262) diff --git a/build.env b/build.env index be3d80a140c..00bc2829afd 100644 --- a/build.env +++ b/build.env @@ -9,7 +9,7 @@ # get proporly expanded. # # cephcsi image version -CSI_IMAGE_VERSION=canary +CSI_IMAGE_VERSION=v3.10.0 # cephcsi upgrade version CSI_UPGRADE_VERSION=v3.9.0 diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index 0d893eb9e8e..0768de2b2b0 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -99,7 +99,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: canary + tag: v3.10.0 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index f8c3ae073b9..95a414d3e90 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -127,7 +127,7 @@ nodeplugin: plugin: image: repository: quay.io/cephcsi/cephcsi - tag: canary + tag: v3.10.0 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index f92b9cd48bc..a244ceb412c 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -94,8 +94,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-cephfsplugin - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -143,7 +142,7 @@ spec: - name: ceph-csi-encryption-kms-config mountPath: /etc/ceph-csi-encryption-kms-config/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index a38ace99f51..96bc313229b 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -48,8 +48,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--nodeid=$(NODE_ID)" - "--type=cephfs" @@ -125,7 +124,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 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 b68488ff477..7c3146ebc8e 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -88,8 +88,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-nfsplugin - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--nodeid=$(NODE_ID)" - "--type=nfs" @@ -121,7 +120,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index 6cb65193657..6f6504a7065 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin.yaml @@ -48,8 +48,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 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 d837a7af218..b7ad236f9c8 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -116,8 +116,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-rbdplugin - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--nodeid=$(NODE_ID)" - "--type=rbd" @@ -173,8 +172,7 @@ spec: mountPath: /run/secrets/tokens readOnly: true - name: csi-rbdplugin-controller - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--type=controller" - "--v=5" @@ -195,7 +193,7 @@ spec: - name: ceph-config mountPath: /etc/ceph/ - name: liveness-prometheus - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 7e3b33f4a51..f2d81f1e3cd 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -50,8 +50,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - # for stable functionality replace canary with latest release version - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--nodeid=$(NODE_ID)" - "--pluginpath=/var/lib/kubelet/plugins" @@ -135,7 +134,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: quay.io/cephcsi/cephcsi:canary + image: quay.io/cephcsi/cephcsi:v3.10.0 args: - "--type=liveness" - "--endpoint=$(CSI_ENDPOINT)"