diff --git a/pkg/server/cli/clicontext.go b/pkg/server/cli/clicontext.go index 170e870..ac0f31b 100644 --- a/pkg/server/cli/clicontext.go +++ b/pkg/server/cli/clicontext.go @@ -11,7 +11,6 @@ type Config struct { KubeConfig string HTTPSListenPort int HTTPListenPort int - Namespace string WebhookConfig authcli.WebhookConfig } @@ -36,7 +35,6 @@ func (c *Config) ToServer() (*server.Server, error) { } return &server.Server{ - Namespace: c.Namespace, RestConfig: restConfig, AuthMiddleware: auth, }, nil @@ -59,12 +57,6 @@ func Flags(config *Config) []cli.Flag { Value: 8080, Destination: &config.HTTPListenPort, }, - cli.StringFlag{ - Name: "namespace", - EnvVar: "NAMESPACE", - Value: "steve", - Destination: &config.Namespace, - }, } return append(flags, authcli.Flags(&config.WebhookConfig)...) diff --git a/pkg/server/config.go b/pkg/server/config.go index 666bf1a..601e08a 100644 --- a/pkg/server/config.go +++ b/pkg/server/config.go @@ -29,7 +29,6 @@ type Server struct { RestConfig *rest.Config - Namespace string BaseSchemas *types.APISchemas AccessSetLookup accesscontrol.AccessSetLookup SchemaTemplates []schema.Template diff --git a/pkg/server/server.go b/pkg/server/server.go index 2b7b852..4ba353f 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -23,10 +23,6 @@ func setDefaults(server *Server) error { return ErrConfigRequired } - if server.Namespace == "" { - server.Namespace = "steve" - } - if server.Controllers == nil { var err error server.Controllers, err = NewController(server.RestConfig)