fix: Allow using AMIs from other accounts

pkg/helpers/helpers.go

@@ -240,7 +240,7 @@ func NewKopsMachinePool(name, namespace, clusterName string) *infrastructurev1al
 		Spec: infrastructurev1alpha1.KopsMachinePoolSpec{
 			ClusterName: clusterName,
 			KopsInstanceGroupSpec: kopsapi.InstanceGroupSpec{
-				Image: "xxxx/ubuntu-v1",
+				Image: "000000000000/ubuntu-v1",
 				Role:  "ControlPlane",
 				Subnets: []string{
 					"dummy-subnet",

utils/fixtures/karpenter/test_successful_ec2_node_class.tpl

@@ -8,6 +8,7 @@ spec:
   amiFamily: Custom
   amiSelectorTerms:
   - name: ubuntu-v1
+    owner: "000000000000"
   metadataOptions:
     httpEndpoint: enabled
     httpProtocolIPv6: disabled
@@ -39,4 +40,4 @@ spec:
     kops.k8s.io/instancegroup: test-machine-pool
     KubernetesCluster: test-cluster.test.k8s.cluster
   userData: |
-    dummy content
+    dummy content

utils/karpenter_utils.go

@@ -165,7 +165,7 @@ func GetKubeletConfiguration(kubeletSpec *kopsapi.KubeletConfigSpec) *karpenterv
 }
 
 func CreateEC2NodeClassFromKopsLaunchTemplateInfo(kopsCluster *kopsapi.Cluster, kmp *infrastructurev1alpha1.KopsMachinePool, nodePoolName, terraformOutputDir string) (string, error) {
-	amiName, err := GetAmiNameFromImageSource(kmp.Spec.KopsInstanceGroupSpec.Image)
+	amiName, amiAccount, err := GetAmiNameFromImageSource(kmp.Spec.KopsInstanceGroupSpec.Image)
 	if err != nil {
 		return "", err
 	}
@@ -185,6 +185,7 @@ func CreateEC2NodeClassFromKopsLaunchTemplateInfo(kopsCluster *kopsapi.Cluster,
 	data := struct {
 		Name              string
 		AmiName           string
+		AmiAccount        string
 		ClusterName       string
 		IGName            string
 		Tags              map[string]string
@@ -194,6 +195,7 @@ func CreateEC2NodeClassFromKopsLaunchTemplateInfo(kopsCluster *kopsapi.Cluster,
 	}{
 		Name:              nodePoolName,
 		AmiName:           amiName,
+		AmiAccount:        amiAccount,
 		IGName:            kmp.Name,
 		ClusterName:       kopsCluster.Name,
 		Tags:              kopsCluster.Spec.CloudLabels,
@@ -222,7 +224,7 @@ func CreateEC2NodeClassFromKopsLaunchTemplateInfo(kopsCluster *kopsapi.Cluster,
 }
 
 func CreateEC2NodeClassV1FromKopsLaunchTemplateInfo(kopsCluster *kopsapi.Cluster, kmp *infrastructurev1alpha1.KopsMachinePool, nodePoolName, terraformOutputDir string) (*karpenterv1.EC2NodeClass, error) {
-	amiName, err := GetAmiNameFromImageSource(kmp.Spec.KopsInstanceGroupSpec.Image)
+	amiName, amiAccount, err := GetAmiNameFromImageSource(kmp.Spec.KopsInstanceGroupSpec.Image)
 	if err != nil {
 		return nil, err
 	}
@@ -257,7 +259,8 @@ func CreateEC2NodeClassV1FromKopsLaunchTemplateInfo(kopsCluster *kopsapi.Cluster
 			AMIFamily: &karpenterv1.AMIFamilyCustom,
 			AMISelectorTerms: []karpenterv1.AMISelectorTerm{
 				{
-					Name: amiName,
+					Name:  amiName,
+					Owner: amiAccount,
 				},
 			},
 			MetadataOptions: &karpenterv1.MetadataOptions{

utils/karpenter_utils_test.go

@@ -81,7 +81,7 @@ func TestCreateEC2NodeClassFromKopsLaunchTemplateInfo(t *testing.T) {
 				g.Expect(err).ToNot(HaveOccurred())
 				expectedOutput, err := os.ReadFile(tc.expectedOutputFile)
 				g.Expect(err).NotTo(HaveOccurred())
-				g.Expect(ec2NodeClassString).To(Equal(string(expectedOutput)))
+				g.Expect(ec2NodeClassString).To(BeEquivalentTo(string(expectedOutput)))
 
 			}
 		})
@@ -127,7 +127,8 @@ func TestCreateEC2NodeClassV1FromKopsLaunchTemplateInfo(t *testing.T) {
 					AMIFamily: &karpenterv1.AMIFamilyCustom,
 					AMISelectorTerms: []karpenterv1.AMISelectorTerm{
 						{
-							Name: "ubuntu-v1",
+							Name:  "ubuntu-v1",
+							Owner: "000000000000",
 						},
 					},
 					MetadataOptions: &karpenterv1.MetadataOptions{

utils/kops_utils.go

@@ -343,12 +343,12 @@ func KopsDeleteResources(ctx context.Context, cloud fi.Cloud, kopsClientset simp
 
 }
 
-func GetAmiNameFromImageSource(image string) (string, error) {
+func GetAmiNameFromImageSource(image string) (string, string, error) {
 	parts := strings.SplitN(image, "/", 2)
 	if len(parts) > 1 {
-		return parts[1], nil
+		return parts[1], parts[0], nil
 	} else {
-		return "", errors.New("invalid image format, should receive image source")
+		return "", "", errors.New("invalid image format, should receive image source")
 	}
 }
 

utils/kops_utils_test.go

@@ -454,12 +454,14 @@ func TestGetAmiNameFromImageSource(t *testing.T) {
 		description   string
 		input         string
 		output        string
+		output2       string
 		expectedError error
 	}{
 		{
 			description: "should return the ami name from the image source",
 			input:       "000000000000/ubuntu-v1.0.0",
 			output:      "ubuntu-v1.0.0",
+			output2:     "000000000000",
 		},
 		{
 			description:   "should fail when receiving ami id",
@@ -479,13 +481,14 @@ func TestGetAmiNameFromImageSource(t *testing.T) {
 
 		t.Run(tc.description, func(t *testing.T) {
 
-			amiName, err := GetAmiNameFromImageSource(tc.input)
+			amiName, amiAccount, err := GetAmiNameFromImageSource(tc.input)
 			if tc.expectedError != nil {
 				g.Expect(err).To(HaveOccurred())
 				g.Expect(err).To(Equal(tc.expectedError))
 			} else {
 				g.Expect(err).To(BeNil())
 				g.Expect(amiName).To(Equal(tc.output))
+				g.Expect(amiAccount).To(Equal(tc.output2))
 			}
 
 		})

utils/templates/ec2nodeclass.yaml.tpl

@@ -8,6 +8,7 @@ spec:
   amiFamily: Custom
   amiSelectorTerms:
   - name: {{ .AmiName }}
+    owner: "{{ .AmiAccount }}"
   metadataOptions:
     httpEndpoint: enabled
     httpProtocolIPv6: disabled
@@ -42,4 +43,4 @@ spec:
     {{ $key }}: {{ $value | quote }}
   {{- end }}
   userData: |
-{{ .UserData | indent 4 }}
+{{ .UserData | indent 4 }}

utils/templates/tests/data/karpenter_resource_output_node_pool.yaml

@@ -72,6 +72,7 @@ spec:
   amiFamily: Custom
   amiSelectorTerms:
   - name: ubuntu-v1
+    owner: "000000000000"
   metadataOptions:
     httpEndpoint: enabled
     httpProtocolIPv6: disabled
@@ -107,3 +108,4 @@ spec:
     set -o errexit
     set -o nounset
     set -o pipefail
+

utils/templates/tests/data/karpenter_resource_output_node_pool_and_provisioner.yaml

@@ -115,6 +115,7 @@ spec:
   amiFamily: Custom
   amiSelectorTerms:
   - name: ubuntu-v1
+    owner: "000000000000"
   associatePublicIPAddress: false
   blockDeviceMappings:
   - deviceName: /dev/sda1

utils/templates/tests/data/karpenter_resource_output_node_pool_v1.yaml

@@ -66,6 +66,7 @@ spec:
   amiFamily: Custom
   amiSelectorTerms:
   - name: ubuntu-v1
+    owner: "000000000000"
   associatePublicIPAddress: false
   blockDeviceMappings:
   - deviceName: /dev/sda1