Skip to content
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.

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

feat: add azure runtime config flag to cs service template #621

Merged
merged 1 commit into from
Sep 19, 2024

Conversation

JameelB
Copy link
Collaborator

@JameelB JameelB commented Sep 18, 2024

What this PR does

Adds a configmap containing the azure runtime configuration in the ARO HCP CS service template. This is used as value to the flag azure-runtime-config which has been added in https://gitlab.cee.redhat.com/service/uhc-clusters-service/-/merge_requests/8478

Current configuration available to be set here is the cloud environment where CS is running on. For now, only the cloud environment is added there. Additional configuration will be added at a later time.

CS image tag has been updated to 9da687c which contains the changes in the MR linked above.

Jira: https://issues.redhat.com/browse/ARO-7653
Link to demo recording: N/A

Special notes for your reviewer

Please note that this depends on https://gitlab.cee.redhat.com/service/uhc-clusters-service/-/merge_requests/8478. The cs image in the makefile will be updated as soon as that's merged.

Comment on lines +367 to +370
config.json: |
{
"cloudEnvironment": "AzurePublicCloud"
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In CS, we have a parameter that takes a json obj and set it here (see MR#8478)

config.json: ${AZURE_RUNTIME_CONFIG}

I see that the rest of the configmap values are hardcoded here so i've kept it the same. Is there a preference to parameterise this? Additional configuration that would be added here for example would be ACR configuration that's used in CS (see related jira issue ARO-9331).

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

once additional dynamic configuration is required for an env, you can do something like this here

https://github.com/Azure/ARO-HCP/blob/129323a66958d8122ecacecd1350af3e493967f2/maestro/deploy/helm/agent/templates/maestro.secret.yaml

so basically templating individual inner fields of the json value.

Copy link
Collaborator Author

@JameelB JameelB Sep 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah perfect! I think we can do this as a follow on task, for now we can start with the hardcoded configmap 👍 jira issue to track this: https://issues.redhat.com/browse/ARO-10539

@JameelB
Copy link
Collaborator Author

JameelB commented Sep 18, 2024

@microsoft-github-policy-service agree company="Red Hat"

@JameelB JameelB force-pushed the feat/add-azure-runtime-config-flag-to-cs branch from 98ac657 to 3bfc95a Compare September 19, 2024 11:31
@JameelB JameelB changed the title ARO-7425|feat: add azure runtime config flag to cs service template feat: add azure runtime config flag to cs service template Sep 19, 2024
@JameelB JameelB marked this pull request as ready for review September 19, 2024 11:50
@mjlshen mjlshen enabled auto-merge (rebase) September 19, 2024 21:13
@mjlshen mjlshen merged commit fc13fab into main Sep 19, 2024
21 checks passed
@mjlshen mjlshen deleted the feat/add-azure-runtime-config-flag-to-cs branch September 19, 2024 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants