add logic to get open shift API URL #1877
Conversation
Signed-off-by: Cameron Wall <[email protected]>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cameronmwall The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/hold |
Signed-off-by: Cameron Wall <[email protected]>
pkg/rendering/renderer.go
Outdated
| @@ -55,6 +55,8 @@ type HubConfig struct { | |||
| OCPVersion string `json:"ocpVersion" structs:"ocpVersion"` | |||
| HubVersion string `json:"hubVersion" structs:"hubVersion"` | |||
| OCPIngress string `json:"ocpIngress" structs:"ocpIngress"` | |||
| APIUrl string `json:"apiUrl" structs:"apiUrl"` | |||
| Target string `json:"target" structs:"target"` | |||
There was a problem hiding this comment.
could you please move Target to a Global section instead of HubConfig ?
There was a problem hiding this comment.
@cameronmwall I just realized that since we have sub-charts in our helm chart, the sub-charts wont be able to access HubConfig section. Sub-charts can look only into global or their own specific sections in values.yaml.
we will need you to put APIUrl, Target and OCPIngress into global section
| @@ -344,6 +346,10 @@ func injectValuesOverrides(values *Values, mch *v1.MultiClusterHub, images map[s | |||
|
|
|||
| values.HubConfig.OCPIngress = os.Getenv("INGRESS_DOMAIN") | |||
There was a problem hiding this comment.
OCPIngress would be necessary at global level, if we used baseDomain it would require no changes on our side but global.OCPIngress is also ok.
pkg/rendering/renderer.go
Outdated
| values.HubConfig.APIUrl = os.Getenv("API_URL") | ||
|
|
||
| values.HubConfig.Target = "acm" | ||
|
|
There was a problem hiding this comment.
Those two would be necessary at global level
In alignment with the PR here: stolostron/multiclusterhub-operator#1877 Co-Authored-By: rawagner <[email protected]> (cherry picked from commit 1f37b2a)
Signed-off-by: Cameron Wall <[email protected]>
|
/retest |
|
In alignment with the PR here: stolostron/multiclusterhub-operator#1877 Co-Authored-By: rawagner <[email protected]> (cherry picked from commit 1f37b2a)
In alignment with the PR here: stolostron/multiclusterhub-operator#1877 Co-Authored-By: rawagner <[email protected]> (cherry picked from commit 1f37b2a)
In alignment with the PR here: stolostron/multiclusterhub-operator#1877 Co-Authored-By: rawagner <[email protected]> (cherry picked from commit 1f37b2a) Co-authored-by: rawagner <[email protected]>
Description
Please provide a brief description of the purpose of this pull request.
Related Issue
If applicable, please reference the issue(s) that this pull request addresses.
Changes Made
Provide a clear and concise overview of the changes made in this pull request.
Screenshots (if applicable)
Add screenshots or GIFs that demonstrate the changes visually, if relevant.
Checklist
Additional Notes
Add any additional notes, context, or information that might be helpful for reviewers.
Reviewers
Tag the appropriate reviewers who should review this pull request. To add reviewers, please add the following line:
/cc @reviewer1 @reviewer2Definition of Done