Skip to content

Skip https:// dance #127

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

Merged
mclasmeier merged 2 commits into from
Apr 30, 2026
Merged

Skip https:// dance #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc435ca
Skip https:// dance
Apr 30, 2026
efcb3e4
Merge branch 'main' into mc/affix-stripping
Apr 30, 2026
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
13 changes: 5 additions & 8 deletions internal/deployer/deploy_via_operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,8 @@ func (d *Deployer) checkPodProgress(ctx context.Context, seenPods map[string]str
d.checkPodProgressInNamespace(ctx, d.centralNamespace, seenPods)
}

// waitForLoadBalancer waits for a LoadBalancer service to get an external IP
// waitForLoadBalancer waits for a LoadBalancer service to get an external IP.
// Returns the endpoint as "host:port", with no https:// prefix.
func (d *Deployer) waitForLoadBalancer(ctx context.Context, namespace, serviceName string, timeout int) (string, error) {
d.logger.Infof("⏳ Waiting for LoadBalancer %s to get external IP...", serviceName)

Expand All @@ -521,7 +522,7 @@ func (d *Deployer) waitForLoadBalancer(ctx context.Context, namespace, serviceNa
} else {
d.logger.Success("✓ LoadBalancer IP")
}
return fmt.Sprintf("https://%s:443", ip), nil
return fmt.Sprintf("%s:443", ip), nil
}
}

Expand All @@ -537,7 +538,7 @@ func (d *Deployer) waitForLoadBalancer(ctx context.Context, namespace, serviceNa
} else {
d.logger.Success("✓ LoadBalancer hostname")
}
return fmt.Sprintf("https://%s:443", hostname), nil
return fmt.Sprintf("%s:443", hostname), nil
}
}

Expand Down Expand Up @@ -613,11 +614,7 @@ func (d *Deployer) configureCentralEndpoint(ctx context.Context, exposure string
if err != nil {
return fmt.Errorf("failed to get LoadBalancer endpoint: %w", err)
}
// Remove https:// prefix if present (waitForLoadBalancer returns https://ip:443)
// TODO(ROX-34499): This is silly, why add these affixes there, and then strip here?!
d.centralEndpoint = strings.TrimPrefix(endpoint, "https://")
d.centralEndpoint = strings.TrimSuffix(d.centralEndpoint, ":443")
d.centralEndpoint = d.centralEndpoint + ":443"
d.centralEndpoint = endpoint
} else {
d.centralEndpoint = "central." + centralNamespace + ".svc:443"
}
Expand Down
8 changes: 3 additions & 5 deletions internal/deployer/deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,12 +1093,10 @@ func (d *Deployer) cleanupTempDir(path string, description string) {
}

func (d *Deployer) writeEnvrcFile(ctx context.Context, exposure string, portForwardWanted bool) error {
endpoint := strings.TrimPrefix(d.centralEndpoint, "https://")

var content strings.Builder
fmt.Fprintf(&content, "export API_ENDPOINT=%q\n", endpoint)
fmt.Fprintf(&content, "export ROX_ENDPOINT=%q\n", endpoint)
fmt.Fprintf(&content, "export ROX_BASE_URL='https://%s'\n", endpoint)
fmt.Fprintf(&content, "export API_ENDPOINT=%q\n", d.centralEndpoint)
fmt.Fprintf(&content, "export ROX_ENDPOINT=%q\n", d.centralEndpoint)
fmt.Fprintf(&content, "export ROX_BASE_URL='https://%s'\n", d.centralEndpoint)
fmt.Fprintf(&content, "export ROX_USERNAME=%q\n", AdminUsername)
fmt.Fprintf(&content, "export ROX_ADMIN_PASSWORD=%q\n", d.centralPassword)
fmt.Fprintf(&content, "export ROX_CA_CERT_FILE=%q\n", d.roxCACertFile)
Expand Down
Loading