-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
[clusterctl] add phases for apply-machines and apply-cluster #581
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| 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) | ||
| } |
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,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) | ||
| } |
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ApplyClusterAPIComponents doesn't include the
client.EnsureNamespace(namespace)call which used to proceed it. Will it now fail if the namespace doesn't exist? Does it also need to include that call in it's phase?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This gets a bit tricky, since post-CRD migration we are not deploying the cluster-api (or provider) components in the default namespace and the namespace creation is added as part of the manager config (at least for the common cluster-api components, aws provider, and gcp provider).
I'm good with re-adding it if there is a provider that depends on this behavior or if there is another use case that I am missing where it is relied upon, but afaict the default/cluster namespace validation is only needed for the cluster, machine creation, and possibly the provider-components config map steps at this point.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sgtm to remove it for now, and we can re-add if we need to.