Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding oci namespaces for registry mirror packages tests #8775

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adding oci namespaces for registry mirror packages tests #8775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions test/e2e/vsphere_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2519,6 +2519,11 @@ func TestVSphereKubernetes129UbuntuAuthenticatedRegistryMirrorCuratedPackagesSim
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129),
EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI,
EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil),
framework.WithRegistryMirrorOciNamespaces(constants.VSphereProviderName,
v1alpha1.OCINamespace{
Registry: "857151390494.dkr.ecr.us-west-2.amazonaws.com",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we no longer use the build account for packages. We should update it to regional beta account private ECR.

Suggested change
Registry: "857151390494.dkr.ecr.us-west-2.amazonaws.com",
Registry: "067575901363.dkr.ecr.us-west-2.amazonaws.com",

Namespace: "",
}),
)
runCuratedPackageInstallSimpleFlowRegistryMirror(test)
}
Expand All @@ -2536,6 +2541,11 @@ func TestVSphereKubernetes130UbuntuAuthenticatedRegistryMirrorCuratedPackagesSim
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube130),
EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI,
EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil),
framework.WithRegistryMirrorOciNamespaces(constants.VSphereProviderName,
v1alpha1.OCINamespace{
Registry: "857151390494.dkr.ecr.us-west-2.amazonaws.com",
Namespace: "",
}),
)
runCuratedPackageInstallSimpleFlowRegistryMirror(test)
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also add the registry mirror OCI namespaces for the 1.31 tests below this?

Expand Down
4 changes: 3 additions & 1 deletion test/framework/registry_mirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func WithRegistryMirrorEndpointAndCert(providerName string) ClusterE2ETestOpt {
}

// WithRegistryMirrorOciNamespaces sets up e2e for registry mirrors with ocinamespaces.
func WithRegistryMirrorOciNamespaces(providerName string) ClusterE2ETestOpt {
func WithRegistryMirrorOciNamespaces(providerName string, optNamespaces ...v1alpha1.OCINamespace) ClusterE2ETestOpt {
return func(e *ClusterE2ETest) {
var ociNamespaces []v1alpha1.OCINamespace

Expand All @@ -84,6 +84,8 @@ func WithRegistryMirrorOciNamespaces(providerName string) ClusterE2ETestOpt {
})
}

ociNamespaces = append(ociNamespaces, optNamespaces...)

setupRegistryMirrorEndpointAndCert(e, providerName, false, ociNamespaces...)
}
}
Expand Down
Loading