Migrate odf-info structs to API folder

api/v1alpha1/odfinfoconfig.go

@@ -0,0 +1,41 @@
+/*
+Copyright 2020 Red Hat OpenShift Container Storage.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import "k8s.io/apimachinery/pkg/types"
+
+// ConnectedClient describes the connected clients of the storage cluster key
+type ConnectedClient struct {
+	Name      string `yaml:"name"`
+	ClusterID string `yaml:"clusterId"`
+}
+
+// InfoStorageCluster describes information regarding a storage cluster key
+type InfoStorageCluster struct {
+	NamespacedName          types.NamespacedName `yaml:"namespacedName"`
+	StorageProviderEndpoint string               `yaml:"storageProviderEndpoint"`
+	CephClusterFSID         string               `yaml:"cephClusterFSID"`
+}
+
+// OdfInfoData describes odf-info CM's data
+type OdfInfoData struct {
+	Version           string             `yaml:"version"`
+	DeploymentType    string             `yaml:"deploymentType"`
+	Clients           []ConnectedClient  `yaml:"clients"`
+	StorageCluster    InfoStorageCluster `yaml:"storageCluster"`
+	StorageSystemName string             `yaml:"storageSystemName"`
+}

controllers/storagecluster/odfinfoconfig.go

@@ -13,31 +13,12 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/yaml"
 )
 
-type connectedClient struct {
-	Name      string `yaml:"name"`
-	ClusterID string `yaml:"clusterId"`
-}
-type infoStorageCluster struct {
-	NamespacedName          types.NamespacedName `yaml:"namespacedName"`
-	StorageProviderEndpoint string               `yaml:"storageProviderEndpoint"`
-	CephClusterFSID         string               `yaml:"cephClusterFSID"`
-}
-
-type OdfInfoData struct {
-	Version           string             `yaml:"version"`
-	DeploymentType    string             `yaml:"deploymentType"`
-	Clients           []connectedClient  `yaml:"clients"`
-	StorageCluster    infoStorageCluster `yaml:"storageCluster"`
-	StorageSystemName string             `yaml:"storageSystemName"`
-}
-
 const (
 	odfInfoKeySuffix          = "config.yaml"
 	odfDeploymentTypeExternal = "external"
@@ -161,12 +142,12 @@ func getOdfInfoData(r *StorageClusterReconciler, storageCluster *ocsv1.StorageCl
 		return "", err
 	}
 
-	data := OdfInfoData{
+	data := ocsv1a1.OdfInfoData{
 		Version:           ocsVersion,
 		DeploymentType:    odfDeploymentType,
 		StorageSystemName: storageSystemName,
 		Clients:           connectedClients,
-		StorageCluster: infoStorageCluster{
+		StorageCluster: ocsv1a1.InfoStorageCluster{
 			NamespacedName:          client.ObjectKeyFromObject(storageCluster),
 			StorageProviderEndpoint: storageCluster.Status.StorageProviderEndpoint,
 			CephClusterFSID:         cephFSId,
@@ -180,19 +161,19 @@ func getOdfInfoData(r *StorageClusterReconciler, storageCluster *ocsv1.StorageCl
 
 }
 
-func getConnectedClients(r *StorageClusterReconciler, storageCluster *ocsv1.StorageCluster) ([]connectedClient, error) {
+func getConnectedClients(r *StorageClusterReconciler, storageCluster *ocsv1.StorageCluster) ([]ocsv1a1.ConnectedClient, error) {
 	storageConsumers := &ocsv1a1.StorageConsumerList{}
 	err := r.Client.List(r.ctx, storageConsumers, client.InNamespace(storageCluster.Namespace))
 	if err != nil {
 		return nil, err
 	}
-	connectedClients := make([]connectedClient, 0, len(storageConsumers.Items))
+	connectedClients := make([]ocsv1a1.ConnectedClient, 0, len(storageConsumers.Items))
 
 	for storageConsumerIdx := range storageConsumers.Items {
 		storageConsumer := &storageConsumers.Items[storageConsumerIdx]
 		clusterID := storageConsumer.Status.Client.ClusterID
 		name := storageConsumer.Status.Client.Name
-		newConnectedClient := connectedClient{
+		newConnectedClient := ocsv1a1.ConnectedClient{
 			Name:      name,
 			ClusterID: clusterID,
 		}

controllers/storagecluster/odfinfoconfig_test.go

@@ -130,7 +130,7 @@ func TestOdfInfoConfig(t *testing.T) {
 		assert.NilError(t, err, "expected to find configmap %q: %+v", odfInfoConfigMapName, err)
 
 		// compare with the expected results
-		odfInfoDataOfStorageClusterKey := OdfInfoData{}
+		odfInfoDataOfStorageClusterKey := v1alpha1.OdfInfoData{}
 		err = yaml.Unmarshal([]byte(configMap.Data[odfInfoConfigReconciler.getOdfInfoKeyName(sc)]),
 			&odfInfoDataOfStorageClusterKey)
 		assert.NilError(t, err, "Expected unmarshalling of OdfInfoConfig's data")