operators: pass additional components to upgrade-agent

This commit is contained in:
Markus Rudy 2023-12-14 16:02:09 +01:00 committed by Markus Rudy
parent 6f1b6b532f
commit 070c23f876
3 changed files with 20 additions and 11 deletions

View file

@ -358,14 +358,8 @@ func (r *NodeVersionReconciler) tryStartClusterVersionUpgrade(ctx context.Contex
log.FromContext(ctx).Info("Starting cluster upgrade", "clusterVersion", nodeVersion.Spec.KubernetesClusterVersion)
kubeadm, err := clusterComponents.GetKubeadmComponent()
if err != nil {
log.FromContext(ctx).Error(err, "Unable to get kubeadm component")
return
}
// talk to the upgrade-agent to start the upgrade
if err := r.Upgrade(ctx, kubeadm.Url, kubeadm.Hash, nodeVersion.Spec.KubernetesClusterVersion); err != nil {
if err := r.Upgrade(ctx, clusterComponents.GetUpgradableComponents(), nodeVersion.Spec.KubernetesClusterVersion); err != nil {
log.FromContext(ctx).Error(err, "Unable to upgrade cluster")
return
}
@ -935,7 +929,7 @@ type etcdRemover interface {
type clusterUpgrader interface {
// UpgradeCluster upgrades the cluster to the specified version.
Upgrade(ctx context.Context, KubeadmURL, KubeadmHash, WantedKubernetesVersion string) error
Upgrade(ctx context.Context, kubernetesComponents components.Components, WantedKubernetesVersion string) error
}
type kubernetesServerVersionGetter interface {