Merge pull request rook#14216 from thotz/update-cosi-images

object: update cosi images
red-hat-storage · Jul 10, 2024 · 28addd1 · 28addd1
2 parents a08a34e + ba40f84
commit 28addd1
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
diff --git a/Documentation/Storage-Configuration/Object-Storage-RGW/cosi.md b/Documentation/Storage-Configuration/Object-Storage-RGW/cosi.md
@@ -53,7 +53,7 @@ kind: BucketClass
 apiVersion: objectstorage.k8s.io/v1alpha1
 metadata:
   name: sample-bcc
-driverName: ceph.objectstorage.k8s.io
+driverName: rook-ceph.ceph.objectstorage.k8s.io
 deletionPolicy: Delete
 parameters:
   objectStoreUserSecretName: rook-ceph-object-user-my-store-cosi
@@ -63,7 +63,7 @@ kind: BucketAccessClass
 apiVersion: objectstorage.k8s.io/v1alpha1
 metadata:
   name: sample-bac
-driverName: ceph.objectstorage.k8s.io
+driverName: rook-ceph.ceph.objectstorage.k8s.io
 authenticationType: KEY
 parameters:
   objectStoreUserSecretName: rook-ceph-object-user-my-store-cosi

diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md
@@ -2,5 +2,7 @@
 
 ## Breaking Changes
 
+- Updating Ceph COSI driver images, this impact existing COSI `Buckets` and `BucketAccesses`,
+please update the `BucketClass` and `BucketAccessClass` for resolving refer [here](https://github.com/rook/rook/discussions/14297)
 
 ## Features
diff --git a/deploy/examples/cosi/bucketaccessclass.yaml b/deploy/examples/cosi/bucketaccessclass.yaml
@@ -2,7 +2,7 @@ kind: BucketAccessClass
 apiVersion: objectstorage.k8s.io/v1alpha1
 metadata:
   name: sample-bac
-driverName: ceph.objectstorage.k8s.io
+driverName: rook-ceph.ceph.objectstorage.k8s.io
 authenticationType: KEY
 parameters:
   objectStoreUserSecretName: rook-ceph-object-user-my-store-cosi

diff --git a/deploy/examples/cosi/bucketclass.yaml b/deploy/examples/cosi/bucketclass.yaml
@@ -2,7 +2,7 @@ kind: BucketClass
 apiVersion: objectstorage.k8s.io/v1alpha1
 metadata:
   name: sample-bcc
-driverName: ceph.objectstorage.k8s.io
+driverName: rook-ceph.ceph.objectstorage.k8s.io
 deletionPolicy: Delete
 parameters:
   objectStoreUserSecretName: rook-ceph-object-user-my-store-cosi

diff --git a/deploy/examples/images.txt b/deploy/examples/images.txt
@@ -1,6 +1,6 @@
- gcr.io/k8s-staging-sig-storage/objectstorage-sidecar/objectstorage-sidecar:v20230130-v0.1.0-24-gc0cf995
+ gcr.io/k8s-staging-sig-storage/objectstorage-sidecar:v20240513-v0.1.0-35-gefb3255
  quay.io/ceph/ceph:v18.2.2
- quay.io/ceph/cosi:v0.1.1
+ quay.io/ceph/cosi:v0.1.2
  quay.io/cephcsi/cephcsi:v3.11.0
  quay.io/csiaddons/k8s-sidecar:v0.8.0
  registry.k8s.io/sig-storage/csi-attacher:v4.5.1

diff --git a/pkg/operator/ceph/object/cosi/controller.go b/pkg/operator/ceph/object/cosi/controller.go
@@ -51,6 +51,7 @@ const (
 	cosiSocketMountPath       = "/var/lib/cosi"
 	DefaultServiceAccountName = "objectstorage-provisioner"
 	cosiSocketVolumeName      = "socket"
+	CephCOSIDriverPrefix      = "rook-ceph"
 )
 
 var (

diff --git a/pkg/operator/ceph/object/cosi/spec.go b/pkg/operator/ceph/object/cosi/spec.go
@@ -26,8 +26,8 @@ import (
 )
 
 const (
-	defaultCOSISideCarImage    = "gcr.io/k8s-staging-sig-storage/objectstorage-sidecar/objectstorage-sidecar:v20230130-v0.1.0-24-gc0cf995"
-	defaultCephCOSIDriverImage = "quay.io/ceph/cosi:v0.1.1"
+	defaultCOSISideCarImage    = "gcr.io/k8s-staging-sig-storage/objectstorage-sidecar:v20240513-v0.1.0-35-gefb3255"
+	defaultCephCOSIDriverImage = "quay.io/ceph/cosi:v0.1.2"
 )
 
 func createCephCOSIDriverDeployment(cephCOSIDriver *cephv1.CephCOSIDriver) (*appsv1.Deployment, error) {
@@ -114,6 +114,9 @@ func createCOSIDriverContainer(cephCOSIDriver *cephv1.CephCOSIDriver) corev1.Con
 	return corev1.Container{
 		Name:  CephCOSIDriverName,
 		Image: cephCOSIDriveImage,
+		Args: []string{
+			"--driver-prefix=" + CephCOSIDriverPrefix,
+		},
 		Env: []corev1.EnvVar{
 			{Name: "POD_NAMESPACE", ValueFrom: &corev1.EnvVarSource{FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.namespace"}}}},
 		VolumeMounts: []corev1.VolumeMount{

diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go
@@ -682,7 +682,7 @@ kind: BucketClass
 metadata:
   name: ` + name + `
   namespace: ` + m.settings.OperatorNamespace + `
-driverName: ceph.objectstorage.k8s.io
+driverName: ` + cosi.CephCOSIDriverPrefix + `.ceph.objectstorage.k8s.io
 deletionPolicy: ` + deletionPolicy + `
 parameters:
   objectStoreUserSecretName:  ` + objectStoreUserSecretName + `