Merge branch 'main' into volgrp-snapclass

api/go.mod

@@ -1,18 +1,18 @@
 module github.com/red-hat-storage/ocs-operator/api/v4
 
-go 1.22.0
+go 1.22.7
 
 require (
-	github.com/noobaa/noobaa-operator/v5 v5.0.0-20240827070548-002966de315a
-	github.com/openshift/api v0.0.0-20240828125535-01b3675ba7b3
+	github.com/noobaa/noobaa-operator/v5 v5.0.0-20241112075542-b62bb7eb535d
+	github.com/openshift/api v0.0.0-20241120064718-caf97963ed30
 	github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87
-	github.com/rook/rook/pkg/apis v0.0.0-20240828225153-88eab510dd2b
-	k8s.io/api v0.31.0
-	k8s.io/apimachinery v0.31.0
+	github.com/rook/rook/pkg/apis v0.0.0-20241119201302-fc456553b3cc
+	k8s.io/api v0.31.2
+	k8s.io/apimachinery v0.31.2
 )
 
 require (
-	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/containernetworking/cni v1.2.3 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
@@ -37,12 +37,12 @@ require (
 	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
 	github.com/hashicorp/go-sockaddr v1.0.6 // indirect
 	github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
-	github.com/hashicorp/vault/api v1.14.0 // indirect
+	github.com/hashicorp/vault/api v1.15.0 // indirect
 	github.com/hashicorp/vault/api/auth/approle v0.7.0 // indirect
 	github.com/hashicorp/vault/api/auth/kubernetes v0.7.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.1 // indirect
+	github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.3 // indirect
 	github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20221122204822-d1a8c34382f1 // indirect
 	github.com/libopenstorage/secrets v0.0.0-20240416031220-a17cf7f72c6c // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -51,25 +51,24 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/onsi/ginkgo/v2 v2.20.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/oauth2 v0.22.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/term v0.23.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
-	golang.org/x/time v0.6.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/oauth2 v0.23.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/term v0.25.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
+	golang.org/x/time v0.7.0 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/client-go v0.31.0 // indirect
+	k8s.io/client-go v0.31.2 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect
+	k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094 // indirect
 	k8s.io/utils v0.0.0-20240821151609-f90d01438635 // indirect
 	sigs.k8s.io/container-object-storage-interface-api v0.1.0 // indirect
 	sigs.k8s.io/controller-runtime v0.19.0 // indirect

api/v1/storageclusterpeer_types.go

@@ -17,57 +17,39 @@ limitations under the License.
 package v1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-type NamespacedName struct {
-	Name      string `json:"name"`
-	Namespace string `json:"namespace"`
-}
-
-// RemoteClusterSpec specifies the spec required for the remote cluster
-type RemoteClusterSpec struct {
-	// ApiEndpoint is the URI of the ODF api server
-	ApiEndpoint string `json:"apiEndpoint"`
-
-	// OnboardingTicket holds an identity information required by the local ODF cluster to onboard.
-	OnboardingTicket string `json:"onboardingTicket"`
 
-	// StorageClusterName holds the namespacedName of the Remote ODF Cluster
-	StorageClusterName NamespacedName `json:"storageClusterName"`
-}
+type StorageClusterPeerState string
 
-// LocalClusterSpec specifies the spec required for the local cluster
-type LocalClusterSpec struct {
-	// Name holds the name of the local ODF cluster
-	Name corev1.LocalObjectReference `json:"name"`
-}
+const (
+	StorageClusterPeerStateInitializing StorageClusterPeerState = "Initializing"
+	StorageClusterPeerStatePending      StorageClusterPeerState = "Pending"
+	StorageClusterPeerStatePeered       StorageClusterPeerState = "Peered"
+	StorageClusterPeerStateFailed       StorageClusterPeerState = "Failed"
+)
 
-// BlockPoolMirroringSpec enables setting up of mirroring for blockPools in the same namespace.
-type BlockPoolMirroringSpec struct {
-	// Selector is used to select blockPools by label
-	Selector metav1.LabelSelector `json:"selector"`
+type PeerInfo struct {
+	StorageClusterUid string `json:"storageClusterUid,omitempty"`
 }
 
 // StorageClusterPeerSpec defines the desired state of StorageClusterPeer
 type StorageClusterPeerSpec struct {
 
-	// RemoteCluster specifies the spec required for the remote cluster
-	RemoteCluster RemoteClusterSpec `json:"remoteCluster"`
-
-	// LocalCluster specifies the spec required for the local cluster
-	LocalCluster LocalClusterSpec `json:"localCluster"`
+	// ApiEndpoint is the URI of the ODF api server
+	ApiEndpoint string `json:"apiEndpoint"`
 
-	// BlockPoolMirroring indicates ceph block mirroring between block pool on the local and remote clusters
-	//+optional
-	BlockPoolMirroring *BlockPoolMirroringSpec `json:"blockPoolMirroring,omitempty"`
+	// OnboardingToken holds an identity information required by the local ODF cluster to onboard.
+	OnboardingToken string `json:"onboardingToken"`
 }
 
 // StorageClusterPeerStatus defines the observed state of StorageClusterPeer
 type StorageClusterPeerStatus struct {
+	State    StorageClusterPeerState `json:"state,omitempty"`
+	PeerInfo *PeerInfo               `json:"peerInfo"`
 }
 
 //+kubebuilder:object:root=true

api/v1alpha1/storageconsumer_types.go

@@ -94,6 +94,10 @@ type ClientStatus struct {
 	// StorageQuotaUtilizationRatio is the ratio of utilized quota of connected client
 	// +optional
 	StorageQuotaUtilizationRatio float64 `json:"storageQuotaUtilizationRatio,omitempty"`
+
+	// ID is the k8s UID of connected storageclient
+	// +optional
+	ID string `json:"clientId,omitempty"`
 }
 
 //+kubebuilder:object:root=true