-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added bootstrap-only components to clusterctl as an option (#790)
Allows clusterctl to apply boostrap cluster only components that will not be applied to the target cluster. Resolves #556
- Loading branch information
1 parent
f8d548b
commit 545c1dc
Showing
11 changed files
with
173 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
cmd/clusterctl/cmd/alpha_phase_apply_boostrap_components.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| Copyright 2019 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 ( | ||
| "io/ioutil" | ||
|
|
||
| "github.com/pkg/errors" | ||
| "github.com/spf13/cobra" | ||
| "k8s.io/klog" | ||
| "sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient" | ||
| "sigs.k8s.io/cluster-api/cmd/clusterctl/phases" | ||
| ) | ||
|
|
||
| type AlphaPhaseApplyBootstrapComponentsOptions struct { | ||
| Kubeconfig string | ||
| BootstrapComponents string | ||
| } | ||
|
|
||
| var pabco = &AlphaPhaseApplyBootstrapComponentsOptions{} | ||
|
|
||
| var alphaPhaseApplyBootstrapComponentsCmd = &cobra.Command{ | ||
| Use: "apply-bootstrap-components", | ||
| Short: "Apply boostrap components", | ||
| Long: `Apply bootstrap components`, | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| if pabco.BootstrapComponents == "" { | ||
| exitWithHelp(cmd, "Please provide yaml file for bootstrap component definition.") | ||
| } | ||
|
|
||
| if pabco.Kubeconfig == "" { | ||
| exitWithHelp(cmd, "Please provide a kubeconfig file.") | ||
| } | ||
|
|
||
| if err := RunAlphaPhaseApplyBootstrapComponents(pabco); err != nil { | ||
| klog.Exit(err) | ||
| } | ||
| }, | ||
| } | ||
|
|
||
| func RunAlphaPhaseApplyBootstrapComponents(pabco *AlphaPhaseApplyBootstrapComponentsOptions) error { | ||
| kubeconfig, err := ioutil.ReadFile(pabco.Kubeconfig) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| pc, err := ioutil.ReadFile(pabco.BootstrapComponents) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "error loading provider components file %q", pabco.BootstrapComponents) | ||
| } | ||
|
|
||
| clientFactory := clusterclient.NewFactory() | ||
| client, err := clientFactory.NewClientFromKubeconfig(string(kubeconfig)) | ||
| if err != nil { | ||
| return errors.Wrap(err, "unable to create cluster client") | ||
| } | ||
|
|
||
| return phases.ApplyBootstrapComponents(client, string(pc)) | ||
| } | ||
|
|
||
| func init() { | ||
| // Required flags | ||
| alphaPhaseApplyBootstrapComponentsCmd.Flags().StringVarP(&pabco.Kubeconfig, "kubeconfig", "", "", "Path for the kubeconfig file to use") | ||
| alphaPhaseApplyBootstrapComponentsCmd.Flags().StringVarP(&pabco.BootstrapComponents, "bootstrap-components", "b", "", "A yaml file containing bootstrap cluster components") | ||
| alphaPhasesCmd.AddCommand(alphaPhaseApplyBootstrapComponentsCmd) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| Copyright 2019 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 ( | ||
| "github.com/pkg/errors" | ||
| "k8s.io/klog" | ||
| "sigs.k8s.io/cluster-api/cmd/clusterctl/clusterdeployer/clusterclient" | ||
| ) | ||
|
|
||
| func ApplyBootstrapComponents(client clusterclient.Client, components string) error { | ||
| klog.Info("Applying Bootstrap-only Components") | ||
| if err := client.Apply(components); err != nil { | ||
| return errors.Wrap(err, "unable to apply bootstrap-only components") | ||
| } | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters