Handle company environments

Author: frengooo

api/core/v1alpha1/company_types.go

@@ -39,6 +39,27 @@ type Cluster struct {
 	Description string            `json:"description,omitempty"`
 }
 
+type Environment struct {
+	Label       string `json:"label"`
+	Description string `json:"description,omitempty"`
+	Hosts       []struct {
+		Scheme       string `json:"scheme"`
+		Host         string `json:"host"`
+		IsBackoffice bool   `json:"isBackoffice"`
+	} `json:"hosts,omitempty"`
+	Cluster struct {
+		ClusterId            string `json:"clusterId"`
+		Namespace            string `json:"namespace"`
+		KubeContextVariables struct {
+			KubeUrl   string `json:"KUBE_URL"`
+			KubeToken string `json:"KUBE_TOKEN"`
+			KubeCAPEM string `json:"KUBE_CA_PEM"`
+		} `json:"kubeContextVariables"`
+	} `json:"cluster"`
+	EnvId     string `json:"envId"`
+	EnvPrefix string `json:"envPrefix"`
+}
+
 // CompanySpec defines the desired state of Company.
 type CompanySpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
@@ -50,8 +71,7 @@ type CompanySpec struct {
 	CompanyOwners []string       `json:"companyOwners,omitempty"`
 	ConsoleRef    NamespacedName `json:"consoleRef"`
 	Clusters      []Cluster      `json:"clusters,omitempty"`
-	// Clusters []string `json:"companyOwners"`
-	// Envs []string `json:"companyOwners"`
+	Environments  []Environment  `json:"environments,omitempty"`
 }
 
 // CompanyStatus defines the observed state of Company.

pkg/company-controller/company_controller.go

@@ -153,19 +153,25 @@ func (r *CompanyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		}
 	}
 
+	var clustersMap map[string]string = make(map[string]string)
 	for _, cluster := range company.Spec.Clusters {
-
 		var serviceAccountTokenSecret v1.Secret
 		if err := r.Get(ctx, types.NamespacedName{Name: cluster.Connection.ServiceAccountToken.SecretRef, Namespace: company.Namespace}, &serviceAccountTokenSecret); err != nil {
 			log.Error(err, "unable to fetch cluster service account token Secret for Company")
 			continue
 		}
 		var serviceAccountToken = string(serviceAccountTokenSecret.Data[cluster.Connection.ServiceAccountToken.KeyRef])
 
-		if err := consoleClient.AddCompanyCluster(ctx, cluster, companyId, serviceAccountToken); err != nil {
+		if clusterId, err := consoleClient.AddCompanyCluster(ctx, cluster, companyId, serviceAccountToken); err != nil {
 			log.Error(err, "failed to add company cluster in Console", "companyName", companyName)
+		} else {
+			clustersMap[cluster.ClusterId] = clusterId
+			log.Info("Cluster added successfully to Company in Console", "companyName", companyName, "clusterId", clusterId)
 		}
-
+	}
+	log.Info("Clusters map: ", clustersMap)
+	if addEnvironmentsErr := consoleClient.AddCompanyEnvironments(ctx, company.Spec.Environments, companyId, clustersMap); addEnvironmentsErr != nil {
+		log.Error(addEnvironmentsErr, "failed to add company environments in Console", "companyName", companyName)
 	}
 
 	company.Status.CompanyId = companyId

pkg/console-client/console_client.go

@@ -221,7 +221,7 @@ func (c *Client) AddCompanyOwners(ctx context.Context, company corev1alpha1.Comp
 	return errors
 }
 
-func (c *Client) AddCompanyCluster(ctx context.Context, cluster corev1alpha1.Cluster, companyId string, serviceAccountToken string) error {
+func (c *Client) AddCompanyCluster(ctx context.Context, cluster corev1alpha1.Cluster, companyId string, serviceAccountToken string) (string, error) {
 
 	var log = log.Default()
 	addClusterURL := fmt.Sprintf("/api/tenants/%s/clusters/", companyId)
@@ -243,12 +243,33 @@ func (c *Client) AddCompanyCluster(ctx context.Context, cluster corev1alpha1.Clu
 	log.Printf("Adding cluster %s to company %s. Calling URL %s", cluster.ClusterId, companyId, addClusterURL)
 	log.Printf("Payload %s", clusterPayload)
 
-	if err := c.PostJSON(ctx, addClusterURL, clusterPayload, nil); err != nil {
+	var result struct {
+		ClusterId string `json:"_id"`
+	}
+	if err := c.PostJSON(ctx, addClusterURL, clusterPayload, &result); err != nil {
 		log.Printf("Error %s", err)
-		return err
+		return "", err
 	}
-	return nil
 
+	return result.ClusterId, nil
+}
+
+func (c *Client) AddCompanyEnvironments(ctx context.Context, environments []corev1alpha1.Environment, companyId string, clusters map[string]string) error {
+	var log = log.Default()
+	var addEnvPath = fmt.Sprintf("/tenants/%s/project-blueprint/environments", companyId)
+	var environmentsPayload []corev1alpha1.Environment = []corev1alpha1.Environment{}
+	for _, env := range environments {
+		clusterId, exists := clusters[env.Cluster.ClusterId]
+		if exists && clusterId != "" {
+			env.Cluster.ClusterId = clusterId
+			environmentsPayload = append(environmentsPayload, env)
+		} else {
+			log.Fatal("ClusterId not found for environment ", env.EnvId, " with cluster ", env.Cluster.ClusterId)
+		}
+	}
+	log.Printf("Adding environments to company %s. Calling URL %s", companyId, addEnvPath)
+	log.Printf("Payload %+v", environmentsPayload)
+	return c.PostJSON(ctx, addEnvPath, environmentsPayload, nil)
 }
 
 // PostJSON is a convenience method that performs POST and unmarshals JSON response