Skip to content

Commit 1fb8bff

Browse files
committed
Adding oci namespaces for registry mirror packages tests
1 parent 519faa3 commit 1fb8bff

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

test/e2e/vsphere_test.go

+10
Original file line numberDiff line numberDiff line change
@@ -2519,6 +2519,11 @@ func TestVSphereKubernetes129UbuntuAuthenticatedRegistryMirrorCuratedPackagesSim
25192519
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129),
25202520
EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI,
25212521
EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil),
2522+
framework.WithRegistryMirrorOciNamespaces(constants.VSphereProviderName,
2523+
v1alpha1.OCINamespace{
2524+
Registry: "857151390494.dkr.ecr.us-west-2.amazonaws.com",
2525+
Namespace: "",
2526+
}),
25222527
)
25232528
runCuratedPackageInstallSimpleFlowRegistryMirror(test)
25242529
}
@@ -2536,6 +2541,11 @@ func TestVSphereKubernetes130UbuntuAuthenticatedRegistryMirrorCuratedPackagesSim
25362541
framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube130),
25372542
EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI,
25382543
EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil),
2544+
framework.WithRegistryMirrorOciNamespaces(constants.VSphereProviderName,
2545+
v1alpha1.OCINamespace{
2546+
Registry: "857151390494.dkr.ecr.us-west-2.amazonaws.com",
2547+
Namespace: "",
2548+
}),
25392549
)
25402550
runCuratedPackageInstallSimpleFlowRegistryMirror(test)
25412551
}

test/framework/registry_mirror.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func WithRegistryMirrorEndpointAndCert(providerName string) ClusterE2ETestOpt {
6565
}
6666

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

@@ -84,6 +84,8 @@ func WithRegistryMirrorOciNamespaces(providerName string) ClusterE2ETestOpt {
8484
})
8585
}
8686

87+
ociNamespaces = append(ociNamespaces, optNamespaces...)
88+
8789
setupRegistryMirrorEndpointAndCert(e, providerName, false, ociNamespaces...)
8890
}
8991
}

0 commit comments

Comments
 (0)