openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 15:47:14 +01:00
Code Issues Releases Activity

Create UI URLs unconditionally

Browse Source 
It doesn't hurt to have them.
This commit is contained in:
Zane Bitter
2025-09-11 17:55:38 +12:00
parent 5684032e69
commit 6ab31eea35
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/asset/agent/image/ignition.go
View File

@@ -457,6 +457,11 @@ func getRendezvousHostEnv(serviceProtocol, nodeZeroIP, agentAuthtoken, userAuthT
Host: net.JoinHostPort(nodeZeroIP, "8888"),
Path: "/",
}
uiBaseURL := url.URL{
Scheme: serviceProtocol,
Host: net.JoinHostPort(nodeZeroIP, "3001"),
Path: "/",
}
// USER_AUTH_TOKEN is required to authenticate API requests against agent-installer-local auth type
// and for the endpoints marked with userAuth security definition in assisted-service swagger.yaml.
// PULL_SECRET_TOKEN contains the AGENT_AUTH_TOKEN and is required for the endpoints marked with agentAuth security definition in assisted-service swagger.yaml.
@@ -475,19 +480,9 @@ IMAGE_SERVICE_BASE_URL=%s
PULL_SECRET_TOKEN=%s
USER_AUTH_TOKEN=%s
WORKFLOW_TYPE=%s
`, nodeZeroIP, serviceBaseURL.String(), imageServiceBaseURL.String(), agentAuthtoken, userAuthToken, workflowType)
if workflowType == workflow.AgentWorkflowTypeInstallInteractiveDisconnected {
uiBaseURL := url.URL{
Scheme: serviceProtocol,
Host: net.JoinHostPort(nodeZeroIP, "3001"),
Path: "/",
}
uiEnv := fmt.Sprintf(`AIUI_APP_API_URL=%s
AIUI_APP_API_URL=%s
AIUI_URL=%s
`, serviceBaseURL.String(), uiBaseURL.String())
rendezvousHostEnv = fmt.Sprintf("%s%s", rendezvousHostEnv, uiEnv)
}
`, nodeZeroIP, serviceBaseURL.String(), imageServiceBaseURL.String(), agentAuthtoken, userAuthToken, workflowType, serviceBaseURL.String(), uiBaseURL.String())
return rendezvousHostEnv
}

2
pkg/asset/agent/image/ignition_test.go
View File

@@ -126,7 +126,7 @@ func TestIgnition_getRendezvousHostEnv(t *testing.T) {
userAuthToken := "userAuthToken"
rendezvousHostEnv := getRendezvousHostEnv("http", nodeZeroIP, agentAuthtoken, userAuthToken, workflow.AgentWorkflowTypeInstall)
assert.Equal(t,
"NODE_ZERO_IP="+nodeZeroIP+"\nSERVICE_BASE_URL=http://["+nodeZeroIP+"]:8090/\nIMAGE_SERVICE_BASE_URL=http://["+nodeZeroIP+"]:8888/\nPULL_SECRET_TOKEN="+agentAuthtoken+"\nUSER_AUTH_TOKEN="+userAuthToken+"\nWORKFLOW_TYPE=install\n",
"NODE_ZERO_IP="+nodeZeroIP+"\nSERVICE_BASE_URL=http://["+nodeZeroIP+"]:8090/\nIMAGE_SERVICE_BASE_URL=http://["+nodeZeroIP+"]:8888/\nPULL_SECRET_TOKEN="+agentAuthtoken+"\nUSER_AUTH_TOKEN="+userAuthToken+"\nWORKFLOW_TYPE=install\nAIUI_APP_API_URL=http://["+nodeZeroIP+"]:8090/\nAIUI_URL=http://["+nodeZeroIP+"]:3001/\n",
rendezvousHostEnv)
}