Merge pull request kubernetes#88124 from rosti/kubeadm-cc-upgrade-plan

kubeadm upgrade plan: print a component config state table

Author: k8s-ci-robot

cmd/kubeadm/app/apis/output/types.go

@@ -48,6 +48,26 @@ type ComponentUpgradePlan struct {
 	NewVersion     string
 }
 
+// ComponentConfigVersionState describes the current and desired version of a component config
+type ComponentConfigVersionState struct {
+	// Group points to the Kubernetes API group that covers the config
+	Group string
+
+	// CurrentVersion is the currently active component config version
+	// NOTE: This can be empty in case the config was not found on the cluster or it was unsupported
+	// kubeadm generated version
+	CurrentVersion string
+
+	// PreferredVersion is the component config version that is currently preferred by kubeadm for use.
+	// NOTE: As of today, this is the only version supported by kubeadm.
+	PreferredVersion string
+
+	// ManualUpgradeRequired indicates if users need to manually upgrade their component config versions. This happens if
+	// the CurrentVersion of the config is user supplied (or modified) and no longer supported. Users should upgrade
+	// their component configs to PreferredVersion or any other supported component config version.
+	ManualUpgradeRequired bool
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // UpgradePlan represents information about upgrade plan for the output
@@ -56,4 +76,6 @@ type UpgradePlan struct {
 	metav1.TypeMeta
 
 	Components []ComponentUpgradePlan
+
+	ConfigVersions []ComponentConfigVersionState
 }

cmd/kubeadm/app/apis/output/v1alpha1/types.go

@@ -48,6 +48,26 @@ type ComponentUpgradePlan struct {
 	NewVersion     string `json:"newVersion"`
 }
 
+// ComponentConfigVersionState describes the current and desired version of a component config
+type ComponentConfigVersionState struct {
+	// Group points to the Kubernetes API group that covers the config
+	Group string `json:"group"`
+
+	// CurrentVersion is the currently active component config version
+	// NOTE: This can be empty in case the config was not found on the cluster or it was unsupported
+	// kubeadm generated version
+	CurrentVersion string `json:"currentVersion"`
+
+	// PreferredVersion is the component config version that is currently preferred by kubeadm for use.
+	// NOTE: As of today, this is the only version supported by kubeadm.
+	PreferredVersion string `json:"preferredVersion"`
+
+	// ManualUpgradeRequired indicates if users need to manually upgrade their component config versions. This happens if
+	// the CurrentVersion of the config is user supplied (or modified) and no longer supported. Users should upgrade
+	// their component configs to PreferredVersion or any other supported component config version.
+	ManualUpgradeRequired bool `json:"manualUpgradeRequired"`
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // UpgradePlan represents information about upgrade plan for the output
@@ -56,4 +76,6 @@ type UpgradePlan struct {
 	metav1.TypeMeta
 
 	Components []ComponentUpgradePlan `json:"components"`
+
+	ConfigVersions []ComponentConfigVersionState `json:"configVersions"`
 }

cmd/kubeadm/app/apis/output/v1alpha1/zz_generated.conversion.go

@@ -15,7 +15,7 @@ go_library(
     deps = [
         "//cmd/kubeadm/app/apis/kubeadm:go_default_library",
         "//cmd/kubeadm/app/apis/kubeadm/validation:go_default_library",
-        "//cmd/kubeadm/app/apis/output/v1alpha1:go_default_library",
+        "//cmd/kubeadm/app/apis/output:go_default_library",
         "//cmd/kubeadm/app/cmd/options:go_default_library",
         "//cmd/kubeadm/app/cmd/phases/upgrade/node:go_default_library",
         "//cmd/kubeadm/app/cmd/phases/workflow:go_default_library",
@@ -38,6 +38,7 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
         "//staging/src/k8s.io/client-go/discovery/fake:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
+        "//vendor/github.com/lithammer/dedent:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
         "//vendor/github.com/pmezard/go-difflib/difflib:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",