Rename package to Armada. (#181)

armadaproject · Oct 18, 2019 · be37e03 · be37e03
1 parent ff7aeb5
commit be37e03
Show file tree

Hide file tree

Showing 62 changed files with 160 additions and 176 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -30,7 +30,7 @@ jobs:
       GO111MODULE: "on"
       GOPATH: "/home/circleci/go"
       GOCACHE: "/home/circleci/go/cache"
-    working_directory: ~/go/src/github.com/G-Research/k8s-batch
+    working_directory: ~/go/src/github.com/G-Research/armada
     steps:
       - checkout
       - run: e2e/setup/setup_environment.sh
@@ -49,7 +49,7 @@ jobs:
       - run:
           name: Check formatting
           command: |
-            exit $(go run golang.org/x/tools/cmd/goimports -l -local "github.com/G-Research/k8s-batch" . | wc -l)
+            exit $(go run golang.org/x/tools/cmd/goimports -l -local "github.com/G-Research/armada" . | wc -l)
 
       - run:
           name: Build & Run e2e tests
@@ -88,7 +88,7 @@ jobs:
   deploy:
     docker:
       - image: alpine/helm:2.13.1
-    working_directory: /go/src/github.com/G-Research/k8s-batch
+    working_directory: /go/src/github.com/G-Research/armada
     steps:
       - checkout
       - run:

diff --git a/cmd/armada-load-tester/cmd/loadtest.go b/cmd/armada-load-tester/cmd/loadtest.go
@@ -4,10 +4,10 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/G-Research/k8s-batch/internal/client"
-	"github.com/G-Research/k8s-batch/internal/client/domain"
-	"github.com/G-Research/k8s-batch/internal/client/service"
-	"github.com/G-Research/k8s-batch/internal/client/util"
+	"github.com/G-Research/armada/internal/client"
+	"github.com/G-Research/armada/internal/client/domain"
+	"github.com/G-Research/armada/internal/client/service"
+	"github.com/G-Research/armada/internal/client/util"
 )
 
 func init() {

diff --git a/cmd/armada-load-tester/cmd/root.go b/cmd/armada-load-tester/cmd/root.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/G-Research/k8s-batch/internal/client"
+	"github.com/G-Research/armada/internal/client"
 )
 
 func init() {

diff --git a/cmd/armada-load-tester/main.go b/cmd/armada-load-tester/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/G-Research/k8s-batch/cmd/armada-load-tester/cmd"
-	"github.com/G-Research/k8s-batch/internal/common"
+	"github.com/G-Research/armada/cmd/armada-load-tester/cmd"
+	"github.com/G-Research/armada/internal/common"
 )
 
 func main() {

diff --git a/cmd/armada/main.go b/cmd/armada/main.go
@@ -9,9 +9,9 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
-	"github.com/G-Research/k8s-batch/internal/armada"
-	"github.com/G-Research/k8s-batch/internal/armada/configuration"
-	"github.com/G-Research/k8s-batch/internal/common"
+	"github.com/G-Research/armada/internal/armada"
+	"github.com/G-Research/armada/internal/armada/configuration"
+	"github.com/G-Research/armada/internal/common"
 )
 
 const CustomConfigLocation string = "config"

diff --git a/cmd/armadactl/cmd/analyze.go b/cmd/armadactl/cmd/analyze.go
@@ -10,10 +10,10 @@ import (
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
-	"github.com/G-Research/k8s-batch/internal/client"
-	"github.com/G-Research/k8s-batch/internal/client/service"
-	"github.com/G-Research/k8s-batch/internal/client/util"
+	"github.com/G-Research/armada/internal/armada/api"
+	"github.com/G-Research/armada/internal/client"
+	"github.com/G-Research/armada/internal/client/service"
+	"github.com/G-Research/armada/internal/client/util"
 )
 
 func init() {

diff --git a/cmd/armadactl/cmd/cancel.go b/cmd/armadactl/cmd/cancel.go
@@ -3,10 +3,10 @@ package cmd
 import (
 	"strings"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
-	"github.com/G-Research/k8s-batch/internal/client"
-	"github.com/G-Research/k8s-batch/internal/client/util"
-	"github.com/G-Research/k8s-batch/internal/common"
+	"github.com/G-Research/armada/internal/armada/api"
+	"github.com/G-Research/armada/internal/client"
+	"github.com/G-Research/armada/internal/client/util"
+	"github.com/G-Research/armada/internal/common"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

diff --git a/cmd/armadactl/cmd/createQueue.go b/cmd/armadactl/cmd/createQueue.go
@@ -5,10 +5,10 @@ import (
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
-	"github.com/G-Research/k8s-batch/internal/client"
-	"github.com/G-Research/k8s-batch/internal/client/service"
-	"github.com/G-Research/k8s-batch/internal/client/util"
+	"github.com/G-Research/armada/internal/armada/api"
+	"github.com/G-Research/armada/internal/client"
+	"github.com/G-Research/armada/internal/client/service"
+	"github.com/G-Research/armada/internal/client/util"
 )
 
 func init() {

diff --git a/cmd/armadactl/cmd/root.go b/cmd/armadactl/cmd/root.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/G-Research/k8s-batch/internal/client"
+	"github.com/G-Research/armada/internal/client"
 )
 
 func init() {

diff --git a/cmd/armadactl/cmd/submit.go b/cmd/armadactl/cmd/submit.go
@@ -5,10 +5,10 @@ import (
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
-	"github.com/G-Research/k8s-batch/internal/client"
-	"github.com/G-Research/k8s-batch/internal/client/service"
-	"github.com/G-Research/k8s-batch/internal/client/util"
+	"github.com/G-Research/armada/internal/armada/api"
+	"github.com/G-Research/armada/internal/client"
+	"github.com/G-Research/armada/internal/client/service"
+	"github.com/G-Research/armada/internal/client/util"
 )
 
 func init() {

diff --git a/cmd/armadactl/cmd/watch.go b/cmd/armadactl/cmd/watch.go
@@ -11,10 +11,10 @@ import (
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
-	"github.com/G-Research/k8s-batch/internal/client"
-	"github.com/G-Research/k8s-batch/internal/client/service"
-	"github.com/G-Research/k8s-batch/internal/client/util"
+	"github.com/G-Research/armada/internal/armada/api"
+	"github.com/G-Research/armada/internal/client"
+	"github.com/G-Research/armada/internal/client/service"
+	"github.com/G-Research/armada/internal/client/util"
 )
 
 func init() {

diff --git a/cmd/armadactl/main.go b/cmd/armadactl/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/G-Research/k8s-batch/cmd/armadactl/cmd"
-	"github.com/G-Research/k8s-batch/internal/common"
+	"github.com/G-Research/armada/cmd/armadactl/cmd"
+	"github.com/G-Research/armada/internal/common"
 )
 
 func main() {

diff --git a/cmd/executor/main.go b/cmd/executor/main.go
@@ -9,9 +9,9 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
-	"github.com/G-Research/k8s-batch/internal/common"
-	"github.com/G-Research/k8s-batch/internal/executor"
-	"github.com/G-Research/k8s-batch/internal/executor/configuration"
+	"github.com/G-Research/armada/internal/common"
+	"github.com/G-Research/armada/internal/executor"
+	"github.com/G-Research/armada/internal/executor/configuration"
 )
 
 const CustomConfigLocation string = "config"

diff --git a/e2e/test/basic_test.go b/e2e/test/basic_test.go
@@ -13,11 +13,11 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
-	"github.com/G-Research/k8s-batch/internal/client/domain"
-	"github.com/G-Research/k8s-batch/internal/client/service"
-	util2 "github.com/G-Research/k8s-batch/internal/client/util"
-	"github.com/G-Research/k8s-batch/internal/common/util"
+	"github.com/G-Research/armada/internal/armada/api"
+	"github.com/G-Research/armada/internal/client/domain"
+	"github.com/G-Research/armada/internal/client/service"
+	util2 "github.com/G-Research/armada/internal/client/util"
+	"github.com/G-Research/armada/internal/common/util"
 )
 
 const integrationEnabledEnvVar = "INTEGRATION_ENABLED"

diff --git a/go.mod b/go.mod
@@ -1,47 +1,29 @@
-module github.com/G-Research/k8s-batch
+module github.com/G-Research/armada
 
 go 1.12
 
 require (
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
-	github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 // indirect
-	github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6 // indirect
+	github.com/G-Research/k8s-batch v0.0.0-20191017134930-ff7aeb58efa2 // indirect
 	github.com/alicebob/miniredis v2.5.0+incompatible
 	github.com/coreos/go-oidc v2.1.0+incompatible
 	github.com/go-redis/redis v6.15.4+incompatible
 	github.com/gogo/protobuf v1.2.1
-	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
-	github.com/gomodule/redigo v2.0.0+incompatible // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
-	github.com/hashicorp/golang-lru v0.5.3 // indirect
-	github.com/imdario/mergo v0.3.7 // indirect
-	github.com/json-iterator/go v1.1.7 // indirect
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/magiconair/properties v1.8.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/oklog/ulid v1.3.1
-	github.com/pelletier/go-toml v1.4.0 // indirect
-	github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
 	github.com/prometheus/client_golang v1.0.0
 	github.com/prometheus/common v0.6.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.5
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.3
 	github.com/spf13/viper v1.4.0
 	github.com/stretchr/testify v1.4.0
 	github.com/weaveworks/promrus v1.2.0
-	github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036 // indirect
-	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
-	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 // indirect
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
-	golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3 // indirect
-	google.golang.org/appengine v1.6.1 // indirect
 	google.golang.org/grpc v1.23.1
 	gopkg.in/square/go-jose.v2 v2.3.1
 	k8s.io/api v0.0.0-20190620084959-7cf5895f2711
 	k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
 	k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
-	k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a // indirect
 )
diff --git a/go.sum b/go.sum
@@ -3,6 +3,8 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/G-Research/k8s-batch v0.0.0-20191017134930-ff7aeb58efa2 h1:Tq8A0CaxMLN1CqQ29b00HHiA92biDyGDVOf8I2TNViQ=
+github.com/G-Research/k8s-batch v0.0.0-20191017134930-ff7aeb58efa2/go.mod h1:9qfkRSozuSgIiVXt+jdTXion3MC1L5+qWYmBKlSObWU=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=

diff --git a/internal/armada/authorization/basic.go b/internal/armada/authorization/basic.go
@@ -5,7 +5,7 @@ import (
 
 	"google.golang.org/grpc/metadata"
 
-	"github.com/G-Research/k8s-batch/internal/common"
+	"github.com/G-Research/armada/internal/common"
 )
 
 type BasicAuthService struct {

diff --git a/internal/armada/authorization/basic_test.go b/internal/armada/authorization/basic_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/metadata"
 
-	"github.com/G-Research/k8s-batch/internal/common"
+	"github.com/G-Research/armada/internal/common"
 )
 
 func TestBasicAuthService(t *testing.T) {

diff --git a/internal/armada/authorization/common.go b/internal/armada/authorization/common.go
@@ -7,7 +7,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/G-Research/k8s-batch/internal/common/util"
+	"github.com/G-Research/armada/internal/common/util"
 )
 
 var (

diff --git a/internal/armada/authorization/oidc.go b/internal/armada/authorization/oidc.go
@@ -9,7 +9,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/G-Research/k8s-batch/internal/armada/configuration"
+	"github.com/G-Research/armada/internal/armada/configuration"
 )
 
 type PermissionClaimQueries map[Permission]string

diff --git a/internal/armada/metrics/metrics.go b/internal/armada/metrics/metrics.go
@@ -4,9 +4,9 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
-	"github.com/G-Research/k8s-batch/internal/armada/repository"
-	"github.com/G-Research/k8s-batch/internal/common/util"
+	"github.com/G-Research/armada/internal/armada/api"
+	"github.com/G-Research/armada/internal/armada/repository"
+	"github.com/G-Research/armada/internal/common/util"
 )
 
 const metricPrefix = "armada_"

diff --git a/internal/armada/repository/event.go b/internal/armada/repository/event.go
@@ -6,7 +6,7 @@ import (
 	"github.com/go-redis/redis"
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
+	"github.com/G-Research/armada/internal/armada/api"
 )
 
 const eventStreamPrefix = "Events:"

diff --git a/internal/armada/repository/job.go b/internal/armada/repository/job.go
@@ -9,8 +9,8 @@ import (
 	"github.com/gogo/protobuf/proto"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
-	"github.com/G-Research/k8s-batch/internal/common/util"
+	"github.com/G-Research/armada/internal/armada/api"
+	"github.com/G-Research/armada/internal/common/util"
 )
 
 const jobObjectPrefix = "Job:"

diff --git a/internal/armada/repository/job_test.go b/internal/armada/repository/job_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	v1 "k8s.io/api/core/v1"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
+	"github.com/G-Research/armada/internal/armada/api"
 )
 
 func TestJobCanBeLeasedOnlyOnce(t *testing.T) {

diff --git a/internal/armada/repository/queue.go b/internal/armada/repository/queue.go
@@ -4,7 +4,7 @@ import (
 	"github.com/go-redis/redis"
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
+	"github.com/G-Research/armada/internal/armada/api"
 )
 
 const queueHashKey = "Queue"

diff --git a/internal/armada/repository/usage.go b/internal/armada/repository/usage.go
@@ -6,7 +6,7 @@ import (
 	"github.com/go-redis/redis"
 	"github.com/gogo/protobuf/proto"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
+	"github.com/G-Research/armada/internal/armada/api"
 )
 
 type Usage struct {

diff --git a/internal/armada/server.go b/internal/armada/server.go
@@ -14,13 +14,13 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/keepalive"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
-	"github.com/G-Research/k8s-batch/internal/armada/authorization"
-	"github.com/G-Research/k8s-batch/internal/armada/configuration"
-	"github.com/G-Research/k8s-batch/internal/armada/metrics"
-	"github.com/G-Research/k8s-batch/internal/armada/repository"
-	"github.com/G-Research/k8s-batch/internal/armada/server"
-	"github.com/G-Research/k8s-batch/internal/armada/service"
+	"github.com/G-Research/armada/internal/armada/api"
+	"github.com/G-Research/armada/internal/armada/authorization"
+	"github.com/G-Research/armada/internal/armada/configuration"
+	"github.com/G-Research/armada/internal/armada/metrics"
+	"github.com/G-Research/armada/internal/armada/repository"
+	"github.com/G-Research/armada/internal/armada/server"
+	"github.com/G-Research/armada/internal/armada/service"
 )
 
 func Serve(config *configuration.ArmadaConfig) (*grpc.Server, *sync.WaitGroup) {

diff --git a/internal/armada/server/event.go b/internal/armada/server/event.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
-	"github.com/G-Research/k8s-batch/internal/armada/repository"
+	"github.com/G-Research/armada/internal/armada/api"
+	"github.com/G-Research/armada/internal/armada/repository"
 
 	"github.com/gogo/protobuf/types"
 )

diff --git a/internal/armada/server/event_test.go b/internal/armada/server/event_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 
-	"github.com/G-Research/k8s-batch/internal/armada/api"
-	"github.com/G-Research/k8s-batch/internal/armada/repository"
+	"github.com/G-Research/armada/internal/armada/api"
+	"github.com/G-Research/armada/internal/armada/repository"
 )
 
 func TestEventServer_ReportUsage(t *testing.T) {