Skip to content

Commit

Permalink
[clusterctl] add phases for apply-machines and apply-cluster (#581)
Browse files Browse the repository at this point in the history
* Add phase for applying a cluster

* Add phase for applying machines
  • Loading branch information
detiber authored and k8s-ci-robot committed Nov 16, 2018
1 parent 05cb1e6 commit 0734939
Show file tree
Hide file tree
Showing 9 changed files with 450 additions and 179 deletions.
21 changes: 7 additions & 14 deletions cmd/clusterctl/clusterdeployer/clusterdeployer.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,29 +92,22 @@ 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)
}

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)
if cluster.Namespace == "" {
cluster.Namespace = bootstrapClient.GetContextNamespace()
}

glog.Infof("Creating master %v in namespace %q", master.Name, cluster.Namespace)
if err := bootstrapClient.CreateMachineObjects([]*clusterv1.Machine{master}, cluster.Namespace); err != nil {
if err := phases.ApplyMachines(bootstrapClient, cluster.Namespace, []*clusterv1.Machine{master}); err != nil {
return fmt.Errorf("unable to create master machine: %v", err)
}

Expand Down Expand Up @@ -160,7 +153,7 @@ func (d *ClusterDeployer) Create(cluster *clusterv1.Cluster, machines []*cluster
}

glog.Info("Creating node machines in target cluster.")
if err := targetClient.CreateMachineObjects(nodes, cluster.Namespace); err != nil {
if err := phases.ApplyMachines(targetClient, cluster.Namespace, nodes); err != nil {
return fmt.Errorf("unable to create node machines: %v", err)
}

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)
}
89 changes: 89 additions & 0 deletions cmd/clusterctl/cmd/alpha_phase_apply_machines.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/*
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 AlphaPhaseApplyMachinesOptions struct {
Kubeconfig string
Machines string
Namespace string
}

var pamo = &AlphaPhaseApplyMachinesOptions{}

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

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

if err := RunAlphaPhaseApplyMachines(pamo); err != nil {
glog.Exit(err)
}
},
}

func RunAlphaPhaseApplyMachines(pamo *AlphaPhaseApplyMachinesOptions) error {
kubeconfig, err := ioutil.ReadFile(pamo.Kubeconfig)
if err != nil {
return err
}

machines, err := util.ParseMachinesYaml(pamo.Machines)
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.ApplyMachines(client, pamo.Namespace, machines); err != nil {
return fmt.Errorf("unable to apply machines: %v", err)
}

return nil
}

func init() {
// Required flags
alphaPhaseApplyMachinesCmd.Flags().StringVarP(&pamo.Kubeconfig, "kubeconfig", "", "", "Path for the kubeconfig file to use")
alphaPhaseApplyMachinesCmd.Flags().StringVarP(&pamo.Machines, "machines", "m", "", "A yaml file containing machine object definitions")

// Optional flags
alphaPhaseApplyMachinesCmd.Flags().StringVarP(&pamo.Namespace, "namespace", "n", "", "Namespace")
alphaPhasesCmd.AddCommand(alphaPhaseApplyMachinesCmd)
}
40 changes: 2 additions & 38 deletions cmd/clusterctl/cmd/create_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ 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"
)

type CreateOptions struct {
Expand Down Expand Up @@ -69,11 +67,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 +135,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
Loading

0 comments on commit 0734939

Please sign in to comment.