fix copy packages destination to match import images

Author: snarkychef

test/e2e/curatedpackages.go

@@ -6,6 +6,7 @@ package e2e
 import (
 	"context"
 	"fmt"
+	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -51,8 +52,63 @@ func runDisabledCuratedPackageInstallSimpleFlow(test *framework.ClusterE2ETest)
 	test.WithCluster(runDisabledCuratedPackage)
 }
 
+// addDefaultOCINamespacesFromEnv adds default OCI namespaces from environment variables if they're not already set.
+func addDefaultOCINamespacesFromEnv(test *framework.ClusterE2ETest) {
+	if test.ClusterConfig.Cluster.Spec.RegistryMirrorConfiguration == nil {
+		return
+	}
+
+	if len(test.ClusterConfig.Cluster.Spec.RegistryMirrorConfiguration.OCINamespaces) > 0 {
+		return
+	}
+
+	// Check if the required env vars are set before calling DefaultOciNamespaces
+	if os.Getenv(framework.RegistryMirrorOciNamespacesRegistry1Var) == "" ||
+		os.Getenv(framework.RegistryMirrorOciNamespacesNamespace1Var) == "" {
+		return
+	}
+
+	test.T.Log("Adding default OCI namespaces from environment variables")
+	test.ClusterConfig.Cluster.Spec.RegistryMirrorConfiguration.OCINamespaces = framework.DefaultOciNamespaces(test)
+}
+
 func runCuratedPackageInstallSimpleFlowRegistryMirror(test *framework.ClusterE2ETest) {
-	test.WithClusterRegistryMirror(EksaPackagesRegistryMirrorAlias, EksaPackagesSourceRegistry, EksaPackagesRegistry, runCuratedPackageInstall)
+	test.GenerateClusterConfig()
+	test.DownloadArtifacts()
+	test.ExtractDownloadedArtifacts()
+
+	// Determine the correct alias from the bundle after download
+	alias, err := test.DeterminePackageRegistryAlias()
+	if err != nil {
+		test.T.Fatalf("Failed to determine package registry alias: %v", err)
+	}
+	test.T.Logf("Using registry alias: %s for curated packages", alias)
+
+	// Add default OCI namespaces from env vars, then append the curated packages one
+	if test.ClusterConfig.Cluster.Spec.RegistryMirrorConfiguration != nil {
+		addDefaultOCINamespacesFromEnv(test)
+
+		test.ClusterConfig.Cluster.Spec.RegistryMirrorConfiguration.OCINamespaces = append(
+			test.ClusterConfig.Cluster.Spec.RegistryMirrorConfiguration.OCINamespaces,
+			v1alpha1.OCINamespace{
+				Registry:  EksaPackagesRegistry,
+				Namespace: alias,
+			},
+		)
+	}
+	test.UpdateClusterConfig()
+
+	test.DownloadImages()
+	test.ImportImages()
+	test.CopyPackages(alias, EksaPackagesSourceRegistry, EksaPackagesRegistry)
+
+	bundlePath := "./eks-anywhere-downloads/bundle-release.yaml"
+	test.CreateCluster(framework.WithBundlesOverride(bundlePath))
+	defer func() {
+		test.GenerateSupportBundleIfTestFailed()
+		test.DeleteCluster(framework.WithBundlesOverride(bundlePath))
+	}()
+	runCuratedPackageInstall(test)
 }
 
 func runCuratedPackageRemoteClusterInstallSimpleFlow(test *framework.MulticlusterE2ETest) {

test/e2e/vsphere_test.go

@@ -2931,11 +2931,7 @@ func TestVSphereKubernetes129UbuntuAuthenticatedRegistryMirrorCuratedPackagesSim
 		framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
 		framework.WithClusterFiller(api.WithExternalEtcdTopology(1)),
 		framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)),
-		framework.WithAuthenticatedRegistryMirror(constants.VSphereProviderName,
-			v1alpha1.OCINamespace{
-				Registry:  EksaPackagesRegistry,
-				Namespace: EksaPackagesRegistryMirrorAlias,
-			}),
+		framework.WithAuthenticatedRegistryMirror(constants.VSphereProviderName),
 	)
 	runCuratedPackageInstallSimpleFlowRegistryMirror(test)
 }
@@ -2949,11 +2945,7 @@ func TestVSphereKubernetes134UbuntuAuthenticatedRegistryMirrorCuratedPackagesSim
 		framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
 		framework.WithClusterFiller(api.WithExternalEtcdTopology(1)),
 		framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube134)),
-		framework.WithAuthenticatedRegistryMirror(constants.VSphereProviderName,
-			v1alpha1.OCINamespace{
-				Registry:  EksaPackagesRegistry,
-				Namespace: EksaPackagesRegistryMirrorAlias,
-			}),
+		framework.WithAuthenticatedRegistryMirror(constants.VSphereProviderName),
 	)
 	runCuratedPackageInstallSimpleFlowRegistryMirror(test)
 }
@@ -2967,11 +2959,7 @@ func TestVSphereKubernetes130UbuntuAuthenticatedRegistryMirrorCuratedPackagesSim
 		framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
 		framework.WithClusterFiller(api.WithExternalEtcdTopology(1)),
 		framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)),
-		framework.WithAuthenticatedRegistryMirror(constants.VSphereProviderName,
-			v1alpha1.OCINamespace{
-				Registry:  EksaPackagesRegistry,
-				Namespace: EksaPackagesRegistryMirrorAlias,
-			}),
+		framework.WithAuthenticatedRegistryMirror(constants.VSphereProviderName),
 	)
 	runCuratedPackageInstallSimpleFlowRegistryMirror(test)
 }
@@ -2985,11 +2973,7 @@ func TestVSphereKubernetes131UbuntuAuthenticatedRegistryMirrorCuratedPackagesSim
 		framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
 		framework.WithClusterFiller(api.WithExternalEtcdTopology(1)),
 		framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)),
-		framework.WithAuthenticatedRegistryMirror(constants.VSphereProviderName,
-			v1alpha1.OCINamespace{
-				Registry:  EksaPackagesRegistry,
-				Namespace: EksaPackagesRegistryMirrorAlias,
-			}),
+		framework.WithAuthenticatedRegistryMirror(constants.VSphereProviderName),
 	)
 	runCuratedPackageInstallSimpleFlowRegistryMirror(test)
 }
@@ -3003,11 +2987,7 @@ func TestVSphereKubernetes132UbuntuAuthenticatedRegistryMirrorCuratedPackagesSim
 		framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
 		framework.WithClusterFiller(api.WithExternalEtcdTopology(1)),
 		framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube132)),
-		framework.WithAuthenticatedRegistryMirror(constants.VSphereProviderName,
-			v1alpha1.OCINamespace{
-				Registry:  EksaPackagesRegistry,
-				Namespace: EksaPackagesRegistryMirrorAlias,
-			}),
+		framework.WithAuthenticatedRegistryMirror(constants.VSphereProviderName),
 	)
 	runCuratedPackageInstallSimpleFlowRegistryMirror(test)
 }
@@ -3021,11 +3001,7 @@ func TestVSphereKubernetes133UbuntuAuthenticatedRegistryMirrorCuratedPackagesSim
 		framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
 		framework.WithClusterFiller(api.WithExternalEtcdTopology(1)),
 		framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube133)),
-		framework.WithAuthenticatedRegistryMirror(constants.VSphereProviderName,
-			v1alpha1.OCINamespace{
-				Registry:  EksaPackagesRegistry,
-				Namespace: EksaPackagesRegistryMirrorAlias,
-			}),
+		framework.WithAuthenticatedRegistryMirror(constants.VSphereProviderName),
 	)
 	runCuratedPackageInstallSimpleFlowRegistryMirror(test)
 }

test/framework/cluster.go

@@ -686,6 +686,50 @@ func (e *ClusterE2ETest) ImportImages(opts ...CommandOpt) {
 	e.RunEKSA(importImagesArgs, opts...)
 }
 
+// DeterminePackageRegistryAlias determines the correct registry alias based on the bundle's package controller chart image.
+// It returns the alias to use for registry mirror destination paths (x3k6m8v0 for dev, w9m0f3l5 for staging, eks-anywhere for prod).
+func (e *ClusterE2ETest) DeterminePackageRegistryAlias() (string, error) {
+	var bundleManifestLocation string
+	if _, err := os.Stat(defaultDownloadArtifactsOutputLocation); err == nil {
+		bundleManifestLocation = bundleReleasePathFromArtifacts
+	} else {
+		bundleManifestLocation = defaultBundleReleaseManifestFile
+	}
+
+	// Read the bundle file
+	bundleData, err := os.ReadFile(bundleManifestLocation)
+	if err != nil {
+		return "", fmt.Errorf("failed to read bundle file %s: %w", bundleManifestLocation, err)
+	}
+
+	// Parse the bundle
+	var bundles releasev1.Bundles
+	if err := yaml.Unmarshal(bundleData, &bundles); err != nil {
+		return "", fmt.Errorf("failed to parse bundle file: %w", err)
+	}
+
+	// Get the package controller chart image from the first version bundle
+	if len(bundles.Spec.VersionsBundles) == 0 {
+		return "", fmt.Errorf("no version bundles found in bundle file")
+	}
+
+	// Image() returns the URI without the tag: registry/alias/image-name
+	// Example: public.ecr.aws/x3k6m8v0/eks-anywhere-packages
+	// We want to extract "x3k6m8v0" (the second-to-last path component)
+	packageControllerImage := bundles.Spec.VersionsBundles[0].PackageController.HelmChart.Image()
+
+	// Split by '/' and get the second-to-last component
+	// We need at least 3 parts: registry, alias, and image name
+	parts := strings.Split(packageControllerImage, "/")
+	if len(parts) < 3 {
+		return "", fmt.Errorf("invalid package controller image format: %s", packageControllerImage)
+	}
+
+	// The alias is the second-to-last component (last is eks-anywhere-packages)
+	alias := parts[len(parts)-2]
+	return alias, nil
+}
+
 // CopyPackages runs the EKS-A `copy packages` command to copy curated packages to the registry mirror.
 func (e *ClusterE2ETest) CopyPackages(packageMirrorAlias string, packageChartRegistry string, packageRegistry string, opts ...CommandOpt) {
 	clusterConfig := e.ClusterConfig.Cluster
@@ -705,7 +749,7 @@ func (e *ClusterE2ETest) CopyPackages(packageMirrorAlias string, packageChartReg
 		"--dst-insecure",
 	}
 
-	e.T.Logf("Copying curated packages to registry mirror: %s", registryMirrorHost)
+	e.T.Logf("Copying curated packages to registry mirror: %s/%s", registryMirrorHost, packageMirrorAlias)
 	e.RunEKSA(copyPackagesArgs, opts...)
 }
 
@@ -1327,22 +1371,6 @@ func (e *ClusterE2ETest) WithCluster(f func(e *ClusterE2ETest)) {
 	f(e)
 }
 
-// WithClusterRegistryMirror helps with bringing up and tearing down E2E test clusters when using registry mirror.
-func (e *ClusterE2ETest) WithClusterRegistryMirror(packageMirrorAlias string, packageChartRegistry string, packageRegistry string, f func(e *ClusterE2ETest)) {
-	e.GenerateClusterConfig()
-	e.DownloadArtifacts()
-	e.ExtractDownloadedArtifacts()
-	e.DownloadImages()
-	e.ImportImages()
-	e.CopyPackages(packageMirrorAlias, packageChartRegistry, packageRegistry)
-	e.CreateCluster(WithBundlesOverride(bundleReleasePathFromArtifacts))
-	defer func() {
-		e.GenerateSupportBundleIfTestFailed()
-		e.DeleteCluster(WithBundlesOverride(bundleReleasePathFromArtifacts))
-	}()
-	f(e)
-}
-
 // Like WithCluster but does not delete the cluster. Useful for debugging.
 func (e *ClusterE2ETest) WithPersistentCluster(f func(e *ClusterE2ETest)) {
 	configPath := e.KubeconfigFilePath()

test/framework/registry_mirror.go

@@ -67,12 +67,13 @@ func WithRegistryMirrorEndpointAndCert(providerName string) ClusterE2ETestOpt {
 // WithRegistryMirrorOciNamespaces sets up e2e for registry mirrors with ocinamespaces.
 func WithRegistryMirrorOciNamespaces(providerName string) ClusterE2ETestOpt {
 	return func(e *ClusterE2ETest) {
-		ociNamespaces := defaultOciNamespaces(e)
+		ociNamespaces := DefaultOciNamespaces(e)
 		setupRegistryMirrorEndpointAndCert(e, providerName, false, ociNamespaces...)
 	}
 }
 
-func defaultOciNamespaces(e *ClusterE2ETest) []v1alpha1.OCINamespace {
+// DefaultOciNamespaces returns the default OCI namespaces from environment variables.
+func DefaultOciNamespaces(e *ClusterE2ETest) []v1alpha1.OCINamespace {
 	var ociNamespaces []v1alpha1.OCINamespace
 
 	checkRequiredEnvVars(e.T, registryMirrorOciNamespacesRequiredEnvVars)
@@ -139,7 +140,7 @@ func WithAuthenticatedRegistryMirror(providerName string, optNamespaces ...v1alp
 
 		var ociNamespaces []v1alpha1.OCINamespace
 		if len(optNamespaces) > 0 {
-			ociNamespaces = append(defaultOciNamespaces(e), optNamespaces...)
+			ociNamespaces = append(DefaultOciNamespaces(e), optNamespaces...)
 		}
 
 		certificate, err := base64.StdEncoding.DecodeString(registryCert)