Skip to content

Commit 8b61e23

Browse files
committed
Implement "upgrade plan" support
1 parent 1e93d52 commit 8b61e23

File tree

4 files changed

+346
-53
lines changed

4 files changed

+346
-53
lines changed

cmd/plugin/cmd/init.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ type initOptions struct {
5959

6060
const (
6161
capiOperatorProviderName = "capi-operator"
62-
// We have to specify a version here, because if we set "latest", clusterctl libs will try to fetch metadata.yaml file for the latest
63-
// release and fail since CAPI operator doesn't provide this file.
64-
capiOperatorManifestsURL = "https://github.com/kubernetes-sigs/cluster-api-operator/releases/v0.1.0/operator-components.yaml"
6562
)
6663

6764
var initOpts = &initOptions{}

cmd/plugin/cmd/upgrade.go

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,9 @@ func init() {
4040

4141
func sortUpgradeItems(plan upgradePlan) {
4242
sort.Slice(plan.Providers, func(i, j int) bool {
43-
return plan.Providers[i].GetType() < plan.Providers[j].GetType() ||
44-
(plan.Providers[i].GetType() == plan.Providers[j].GetType() && plan.Providers[i].GetName() < plan.Providers[j].GetName()) ||
45-
(plan.Providers[i].GetType() == plan.Providers[j].GetType() && plan.Providers[i].GetName() == plan.Providers[j].GetName() && plan.Providers[i].GetNamespace() < plan.Providers[j].GetNamespace())
46-
})
47-
}
48-
49-
func sortUpgradePlans(upgradePlans []upgradePlan) {
50-
sort.Slice(upgradePlans, func(i, j int) bool {
51-
return upgradePlans[i].Contract < upgradePlans[j].Contract
43+
return plan.Providers[i].Type < plan.Providers[j].Type ||
44+
(plan.Providers[i].Type == plan.Providers[j].Type && plan.Providers[i].Name < plan.Providers[j].Name) ||
45+
(plan.Providers[i].Type == plan.Providers[j].Type && plan.Providers[i].Name == plan.Providers[j].Name && plan.Providers[i].Namespace < plan.Providers[j].Namespace)
5246
})
5347
}
5448

0 commit comments

Comments
 (0)