init apps modules #14 #15

Clivern · Apr 19, 2020 · 5506e56 · 5506e56
1 parent 8d83e69
commit 5506e56
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 3 deletions.
diff --git a/internal/app/controller/cluster.go b/internal/app/controller/cluster.go
@@ -40,6 +40,8 @@ func Cluster(c *gin.Context) {
 		}).Error(fmt.Sprintf(`Error: %s`, err.Error()))
 	}
 
+	cluster.GetDeployments(context.Background(), "default", "app.clivern.com/managed-by=beetle")
+
 	result.Name = cluster.Name
 	result.Health = status
 

diff --git a/internal/app/kubernetes/application.go b/internal/app/kubernetes/application.go
@@ -5,10 +5,48 @@
 package kubernetes
 
 import (
+	"fmt"
 	"context"
+
+	"github.com/clivern/beetle/internal/app/model"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // GetApplicationVersion gets current application version
-func (c *Cluster) GetApplicationVersion(ctx context.Context, namespace, appID, imageFormat string) (string, error) {
-	return appID, nil
+func (c *Cluster) GetApplicationVersion(ctx context.Context, namespace, id, format string) (string, error) {
+	err := c.Config()
+
+	if err != nil {
+		return id, err
+	}
+
+	data, err := c.ClientSet.AppsV1().Deployments(namespace).List(ctx, metav1.ListOptions{
+		LabelSelector: fmt.Sprintf(
+			"%s=%s,%s=%s",
+			"app.clivern.com/managed-by",
+			"beetle",
+			"app.clivern.com/application-id",
+			id,
+		),
+	})
+
+	if err != nil {
+		return id, err
+	}
+
+	for _, deployment := range data.Items {
+		fmt.Printf("%+v\n", deployment.Spec.Template.Spec.Containers)
+
+
+
+		result = append(result, model.Deployment{
+			Name: deployment.ObjectMeta.Name,
+			UID: string(deployment.ObjectMeta.UID),
+		})
+	}
+
+	return result, nil
+
+	return id, nil
 }
diff --git a/internal/app/kubernetes/deployment.go b/internal/app/kubernetes/deployment.go
@@ -5,6 +5,7 @@
 package kubernetes
 
 import (
+	"fmt"
 	"context"
 
 	"github.com/clivern/beetle/internal/app/model"
@@ -13,7 +14,7 @@ import (
 )
 
 // GetDeployments gets a list of deployments
-func (c *Cluster) GetDeployments(ctx context.Context, namespace string, label string) ([]model.Deployment, error) {
+func (c *Cluster) GetDeployments(ctx context.Context, namespace, label string) ([]model.Deployment, error) {
 	result := []model.Deployment{}
 
 	err := c.Config()
@@ -31,8 +32,10 @@ func (c *Cluster) GetDeployments(ctx context.Context, namespace string, label st
 	}
 
 	for _, deployment := range data.Items {
+		fmt.Printf("%+v\n", deployment.Spec.Template.Spec.Containers)
 		result = append(result, model.Deployment{
 			Name: deployment.ObjectMeta.Name,
+			UID: string(deployment.ObjectMeta.UID),
 		})
 	}
 
@@ -56,6 +59,7 @@ func (c *Cluster) GetDeployment(ctx context.Context, namespace, name string) (mo
 	}
 
 	result.Name = deployment.ObjectMeta.Name
+	result.UID = string(deployment.ObjectMeta.UID)
 
 	return result, nil
 }
diff --git a/internal/app/model/configs.go b/internal/app/model/configs.go
@@ -14,6 +14,7 @@ type Application struct {
 	Name         string `yaml:"name"`
 	ImageFormat  string `yaml:"imageFormat"`
 	CurrentImage string `yaml:"currentImage"`
+	Deployment   []Deployment `yaml:"deployment"`
 }
 
 // Configs struct

diff --git a/internal/app/model/deployment.go b/internal/app/model/deployment.go
@@ -11,6 +11,7 @@ import (
 // Deployment struct
 type Deployment struct {
 	Name string `json:"name"`
+	UID  string `json:"uid"`
 }
 
 // LoadFromJSON update object from json