diff --git a/cmd/integration_test/build/buildspecs/vsphere-test-eks-a-cli.yml b/cmd/integration_test/build/buildspecs/vsphere-test-eks-a-cli.yml index 78a8cff1c96f..7f123b4ecfe0 100644 --- a/cmd/integration_test/build/buildspecs/vsphere-test-eks-a-cli.yml +++ b/cmd/integration_test/build/buildspecs/vsphere-test-eks-a-cli.yml @@ -80,9 +80,6 @@ env: T_PRIVATE_REGISTRY_MIRROR_USERNAME: "harbor-registry-data:authenticated_username" T_PRIVATE_REGISTRY_MIRROR_PASSWORD: "harbor-registry-data:authenticated_password" T_PRIVATE_REGISTRY_MIRROR_CA_CERT: "harbor-registry-data:authenticated_caCert" - T_PRIVATE_REGISTRY_MIRROR_ENDPOINT_BOTTLEROCKET: "harbor-registry-data:authenticated_bottlerocket_endpoint" - T_PRIVATE_REGISTRY_MIRROR_PORT_BOTTLEROCKET: "harbor-registry-data:authenticated_bottlerocket_port" - T_PRIVATE_REGISTRY_MIRROR_CA_CERT_BOTTLEROCKET: "harbor-registry-data:authenticated_bottlerocket_caCert" T_REGISTRY_MIRROR_OCINAMESPACES_REGISTRY1: "harbor-registry-data:ocinamespace_registry1" T_REGISTRY_MIRROR_OCINAMESPACES_NAMESPACE1: "harbor-registry-data:ocinamespace_namespace1" T_REGISTRY_MIRROR_OCINAMESPACES_REGISTRY2: "harbor-registry-data:ocinamespace_registry2" diff --git a/internal/test/e2e/registryMirror.go b/internal/test/e2e/registryMirror.go index a50a022dc094..7f491249eeec 100644 --- a/internal/test/e2e/registryMirror.go +++ b/internal/test/e2e/registryMirror.go @@ -61,19 +61,6 @@ func (e *E2ESession) setupRegistryMirrorEnv(testRegex string) error { } } - // Bottlerocket authenticated tests use a separate registry, mount its cert too. - re = regexp.MustCompile(`^.*VSphere.*Bottlerocket.*Authenticated.*$`) - if re.MatchString(testRegex) { - brEndpoint := e.testEnvVars[e2etests.PrivateRegistryEndpointBottlerocketVar] - brPort := e.testEnvVars[e2etests.PrivateRegistryPortBottlerocketVar] - brCaCert := e.testEnvVars[e2etests.PrivateRegistryCACertBottlerocketVar] - if brEndpoint != "" && brPort != "" && brCaCert != "" { - if err := e.mountRegistryCert(brCaCert, net.JoinHostPort(brEndpoint, brPort)); err != nil { - return err - } - } - } - re = regexp.MustCompile(`^.*Docker.*Airgapped.*$`) if re.MatchString(testRegex) { err := os.Setenv("DEFAULT_SECURITY_GROUP", e.testEnvVars[e2etests.RegistryMirrorDefaultSecurityGroup]) diff --git a/test/framework/registry_mirror.go b/test/framework/registry_mirror.go index 704be0462bcb..1550948737ba 100644 --- a/test/framework/registry_mirror.go +++ b/test/framework/registry_mirror.go @@ -5,7 +5,6 @@ import ( "encoding/base64" "net" "os" - "strings" "github.com/aws/eks-anywhere/internal/pkg/api" "github.com/aws/eks-anywhere/pkg/api/v1alpha1" @@ -25,14 +24,11 @@ const ( RegistryCACertTinkerbellVar = "T_REGISTRY_MIRROR_CA_CERT_TINKERBELL" RegistryMirrorDefaultSecurityGroup = "T_REGISTRY_MIRROR_DEFAULT_SECURITY_GROUP" RegistryMirrorAirgappedSecurityGroup = "T_REGISTRY_MIRROR_AIRGAPPED_SECURITY_GROUP" - PrivateRegistryEndpointVar = "T_PRIVATE_REGISTRY_MIRROR_ENDPOINT" - PrivateRegistryPortVar = "T_PRIVATE_REGISTRY_MIRROR_PORT" - PrivateRegistryUsernameVar = "T_PRIVATE_REGISTRY_MIRROR_USERNAME" - PrivateRegistryPasswordVar = "T_PRIVATE_REGISTRY_MIRROR_PASSWORD" - PrivateRegistryCACertVar = "T_PRIVATE_REGISTRY_MIRROR_CA_CERT" - PrivateRegistryEndpointBottlerocketVar = "T_PRIVATE_REGISTRY_MIRROR_ENDPOINT_BOTTLEROCKET" - PrivateRegistryPortBottlerocketVar = "T_PRIVATE_REGISTRY_MIRROR_PORT_BOTTLEROCKET" - PrivateRegistryCACertBottlerocketVar = "T_PRIVATE_REGISTRY_MIRROR_CA_CERT_BOTTLEROCKET" + PrivateRegistryEndpointVar = "T_PRIVATE_REGISTRY_MIRROR_ENDPOINT" + PrivateRegistryPortVar = "T_PRIVATE_REGISTRY_MIRROR_PORT" + PrivateRegistryUsernameVar = "T_PRIVATE_REGISTRY_MIRROR_USERNAME" + PrivateRegistryPasswordVar = "T_PRIVATE_REGISTRY_MIRROR_PASSWORD" + PrivateRegistryCACertVar = "T_PRIVATE_REGISTRY_MIRROR_CA_CERT" PrivateRegistryEndpointTinkerbellVar = "T_PRIVATE_REGISTRY_MIRROR_ENDPOINT_TINKERBELL" PrivateRegistryPortTinkerbellVar = "T_PRIVATE_REGISTRY_MIRROR_PORT_TINKERBELL" PrivateRegistryUsernameTinkerbellVar = "T_PRIVATE_REGISTRY_MIRROR_USERNAME_TINKERBELL" @@ -49,8 +45,7 @@ var ( registryMirrorRequiredEnvVars = []string{RegistryEndpointVar, RegistryPortVar, RegistryUsernameVar, RegistryPasswordVar, RegistryCACertVar} registryMirrorTinkerbellRequiredEnvVars = []string{RegistryEndpointTinkerbellVar, RegistryPortTinkerbellVar, RegistryUsernameTinkerbellVar, RegistryPasswordTinkerbellVar, RegistryCACertTinkerbellVar} registryMirrorDockerAirgappedRequiredEnvVars = []string{RegistryMirrorDefaultSecurityGroup, RegistryMirrorAirgappedSecurityGroup} - privateRegistryMirrorRequiredEnvVars = []string{PrivateRegistryEndpointVar, PrivateRegistryPortVar, PrivateRegistryUsernameVar, PrivateRegistryPasswordVar, PrivateRegistryCACertVar} - privateRegistryMirrorBottlerocketRequiredEnvVars = []string{PrivateRegistryEndpointBottlerocketVar, PrivateRegistryPortBottlerocketVar, PrivateRegistryUsernameVar, PrivateRegistryPasswordVar, PrivateRegistryCACertBottlerocketVar} + privateRegistryMirrorRequiredEnvVars = []string{PrivateRegistryEndpointVar, PrivateRegistryPortVar, PrivateRegistryUsernameVar, PrivateRegistryPasswordVar, PrivateRegistryCACertVar} privateRegistryMirrorTinkerbellRequiredEnvVars = []string{PrivateRegistryEndpointTinkerbellVar, PrivateRegistryPortTinkerbellVar, PrivateRegistryUsernameTinkerbellVar, PrivateRegistryPasswordTinkerbellVar, PrivateRegistryCACertTinkerbellVar} registryMirrorOciNamespacesRequiredEnvVars = []string{RegistryMirrorOciNamespacesRegistry1Var, RegistryMirrorOciNamespacesNamespace1Var} ) @@ -117,26 +112,14 @@ func WithAuthenticatedRegistryMirror(providerName string, optNamespaces ...v1alp port = os.Getenv(PrivateRegistryPortTinkerbellVar) } default: - if strings.Contains(e.T.Name(), "BottlerocketAuthenticatedRegistryMirror") { - checkRequiredEnvVars(e.T, privateRegistryMirrorBottlerocketRequiredEnvVars) - endpoint = os.Getenv(PrivateRegistryEndpointBottlerocketVar) - hostPort = net.JoinHostPort(endpoint, os.Getenv(PrivateRegistryPortBottlerocketVar)) - username = os.Getenv(PrivateRegistryUsernameVar) - password = os.Getenv(PrivateRegistryPasswordVar) - registryCert = os.Getenv(PrivateRegistryCACertBottlerocketVar) - if os.Getenv(PrivateRegistryPortBottlerocketVar) != "" { - port = os.Getenv(PrivateRegistryPortBottlerocketVar) - } - } else { - checkRequiredEnvVars(e.T, privateRegistryMirrorRequiredEnvVars) - endpoint = os.Getenv(PrivateRegistryEndpointVar) - hostPort = net.JoinHostPort(endpoint, os.Getenv(PrivateRegistryPortVar)) - username = os.Getenv(PrivateRegistryUsernameVar) - password = os.Getenv(PrivateRegistryPasswordVar) - registryCert = os.Getenv(PrivateRegistryCACertVar) - if os.Getenv(PrivateRegistryPortVar) != "" { - port = os.Getenv(PrivateRegistryPortVar) - } + checkRequiredEnvVars(e.T, privateRegistryMirrorRequiredEnvVars) + endpoint = os.Getenv(PrivateRegistryEndpointVar) + hostPort = net.JoinHostPort(endpoint, os.Getenv(PrivateRegistryPortVar)) + username = os.Getenv(PrivateRegistryUsernameVar) + password = os.Getenv(PrivateRegistryPasswordVar) + registryCert = os.Getenv(PrivateRegistryCACertVar) + if os.Getenv(PrivateRegistryPortVar) != "" { + port = os.Getenv(PrivateRegistryPortVar) } } @@ -173,7 +156,6 @@ func RequiredRegistryMirrorEnvVars() []string { registryMirrorRequiredEnvVars = append(registryMirrorRequiredEnvVars, registryMirrorTinkerbellRequiredEnvVars...) registryMirrorRequiredEnvVars = append(registryMirrorRequiredEnvVars, privateRegistryMirrorRequiredEnvVars...) registryMirrorRequiredEnvVars = append(registryMirrorRequiredEnvVars, privateRegistryMirrorTinkerbellRequiredEnvVars...) - registryMirrorRequiredEnvVars = append(registryMirrorRequiredEnvVars, privateRegistryMirrorBottlerocketRequiredEnvVars...) return append(registryMirrorRequiredEnvVars, registryMirrorDockerAirgappedRequiredEnvVars...) }