Merge pull request #246 from openshift-cherrypick-robot/cherry-pick-2…

…44-to-release-4.18 DFBUGS-964: [release-4.18] Adds StorageClusterPeer annotation to client pair mapping
red-hat-storage · Dec 5, 2024 · 3598290 · 3598290
2 parents f334667 + 3842558
commit 3598290
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/controllers/mirrorpeer_controller.go b/controllers/mirrorpeer_controller.go
@@ -348,6 +348,9 @@ func updateProviderConfigMap(logger *slog.Logger, ctx context.Context, client cl
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "storage-client-mapping",
 					Namespace: providerClientInfo.ProviderInfo.NamespacedName.Namespace,
+					Annotations: map[string]string{
+						utils.StorageClusterPeerNameAnnotationKey: getStorageClusterPeerName(pairedClientInfo.ProviderInfo.ProviderManagedClusterName),
+					},
 				},
 				Data: make(map[string]string),
 			}

diff --git a/controllers/utils/configmap.go b/controllers/utils/configmap.go
@@ -14,9 +14,10 @@ import (
 )
 
 const (
-	ODFInfoConfigMapName    = "odf-info"
-	ConfigMapResourceType   = "ConfigMap"
-	ClientInfoConfigMapName = "odf-client-info"
+	ODFInfoConfigMapName                = "odf-info"
+	ConfigMapResourceType               = "ConfigMap"
+	ClientInfoConfigMapName             = "odf-client-info"
+	StorageClusterPeerNameAnnotationKey = "ocs.openshift.io/storage-cluster-peer"
 )
 
 // FetchConfigMap fetches a ConfigMap with a given name from a given namespace