diff --git a/Makefile b/Makefile index c91f765e..df4a480d 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ all: bin .PHONY: bin bin: - CGO_ENABLED=0 go build ${BUILD_FLAGS} -o kompose main.go + CGO_ENABLED=0 GO111MODULE=off go build ${BUILD_FLAGS} -o kompose main.go .PHONY: install install: diff --git a/cmd/down.go b/cmd/down.go index 44a09742..3fe216a0 100644 --- a/cmd/down.go +++ b/cmd/down.go @@ -29,6 +29,9 @@ var ( DownNamespace string DownController string DownOpt kobject.ConvertOptions + + // DownServer allow use to choose different kubernetes server url + DownServer string ) var downCmd = &cobra.Command{ @@ -44,6 +47,7 @@ var downCmd = &cobra.Command{ Namespace: DownNamespace, Controller: strings.ToLower(DownController), IsNamespaceFlag: cmd.Flags().Lookup("namespace").Changed, + Server: DownServer, } // Validate before doing anything else. @@ -57,5 +61,6 @@ var downCmd = &cobra.Command{ func init() { downCmd.Flags().StringVar(&DownNamespace, "namespace", "default", " Specify Namespace to deploy your application") downCmd.Flags().StringVar(&DownController, "controller", "", `Set the output controller ("deployment"|"daemonSet"|"replicationController")`) + downCmd.Flags().StringVar(&DownServer, "server", "https://127.0.0.1:6443", "kubernetes apiserver url") RootCmd.AddCommand(downCmd) } diff --git a/cmd/up.go b/cmd/up.go index b65efcaa..e83be4af 100644 --- a/cmd/up.go +++ b/cmd/up.go @@ -94,7 +94,7 @@ func init() { upCmd.Flags().BoolVar(&UpPushImage, "push-image", true, "If we should push the docker image we built") upCmd.Flags().BoolVar(&StoreManifest, "store-manifest", false, "Store the generated manifest (default false)") upCmd.Flags().StringVar(&UpController, "controller", "", `Set the output controller ("deployment"|"daemonSet"|"replicationController")`) - upCmd.Flags().StringVar(&UpServer, "server", "", "kubernetes apiserver url (default https://127.0.0.1:6443)") + upCmd.Flags().StringVar(&UpServer, "server", "https://127.0.0.1:6443", "kubernetes apiserver url") upCmd.Flags().MarkHidden("insecure-repository") upCmd.Flags().MarkHidden("build-repo") upCmd.Flags().MarkHidden("build-branch") diff --git a/docs/user-guide.md b/docs/user-guide.md index 6cf83ee9..7038b4c0 100644 --- a/docs/user-guide.md +++ b/docs/user-guide.md @@ -185,6 +185,7 @@ INFO Successfully deleted deployment: frontend ``` Note: - You must have a running Kubernetes cluster with a pre-configured kubectl context. +- If you kubernetes api server url is different than https://127.0.0.1:6443, you can use the --server flag to customize it. ## Build and Push Docker Images