Skip to content

✨clusterctl: add upgrade plan cmd #2178

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

Conversation

fabriziopandini
Copy link
Member

@fabriziopandini fabriziopandini commented Jan 28, 2020

What this PR does / why we need it:
This PR adds the clusterctl upgrade plan cmd as per discussion on #1988

Which issue(s) this PR fixes:
rif #1729

/area clusterctl
/assign @ncdc
/assign @vincepri

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 28, 2020
@k8s-ci-robot k8s-ci-robot added area/clusterctl Issues or PRs related to clusterctl cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 28, 2020
@ncdc ncdc added this to the v0.3.0 milestone Jan 28, 2020
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 28, 2020
@fabriziopandini fabriziopandini force-pushed the clusterctl-upgrade-plan-cmd branch 2 times, most recently from 49eea4a to eb4de58 Compare January 31, 2020 19:26
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 31, 2020
@fabriziopandini fabriziopandini changed the title [WIP]✨clusterctl: add upgrade plan cmd ✨clusterctl: add upgrade plan cmd Jan 31, 2020
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 31, 2020
@fabriziopandini fabriziopandini force-pushed the clusterctl-upgrade-plan-cmd branch from eb4de58 to 727a0fd Compare February 3, 2020 10:39
@fabriziopandini
Copy link
Member Author

@vincepri @ncdc this is ready for review now

url: "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/latest/infrastructure-components.yaml",
providerType: clusterctlv1.InfrastructureProviderType,
},
&provider{
name: "docker",
name: DockerProviderName,
Copy link
Contributor

Choose a reason for hiding this comment

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

We aren't maintaining github.com/kubernetes-sigs/cluster-api-provider-docker as a separate repo any more. See #1565 for example. We may want to consider removing capd from clusterctl for now, and add it back later when we have updated release artifacts for it.

Copy link
Member Author

Choose a reason for hiding this comment

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

What about assuming infrastructure-components.yaml for CAPD will get released with CAPI (might be with another file name)?

Copy link
Contributor

Choose a reason for hiding this comment

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

That's fair, but we haven't decided what it will look like yet.

return nil, err
}

// UpgradePlan is an alias for cluster.UpgradePlan; this makes the conversion
Copy link
Contributor

Choose a reason for hiding this comment

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

icky but ok i guess

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'm not super happy about this, but I don't have a better idea...

return err
}

//TODO: switch to klog as soon as https://github.com/kubernetes-sigs/cluster-api/pull/2150 merge
Copy link
Member

Choose a reason for hiding this comment

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

Seems we can switch now?

Copy link
Member Author

Choose a reason for hiding this comment

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

Unfortunately no, because we switched to the global logger approach and this is not yet merged. Waiting for #2191

Copy link
Contributor

Choose a reason for hiding this comment

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

Since 2191 is blocked on this PR, we can create an issue to track this work or I'm assuming @fabriziopandini will be submitting a PR to refactor the upgrade cmd to use the global logger.

Copy link
Contributor

Choose a reason for hiding this comment

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

He's going to update 2191 after this goes in

@fabriziopandini fabriziopandini force-pushed the clusterctl-upgrade-plan-cmd branch from b0a7ba9 to 1b99813 Compare February 4, 2020 08:46
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Feb 4, 2020

@fabriziopandini: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-cluster-api-e2e 4386fc4 link /test pull-cluster-api-e2e

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@fabriziopandini fabriziopandini force-pushed the clusterctl-upgrade-plan-cmd branch from 1b99813 to 936d92b Compare February 4, 2020 13:38
@fabriziopandini fabriziopandini force-pushed the clusterctl-upgrade-plan-cmd branch from 936d92b to 43e6ca6 Compare February 5, 2020 07:04
@fabriziopandini
Copy link
Member Author

rebased

@ncdc
Copy link
Contributor

ncdc commented Feb 5, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini, ncdc

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 Feb 5, 2020
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 5, 2020
@k8s-ci-robot k8s-ci-robot merged commit 8e041b8 into kubernetes-sigs:master Feb 5, 2020
@fabriziopandini fabriziopandini deleted the clusterctl-upgrade-plan-cmd branch February 5, 2020 20:46
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. area/clusterctl Issues or PRs related to clusterctl 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.

5 participants