Syncing latest changes from upstream master for rook

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

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

README.md

@@ -54,7 +54,7 @@ Please use the following to reach members of the community:
 
 ## Community Meeting
 
-A regular community meeting takes place every other [Tuesday at 9:00 AM PT (Pacific Time)](https://zoom.us/j/98052644520?pwd=K0R4RUZCc3NhQisyMnA5VlV2MVBhQT09).
+A regular community meeting takes place the [2nd Tuesday of every month at 9:00 AM PT (Pacific Time)](https://zoom.us/j/98052644520?pwd=K0R4RUZCc3NhQisyMnA5VlV2MVBhQT09).
 Convert to your [local timezone](http://www.thetimezoneconverter.com/?t=9:00&tz=PT%20%28Pacific%20Time%29).
 
 Any changes to the meeting schedule will be added to the [agenda doc](https://docs.google.com/document/d/1exd8_IG6DkdvyA0eiTtL2z5K2Ra-y68VByUUgwP7I9A/edit?usp=sharing) and posted to [Slack #announcements](https://rook-io.slack.com/messages/C76LLCEE7/).

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

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

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

pkg/daemon/ceph/client/pool.go

@@ -468,6 +468,10 @@ func updatePoolCrushRule(context *clusterd.Context, clusterInfo *ClusterInfo, cl
 		logger.Debugf("Skipping crush rule update for pool %q: EnableCrushUpdates is disabled", pool.Name)
 		return nil
 	}
+	if clusterSpec.IsStretchCluster() {
+		logger.Debugf("skipping crush rule update for pool %q in a stretch cluster", pool.Name)
+		return nil
+	}
 
 	if pool.FailureDomain == "" && pool.DeviceClass == "" {
 		logger.Debugf("skipping check for failure domain and deviceClass on pool %q as it is not specified", pool.Name)

pkg/daemon/ceph/client/pool_test.go

@@ -251,10 +251,12 @@ func TestUpdateFailureDomain(t *testing.T) {
 	currentFailureDomain := "rack"
 	currentDeviceClass := "default"
 	testCrushRuleName := "test_rule"
+	cephCommandCalled := false
 	executor := &exectest.MockExecutor{}
 	context := &clusterd.Context{Executor: executor}
 	executor.MockExecuteCommandWithOutput = func(command string, args ...string) (string, error) {
 		logger.Infof("Command: %s %v", command, args)
+		cephCommandCalled = true
 		if args[1] == "pool" {
 			if args[2] == "get" {
 				assert.Equal(t, "mypool", args[3])
@@ -335,6 +337,27 @@ func TestUpdateFailureDomain(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Equal(t, "mypool_zone", newCrushRule)
 	})
+
+	t.Run("stretch cluster skips crush rule update", func(t *testing.T) {
+		p := cephv1.NamedPoolSpec{
+			Name: "mypool",
+			PoolSpec: cephv1.PoolSpec{
+				FailureDomain:      "zone",
+				Replicated:         cephv1.ReplicatedSpec{Size: 3},
+				EnableCrushUpdates: true,
+			},
+		}
+		clusterSpec := &cephv1.ClusterSpec{
+			Mon:     cephv1.MonSpec{StretchCluster: &cephv1.StretchClusterSpec{Zones: []cephv1.MonZoneSpec{{Name: "zone1"}, {Name: "zone2"}, {Name: "zone3", Arbiter: true}}}},
+			Storage: cephv1.StorageScopeSpec{},
+		}
+		newCrushRule = ""
+		cephCommandCalled = false
+		err := updatePoolCrushRule(context, AdminTestClusterInfo("mycluster"), clusterSpec, p)
+		assert.NoError(t, err)
+		assert.Equal(t, "", newCrushRule)
+		assert.False(t, cephCommandCalled)
+	})
 }
 
 func TestExtractPoolDetails(t *testing.T) {

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 (

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{

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 + `