Implement "upgrade plan" support

kubernetes-sigs · May 3, 2024 · 8b61e23 · 8b61e23
1 parent 1e93d52
commit 8b61e23
Show file tree

Hide file tree

Showing 4 changed files with 346 additions and 53 deletions.
diff --git a/cmd/plugin/cmd/init.go b/cmd/plugin/cmd/init.go
@@ -59,9 +59,6 @@ type initOptions struct {
 
 const (
 	capiOperatorProviderName = "capi-operator"
-	// We have to specify a version here, because if we set "latest", clusterctl libs will try to fetch metadata.yaml file for the latest
-	// release and fail since CAPI operator doesn't provide this file.
-	capiOperatorManifestsURL = "https://github.com/kubernetes-sigs/cluster-api-operator/releases/v0.1.0/operator-components.yaml"
 )
 
 var initOpts = &initOptions{}

diff --git a/cmd/plugin/cmd/upgrade.go b/cmd/plugin/cmd/upgrade.go
@@ -40,15 +40,9 @@ func init() {
 
 func sortUpgradeItems(plan upgradePlan) {
 	sort.Slice(plan.Providers, func(i, j int) bool {
-		return plan.Providers[i].GetType() < plan.Providers[j].GetType() ||
-			(plan.Providers[i].GetType() == plan.Providers[j].GetType() && plan.Providers[i].GetName() < plan.Providers[j].GetName()) ||
-			(plan.Providers[i].GetType() == plan.Providers[j].GetType() && plan.Providers[i].GetName() == plan.Providers[j].GetName() && plan.Providers[i].GetNamespace() < plan.Providers[j].GetNamespace())
-	})
-}
-
-func sortUpgradePlans(upgradePlans []upgradePlan) {
-	sort.Slice(upgradePlans, func(i, j int) bool {
-		return upgradePlans[i].Contract < upgradePlans[j].Contract
+		return plan.Providers[i].Type < plan.Providers[j].Type ||
+			(plan.Providers[i].Type == plan.Providers[j].Type && plan.Providers[i].Name < plan.Providers[j].Name) ||
+			(plan.Providers[i].Type == plan.Providers[j].Type && plan.Providers[i].Name == plan.Providers[j].Name && plan.Providers[i].Namespace < plan.Providers[j].Namespace)
 	})
 }