wip

Signed-off-by: Chris Martin <[email protected]>
armadaproject · Feb 12, 2024 · 992cc1c · 992cc1c
1 parent e84e073
commit 992cc1c
Show file tree

Hide file tree

Showing 27 changed files with 14 additions and 1,073 deletions.
diff --git a/build/queryapi/Dockerfile b/build/queryapi/Dockerfile
diff --git a/build_goreleaser/queryapi/Dockerfile b/build_goreleaser/queryapi/Dockerfile
diff --git a/deployment/queryapi/Chart.yaml b/deployment/queryapi/Chart.yaml
diff --git a/deployment/queryapi/templates/_helpers.tpl b/deployment/queryapi/templates/_helpers.tpl
diff --git a/deployment/queryapi/templates/deployment.yaml b/deployment/queryapi/templates/deployment.yaml
diff --git a/deployment/queryapi/templates/ingress.yaml b/deployment/queryapi/templates/ingress.yaml
diff --git a/deployment/queryapi/templates/secret.yaml b/deployment/queryapi/templates/secret.yaml
diff --git a/deployment/queryapi/templates/service.yaml b/deployment/queryapi/templates/service.yaml
diff --git a/deployment/queryapi/templates/serviceaccount.yaml b/deployment/queryapi/templates/serviceaccount.yaml
diff --git a/deployment/queryapi/values.yaml b/deployment/queryapi/values.yaml
diff --git a/internal/armada/permissions/permissions.go b/internal/armada/permissions/permissions.go
@@ -12,6 +12,5 @@ const (
 	WatchAllEvents                            = "watch_all_events"
 	CreateQueue                               = "create_queue"
 	DeleteQueue                               = "delete_queue"
-	ExecuteJobs                               = "execute_jobs"
 	CordonNodes                               = "cordon_nodes"
 )
diff --git a/internal/queryapi/database/db.go → internal/armada/queryapi/database/db.go b/internal/queryapi/database/db.go → internal/armada/queryapi/database/db.go
diff --git a/internal/queryapi/database/models.go → internal/armada/queryapi/database/models.go b/internal/queryapi/database/models.go → internal/armada/queryapi/database/models.go
diff --git a/internal/queryapi/database/query.sql → internal/armada/queryapi/database/query.sql b/internal/queryapi/database/query.sql → internal/armada/queryapi/database/query.sql
diff --git a/internal/queryapi/database/query.sql.go → ...nal/armada/queryapi/database/query.sql.go b/internal/queryapi/database/query.sql.go → ...nal/armada/queryapi/database/query.sql.go
diff --git a/internal/queryapi/database/sql.yaml → internal/armada/queryapi/database/sql.yaml b/internal/queryapi/database/sql.yaml → internal/armada/queryapi/database/sql.yaml
diff --git a/internal/queryapi/server/query_api.go → internal/armada/queryapi/query_api.go b/internal/queryapi/server/query_api.go → internal/armada/queryapi/query_api.go
@@ -1,12 +1,12 @@
-package server
+package queryapi
 
 import (
 	"context"
 
 	"github.com/jackc/pgx/v5/pgxpool"
 
+	"github.com/armadaproject/armada/internal/armada/queryapi/database"
 	"github.com/armadaproject/armada/internal/common/database/lookout"
-	"github.com/armadaproject/armada/internal/queryapi/database"
 	"github.com/armadaproject/armada/pkg/queryapi"
 )
 

diff --git a/internal/queryapi/server/query_api_test.go → internal/armada/queryapi/query_api_test.go b/internal/queryapi/server/query_api_test.go → internal/armada/queryapi/query_api_test.go
@@ -1,4 +1,4 @@
-package server
+package queryapi
 
 import (
 	"context"

diff --git a/internal/armada/server.go b/internal/armada/server.go
@@ -3,6 +3,7 @@ package armada
 import (
 	"context"
 	"fmt"
+	"github.com/armadaproject/armada/internal/armada/queryapi"
 	"math"
 	"net"
 	"time"
@@ -256,8 +257,15 @@ func Serve(ctx *armadacontext.Context, config *configuration.ArmadaConfig, healt
 		jobRepository,
 	)
 
+	queryDb, err := database.OpenPgxPool(config.Postgres)
+	if err != nil {
+		return errors.WithMessage(err, "error creating postgres pool")
+	}
+	queryapiServer := queryapi.New(queryDb)
+
 	api.RegisterSubmitServer(grpcServer, pulsarSubmitServer)
 	api.RegisterEventServer(grpcServer, eventServer)
+	api.RegisterQueryApiServer(grpcServer, queryapiServer)
 	schedulerobjects.RegisterSchedulerReportingServer(grpcServer, schedulingReportsServer)
 	grpc_prometheus.Register(grpcServer)