Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clustername #35

Merged
merged 2 commits into from
May 9, 2019
Merged

Clustername #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ebf342
Consolidate the default cluster name into as single definition
andyz-dev May 8, 2019
93f72e6
Make sure the culster name is valid before creating it.
andyz-dev May 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions cli/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,37 @@ import (
)

const defaultRegistry = "docker.io"
const clusterNameMaxSize int = 35

// Make sure a cluster name is also a valid host name according to RFC 1123.
// We further restrict the length of the cluster name to shorter than 'clusterNameMaxSize'
// so that we can construct the host names based on the cluster name, and still stay
// within the 64 characters limit.
func checkClusterName(name string) error {
if len(name) > clusterNameMaxSize {
return fmt.Errorf("cluster name is too long")
}

if name[0] == '-' || name[len(name) - 1] == '-' {
return fmt.Errorf("cluster name can not start or end with - (dash)")
}


for _ , c := range name {
iwilltry42 marked this conversation as resolved.
Show resolved Hide resolved
switch {
case '0' <= c && c <= '9':
case 'a' <= c && c <= 'z':
case 'A' <= c && c <= 'Z':
case c == '-':
break;
default:
return fmt.Errorf("cluster name contains charaters other than 'Aa-Zz', '0-9' or '-'")

}
}

return nil
}

// CheckTools checks if the docker API server is responding
func CheckTools(c *cli.Context) error {
Expand All @@ -45,6 +76,10 @@ func CheckTools(c *cli.Context) error {
// CreateCluster creates a new single-node cluster container and initializes the cluster directory
func CreateCluster(c *cli.Context) error {

if err := checkClusterName(c.String("name")); err != nil {
iwilltry42 marked this conversation as resolved.
Show resolved Hide resolved
return err;
}

// define image
image := c.String("image")
if c.IsSet("version") {
Expand Down
11 changes: 6 additions & 5 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

// defaultK3sImage specifies the default image being used for server and workers
const defaultK3sImage = "docker.io/rancher/k3s"
const defaultK3sClusterName string = "k3s-default"

// main represents the CLI application
func main() {
Expand Down Expand Up @@ -52,7 +53,7 @@ func main() {
Flags: []cli.Flag{
cli.StringFlag{
Name: "name, n",
Value: "k3s-default",
Value: defaultK3sClusterName,
Usage: "Set a name for the cluster",
},
cli.StringFlag{
Expand Down Expand Up @@ -107,7 +108,7 @@ func main() {
Flags: []cli.Flag{
cli.StringFlag{
Name: "name, n",
Value: "k3s-default",
Value: defaultK3sClusterName,
Usage: "name of the cluster",
},
cli.BoolFlag{
Expand All @@ -124,7 +125,7 @@ func main() {
Flags: []cli.Flag{
cli.StringFlag{
Name: "name, n",
Value: "k3s-default",
Value: defaultK3sClusterName,
Usage: "Name of the cluster",
},
cli.BoolFlag{
Expand All @@ -141,7 +142,7 @@ func main() {
Flags: []cli.Flag{
cli.StringFlag{
Name: "name, n",
Value: "k3s-default",
Value: defaultK3sClusterName,
Usage: "Name of the cluster",
},
cli.BoolFlag{
Expand Down Expand Up @@ -171,7 +172,7 @@ func main() {
Flags: []cli.Flag{
cli.StringFlag{
Name: "name, n",
Value: "k3s-default",
Value: defaultK3sClusterName,
Usage: "Name of the cluster",
},
cli.BoolFlag{
Expand Down