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 9, 2018
1 parent 06a3b49 commit a74fc5e
Show file tree
Hide file tree
Showing 5 changed files with 178 additions and 52 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)
}
40 changes: 2 additions & 38 deletions cmd/clusterctl/cmd/create_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"fmt"
"io/ioutil"

"github.com/ghodss/yaml"
"github.com/golang/glog"
"github.com/spf13/cobra"
"sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer"
Expand All @@ -29,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"
)

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
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
}
39 changes: 37 additions & 2 deletions pkg/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,20 @@ package util
import (
"context"
"fmt"
"io/ioutil"
"math/rand"
"os"
"os/exec"
"os/user"
"strings"
"time"

"github.com/ghodss/yaml"
"github.com/golang/glog"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"sigs.k8s.io/controller-runtime/pkg/client"

clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/client"
)

const (
Expand Down Expand Up @@ -171,3 +172,37 @@ func GetNamespaceOrDefault(namespace string) string {
}
return namespace
}

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 MachineP(list.Items), nil
}

0 comments on commit a74fc5e

Please sign in to comment.