Add methods to fetch upgrader image from bundle

controllers/controlplaneupgrade_controller_test.go

@@ -205,7 +205,7 @@ func getObjectsForCPUpgradeTest() (*clusterv1.Cluster, []*clusterv1.Machine, []*
 	machines := []*clusterv1.Machine{machine1, machine2}
 	nodes := []*corev1.Node{node1, node2}
 	nodeUpgrades := []*anywherev1.NodeUpgrade{nodeUpgrade1, nodeUpgrade2}
-	cpUpgrade := generateCPUpgrade(machines, cluster)
+	cpUpgrade := generateCPUpgrade(machines)
 	return cluster, machines, nodes, cpUpgrade, nodeUpgrades
 }
 
@@ -218,7 +218,7 @@ func cpUpgradeRequest(cpUpgrade *anywherev1.ControlPlaneUpgrade) reconcile.Reque
 	}
 }
 
-func generateCPUpgrade(machine []*clusterv1.Machine, cluster *clusterv1.Cluster) *anywherev1.ControlPlaneUpgrade {
+func generateCPUpgrade(machine []*clusterv1.Machine) *anywherev1.ControlPlaneUpgrade {
 	etcdVersion := "v1.28.3-eks-1-28-9"
 	return &anywherev1.ControlPlaneUpgrade{
 		ObjectMeta: metav1.ObjectMeta{

controllers/machinedeploymentupgrade_controller_test.go

@@ -146,7 +146,7 @@ func getObjectsForMDUpgradeTest() (*clusterv1.Cluster, *clusterv1.Machine, *core
 	node := generateNode()
 	machine := generateMachine(cluster, node)
 	nodeUpgrade := generateNodeUpgrade(machine)
-	mdUpgrade := generateMDUpgrade(machine, cluster)
+	mdUpgrade := generateMDUpgrade(machine)
 	return cluster, machine, node, mdUpgrade, nodeUpgrade
 }
 
@@ -159,7 +159,7 @@ func mdUpgradeRequest(mdUpgrade *anywherev1.MachineDeploymentUpgrade) reconcile.
 	}
 }
 
-func generateMDUpgrade(machine *clusterv1.Machine, cluster *clusterv1.Cluster) *anywherev1.MachineDeploymentUpgrade {
+func generateMDUpgrade(machine *clusterv1.Machine) *anywherev1.MachineDeploymentUpgrade {
 	return &anywherev1.MachineDeploymentUpgrade{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "md-upgrade-request",

controllers/nodeupgrade_controller.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
+	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -25,10 +26,8 @@ import (
 )
 
 const (
-	// TODO(in-place): Get this image from the bundle instead of using the hardcoded one.
-	defaultUpgraderImage = "public.ecr.aws/t2p4l7v3/upgrader:eksdbase"
-	controlPlaneLabel    = "node-role.kubernetes.io/control-plane"
-	podDNEMessage        = "Upgrader pod does not exist"
+	controlPlaneLabel = "node-role.kubernetes.io/control-plane"
+	podDNEMessage     = "Upgrader pod does not exist"
 
 	// nodeUpgradeFinalizerName is the finalizer added to NodeUpgrade objects to handle deletion.
 	nodeUpgradeFinalizerName = "nodeupgrades.anywhere.eks.amazonaws.com/finalizer"
@@ -168,14 +167,23 @@ func (r *NodeUpgradeReconciler) reconcile(ctx context.Context, log logr.Logger,
 		return ctrl.Result{}, nil
 	}
 
+	configMap := &corev1.ConfigMap{}
+	if err := remoteClient.Get(ctx, types.NamespacedName{Name: constants.UpgraderConfigMapName, Namespace: constants.EksaSystemNamespace}, configMap); err != nil {
+		return ctrl.Result{}, err
+	}
+	if configMap.Data == nil {
+		return ctrl.Result{}, errors.New("upgrader config map is empty")
+	}
+	upgraderImage := configMap.Data[nodeUpgrade.Spec.KubernetesVersion]
+
 	if isControlPlane(node) {
 		if nodeUpgrade.Spec.FirstNodeToBeUpgraded {
-			upgraderPod = upgrader.UpgradeFirstControlPlanePod(node.Name, defaultUpgraderImage, nodeUpgrade.Spec.KubernetesVersion, *nodeUpgrade.Spec.EtcdVersion)
+			upgraderPod = upgrader.UpgradeFirstControlPlanePod(node.Name, upgraderImage, nodeUpgrade.Spec.KubernetesVersion, *nodeUpgrade.Spec.EtcdVersion)
 		} else {
-			upgraderPod = upgrader.UpgradeSecondaryControlPlanePod(node.Name, defaultUpgraderImage)
+			upgraderPod = upgrader.UpgradeSecondaryControlPlanePod(node.Name, upgraderImage)
 		}
 	} else {
-		upgraderPod = upgrader.UpgradeWorkerPod(node.Name, defaultUpgraderImage)
+		upgraderPod = upgrader.UpgradeWorkerPod(node.Name, upgraderImage)
 	}
 
 	if err := remoteClient.Create(ctx, upgraderPod); err != nil {

controllers/nodeupgrade_controller_test.go

@@ -26,13 +26,13 @@ func TestNodeUpgradeReconcilerReconcileFirstControlPlane(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	clientRegistry := mocks.NewMockRemoteClientRegistry(ctrl)
 
-	cluster, machine, node, nodeUpgrade := getObjectsForNodeUpgradeTest()
+	cluster, machine, node, nodeUpgrade, configMap := getObjectsForNodeUpgradeTest()
 	nodeUpgrade.Spec.FirstNodeToBeUpgraded = true
 	nodeUpgrade.Spec.EtcdVersion = ptr.String("v3.5.9-eks-1-28-9")
 	node.Labels = map[string]string{
 		"node-role.kubernetes.io/control-plane": "true",
 	}
-	client := fake.NewClientBuilder().WithRuntimeObjects(cluster, machine, node, nodeUpgrade).Build()
+	client := fake.NewClientBuilder().WithRuntimeObjects(cluster, machine, node, nodeUpgrade, configMap).Build()
 
 	clientRegistry.EXPECT().GetClient(ctx, types.NamespacedName{Name: cluster.Name, Namespace: cluster.Namespace}).Return(client, nil)
 
@@ -52,11 +52,11 @@ func TestNodeUpgradeReconcilerReconcileNextControlPlane(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	clientRegistry := mocks.NewMockRemoteClientRegistry(ctrl)
 
-	cluster, machine, node, nodeUpgrade := getObjectsForNodeUpgradeTest()
+	cluster, machine, node, nodeUpgrade, configMap := getObjectsForNodeUpgradeTest()
 	node.Labels = map[string]string{
 		"node-role.kubernetes.io/control-plane": "true",
 	}
-	client := fake.NewClientBuilder().WithRuntimeObjects(cluster, machine, node, nodeUpgrade).Build()
+	client := fake.NewClientBuilder().WithRuntimeObjects(cluster, machine, node, nodeUpgrade, configMap).Build()
 
 	clientRegistry.EXPECT().GetClient(ctx, types.NamespacedName{Name: cluster.Name, Namespace: cluster.Namespace}).Return(client, nil)
 
@@ -76,8 +76,8 @@ func TestNodeUpgradeReconcilerReconcileWorker(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	clientRegistry := mocks.NewMockRemoteClientRegistry(ctrl)
 
-	cluster, machine, node, nodeUpgrade := getObjectsForNodeUpgradeTest()
-	client := fake.NewClientBuilder().WithRuntimeObjects(cluster, machine, node, nodeUpgrade).Build()
+	cluster, machine, node, nodeUpgrade, configMap := getObjectsForNodeUpgradeTest()
+	client := fake.NewClientBuilder().WithRuntimeObjects(cluster, machine, node, nodeUpgrade, configMap).Build()
 
 	clientRegistry.EXPECT().GetClient(ctx, types.NamespacedName{Name: cluster.Name, Namespace: cluster.Namespace}).Return(client, nil)
 
@@ -97,8 +97,8 @@ func TestNodeUpgradeReconcilerReconcileCreateUpgraderPodState(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	clientRegistry := mocks.NewMockRemoteClientRegistry(ctrl)
 
-	cluster, machine, node, nodeUpgrade := getObjectsForNodeUpgradeTest()
-	client := fake.NewClientBuilder().WithRuntimeObjects(cluster, machine, node, nodeUpgrade).Build()
+	cluster, machine, node, nodeUpgrade, configMap := getObjectsForNodeUpgradeTest()
+	client := fake.NewClientBuilder().WithRuntimeObjects(cluster, machine, node, nodeUpgrade, configMap).Build()
 
 	clientRegistry.EXPECT().GetClient(ctx, types.NamespacedName{Name: cluster.Name, Namespace: cluster.Namespace}).Return(client, nil).Times(2)
 
@@ -158,8 +158,8 @@ func TestNodeUpgradeReconcilerReconcileDelete(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	clientRegistry := mocks.NewMockRemoteClientRegistry(ctrl)
 
-	cluster, machine, node, nodeUpgrade := getObjectsForNodeUpgradeTest()
-	client := fake.NewClientBuilder().WithRuntimeObjects(cluster, machine, node, nodeUpgrade).Build()
+	cluster, machine, node, nodeUpgrade, configMap := getObjectsForNodeUpgradeTest()
+	client := fake.NewClientBuilder().WithRuntimeObjects(cluster, machine, node, nodeUpgrade, configMap).Build()
 
 	clientRegistry.EXPECT().GetClient(ctx, types.NamespacedName{Name: cluster.Name, Namespace: cluster.Namespace}).Return(client, nil).Times(2)
 
@@ -189,8 +189,8 @@ func TestNodeUpgradeReconcilerReconcileDeleteUpgraderPodAlreadyDeleted(t *testin
 	ctrl := gomock.NewController(t)
 	clientRegistry := mocks.NewMockRemoteClientRegistry(ctrl)
 
-	cluster, machine, node, nodeUpgrade := getObjectsForNodeUpgradeTest()
-	client := fake.NewClientBuilder().WithRuntimeObjects(cluster, machine, node, nodeUpgrade).Build()
+	cluster, machine, node, nodeUpgrade, configMap := getObjectsForNodeUpgradeTest()
+	client := fake.NewClientBuilder().WithRuntimeObjects(cluster, machine, node, nodeUpgrade, configMap).Build()
 
 	clientRegistry.EXPECT().GetClient(ctx, types.NamespacedName{Name: cluster.Name, Namespace: cluster.Namespace}).Return(client, nil).Times(2)
 
@@ -217,12 +217,13 @@ func TestNodeUpgradeReconcilerReconcileDeleteUpgraderPodAlreadyDeleted(t *testin
 	g.Expect(err).To(MatchError("pods \"node01-node-upgrader\" not found"))
 }
 
-func getObjectsForNodeUpgradeTest() (*clusterv1.Cluster, *clusterv1.Machine, *corev1.Node, *anywherev1.NodeUpgrade) {
+func getObjectsForNodeUpgradeTest() (*clusterv1.Cluster, *clusterv1.Machine, *corev1.Node, *anywherev1.NodeUpgrade, *corev1.ConfigMap) {
 	cluster := generateCluster()
 	node := generateNode()
 	machine := generateMachine(cluster, node)
 	nodeUpgrade := generateNodeUpgrade(machine)
-	return cluster, machine, node, nodeUpgrade
+	configMap := generateConfigMap()
+	return cluster, machine, node, nodeUpgrade, configMap
 }
 
 func nodeUpgradeRequest(nodeUpgrade *anywherev1.NodeUpgrade) reconcile.Request {
@@ -284,3 +285,13 @@ func generateCluster() *clusterv1.Cluster {
 		},
 	}
 }
+
+func generateConfigMap() *corev1.ConfigMap {
+	return &corev1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "in-place-upgrade",
+			Namespace: "eksa-system",
+		},
+		Data: map[string]string{"v1.28.1": "test"},
+	}
+}

internal/test/cluster.go

@@ -47,11 +47,29 @@ func NewClusterSpec(opts ...ClusterSpecOpt) *cluster.Spec {
 	}
 	s.VersionsBundles = map[v1alpha1.KubernetesVersion]*cluster.VersionsBundle{
 		v1alpha1.Kube119: {
-			VersionsBundle: &releasev1alpha1.VersionsBundle{},
-			KubeDistro:     &cluster.KubeDistro{},
+			VersionsBundle: &releasev1alpha1.VersionsBundle{
+				EksD: releasev1alpha1.EksDRelease{
+					Name:           "kubernetes-1-19-eks-7",
+					EksDReleaseUrl: "embed:///testdata/release.yaml",
+					KubeVersion:    "1.19",
+				},
+			},
+			KubeDistro: &cluster.KubeDistro{},
+		},
+	}
+	s.Bundles = &releasev1alpha1.Bundles{
+		Spec: releasev1alpha1.BundlesSpec{
+			VersionsBundles: []releasev1alpha1.VersionsBundle{
+				{
+					EksD: releasev1alpha1.EksDRelease{
+						Name:           "kubernetes-1-19-eks-7",
+						EksDReleaseUrl: "embed:///testdata/release.yaml",
+						KubeVersion:    "1.19",
+					},
+				},
+			},
 		},
 	}
-	s.Bundles = &releasev1alpha1.Bundles{}
 	s.EKSARelease = EKSARelease()
 
 	for _, opt := range opts {

pkg/clustermanager/cluster_manager.go

@@ -16,6 +16,8 @@ import (
 	eksdv1alpha1 "github.com/aws/eks-distro-build-tooling/release/api/v1alpha1"
 	etcdv1 "github.com/aws/etcdadm-controller/api/v1beta1"
 	"github.com/go-logr/logr"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/integer"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
@@ -151,6 +153,7 @@ type ClusterClient interface {
 	GetMachineDeployment(ctx context.Context, workerNodeGroupName string, opts ...executables.KubectlOpt) (*clusterv1.MachineDeployment, error)
 	GetEksdRelease(ctx context.Context, name, namespace, kubeconfigFile string) (*eksdv1alpha1.Release, error)
 	ListObjects(ctx context.Context, resourceType, namespace, kubeconfig string, list kubernetes.ObjectList) error
+	GetConfigMap(ctx context.Context, kubeconfigFile, name, namespace string) (*corev1.ConfigMap, error)
 }
 
 type Networking interface {
@@ -1176,6 +1179,16 @@ func (c *ClusterManager) ApplyBundles(ctx context.Context, clusterSpec *cluster.
 	if err != nil {
 		return fmt.Errorf("applying bundle spec: %v", err)
 	}
+
+	// We need to update this config map with the new upgrader images whenever we
+	// apply a new Bundles object to the cluster in order to support in-place upgrades.
+	cm, err := c.getUpgraderImagesFromBundle(ctx, cluster, clusterSpec)
+	if err != nil {
+		return fmt.Errorf("getting upgrader images from bundle: %v", err)
+	}
+	if err = c.clusterClient.Apply(ctx, cluster.KubeconfigFile, cm); err != nil {
+		return fmt.Errorf("applying upgrader images config map: %v", err)
+	}
 	return nil
 }
 
@@ -1394,3 +1407,44 @@ func (c *ClusterManager) buildSpecForCluster(ctx context.Context, clus *types.Cl
 func (c *ClusterManager) DeletePackageResources(ctx context.Context, managementCluster *types.Cluster, clusterName string) error {
 	return c.clusterClient.DeletePackageResources(ctx, managementCluster, clusterName)
 }
+
+func (c *ClusterManager) getUpgraderImagesFromBundle(ctx context.Context, cluster *types.Cluster, cl *cluster.Spec) (*corev1.ConfigMap, error) {
+	upgraderImages := make(map[string]string)
+	for _, versionBundle := range cl.Bundles.Spec.VersionsBundles {
+		eksD := versionBundle.EksD
+		eksdVersion := fmt.Sprintf("%s-eks-%s-%s", eksD.KubeVersion, eksD.ReleaseChannel, strings.Split(eksD.Name, "-")[4])
+		if _, ok := upgraderImages[eksdVersion]; !ok {
+			upgraderImages[eksdVersion] = versionBundle.Upgrader.Upgrader.URI
+		}
+	}
+
+	upgraderConfigMap, err := c.clusterClient.GetConfigMap(ctx, cluster.KubeconfigFile, constants.UpgraderConfigMapName, constants.EksaSystemNamespace)
+	if err != nil {
+		if executables.IsKubectlNotFoundError(err) {
+			return newUpgraderConfigMap(upgraderImages), nil
+		}
+		return nil, err
+	}
+
+	for version, image := range upgraderImages {
+		if _, ok := upgraderConfigMap.Data[version]; !ok {
+			upgraderConfigMap.Data[version] = image
+		}
+	}
+
+	return upgraderConfigMap, nil
+}
+
+func newUpgraderConfigMap(m map[string]string) *corev1.ConfigMap {
+	return &corev1.ConfigMap{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "ConfigMap",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      constants.UpgraderConfigMapName,
+			Namespace: constants.EksaSystemNamespace,
+		},
+		Data: m,
+	}
+}