kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-staticcheck-pkg-resources-digitalocean

This commit is contained in:
ares 2019-12-24 11:00:50 +08:00 committed by GitHub
parent dffc8975d6 18cd317a94
commit 65aa6bc594
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kops/update_cluster.go
View File

@ -368,7 +368,7 @@ func RunUpdateCluster(f *util.Factory, clusterName string, out io.Writer, c *Upd
} }
} }
fmt.Fprintf(sb, " * the admin user is specific to Debian. If not using Debian please use the appropriate user based on your OS.\n") fmt.Fprintf(sb, " * the admin user is specific to Debian. If not using Debian please use the appropriate user based on your OS.\n")
fmt.Fprintf(sb, " * read about installing addons at: https://github.com/kubernetes/kops/blob/master/docs/operations/addons.md.\n") fmt.Fprintf(sb, " * read about installing addons at: https://kops.sigs.k8s.io/operations/addons.\n")
fmt.Fprintf(sb, "\n") fmt.Fprintf(sb, "\n")
} }

2
cmd/kops/util/factory.go
View File

@ -54,7 +54,7 @@ func NewFactory(options *FactoryOptions) *Factory {
const ( const (
STATE_ERROR = `Please set the --state flag or export KOPS_STATE_STORE. STATE_ERROR = `Please set the --state flag or export KOPS_STATE_STORE.
For example, a valid value follows the format s3://<bucket>. For example, a valid value follows the format s3://<bucket>.
You can find the supported stores in https://github.com/kubernetes/kops/blob/master/docs/state.md.` You can find the supported stores in https://kops.sigs.k8s.io/state.`
INVALID_STATE_ERROR = `Unable to read state store. INVALID_STATE_ERROR = `Unable to read state store.
Please use a valid state store when setting --state or KOPS_STATE_STORE env var. Please use a valid state store when setting --state or KOPS_STATE_STORE env var.

2
upup/pkg/fi/cloudup/apply_cluster.go
View File

@ -302,7 +302,7 @@ func (c *ApplyClusterCmd) Run() error {
fmt.Println("Kubelet anonymousAuth is currently turned on. This allows RBAC escalation and remote code execution possibilities.") fmt.Println("Kubelet anonymousAuth is currently turned on. This allows RBAC escalation and remote code execution possibilities.")
fmt.Println("It is highly recommended you turn it off by setting 'spec.kubelet.anonymousAuth' to 'false' via 'kops edit cluster'") fmt.Println("It is highly recommended you turn it off by setting 'spec.kubelet.anonymousAuth' to 'false' via 'kops edit cluster'")
fmt.Println("") fmt.Println("")
fmt.Println("See https://github.com/kubernetes/kops/blob/master/docs/security.md#kubelet-api") fmt.Println("See https://kops.sigs.k8s.io/security/#kubelet-api")
fmt.Println("") fmt.Println("")
fmt.Printf(starline) fmt.Printf(starline)
fmt.Println("") fmt.Println("")