Fetch source and automation data for a given application (#497)

weaveworks · Jul 26, 2021 · 5cec865 · 5cec865
1 parent 3517c79
commit 5cec865
Show file tree

Hide file tree

Showing 14 changed files with 504 additions and 116 deletions.
diff --git a/api/applications/applications.proto b/api/applications/applications.proto
@@ -38,10 +38,22 @@ service Applications {
     }
 }
 
+// This object represents a single condition for a Kubernetes object.
+// It roughly matches the Kubernetes type defined here: https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#Condition
+message Condition {
+    string type      = 1;
+    string status    = 2;
+    string reason    = 3;
+    string message   = 4;
+    int32 timestamp = 5;
+}
+
 message Application {
-    string name = 1;  // The name of the application
-    string path = 2;  // The file path where the k8s yaml files for this application are stored.
-    string url  = 3;  // The git repository URL for this application
+    string   name                            = 1;  // The name of the application
+    string   path                            = 2;  // The file path where the k8s yaml files for this application are stored.
+    string   url                             = 3;  // The git repository URL for this application
+    repeated Condition source_conditions     = 4;  // A list of conditions for the Source related to this Application
+    repeated Condition deployment_conditions = 5;  // A list of conditions for the Kustomization or HelmRelease for this application
 }
 
 message ListApplicationsRequest {

diff --git a/api/applications/applications.swagger.json b/api/applications/applications.swagger.json
@@ -128,9 +128,43 @@
         },
         "url": {
           "type": "string"
+        },
+        "sourceConditions": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/v1Condition"
+          }
+        },
+        "deploymentConditions": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/v1Condition"
+          }
         }
       }
     },
+    "v1Condition": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string"
+        },
+        "status": {
+          "type": "string"
+        },
+        "reason": {
+          "type": "string"
+        },
+        "message": {
+          "type": "string"
+        },
+        "timestamp": {
+          "type": "integer",
+          "format": "int32"
+        }
+      },
+      "title": "This object represents a single condition for a Kubernetes object.\nIt roughly matches the Kubernetes type defined here: https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#Condition"
+    },
     "v1GetApplicationResponse": {
       "type": "object",
       "properties": {

diff --git a/api/v1alpha1/application_types.go b/api/v1alpha1/application_types.go
@@ -43,9 +43,19 @@ type ApplicationSpec struct {
 // +kubebuilder:validation:Enum=helm;kustomize
 type DeploymentType string
 
+const (
+	DeploymentTypeHelm      DeploymentType = "helm"
+	DeploymentTypeKustomize DeploymentType = "kustomize"
+)
+
 // +kubebuilder:validation:Enum=helm;git
 type SourceType string
 
+const (
+	SourceTypeGit  SourceType = "git"
+	SourceTypeHelm SourceType = "helm"
+)
+
 // ApplicationStatus defines the observed state of Application
 type ApplicationStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster

diff --git a/cmd/wego-server/main.go b/cmd/wego-server/main.go
@@ -13,7 +13,6 @@ import (
 	"github.com/spf13/cobra"
 	pb "github.com/weaveworks/weave-gitops/pkg/api/applications"
 	"github.com/weaveworks/weave-gitops/pkg/kube"
-	"github.com/weaveworks/weave-gitops/pkg/runner"
 	"github.com/weaveworks/weave-gitops/pkg/server"
 )
 
@@ -61,7 +60,12 @@ func StartServer() error {
 func RunInProcessGateway(ctx context.Context, addr string, opts ...runtime.ServeMuxOption) error {
 	mux := runtime.NewServeMux(opts...)
 
-	if err := pb.RegisterApplicationsHandlerServer(ctx, mux, server.NewApplicationsServer(kube.New(&runner.CLIRunner{}))); err != nil {
+	kubeClient, err := kube.NewKubeHTTPClient()
+	if err != nil {
+		return fmt.Errorf("could not create kube http client: %w", err)
+	}
+
+	if err := pb.RegisterApplicationsHandlerServer(ctx, mux, server.NewApplicationsServer(kubeClient)); err != nil {
 		return fmt.Errorf("could not register application: %w", err)
 	}
 	s := &http.Server{

diff --git a/cmd/wego/app/add/cmd.go b/cmd/wego/app/add/cmd.go
@@ -56,6 +56,7 @@ func init() {
 	Cmd.Flags().StringVar(&params.Path, "path", "./", "Path of files within git repository")
 	Cmd.Flags().StringVar(&params.Branch, "branch", "main", "Branch to watch within git repository")
 	Cmd.Flags().StringVar(&params.DeploymentType, "deployment-type", "kustomize", "deployment type [kustomize, helm]")
+	Cmd.Flags().StringVar(&params.SourceType, "source-type", "git", "source type [git, helm]")
 	Cmd.Flags().StringVar(&params.Chart, "chart", "", "Specify chart for helm source")
 	Cmd.Flags().StringVar(&params.PrivateKey, "private-key", "", "Private key to access git repository over ssh")
 	Cmd.Flags().StringVar(&params.AppConfigUrl, "app-config-url", "", "URL of external repository (if any) which will hold automation manifests; NONE to store only in the cluster")

diff --git a/go.mod b/go.mod
@@ -37,7 +37,7 @@ require (
 	k8s.io/apimachinery v0.21.2
 	k8s.io/client-go v0.21.2
 	sigs.k8s.io/controller-runtime v0.9.1
-	sigs.k8s.io/controller-tools v0.4.1 // indirect
+	sigs.k8s.io/controller-tools v0.4.1
 	sigs.k8s.io/yaml v1.2.0
 
 )