Skip to content

Added orchestrator-infra subchart - #108

Merged
openshift-merge-bot[bot] merged 8 commits into
redhat-developer:mainfrom
elai-shalev:orchestrator-infra-chart-test
Mar 18, 2025
Merged

Added orchestrator-infra subchart#108
openshift-merge-bot[bot] merged 8 commits into
redhat-developer:mainfrom
elai-shalev:orchestrator-infra-chart-test

Conversation

@elai-shalev

@elai-shalev elai-shalev commented Mar 5, 2025

Copy link
Copy Markdown

This PR will introduce the orchestrator-infra helm chart, that will be included as a dependency for RHDH chart for the RHDHxOrchestrator flavor of RHDH. This PR will introduce changes to the Chart Values: upon enabling orchestrator, the RHDH chart will install the orchestrator-infra chart before the backstage chart.

The orchestrator-infra chart will incluse template files for serverless operator (knative eventing, serving) and openshift-serverless operator (sonataflow) that are pre-requisite infrastructure for Orchestrator to work.

Tests and documentation are TBA.

Relates to this epic: https://issues.redhat.com/browse/RHIDP-6159

  • Chart version bumped in Chart.yaml according to semver.
  • Variables are documented in the values.yaml and added to the README.md. The pre-commit utility can be used to generate the necessary content. Use pre-commit run -a to apply changes.
  • JSON Schema template updated and re-generated the raw schema via pre-commit hook.
  • List tests pass for Chart using the Chart Testing tool and the ct lint command.

@openshift-ci
openshift-ci Bot requested review from gazarenkov and tumido March 5, 2025 16:46
Comment thread charts/orchestrator-infra/Chart.yaml Outdated
@elai-shalev
elai-shalev force-pushed the orchestrator-infra-chart-test branch from f15c87b to aa0b58d Compare March 5, 2025 16:55
Comment thread charts/backstage/values.yaml Outdated
Comment thread charts/orchestrator-infra/templates/openshift-serverless.yaml Outdated
Comment thread charts/orchestrator-infra/values.yaml Outdated
Comment thread charts/orchestrator-infra/values.yaml Outdated
Comment thread charts/orchestrator-infra/values.yaml Outdated
@elai-shalev
elai-shalev force-pushed the orchestrator-infra-chart-test branch from dcfb238 to ef3a097 Compare March 6, 2025 08:45
@elai-shalev

Copy link
Copy Markdown
Author

@masayag Updated the PR with all the comments

Comment thread charts/backstage/values.yaml Outdated
Comment thread charts/orchestrator-infra/README.md Outdated
Comment thread charts/orchestrator-infra/values.yaml Outdated
Comment thread charts/orchestrator-infra/values.yaml Outdated
@masayag

masayag commented Mar 11, 2025

Copy link
Copy Markdown

@rm3l can you take a look pls?

@rm3l

rm3l commented Mar 11, 2025

Copy link
Copy Markdown
Member

@rm3l can you take a look pls?

Sure - I'll take a look soon.

/cc

@openshift-ci
openshift-ci Bot requested a review from rm3l March 11, 2025 14:48
@rm3l

rm3l commented Mar 11, 2025

Copy link
Copy Markdown
Member

FYI

/cc @durandom

@openshift-ci
openshift-ci Bot requested a review from durandom March 11, 2025 15:07
Comment thread charts/backstage/Chart.yaml Outdated
Comment thread charts/backstage/values.yaml Outdated
Comment thread charts/backstage/Chart.yaml Outdated
@masayag

masayag commented Mar 13, 2025

Copy link
Copy Markdown

@ElaiShalevRH pls add also notes.txt file - https://helm.sh/docs/chart_template_guide/notes_files/
so the user that install the chart can verify it was properly installed.

@elai-shalev
elai-shalev force-pushed the orchestrator-infra-chart-test branch from d2177d4 to f8efde8 Compare March 13, 2025 14:05
@elai-shalev

Copy link
Copy Markdown
Author

Hey @rm3l @masayag
Updated the Infra chart, now with no relation to the RHDH chart.

Should I open a MR for updating https://gitlab.cee.redhat.com/rhidp/rhdh/-/blob/rhdh-1-rhel-9/build/helm/prepare.sh to include the orchestrator-chart build?

Also added NOTES.txt

Comment thread charts/orchestrator-infra/Chart.yaml
Comment thread charts/orchestrator-infra/templates/openshift-serverless-logic.yaml Outdated
Comment thread charts/orchestrator-infra/templates/openshift-serverless-logic.yaml Outdated
Comment thread charts/orchestrator-infra/templates/openshift-serverless.yaml Outdated
Comment thread charts/orchestrator-infra/values.yaml

@rm3l rm3l left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would it be possible to also add a test template? I think that would also be required for shipping the Chart into the OpenShift Charts repo.

@rm3l

rm3l commented Mar 14, 2025

Copy link
Copy Markdown
Member

Should I open a MR for updating gitlab.cee.redhat.com/rhidp/rhdh/-/blob/rhdh-1-rhel-9/build/helm/prepare.sh to include the orchestrator-chart build?

@ElaiShalevRH That task was captured in https://issues.redhat.com/browse/RHIDP-6169. We (RHDH team) might be able to handle this, so you can focus on getting your PRs merged on GH.
I'll check with the team next week if anyone can help with this. I'll get back to you.

@rm3l rm3l left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@ElaiShalevRH Could you please rebase your PR branch? It should hopefully fix the CI errors: https://github.com/redhat-developer/rhdh-chart/actions/runs/13836562023/job/38726590327?pr=108#step:11:30. Thanks.

EDIT: Done

@elai-shalev

Copy link
Copy Markdown
Author

Should I open a MR for updating gitlab.cee.redhat.com/rhidp/rhdh/-/blob/rhdh-1-rhel-9/build/helm/prepare.sh to include the orchestrator-chart build?

@ElaiShalevRH That task was captured in https://issues.redhat.com/browse/RHIDP-6169. We (RHDH team) might be able to handle this, so you can focus on getting your PRs merged on GH. I'll check with the team next week if anyone can help with this. I'll get back to you.

Thanks, that could be helpful
If you don't seem to have time for it I could also take that task, of course

@elai-shalev
elai-shalev force-pushed the orchestrator-infra-chart-test branch from 9d70c23 to dfd3821 Compare March 16, 2025 14:01
Comment thread charts/orchestrator-infra/templates/tests/infra-test.yaml Fixed
Comment thread charts/orchestrator-infra/templates/tests/infra-test.yaml Fixed
Comment thread charts/orchestrator-infra/templates/tests/infra-test.yaml Fixed
Comment thread charts/orchestrator-infra/templates/tests/infra-test.yaml Fixed
@elai-shalev
elai-shalev force-pushed the orchestrator-infra-chart-test branch from d3c2ad5 to 7016d1f Compare March 16, 2025 14:11
@elai-shalev

Copy link
Copy Markdown
Author

Hey @rm3l, Thanks for the review :)
I've implemented all the changes you've suggested. The chart is ready to be reviewed again.
I'm also working on a test, it looks like its clashing with the SonadCloud analysis, so I've deleted it for now but will keep working on it.

Please let me know if there is more to be done that is required for shipping the Chart.
@masayag

@rm3l rm3l left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@ElaiShalevRH Thanks for the changes. A few comments below ;)

Comment thread charts/orchestrator-infra/Chart.yaml Outdated
Comment thread charts/orchestrator-infra/values.yaml Outdated
subscription:
namespace: openshift-serverless-logic # namespace where the operator should be deployed
channel: alpha # channel of an operator package to subscribe to
installPlanApproval: Manual # whether the update should be installed automatically

@rm3l rm3l Mar 17, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
installPlanApproval: Manual # whether the update should be installed automatically
installPlanApproval: Automatic # whether the update should be installed automatically

Shouldn't this be Automatic by default? In your previous changes, it was hardcoded to Automatic in the template, IIRC. And I had noticed that as well in https://github.com/rhdhorchestrator/orchestrator-helm-operator/blob/main/helm-charts/orchestrator/templates/openshift-serverless.yaml#L57

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Having the installPlan be Automatic will cause it to automatically install updates as well. We want to avoid scenarios where the OpenshiftServerlessLogic operator version gets upgraded, but the newer version isn't supported by other orchestrator functionality.

@rm3l rm3l Mar 17, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ok, that makes sense. So there would be an extra step for cluster admins (approving the Install Plan) that should be added to the docs.

Comment thread charts/orchestrator-infra/values.yaml Outdated
Comment thread charts/orchestrator-infra/templates/NOTES.txt Outdated
Comment thread charts/orchestrator-infra/templates/serverless/subscription.yaml Outdated
Comment thread charts/orchestrator-infra/Chart.yaml Outdated
Comment thread charts/orchestrator-infra/templates/tests/infra-test.yaml Fixed
@elai-shalev
elai-shalev requested a review from rm3l March 17, 2025 13:01

@rm3l rm3l left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Almost there ;-)

Comment thread charts/orchestrator-infra/templates/NOTES.txt Outdated
Comment thread charts/orchestrator-infra/templates/NOTES.txt Outdated
Comment thread charts/orchestrator-infra/values.yaml Outdated
Comment thread charts/orchestrator-infra/values.yaml Outdated
Comment thread charts/orchestrator-infra/templates/tests/infra-test.yaml Fixed
Comment thread charts/orchestrator-infra/templates/tests/infra-test.yaml Outdated
Comment thread charts/orchestrator-infra/templates/tests/infra-test.yaml Outdated
@elai-shalev

Copy link
Copy Markdown
Author

@rm3l Hey, added some more changes
The "Bind this Service Account to RBAC or disable "automountServiceAccountToken" error persists... I've changes all ClusterRoles[binding] to namespaced Role, Rolebindins, it still complains...

@rm3l

rm3l commented Mar 18, 2025

Copy link
Copy Markdown
Member

@rm3l Hey, added some more changes The "Bind this Service Account to RBAC or disable "automountServiceAccountToken" error persists... I've changes all ClusterRoles[binding] to namespaced Role, Rolebindins, it still complains...

Okay, sounds like a false positive to me. I've dismissed it for now. Let's see how it goes now.

@sonarqubecloud

Copy link
Copy Markdown

@rm3l rm3l left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. Thanks for your patience, @ElaiShalevRH !! If you don't have anything else to add to this PR (noticed the "WIP" in the PR title), I am fine with merging this first version of the orchestrator infra chart.

@elai-shalev elai-shalev changed the title Added orchestrator-infra subchart (WIP) Added orchestrator-infra subchart Mar 18, 2025

@rm3l rm3l left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Mar 18, 2025
@openshift-merge-bot
openshift-merge-bot Bot merged commit f054034 into redhat-developer:main Mar 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants