diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index cd1332b79..04ab198dc 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -2022,7 +2022,7 @@ jobs: - name: deploy cluster without ceph-csi operator run: | OPERATOR_MANIFEST="deploy/examples/operator.yaml" - sed -i 's|# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.16.1"|ROOK_CSI_CEPH_IMAGE: "quay.io/nixpanic/cephcsi:nvmeof"|' "${OPERATOR_MANIFEST}" + sed -i 's|# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.16.2"|ROOK_CSI_CEPH_IMAGE: "quay.io/nixpanic/cephcsi:nvmeof"|' "${OPERATOR_MANIFEST}" sed -i 's|ROOK_USE_CSI_OPERATOR: "true"|ROOK_USE_CSI_OPERATOR: "false"|' "${OPERATOR_MANIFEST}" tests/scripts/github-action-helper.sh deploy_manifest_with_local_build "${OPERATOR_MANIFEST}" diff --git a/Documentation/Helm-Charts/operator-chart.md b/Documentation/Helm-Charts/operator-chart.md index ea51fb5a5..0b751fdc5 100644 --- a/Documentation/Helm-Charts/operator-chart.md +++ b/Documentation/Helm-Charts/operator-chart.md @@ -60,7 +60,7 @@ The following table lists the configurable parameters of the rook-operator chart | `csi.cephFSPluginUpdateStrategy` | CSI CephFS plugin daemonset update strategy, supported values are OnDelete and RollingUpdate | `RollingUpdate` | | `csi.cephFSPluginUpdateStrategyMaxUnavailable` | A maxUnavailable parameter of CSI cephFS plugin daemonset update strategy. | `1` | | `csi.cephcsi.repository` | Ceph CSI image repository | `"quay.io/cephcsi/cephcsi"` | -| `csi.cephcsi.tag` | Ceph CSI image tag | `"v3.16.1"` | +| `csi.cephcsi.tag` | Ceph CSI image tag | `"v3.16.2"` | | `csi.cephfsLivenessMetricsPort` | CSI CephFS driver metrics port | `9081` | | `csi.cephfsPodLabels` | Labels to add to the CSI CephFS Deployments and DaemonSets Pods | `nil` | | `csi.clusterName` | Cluster name identifier to set as metadata on the CephFS subvolume and RBD images. This will be useful in cases like for example, when two container orchestrator clusters (Kubernetes/OCP) are using a single ceph cluster | `nil` | diff --git a/Documentation/Storage-Configuration/Ceph-CSI/ceph-csi-drivers.md b/Documentation/Storage-Configuration/Ceph-CSI/ceph-csi-drivers.md index 495d0ec73..c256070b1 100644 --- a/Documentation/Storage-Configuration/Ceph-CSI/ceph-csi-drivers.md +++ b/Documentation/Storage-Configuration/Ceph-CSI/ceph-csi-drivers.md @@ -217,10 +217,10 @@ CSI-Addons supports the following operations: Ceph-CSI supports encrypting PersistentVolumeClaims (PVCs) for both RBD and CephFS. This can be achieved using LUKS for RBD and fscrypt for CephFS. More details on encrypting RBD PVCs can be found -[here](https://github.com/ceph/ceph-csi/blob/v3.16.1/docs/deploy-rbd.md#encryption-for-rbd-volumes), +[here](https://github.com/ceph/ceph-csi/blob/v3.16.2/docs/deploy-rbd.md#encryption-for-rbd-volumes), which includes a full list of supported encryption configurations. More details on encrypting CephFS PVCs can be found [here](https://github.com/ceph/ceph-csi/blob/v3.14.2/docs/deploy-cephfs.md#cephfs-volume-encryption). -A sample KMS configmap can be found [here](https://github.com/ceph/ceph-csi/blob/v3.16.1/examples/kms/vault/kms-config.yaml). +A sample KMS configmap can be found [here](https://github.com/ceph/ceph-csi/blob/v3.16.2/examples/kms/vault/kms-config.yaml). !!! note Not all KMS are compatible with fscrypt. Generally, KMS that either store secrets to use directly (like Vault) diff --git a/Documentation/Storage-Configuration/Ceph-CSI/custom-images.md b/Documentation/Storage-Configuration/Ceph-CSI/custom-images.md index c758fd48c..c7a144166 100644 --- a/Documentation/Storage-Configuration/Ceph-CSI/custom-images.md +++ b/Documentation/Storage-Configuration/Ceph-CSI/custom-images.md @@ -18,7 +18,7 @@ kubectl -n $ROOK_OPERATOR_NAMESPACE edit configmap rook-ceph-operator-config The default upstream images are included below, which you can change to your desired images. ```yaml -ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.16.1" +ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.16.2" ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.16.0" ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v6.1.1" ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v4.11.0" diff --git a/deploy/charts/rook-ceph/values.yaml b/deploy/charts/rook-ceph/values.yaml index 36799cb01..ccf8a95df 100644 --- a/deploy/charts/rook-ceph/values.yaml +++ b/deploy/charts/rook-ceph/values.yaml @@ -498,7 +498,7 @@ csi: # -- Ceph CSI image repository repository: quay.io/cephcsi/cephcsi # -- Ceph CSI image tag - tag: v3.16.1 + tag: v3.16.2 registrar: # -- Kubernetes CSI registrar image repository diff --git a/deploy/examples/csi/nvmeof/node-plugin.yaml b/deploy/examples/csi/nvmeof/node-plugin.yaml index 912c0ea39..2ad2fe41a 100644 --- a/deploy/examples/csi/nvmeof/node-plugin.yaml +++ b/deploy/examples/csi/nvmeof/node-plugin.yaml @@ -44,7 +44,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: quay.io/cephcsi/cephcsi:v3.16.1 + image: quay.io/cephcsi/cephcsi:v3.16.2 imagePullPolicy: Always name: csi-nvmeofplugin resources: {} diff --git a/deploy/examples/csi/nvmeof/provisioner.yaml b/deploy/examples/csi/nvmeof/provisioner.yaml index 3b78f0849..a3f49241f 100644 --- a/deploy/examples/csi/nvmeof/provisioner.yaml +++ b/deploy/examples/csi/nvmeof/provisioner.yaml @@ -198,7 +198,7 @@ spec: - name: csi-nvmeofplugin # for stable functionality replace canary with latest release version # image: quay.io/gdidi/cephcsi:nvmeof - image: quay.io/cephcsi/cephcsi:v3.16.1 + image: quay.io/cephcsi/cephcsi:v3.16.2 command: ["/usr/local/bin/cephcsi"] args: - "--nodeid=$(NODE_ID)" diff --git a/deploy/examples/images.txt b/deploy/examples/images.txt index 6b5619a8e..c0e626e5a 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -3,7 +3,7 @@ quay.io/ceph/ceph:v19.2.3 quay.io/ceph/cosi:v0.1.2 quay.io/cephcsi/ceph-csi-operator:v0.5.0 - quay.io/cephcsi/cephcsi:v3.16.1 + quay.io/cephcsi/cephcsi:v3.16.2 quay.io/csiaddons/k8s-sidecar:v0.14.0 registry.k8s.io/sig-storage/csi-attacher:v4.11.0 registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.16.0 diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index d0bfc755e..3e1446e0c 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -202,7 +202,7 @@ data: # The default version of CSI supported by Rook will be started. To change the version # of the CSI driver to something other than what is officially supported, change # these images to the desired release of the CSI driver. - # ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.16.1" + # ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.16.2" # ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.16.0" # ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v2.1.0" # ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v6.1.1" diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index 3bcd88a84..404f306b8 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -119,7 +119,7 @@ data: # The default version of CSI supported by Rook will be started. To change the version # of the CSI driver to something other than what is officially supported, change # these images to the desired release of the CSI driver. - # ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.16.1" + # ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.16.2" # ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.16.0" # ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v2.1.0" # ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v6.1.1" diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index 87ad639ea..6c20ed6f4 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -135,7 +135,7 @@ var ( // manually challenging. var ( // image names - DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.16.1" + DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.16.2" DefaultRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.16.0" DefaultProvisionerImage = "registry.k8s.io/sig-storage/csi-provisioner:v6.1.1" DefaultAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v4.11.0" diff --git a/pkg/operator/ceph/csi/util_test.go b/pkg/operator/ceph/csi/util_test.go index f505a33dd..845b034d4 100644 --- a/pkg/operator/ceph/csi/util_test.go +++ b/pkg/operator/ceph/csi/util_test.go @@ -280,7 +280,7 @@ func Test_getImage(t *testing.T) { { name: "test with default image", args: args{ - defaultImage: "quay.io/cephcsi/cephcsi:v3.16.1", + defaultImage: "quay.io/cephcsi/cephcsi:v3.16.2", }, want: DefaultCSIPluginImage, },