Skip to content
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] Rename external to bootstrap and internal to target #484

Merged
merged 1 commit into from
Aug 23, 2018

Conversation

detiber
Copy link
Member

@detiber detiber commented Aug 21, 2018

What this PR does / why we need it:

Per the discussion during the cluster-api working group meeting the usage of external/internal to reference clusters within clusterctl is confusing. This PR updates changes to using bootstrap and target instead.

Release note:

[clusterctl] the `--cleanup-external-cluster ` flag has been renamed to `--cleanup-bootstrap-cluster`

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 21, 2018
@@ -37,14 +37,15 @@ func NewExternalCluster(kubeconfigPath string) (*ExternalBootstrapCluster, error
return nil, fmt.Errorf("file at %s does not exist", kubeconfigPath)
}

return &ExternalBootstrapCluster{kubeconfigPath:kubeconfigPath}, nil
return &ExternalBootstrapCluster{kubeconfigPath: kubeconfigPath}, nil
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we leaving this as "ExternalBootstrap" because we also expect to have a different type of FooBoootstrap in the future? Or is that redundant and we should just call this "BootstrapCluster"?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a bit of re-organization and renaming to help clear it up.

glog.Info("Creating external cluster")
externalClient, cleanupExternalCluster, err := d.createExternalCluster()
defer cleanupExternalCluster()
glog.Info("Creating bootstrap client")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm torn about saying client here vs. cluster. In some cases, it will just be a client (to an existing cluster) but the default (at least today) is to actually create a cluster, in which case saying it this way will be confusing to users.

externalClient, cleanupExternalCluster, err := d.createExternalCluster()
defer cleanupExternalCluster()
func (d *ClusterDeployer) Delete(targetClient ClusterClient) error {
glog.Info("Creating bootstrap cluster")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here you left it as "cluster" instead of "client"

@roberthbailey roberthbailey self-assigned this Aug 22, 2018
- Rename references to "external" cluster to "bootstrap"
- Rename references to "internal" cluster to "target"
- Rename ExternalBootstrapCluster to ExistingCluster
@roberthbailey
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 22, 2018
@roberthbailey
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: detiber, roberthbailey

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 23, 2018
@k8s-ci-robot k8s-ci-robot merged commit bbb8cdb into kubernetes-sigs:master Aug 23, 2018
@detiber detiber deleted the externalToBootstrap branch April 2, 2019 17:44
jayunit100 pushed a commit to jayunit100/cluster-api that referenced this pull request Jan 31, 2020
…pdate

moved preferredAPIServerCidr in troubleshooting doc to correct line
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants