-
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.
Resolved merge conflicts and updated comments
- Loading branch information
Showing
33 changed files
with
711 additions
and
466 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
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
68 changes: 68 additions & 0 deletions
68
clusterctl/clusterdeployer/bootstrap/existing/exisingcluster.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,68 @@ | ||
| /* | ||
| 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 existing | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io/ioutil" | ||
| "os" | ||
| ) | ||
|
|
||
| // Represents an existing cluster being used for bootstrapping, should not be able to | ||
| // actually delete or create, but can point to actual kubeconfig file. | ||
| type ExistingCluster struct { | ||
| kubeconfigPath string | ||
| kubeconfigFile string | ||
| } | ||
|
|
||
| // NewExistingCluster creates a new existing k8s bootstrap cluster object | ||
| // We should clean up any lingering resources when clusterctl is complete. | ||
| // TODO https://github.com/kubernetes-sigs/cluster-api/issues/448 | ||
| func NewExistingCluster(kubeconfigPath string) (*ExistingCluster, error) { | ||
| if _, err := os.Stat(kubeconfigPath); os.IsNotExist(err) { | ||
| return nil, fmt.Errorf("file at %s does not exist", kubeconfigPath) | ||
| } | ||
|
|
||
| return &ExistingCluster{kubeconfigPath: kubeconfigPath}, nil | ||
| } | ||
|
|
||
| // Create implements clusterdeployer.ClusterProvisioner interface | ||
| func (e *ExistingCluster) Create() error { | ||
| // noop | ||
| return nil | ||
| } | ||
|
|
||
| // Delete implements clusterdeployer.ClusterProvisioner interface | ||
| func (e *ExistingCluster) Delete() error { | ||
| // noop | ||
| return nil | ||
| } | ||
|
|
||
| // GetKubeconfig implements clusterdeployer.ClusterProvisioner interface | ||
| func (e *ExistingCluster) GetKubeconfig() (string, error) { | ||
|
|
||
| if e.kubeconfigFile == "" { | ||
| b, err := ioutil.ReadFile(e.kubeconfigPath) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| e.kubeconfigFile = string(b) | ||
| } | ||
|
|
||
| return e.kubeconfigFile, 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
File renamed without changes.
File renamed without changes.
Oops, something went wrong.