Skip to content

Revert "Use separate registry mirror endpoint for Bottlerocket authenticated …" #10939

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

Open
rahulbabu95 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −48
Open

Revert "Use separate registry mirror endpoint for Bottlerocket authenticated …" #10939

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
3 changes: 0 additions & 3 deletions cmd/integration_test/build/buildspecs/vsphere-test-eks-a-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
13 changes: 0 additions & 13 deletions internal/test/e2e/registryMirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
46 changes: 14 additions & 32 deletions test/framework/registry_mirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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}
)
Expand Down Expand Up @@ -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)
}
}

Expand Down Expand Up @@ -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...)
}

Expand Down
Loading