-
Notifications
You must be signed in to change notification settings - Fork 79
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
✨ Add deployment overrides to templates #525
base: main
Are you sure you want to change the base?
✨ Add deployment overrides to templates #525
Conversation
Welcome @omerap12! |
Hi @omerap12. Thanks for your PR. I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
✅ Deploy Preview for kubernetes-sigs-cluster-api-operator ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
4610c00
to
1df9146
Compare
:sparkles:
) Add deployment overrides to templates
:sparkles:
) Add deployment overrides to templates
/ok-to-test |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the contribution, can I ask you to add tests for this change https://github.com/kubernetes-sigs/cluster-api-operator/blob/main/test/e2e/helm_test.go#L31?
Of course, Ill try to do it on this weekend @alexander-demicev |
Hey @alexander-demicev , any update on this? should I close the PR? |
/retest |
@omerap12 hey, thanks for the PR. Can you please rebase it first, so we can then take a closer look? Thanks |
Signed-off-by: Omer Aplatony <[email protected]>
5c0194a
to
a51d44e
Compare
Done |
/retest |
Looks like something went wrong with rebase, I see your branch is still behind by 32 commits. I was suspecting the rebase being the initial root cause of CI failure |
Merged master |
By checking the CI logs, e2e tests are not compiling properly |
When I first submitted the PR they seemed to wok lol. Ill take a look later and get this fixed |
Signed-off-by: Omer Aplatony <[email protected]>
665fe48
to
81527ae
Compare
@furkatgofurov7 Fixed :) |
btw, can I set deploymentOverride in the values file to a default of empty dict? deploymentOverride: {} |
Hey, thanks. Can we also add tests for other provider types (currently, only infra provider is being added)? |
@@ -27,5 +27,7 @@ spec: | |||
{{- end }} | |||
{{- end }} | |||
{{- end }} | |||
{{- if hasKey (default (dict) $.Values.deploymentOverride ) "coreCondition" }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a test case for this manifest? Also, isn’t this a duplicate of templates/core.yaml
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what do you mean by duplicate? templates/core.yaml has the following:
https://github.com/kubernetes-sigs/cluster-api-operator/pull/525/files#diff-c73589d6ec69abbc84b0231a82d1fa536f3955e38026e4440db0b8e351295621R63
and I think we should avoid this default by just adding a default values to the values.yaml file.
- addon and infra override
Added another test. |
Please, let me rebase my changes when approved. |
@@ -52,4 +52,7 @@ spec: | |||
{{- end }} | |||
{{- end }} | |||
{{- end }} | |||
{{- if hasKey (default (dict) $.Values.deploymentOverride) "bootstrap" }} | |||
{{ .Values.deploymentOverride.bootstrap | toYaml | nindent 2 }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This isn't necessarily a deployment override, or? It allows to add custom stuff to the provider CR, which could be anything? Maybe the word 'deployment' is confusing here.
(I came here when looking for a way to add a manifestPatches
key to the provider to set resource requests for the provider's deployment resource).
Looking forward for this 🥳 Thanks everyone for your contributions! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
LGTM label has been added. Git tree hash: 388d65d75f4f952c11ed622cc96a26bac4c1c986
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/approve
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alexander-demicev 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 |
@omerap12: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
What this PR does / why we need it:
Adding option to override certain configuration in the following resources:
addon
bootstrap
control-plane
core-conditions
core
infra-conditions
infra
Example of values.yaml snippet:
Output be like:
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close the issue(s) when PR gets merged):Fixes #516