From bd1aa83a57a03e9eb48b8eada28a67f5bdf665a4 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Mon, 18 Dec 2017 19:39:08 -0500 Subject: [PATCH] Correctly detect env from ctx (#346) #345 --- cloud/providers/azure/cloud.go | 3 +-- cloud/providers/vultr/cloud.go | 3 +-- docs/cloud/aws/README.md | 2 +- docs/cloud/azure/README.md | 2 +- docs/cloud/digitalocean/README.md | 2 +- docs/cloud/lightsail/README.md | 2 +- docs/cloud/linode/README.md | 2 +- docs/cloud/packet/README.md | 2 +- docs/cloud/scaleway/README.md | 2 +- docs/cloud/vultr/README.md | 2 +- docs/developer-guide/README.md | 2 +- 11 files changed, 11 insertions(+), 13 deletions(-) diff --git a/cloud/providers/azure/cloud.go b/cloud/providers/azure/cloud.go index e234ba00..439460f1 100644 --- a/cloud/providers/azure/cloud.go +++ b/cloud/providers/azure/cloud.go @@ -16,7 +16,6 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/adal" "github.com/Azure/go-autorest/autorest/azure" - _env "github.com/appscode/go/env" "github.com/appscode/go/errors" . "github.com/appscode/go/types" api "github.com/pharmer/pharmer/apis/v1alpha1" @@ -573,7 +572,7 @@ func (conn *cloudConnector) createVirtualMachine(nic network.Interface, as compu AdminUsername: StringP(conn.namer.AdminUsername()), CustomData: StringP(base64.StdEncoding.EncodeToString([]byte(data))), LinuxConfiguration: &compute.LinuxConfiguration{ - DisablePasswordAuthentication: BoolP(!_env.FromHost().DebugEnabled()), + DisablePasswordAuthentication: BoolP(!Env(conn.ctx).DebugEnabled()), SSH: &compute.SSHConfiguration{ PublicKeys: &[]compute.SSHPublicKey{ { diff --git a/cloud/providers/vultr/cloud.go b/cloud/providers/vultr/cloud.go index 0dcb60c7..4ac97247 100644 --- a/cloud/providers/vultr/cloud.go +++ b/cloud/providers/vultr/cloud.go @@ -7,7 +7,6 @@ import ( "strings" gv "github.com/JamesClonk/vultr/lib" - _env "github.com/appscode/go/env" "github.com/appscode/go/errors" api "github.com/pharmer/pharmer/apis/v1alpha1" . "github.com/pharmer/pharmer/cloud" @@ -272,7 +271,7 @@ func (conn *cloudConnector) CreateInstance(name, token string, ng *api.NodeGroup Hostname: name, Tag: conn.cluster.Name, } - if _env.FromHost().IsPublic() { + if Env(conn.ctx).IsPublic() { opts.SSHKey = sshKeyID } resp, err := conn.client.CreateServer(name, regionID, planID, osID, opts) diff --git a/docs/cloud/aws/README.md b/docs/cloud/aws/README.md index 1b072c91..88f3391f 100644 --- a/docs/cloud/aws/README.md +++ b/docs/cloud/aws/README.md @@ -22,7 +22,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 2 work As a prerequisite, you need to have `pharmer` installed. To install `pharmer` run the following command. ```console -$ go get github.com/pharmer/pharmer +$ go get -u github.com/pharmer/pharmer ``` ### Pharmer storage diff --git a/docs/cloud/azure/README.md b/docs/cloud/azure/README.md index 846a249f..1d569680 100644 --- a/docs/cloud/azure/README.md +++ b/docs/cloud/azure/README.md @@ -23,7 +23,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 1 work As a prerequisite, you need to have `pharmer` installed. To install `pharmer` run the following command. ```console -$ go get github.com/pharmer/pharmer +$ go get -u github.com/pharmer/pharmer ``` ### Pharmer storage diff --git a/docs/cloud/digitalocean/README.md b/docs/cloud/digitalocean/README.md index 546e57ac..35e8d8fa 100644 --- a/docs/cloud/digitalocean/README.md +++ b/docs/cloud/digitalocean/README.md @@ -21,7 +21,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 2 work As a prerequisite, you need to have `pharmer` installed. To install `pharmer` run the following command. ```console -$ go get github.com/pharmer/pharmer +$ go get -u github.com/pharmer/pharmer ``` ### Pharmer storage diff --git a/docs/cloud/lightsail/README.md b/docs/cloud/lightsail/README.md index abb10d86..bb9b6381 100644 --- a/docs/cloud/lightsail/README.md +++ b/docs/cloud/lightsail/README.md @@ -22,7 +22,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 1 work As a prerequisite, you need to have `pharmer` installed. To install `pharmer` run the following command. ```console -$ go get github.com/pharmer/pharmer +$ go get -u github.com/pharmer/pharmer ``` ### Pharmer storage diff --git a/docs/cloud/linode/README.md b/docs/cloud/linode/README.md index f97dd9bb..25635dea 100644 --- a/docs/cloud/linode/README.md +++ b/docs/cloud/linode/README.md @@ -22,7 +22,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 2 work As a prerequisite, you need to have `pharmer` installed. To install `pharmer` run the following command. ```console -$ go get github.com/pharmer/pharmer +$ go get -u github.com/pharmer/pharmer ``` ### Pharmer storage diff --git a/docs/cloud/packet/README.md b/docs/cloud/packet/README.md index d6d43a44..c162bb65 100644 --- a/docs/cloud/packet/README.md +++ b/docs/cloud/packet/README.md @@ -22,7 +22,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 1 work As a prerequisite, you need to have `pharmer` installed. To install `pharmer` run the following command. ```console -$ go get github.com/pharmer/pharmer +$ go get -u github.com/pharmer/pharmer ``` ### Pharmer storage diff --git a/docs/cloud/scaleway/README.md b/docs/cloud/scaleway/README.md index 494bee51..647e1976 100644 --- a/docs/cloud/scaleway/README.md +++ b/docs/cloud/scaleway/README.md @@ -22,7 +22,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 2 work As a prerequisite, you need to have `pharmer` installed. To install `pharmer` run the following command. ```console -$ go get github.com/pharmer/pharmer +$ go get -u github.com/pharmer/pharmer ``` ### Pharmer storage diff --git a/docs/cloud/vultr/README.md b/docs/cloud/vultr/README.md index 3e5fb258..d340e278 100644 --- a/docs/cloud/vultr/README.md +++ b/docs/cloud/vultr/README.md @@ -23,7 +23,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 2 work As a prerequisite, you need to have `pharmer` installed. To install `pharmer` run the following command. ```console -$ go get github.com/pharmer/pharmer +$ go get -u github.com/pharmer/pharmer ``` ### Pharmer storage diff --git a/docs/developer-guide/README.md b/docs/developer-guide/README.md index fa895b7c..d25cb978 100644 --- a/docs/developer-guide/README.md +++ b/docs/developer-guide/README.md @@ -33,7 +33,7 @@ development environment, please follow [these instructions](https://golang.org/d #### Download Source ```console -$ go get github.com/pharmer/pharmer +$ go get -u github.com/pharmer/pharmer $ cd $(go env GOPATH)/src/github.com/pharmer/pharmer ```