Merge pull request #3005 from rewantsoni/network

update the odf-info api to contain the exported endpoint address

api/v1alpha1/odfinfoconfig.go

@@ -18,6 +18,8 @@ package v1alpha1
 
 import "k8s.io/apimachinery/pkg/types"
 
+const ApiServerExportedAddressAnnotationName = "ocs.openshift.io/api-server-exported-address"
+
 // ConnectedClient describes the connected clients of the storage cluster key
 type ConnectedClient struct {
 	Name      string `yaml:"name"`
@@ -31,6 +33,7 @@ type InfoStorageCluster struct {
 	StorageProviderEndpoint string               `yaml:"storageProviderEndpoint"`
 	CephClusterFSID         string               `yaml:"cephClusterFSID"`
 	StorageClusterUID       string               `yaml:"storageClusterUID"`
+	Annotations             map[string]string    `yaml:"annotations"`
 }
 
 // OdfInfoData describes odf-info CM's data

controllers/storagecluster/odfinfoconfig.go

@@ -137,6 +137,14 @@ func getOdfInfoData(r *StorageClusterReconciler, storageCluster *ocsv1.StorageCl
 		return "", err
 	}
 
+	annotations := map[string]string{}
+	for key, value := range storageCluster.GetAnnotations() {
+		parts := strings.Split(key, "/")
+		if len(parts) == 2 && strings.HasSuffix(parts[0], "ocs.openshift.io") {
+			annotations[key] = value
+		}
+	}
+
 	data := ocsv1a1.OdfInfoData{
 		Version:           ocsVersion,
 		DeploymentType:    odfDeploymentType,
@@ -147,6 +155,7 @@ func getOdfInfoData(r *StorageClusterReconciler, storageCluster *ocsv1.StorageCl
 			StorageProviderEndpoint: storageCluster.Status.StorageProviderEndpoint,
 			CephClusterFSID:         cephFSId,
 			StorageClusterUID:       string(storageCluster.UID),
+			Annotations:             annotations,
 		},
 	}
 	yamlData, err := yaml.Marshal(data)