Skip to content

Commit

Permalink
Add phase for applying a cluster
Browse files Browse the repository at this point in the history
  • Loading branch information
detiber committed Nov 15, 2018
1 parent c82ed12 commit 525cf8d
Show file tree
Hide file tree
Showing 7 changed files with 322 additions and 176 deletions.
23 changes: 11 additions & 12 deletions cmd/clusterctl/clusterdeployer/clusterdeployer.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,25 +92,24 @@ func (d *ClusterDeployer) Create(cluster *clusterv1.Cluster, machines []*cluster
}
defer closeClient(bootstrapClient, "bootstrap")

if cluster.Namespace == "" {
cluster.Namespace = bootstrapClient.GetContextNamespace()
}

err = bootstrapClient.EnsureNamespace(cluster.Namespace)
if err != nil {
return fmt.Errorf("unable to ensure namespace %q in bootstrap cluster: %v", cluster.Namespace, err)
}

glog.Info("Applying Cluster API stack to bootstrap cluster")
if err := phases.ApplyClusterAPIComponents(bootstrapClient, d.providerComponents); err != nil {
return fmt.Errorf("unable to apply cluster api stack to bootstrap cluster: %v", err)
}

glog.Info("Provisioning target cluster via bootstrap cluster")
if err := phases.ApplyCluster(bootstrapClient, cluster); err != nil {
return fmt.Errorf("unable to create cluster %q in bootstrap cluster: %v", cluster.Name, err)
}

// Create initial controlplane instance
if cluster.Namespace == "" {
cluster.Namespace = bootstrapClient.GetContextNamespace()
}

glog.Infof("Creating cluster object %v on bootstrap cluster in namespace %q", cluster.Name, cluster.Namespace)
if err := bootstrapClient.CreateClusterObject(cluster); err != nil {
return fmt.Errorf("unable to create cluster object: %v", err)
err = bootstrapClient.EnsureNamespace(cluster.Namespace)
if err != nil {
return fmt.Errorf("unable to ensure namespace %q in bootstrap cluster: %v", cluster.Namespace, err)
}

glog.Infof("Creating master %v in namespace %q", master.Name, cluster.Namespace)
Expand Down
85 changes: 85 additions & 0 deletions cmd/clusterctl/cmd/alpha_phase_apply_cluster.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package cmd

import (
"fmt"
"io/ioutil"

"github.com/golang/glog"
"github.com/spf13/cobra"
"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
"sigs.k8s.io/cluster-api/cmd/clusterctl/phases"
"sigs.k8s.io/cluster-api/pkg/util"
)

type AlphaPhaseApplyClusterOptions struct {
Kubeconfig string
Cluster string
}

var paco = &AlphaPhaseApplyClusterOptions{}

var alphaPhaseApplyClusterCmd = &cobra.Command{
Use: "apply-cluster",
Short: "Apply Cluster",
Long: `Apply Cluster`,
Run: func(cmd *cobra.Command, args []string) {
if paco.Cluster == "" {
exitWithHelp(cmd, "Please provide yaml file for cluster definition.")
}

if paco.Kubeconfig == "" {
exitWithHelp(cmd, "Please provide a kubeconfig file.")
}

if err := RunAlphaPhaseApplyCluster(paco); err != nil {
glog.Exit(err)
}
},
}

func RunAlphaPhaseApplyCluster(paco *AlphaPhaseApplyClusterOptions) error {
kubeconfig, err := ioutil.ReadFile(paco.Kubeconfig)
if err != nil {
return err
}

cluster, err := util.ParseClusterYaml(paco.Cluster)
if err != nil {
return err
}

clientFactory := clusterclient.NewFactory()
client, err := clientFactory.NewClientFromKubeconfig(string(kubeconfig))
if err != nil {
return fmt.Errorf("unable to create cluster client: %v", err)
}

if err := phases.ApplyCluster(client, cluster); err != nil {
return fmt.Errorf("unable to apply cluster: %v", err)
}

return nil
}

func init() {
// Required flags
alphaPhaseApplyClusterCmd.Flags().StringVarP(&paco.Kubeconfig, "kubeconfig", "", "", "Path for the kubeconfig file to use")
alphaPhaseApplyClusterCmd.Flags().StringVarP(&paco.Cluster, "cluster", "c", "", "A yaml file containing cluster object definition")
alphaPhasesCmd.AddCommand(alphaPhaseApplyClusterCmd)
}
39 changes: 2 additions & 37 deletions cmd/clusterctl/cmd/create_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/bootstrap/minikube"
"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
clustercommon "sigs.k8s.io/cluster-api/pkg/apis/cluster/common"
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/pkg/util"
"sigs.k8s.io/yaml"
)
Expand Down Expand Up @@ -69,11 +68,11 @@ var createClusterCmd = &cobra.Command{
}

func RunCreate(co *CreateOptions) error {
c, err := parseClusterYaml(co.Cluster)
c, err := util.ParseClusterYaml(co.Cluster)
if err != nil {
return err
}
m, err := parseMachinesYaml(co.Machine)
m, err := util.ParseMachinesYaml(co.Machine)
if err != nil {
return err
}
Expand Down Expand Up @@ -137,40 +136,6 @@ func init() {
createCmd.AddCommand(createClusterCmd)
}

func parseClusterYaml(file string) (*clusterv1.Cluster, error) {
bytes, err := ioutil.ReadFile(file)
if err != nil {
return nil, err
}

cluster := &clusterv1.Cluster{}
err = yaml.Unmarshal(bytes, cluster)
if err != nil {
return nil, err
}

return cluster, nil
}

func parseMachinesYaml(file string) ([]*clusterv1.Machine, error) {
bytes, err := ioutil.ReadFile(file)
if err != nil {
return nil, err
}

list := &clusterv1.MachineList{}
err = yaml.Unmarshal(bytes, &list)
if err != nil {
return nil, err
}

if list == nil {
return []*clusterv1.Machine{}, nil
}

return util.MachineP(list.Items), nil
}

func getProvider(name string) (clusterdeployer.ProviderDeployer, error) {
provisioner, err := clustercommon.ClusterProvisioner(name)
if err != nil {
Expand Down
125 changes: 0 additions & 125 deletions cmd/clusterctl/cmd/create_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,124 +17,9 @@ limitations under the License.
package cmd

import (
"io/ioutil"
"os"
"testing"
)

const validCluster = `
apiVersion: "cluster.k8s.io/v1alpha1"
kind: Cluster
metadata:
name: cluster1
spec:`

const validMachines = `
items:
- apiVersion: "cluster.k8s.io/v1alpha1"
kind: Machine
metadata:
name: machine1
spec:`

func TestParseClusterYaml(t *testing.T) {
t.Run("File does not exist", func(t *testing.T) {
_, err := parseClusterYaml("fileDoesNotExist")
if err == nil {
t.Fatal("Was able to parse a file that does not exist")
}
})
var testcases = []struct {
name string
contents string
expectedName string
expectErr bool
}{
{
name: "valid file",
contents: validCluster,
expectedName: "cluster1",
},
{
name: "gibberish in file",
contents: `blah ` + validCluster + ` blah`,
expectErr: true,
},
}
for _, testcase := range testcases {
t.Run(testcase.name, func(t *testing.T) {
file, err := createTempFile(testcase.contents)
if err != nil {
t.Fatal(err)
}
defer os.Remove(file)

c, err := parseClusterYaml(file)
if (testcase.expectErr && err == nil) || (!testcase.expectErr && err != nil) {
t.Fatalf("Unexpected returned error. Got: %v, Want Err: %v", err, testcase.expectErr)
}
if err != nil {
return
}
if c == nil {
t.Fatalf("No cluster returned in success case.")
}
if c.Name != testcase.expectedName {
t.Fatalf("Unexpected name. Got: %v, Want:%v", c.Name, testcase.expectedName)
}
})
}
}

func TestParseMachineYaml(t *testing.T) {
t.Run("File does not exist", func(t *testing.T) {
_, err := parseMachinesYaml("fileDoesNotExist")
if err == nil {
t.Fatal("Was able to parse a file that does not exist")
}
})
var testcases = []struct {
name string
contents string
expectErr bool
expectedMachineCount int
}{
{
name: "valid file",
contents: validMachines,
expectedMachineCount: 1,
},
{
name: "gibberish in file",
contents: `blah ` + validMachines + ` blah`,
expectErr: true,
},
}
for _, testcase := range testcases {
t.Run(testcase.name, func(t *testing.T) {
file, err := createTempFile(testcase.contents)
if err != nil {
t.Fatal(err)
}
defer os.Remove(file)

m, err := parseMachinesYaml(file)
if (testcase.expectErr && err == nil) || (!testcase.expectErr && err != nil) {
t.Fatalf("Unexpected returned error. Got: %v, Want Err: %v", err, testcase.expectErr)
}
if err != nil {
return
}
if m == nil {
t.Fatalf("No machines returned in success case.")
}
if len(m) != testcase.expectedMachineCount {
t.Fatalf("Unexpected machine count. Got: %v, Want: %v", len(m), testcase.expectedMachineCount)
}
})
}
}

func TestGetProvider(t *testing.T) {
var testcases = []struct {
provider string
Expand All @@ -154,13 +39,3 @@ func TestGetProvider(t *testing.T) {
})
}
}

func createTempFile(contents string) (string, error) {
f, err := ioutil.TempFile("", "")
if err != nil {
return "", err
}
defer f.Close()
f.WriteString(contents)
return f.Name(), nil
}
43 changes: 43 additions & 0 deletions cmd/clusterctl/phases/applycluster.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package phases

import (
"fmt"

"github.com/golang/glog"
"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient"
clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
)

func ApplyCluster(client clusterclient.Client, cluster *clusterv1.Cluster) error {
if cluster.Namespace == "" {
cluster.Namespace = client.GetContextNamespace()
}

err := client.EnsureNamespace(cluster.Namespace)
if err != nil {
return fmt.Errorf("unable to ensure namespace %q: %v", cluster.Namespace, err)
}

glog.Infof("Creating cluster object %v in namespace %q", cluster.Name, cluster.Namespace)
if err := client.CreateClusterObject(cluster); err != nil {
return err
}

return nil
}
Loading

0 comments on commit 525cf8d

Please sign in to comment.