diff --git a/Dockerfile b/Dockerfile index 15a09a2..13faeba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,11 @@ COPY go.mod go.sum main.go /src/ COPY vendor /src/vendor/ COPY pkg /src/pkg/ RUN cd /src && \ - CGO_ENABLED=0 go build -ldflags "-extldflags -static -s" -o /naok -mod=vendor + CGO_ENABLED=0 go build -ldflags "-extldflags -static -s" -o /steve -mod=vendor FROM alpine RUN apk -U --no-cache add ca-certificates -COPY --from=build /naok /usr/bin/naok +COPY --from=build /steve /usr/bin/steve # Hack to make golang do files,dns search order ENV LOCALDOMAIN="" -ENTRYPOINT ["/usr/bin/naok"] +ENTRYPOINT ["/usr/bin/steve"] diff --git a/Makefile b/Makefile index 27ef58f..efb5ad8 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ build: - docker build -t naok . + docker build -t steve . run: build - docker run $(DOCKER_ARGS) --rm -p 8989:8080 -it -v ${HOME}/.kube:/root/.kube naok + docker run $(DOCKER_ARGS) --rm -p 8989:8080 -it -v ${HOME}/.kube:/root/.kube steve run-host: build - docker run $(DOCKER_ARGS) --net=host --uts=host --rm -it -v ${HOME}/.kube:/root/.kube naok --kubeconfig /root/.kube/config --listen-address :8989 + docker run $(DOCKER_ARGS) --net=host --uts=host --rm -it -v ${HOME}/.kube:/root/.kube steve --kubeconfig /root/.kube/config --listen-address :8989 diff --git a/go.mod b/go.mod index 0d3dde8..ad57c0d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/rancher/naok +module github.com/rancher/steve go 1.12 diff --git a/main.go b/main.go index 71ccc0c..88e2af9 100644 --- a/main.go +++ b/main.go @@ -5,8 +5,8 @@ import ( "flag" "os" - "github.com/rancher/naok/pkg/server" - "github.com/rancher/naok/pkg/version" + "github.com/rancher/steve/pkg/server" + "github.com/rancher/steve/pkg/version" "github.com/rancher/wrangler/pkg/signals" "github.com/sirupsen/logrus" "github.com/urfave/cli" @@ -19,7 +19,7 @@ var ( func main() { app := cli.NewApp() - app.Name = "naok" + app.Name = "steve" app.Version = version.FriendlyVersion() app.Usage = "" app.Flags = []cli.Flag{ diff --git a/pkg/accesscontrol/access_set.go b/pkg/accesscontrol/access_set.go index 72b745b..5210fd4 100644 --- a/pkg/accesscontrol/access_set.go +++ b/pkg/accesscontrol/access_set.go @@ -1,7 +1,7 @@ package accesscontrol import ( - "github.com/rancher/naok/pkg/attributes" + "github.com/rancher/steve/pkg/attributes" "github.com/rancher/norman/pkg/types" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/client/factory.go b/pkg/client/factory.go index 6bef8f7..b6f0ae0 100644 --- a/pkg/client/factory.go +++ b/pkg/client/factory.go @@ -1,7 +1,7 @@ package client import ( - "github.com/rancher/naok/pkg/attributes" + "github.com/rancher/steve/pkg/attributes" "github.com/rancher/norman/pkg/types" "k8s.io/client-go/dynamic" "k8s.io/client-go/rest" diff --git a/pkg/clustercache/controller.go b/pkg/clustercache/controller.go index f1133ad..e3a1021 100644 --- a/pkg/clustercache/controller.go +++ b/pkg/clustercache/controller.go @@ -8,8 +8,8 @@ import ( meta "k8s.io/apimachinery/pkg/api/meta" - "github.com/rancher/naok/pkg/attributes" - "github.com/rancher/naok/pkg/resources/schema" + "github.com/rancher/steve/pkg/attributes" + "github.com/rancher/steve/pkg/resources/schema" "github.com/rancher/norman/pkg/types" "github.com/rancher/wrangler/pkg/generic" "github.com/rancher/wrangler/pkg/merr" diff --git a/pkg/controllers/schema/schemas.go b/pkg/controllers/schema/schemas.go index 5e57f8f..4c4c816 100644 --- a/pkg/controllers/schema/schemas.go +++ b/pkg/controllers/schema/schemas.go @@ -6,9 +6,9 @@ import ( "sync/atomic" "time" - "github.com/rancher/naok/pkg/attributes" - schema2 "github.com/rancher/naok/pkg/resources/schema" - "github.com/rancher/naok/pkg/resources/schema/converter" + "github.com/rancher/steve/pkg/attributes" + schema2 "github.com/rancher/steve/pkg/resources/schema" + "github.com/rancher/steve/pkg/resources/schema/converter" "github.com/rancher/norman/pkg/types" apiextcontrollerv1beta1 "github.com/rancher/wrangler-api/pkg/generated/controllers/apiextensions.k8s.io/v1beta1" v1 "github.com/rancher/wrangler-api/pkg/generated/controllers/apiregistration.k8s.io/v1" diff --git a/pkg/resources/common/defaultcolumns.go b/pkg/resources/common/defaultcolumns.go index c4fc60a..d1788f2 100644 --- a/pkg/resources/common/defaultcolumns.go +++ b/pkg/resources/common/defaultcolumns.go @@ -1,8 +1,8 @@ package common import ( - "github.com/rancher/naok/pkg/attributes" - "github.com/rancher/naok/pkg/table" + "github.com/rancher/steve/pkg/attributes" + "github.com/rancher/steve/pkg/table" "github.com/rancher/norman/pkg/types" ) diff --git a/pkg/resources/common/formatter.go b/pkg/resources/common/formatter.go index 680b55e..7bc005e 100644 --- a/pkg/resources/common/formatter.go +++ b/pkg/resources/common/formatter.go @@ -1,7 +1,7 @@ package common import ( - "github.com/rancher/naok/pkg/resources/schema" + "github.com/rancher/steve/pkg/resources/schema" "github.com/rancher/norman/pkg/store/proxy" "github.com/rancher/norman/pkg/types" "github.com/rancher/norman/pkg/types/convert" diff --git a/pkg/resources/core/resources.go b/pkg/resources/core/resources.go index 4d5ee09..2f8e346 100644 --- a/pkg/resources/core/resources.go +++ b/pkg/resources/core/resources.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/rancher/naok/pkg/resources/common" - "github.com/rancher/naok/pkg/resources/schema" - "github.com/rancher/naok/pkg/table" + "github.com/rancher/steve/pkg/resources/common" + "github.com/rancher/steve/pkg/resources/schema" + "github.com/rancher/steve/pkg/table" "github.com/rancher/norman/pkg/data" "github.com/rancher/norman/pkg/types/convert" schema2 "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/resources/counts/counts.go b/pkg/resources/counts/counts.go index b1fe781..3a51384 100644 --- a/pkg/resources/counts/counts.go +++ b/pkg/resources/counts/counts.go @@ -7,9 +7,9 @@ import ( schema2 "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/rancher/naok/pkg/accesscontrol" - "github.com/rancher/naok/pkg/attributes" - "github.com/rancher/naok/pkg/clustercache" + "github.com/rancher/steve/pkg/accesscontrol" + "github.com/rancher/steve/pkg/attributes" + "github.com/rancher/steve/pkg/clustercache" "github.com/rancher/norman/pkg/store/empty" "github.com/rancher/norman/pkg/types" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/resources/schema.go b/pkg/resources/schema.go index 56bd26d..3c75613 100644 --- a/pkg/resources/schema.go +++ b/pkg/resources/schema.go @@ -1,14 +1,14 @@ package resources import ( - "github.com/rancher/naok/pkg/accesscontrol" - "github.com/rancher/naok/pkg/clustercache" - "github.com/rancher/naok/pkg/resources/apigroups" - "github.com/rancher/naok/pkg/resources/common" - "github.com/rancher/naok/pkg/resources/core" - "github.com/rancher/naok/pkg/resources/counts" - "github.com/rancher/naok/pkg/resources/helmrelease" - "github.com/rancher/naok/pkg/resources/schema" + "github.com/rancher/steve/pkg/accesscontrol" + "github.com/rancher/steve/pkg/clustercache" + "github.com/rancher/steve/pkg/resources/apigroups" + "github.com/rancher/steve/pkg/resources/common" + "github.com/rancher/steve/pkg/resources/core" + "github.com/rancher/steve/pkg/resources/counts" + "github.com/rancher/steve/pkg/resources/helmrelease" + "github.com/rancher/steve/pkg/resources/schema" "github.com/rancher/norman/pkg/store/apiroot" "github.com/rancher/norman/pkg/store/proxy" "github.com/rancher/norman/pkg/subscribe" diff --git a/pkg/resources/schema/collection.go b/pkg/resources/schema/collection.go index bfbc67b..8134742 100644 --- a/pkg/resources/schema/collection.go +++ b/pkg/resources/schema/collection.go @@ -3,9 +3,9 @@ package schema import ( "strings" - "github.com/rancher/naok/pkg/accesscontrol" - "github.com/rancher/naok/pkg/attributes" - "github.com/rancher/naok/pkg/table" + "github.com/rancher/steve/pkg/accesscontrol" + "github.com/rancher/steve/pkg/attributes" + "github.com/rancher/steve/pkg/table" "github.com/rancher/norman/pkg/data" "github.com/rancher/norman/pkg/types" "github.com/rancher/wrangler/pkg/name" diff --git a/pkg/resources/schema/converter/crd.go b/pkg/resources/schema/converter/crd.go index 3eacfc6..c249316 100644 --- a/pkg/resources/schema/converter/crd.go +++ b/pkg/resources/schema/converter/crd.go @@ -1,8 +1,8 @@ package converter import ( - "github.com/rancher/naok/pkg/attributes" - "github.com/rancher/naok/pkg/table" + "github.com/rancher/steve/pkg/attributes" + "github.com/rancher/steve/pkg/table" "github.com/rancher/norman/pkg/types" "github.com/rancher/wrangler-api/pkg/generated/controllers/apiextensions.k8s.io/v1beta1" beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" diff --git a/pkg/resources/schema/converter/discovery.go b/pkg/resources/schema/converter/discovery.go index c53ab55..9794991 100644 --- a/pkg/resources/schema/converter/discovery.go +++ b/pkg/resources/schema/converter/discovery.go @@ -3,7 +3,7 @@ package converter import ( "strings" - "github.com/rancher/naok/pkg/attributes" + "github.com/rancher/steve/pkg/attributes" "github.com/rancher/norman/pkg/types" "github.com/rancher/wrangler/pkg/merr" "github.com/sirupsen/logrus" diff --git a/pkg/resources/schema/converter/openapi.go b/pkg/resources/schema/converter/openapi.go index 02617cf..3e0f138 100644 --- a/pkg/resources/schema/converter/openapi.go +++ b/pkg/resources/schema/converter/openapi.go @@ -1,7 +1,7 @@ package converter import ( - "github.com/rancher/naok/pkg/attributes" + "github.com/rancher/steve/pkg/attributes" "github.com/rancher/norman/pkg/types" "github.com/rancher/norman/pkg/types/convert" "github.com/sirupsen/logrus" diff --git a/pkg/resources/schema/factory.go b/pkg/resources/schema/factory.go index 390c267..1b3cb22 100644 --- a/pkg/resources/schema/factory.go +++ b/pkg/resources/schema/factory.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/rancher/naok/pkg/table" + "github.com/rancher/steve/pkg/table" - "github.com/rancher/naok/pkg/accesscontrol" - "github.com/rancher/naok/pkg/attributes" + "github.com/rancher/steve/pkg/accesscontrol" + "github.com/rancher/steve/pkg/attributes" "github.com/rancher/norman/pkg/api/builtin" "github.com/rancher/norman/pkg/types" "k8s.io/apiserver/pkg/authentication/user" diff --git a/pkg/server/publicapi/apiserver.go b/pkg/server/publicapi/apiserver.go index 5ecd637..4756108 100644 --- a/pkg/server/publicapi/apiserver.go +++ b/pkg/server/publicapi/apiserver.go @@ -5,10 +5,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/rancher/naok/pkg/accesscontrol" - k8sproxy "github.com/rancher/naok/pkg/proxy" - "github.com/rancher/naok/pkg/resources/schema" - "github.com/rancher/naok/pkg/server/router" + "github.com/rancher/steve/pkg/accesscontrol" + k8sproxy "github.com/rancher/steve/pkg/proxy" + "github.com/rancher/steve/pkg/resources/schema" + "github.com/rancher/steve/pkg/server/router" "github.com/rancher/norman/pkg/api" "github.com/rancher/norman/pkg/types" "github.com/rancher/norman/pkg/urlbuilder" diff --git a/pkg/server/publicapi/handlers.go b/pkg/server/publicapi/handlers.go index a8e8b7f..8562638 100644 --- a/pkg/server/publicapi/handlers.go +++ b/pkg/server/publicapi/handlers.go @@ -2,8 +2,8 @@ package publicapi import ( "github.com/gorilla/mux" - "github.com/rancher/naok/pkg/attributes" - "github.com/rancher/naok/pkg/resources/schema" + "github.com/rancher/steve/pkg/attributes" + "github.com/rancher/steve/pkg/resources/schema" "github.com/rancher/norman/pkg/types" runtimeschema "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/server/server.go b/pkg/server/server.go index 0872299..22d1f33 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -5,12 +5,12 @@ import ( "github.com/rancher/norman/pkg/auth" "net/http" - "github.com/rancher/naok/pkg/accesscontrol" - "github.com/rancher/naok/pkg/client" - "github.com/rancher/naok/pkg/clustercache" - "github.com/rancher/naok/pkg/controllers/schema" - "github.com/rancher/naok/pkg/resources" - "github.com/rancher/naok/pkg/server/publicapi" + "github.com/rancher/steve/pkg/accesscontrol" + "github.com/rancher/steve/pkg/client" + "github.com/rancher/steve/pkg/clustercache" + "github.com/rancher/steve/pkg/controllers/schema" + "github.com/rancher/steve/pkg/resources" + "github.com/rancher/steve/pkg/server/publicapi" "github.com/rancher/wrangler-api/pkg/generated/controllers/apiextensions.k8s.io" "github.com/rancher/wrangler-api/pkg/generated/controllers/apiregistration.k8s.io" "github.com/rancher/wrangler-api/pkg/generated/controllers/core" diff --git a/pkg/table/mapper.go b/pkg/table/mapper.go index d59a888..c9adc90 100644 --- a/pkg/table/mapper.go +++ b/pkg/table/mapper.go @@ -1,7 +1,7 @@ package table import ( - "github.com/rancher/naok/pkg/attributes" + "github.com/rancher/steve/pkg/attributes" "github.com/rancher/norman/pkg/data" "github.com/rancher/norman/pkg/types" )