Add methods to fetch upgrader image from bundle

config/crd/bases/anywhere.eks.amazonaws.com_controlplaneupgrades.yaml

@@ -37,13 +37,6 @@ spec:
           spec:
             description: ControlPlaneUpgradeSpec defines the desired state of ControlPlaneUpgrade.
             properties:
-              cluster:
-                properties:
-                  kind:
-                    type: string
-                  name:
-                    type: string
-                type: object
               controlPlane:
                 properties:
                   kind:
@@ -70,13 +63,15 @@ spec:
                       type: string
                   type: object
                 type: array
+              upgraderImage:
+                type: string
             required:
-            - cluster
             - controlPlane
             - kubeadmClusterConfig
             - kubeletVersion
             - kubernetesVersion
             - machinesRequireUpgrade
+            - upgraderImage
             type: object
           status:
             description: ControlPlaneUpgradeStatus defines the observed state of ControlPlaneUpgrade.

config/crd/bases/anywhere.eks.amazonaws.com_machinedeploymentupgrades.yaml

@@ -38,13 +38,6 @@ spec:
             description: MachineDeploymentUpgradeSpec defines the desired state of
               MachineDeploymentUpgrade.
             properties:
-              cluster:
-                properties:
-                  kind:
-                    type: string
-                  name:
-                    type: string
-                type: object
               kubeadmClusterConfig:
                 type: string
               kubeletVersion:
@@ -67,13 +60,15 @@ spec:
                       type: string
                   type: object
                 type: array
+              upgraderImage:
+                type: string
             required:
-            - cluster
             - kubeadmClusterConfig
             - kubeletVersion
             - kubernetesVersion
             - machineDeployment
             - machinesRequireUpgrade
+            - upgraderImage
             type: object
           status:
             description: MachineDeploymentUpgradeStatus defines the observed state

config/crd/bases/anywhere.eks.amazonaws.com_nodeupgrades.yaml

@@ -46,8 +46,6 @@ spec:
                   nodes and ignored for worker nodes.
                 type: boolean
               kubernetesVersion:
-                description: 'TODO(in-place): Determine if there''s a way to get these
-                  dynamically instead of expecting it from the CRD.'
                 type: string
               machine:
                 description: Machine is a reference to the CAPI Machine that needs
@@ -86,9 +84,12 @@ spec:
                     description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                     type: string
                 type: object
+              upgraderImage:
+                type: string
             required:
             - kubernetesVersion
             - machine
+            - upgraderImage
             type: object
           status:
             description: NodeUpgradeStatus defines the observed state of NodeUpgrade.

config/manifest/eksa-components.yaml

@@ -3740,24 +3740,51 @@ spec:
                       in the cluster
                     properties:
                       cilium:
+                        description: CiliumConfig contains configuration specific
+                          to the Cilium CNI.
                         properties:
                           egressMasqueradeInterfaces:
                             description: EgressMasquaradeInterfaces determines which
                               network interfaces are used for masquerading. Accepted
                               values are a valid interface name or interface prefix.
                             type: string
+                          ipv4NativeRoutingCIDR:
+                            description: IPv4NativeRoutingCIDR specifies the CIDR
+                              to use when RoutingMode is set to direct. When specified,
+                              Cilium assumes networking for this CIDR is preconfigured
+                              and hands traffic destined for that range to the Linux
+                              network stack without applying any SNAT. If this is
+                              not set autoDirectNodeRoutes will be set to true
+                            type: string
+                          ipv6NativeRoutingCIDR:
+                            description: IPv6NativeRoutingCIDR specifies the IPv6
+                              CIDR to use when RoutingMode is set to direct. When
+                              specified, Cilium assumes networking for this CIDR is
+                              preconfigured and hands traffic destined for that range
+                              to the Linux network stack without applying any SNAT.
+                              If this is not set autoDirectNodeRoutes will be set
+                              to true
+                            type: string
                           policyEnforcementMode:
                             description: PolicyEnforcementMode determines communication
                               allowed between pods. Accepted values are default, always,
                               never.
                             type: string
+                          routingMode:
+                            description: RoutingMode indicates the routing tunnel
+                              mode to use for Cilium. Accepted values are overlay
+                              (geneve tunnel with overlay) or direct (tunneling disabled
+                              with direct routing) Defaults to overlay.
+                            type: string
                           skipUpgrade:
                             description: SkipUpgrade indicicates that Cilium maintenance
                               should be skipped during upgrades. This can be used
                               when operators wish to self manage the Cilium installation.
                             type: boolean
                         type: object
                       kindnetd:
+                        description: KindnetdConfig contains configuration specific
+                          to the Kindnetd CNI.
                         type: object
                     type: object
                   dns:
@@ -4388,13 +4415,6 @@ spec:
           spec:
             description: ControlPlaneUpgradeSpec defines the desired state of ControlPlaneUpgrade.
             properties:
-              cluster:
-                properties:
-                  kind:
-                    type: string
-                  name:
-                    type: string
-                type: object
               controlPlane:
                 properties:
                   kind:
@@ -4421,13 +4441,15 @@ spec:
                       type: string
                   type: object
                 type: array
+              upgraderImage:
+                type: string
             required:
-            - cluster
             - controlPlane
             - kubeadmClusterConfig
             - kubeletVersion
             - kubernetesVersion
             - machinesRequireUpgrade
+            - upgraderImage
             type: object
           status:
             description: ControlPlaneUpgradeStatus defines the observed state of ControlPlaneUpgrade.
@@ -4440,10 +4462,6 @@ spec:
               upgraded:
                 format: int64
                 type: integer
-            required:
-            - ready
-            - requireUpgrade
-            - upgraded
             type: object
         type: object
     served: true
@@ -4823,13 +4841,6 @@ spec:
             description: MachineDeploymentUpgradeSpec defines the desired state of
               MachineDeploymentUpgrade.
             properties:
-              cluster:
-                properties:
-                  kind:
-                    type: string
-                  name:
-                    type: string
-                type: object
               kubeadmClusterConfig:
                 type: string
               kubeletVersion:
@@ -4852,13 +4863,15 @@ spec:
                       type: string
                   type: object
                 type: array
+              upgraderImage:
+                type: string
             required:
-            - cluster
             - kubeadmClusterConfig
             - kubeletVersion
             - kubernetesVersion
             - machineDeployment
             - machinesRequireUpgrade
+            - upgraderImage
             type: object
           status:
             description: MachineDeploymentUpgradeStatus defines the observed state
@@ -4969,9 +4982,12 @@ spec:
                     description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                     type: string
                 type: object
+              upgraderImage:
+                type: string
             required:
             - kubernetesVersion
             - machine
+            - upgraderImage
             type: object
           status:
             description: NodeUpgradeStatus defines the observed state of NodeUpgrade.

controllers/cluster_controller.go

@@ -632,3 +632,21 @@ func validateEksaRelease(ctx context.Context, client client.Client, cluster *any
 	}
 	return nil
 }
+
+func (r *ClusterReconciler) getUpgraderImagesFromBundle(ctx context.Context, cluster *anywherev1.Cluster) (map[string]string, error) {
+	upgraderImages := make(map[string]string)
+	bundles, err := c.BundlesForCluster(ctx, clientutil.NewKubeClient(r.client), cluster)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, v := range cluster.KubernetesVersions() {
+		verBundle, err := c.GetVersionsBundle(v, bundles)
+		if err != nil {
+			return nil, err
+		}
+		upgraderImages[string(v)] = verBundle.Upgrader.Upgrader.URI
+	}
+
+	return upgraderImages, nil
+}

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,18 +218,15 @@ 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{
 			Name:      "cp-upgrade-request",
 			Namespace: "eksa-system",
 		},
 		Spec: anywherev1.ControlPlaneUpgradeSpec{
-			Cluster: anywherev1.Ref{
-				Name: cluster.Name,
-				Kind: "Cluster",
-			},
+			UpgraderImage: "test-image",
 			ControlPlane: anywherev1.Ref{
 				Name: "my-cp",
 				Kind: "KubeadmControlPlane",

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,17 +159,14 @@ 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",
 			Namespace: "eksa-system",
 		},
 		Spec: anywherev1.MachineDeploymentUpgradeSpec{
-			Cluster: anywherev1.Ref{
-				Name: cluster.Name,
-				Kind: "Cluster",
-			},
+			UpgraderImage: "test-image",
 			MachineDeployment: anywherev1.Ref{
 				Name: "my-md",
 				Kind: "MachineDeployment",

controllers/nodeupgrade_controller.go

@@ -25,10 +25,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"
@@ -170,12 +168,12 @@ func (r *NodeUpgradeReconciler) reconcile(ctx context.Context, log logr.Logger,
 
 	if isControlPlane(node) {
 		if nodeUpgrade.Spec.FirstNodeToBeUpgraded {
-			upgraderPod = upgrader.UpgradeFirstControlPlanePod(node.Name, defaultUpgraderImage, nodeUpgrade.Spec.KubernetesVersion, *nodeUpgrade.Spec.EtcdVersion)
+			upgraderPod = upgrader.UpgradeFirstControlPlanePod(node.Name, nodeUpgrade.Spec.UpgraderImage, nodeUpgrade.Spec.KubernetesVersion, *nodeUpgrade.Spec.EtcdVersion)
 		} else {
-			upgraderPod = upgrader.UpgradeSecondaryControlPlanePod(node.Name, defaultUpgraderImage)
+			upgraderPod = upgrader.UpgradeSecondaryControlPlanePod(node.Name, nodeUpgrade.Spec.UpgraderImage)
 		}
 	} else {
-		upgraderPod = upgrader.UpgradeWorkerPod(node.Name, defaultUpgraderImage)
+		upgraderPod = upgrader.UpgradeWorkerPod(node.Name, nodeUpgrade.Spec.UpgraderImage)
 	}
 
 	if err := remoteClient.Create(ctx, upgraderPod); err != nil {

pkg/api/v1alpha1/controlplaneupgrade_types.go

@@ -9,7 +9,7 @@ const ControlPlaneUpgradeKind = "ControlPlaneUpgrade"
 
 // ControlPlaneUpgradeSpec defines the desired state of ControlPlaneUpgrade.
 type ControlPlaneUpgradeSpec struct {
-	Cluster                Ref     `json:"cluster"`
+	UpgraderImage          string  `json:"upgraderImage"`
 	ControlPlane           Ref     `json:"controlPlane"`
 	MachinesRequireUpgrade []Ref   `json:"machinesRequireUpgrade"`
 	KubernetesVersion      string  `json:"kubernetesVersion"`

pkg/api/v1alpha1/machinedeploymentupgrade_types.go

@@ -9,7 +9,7 @@ const MachineDeploymentUpgradeKind = "MachineDeploymentUpgrade"
 
 // MachineDeploymentUpgradeSpec defines the desired state of MachineDeploymentUpgrade.
 type MachineDeploymentUpgradeSpec struct {
-	Cluster                Ref    `json:"cluster"`
+	UpgraderImage          string `json:"upgraderImage"`
 	MachineDeployment      Ref    `json:"machineDeployment"`
 	MachinesRequireUpgrade []Ref  `json:"machinesRequireUpgrade"`
 	KubernetesVersion      string `json:"kubernetesVersion"`

pkg/api/v1alpha1/nodeupgrade_types.go

@@ -47,6 +47,8 @@ type NodeUpgradeSpec struct {
 	// This flag is only valid for control plane nodes and ignored for worker nodes.
 	// +optional
 	FirstNodeToBeUpgraded bool `json:"firstNodeToBeUpgraded,omitempty"`
+
+	UpgraderImage string `json:"upgraderImage"`
 }
 
 // NodeUpgradeStatus defines the observed state of NodeUpgrade.