✨ (helm/v2alpha) Extract image and resources from kustomize #5151

BadisLaffet1 · 2025-10-28T00:38:58Z

Ensures Helm v2-alpha extracts deployment configuration (image, imagePullPolicy, resources) from kustomize output instead of using hardcoded defaults.

Changes

chart_converter.go:
Added parseImageString() helper (parses image strings into repository/tag/digest components with registry port detection) / Updated ExtractDeploymentConfig() (finds manager container by name, extracts image, imagePullPolicy, and resources from actual kustomize deployment).
values_basic.go:
Updated generateBasicValues() (populates values.yaml with extracted kustomize data instead of hardcoded defaults, implements digest-over-tag priority logic, conditional tag/digest inclusion based on actual deployment config).
helm_templater.go:
Implemented templateImageReference() (creates conditional digest/tag templating with {{- if .Values.controllerManager.image.digest }} logic) / Implemented templateResources() (generates dynamic resource templating with precise boundary detection using regex patterns), handles both - name: manager and name: manager container formats.
tests:
Added test assertions validating image parsing, extraction logic, templating behavior, and generated output correctness with specific scenarios for tag/digest formats.

Before: helm install deployed hardcoded controller:latest with static resource limits regardless of kustomize content .
After: helm install deploys exact same image/resources as make build-installer.

Fixes #5113

…s-sigs#5113

k8s-ci-robot · 2025-10-28T00:39:04Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: BadisLaffet1
Once this PR has been reviewed and has the lgtm label, please assign varshaprasad96 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

linux-foundation-easycla · 2025-10-28T00:39:05Z

The committers listed above are authorized under a signed CLA.

✅ login: BadisLaffet1 / name: Badis Laffet (a825c88)

k8s-ci-robot · 2025-10-28T00:39:07Z

Welcome @BadisLaffet1!

It looks like this is your first PR to kubernetes-sigs/kubebuilder 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kubebuilder has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2025-10-28T00:39:07Z

Hi @BadisLaffet1. Thanks for your PR.

I'm waiting for a github.com member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

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.

BadisLaffet1 · 2025-10-28T00:44:57Z

/retitle ✨ helm/v2: Extract image and resources from kustomize

k8s-ci-robot · 2025-10-28T00:45:06Z

@BadisLaffet1: Re-titling can only be requested by trusted users, like repository collaborators.

In response to this:

/retitle ✨ helm/v2: Extract image and resources from kustomize

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.

camilamacedo86 · 2025-10-28T07:47:35Z

Hi @BadisLaffet1,

It looks great! 🎉

Before we get this one merged, please fix the lint issues — you can run make lint-fix locally to handle that.

Also, it seems the commit message is failing for some reason — could you please take a look at that?

Lastly, once the lint issues are fixed, please squash your commits so we end up with just one commit for merging.

Moreover, please check the comments bellow.

Looking forward to seeing your updates so we can get this one merged soon! 🚀

camilamacedo86 · 2025-10-28T07:50:46Z

pkg/plugins/optional/helm/v2alpha/scaffolds/internal/templates/values_basic_test.go

 		It("should still include other basic sections", func() {
 			content := valuesTemplate.GetBody()

-			Expect(content).To(ContainSubstring("replicaCount:"))


Could we keep it?

camilamacedo86 · 2025-10-28T07:50:54Z

pkg/plugins/optional/helm/v2alpha/scaffolds/internal/templates/values_basic_test.go

 			content := valuesTemplate.GetBody()

 			Expect(content).NotTo(ContainSubstring("certManager:"))
-			Expect(content).NotTo(ContainSubstring("enable: true"))


Could we keep it ?

camilamacedo86 · 2025-10-28T07:51:27Z

pkg/plugins/optional/helm/v2alpha/scaffolds/internal/templates/values_basic_test.go

 		It("should have correct file permissions", func() {
 			info := valuesTemplate.GetIfExistsAction()
-			Expect(info).To(Equal(machinery.OverwriteFile))
+			Expect(info).To(Equal(machinery.SkipFile))


Why are we changing it ?
We should not change it.

camilamacedo86 · 2025-10-28T07:52:31Z

testdata/project-v4-with-plugins/dist/chart/templates/manager/manager.yaml

                    - name: MEMCACHED_IMAGE
                      value: memcached:1.6.26-alpine3.19
+                  {{- if .Values.controllerManager.image.digest }}
+                  image: "{{ .Values.controllerManager.image.repository }}@{{ .Values.controllerManager.image.digest }}"


Why do we need digest?

camilamacedo86 · 2025-10-28T10:29:04Z

If you don’t mind, I’d like to close this PR in favor of #5147
.

We recently introduced helm/v2alpha, which hasn’t been released yet. The changes in that PR address this issue (and a few others) and are required before the release.

Since that work includes a significant refactor, merging this one separately would likely cause conflicts or break things.

I really appreciate you taking the time to look into this and open the PR — thank you! 🙏

My sincere apologies for any inconvenience. I was already reviewing this area but forgot to assign the issue to myself.

BadisLaffet1 · 2025-10-28T10:54:44Z

Thanks, @camilamacedo86 — totally understand!
I didn’t realize pr 5147 already covered this area.
I’d be glad to support any follow-up work or issues in Kubebuilder. 🙌

camilamacedo86 · 2025-10-28T11:05:32Z

Hi @BadisLaffet1,

Really sorry about this 🙏

I was initially thinking of keeping the image covered here as well since I didn’t want your effort to go to waste, but after reviewing it more closely, it looks like it would require some refactoring — and that would probably cause a lot of extra work later with rebases and conflict resolution.

I truly appreciate all your effort on this! If you’d like to review or improve this further in a follow-up, that would be amazing — your help is always more than welcome. 💪

helm/v2: Extract image and resources from kustomize / Fixes kubernete…

a825c88

…s-sigs#5113

k8s-ci-robot added the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Oct 28, 2025

k8s-ci-robot requested review from Kavinjsir and camilamacedo86 October 28, 2025 00:39

k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 28, 2025

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Oct 28, 2025

camilamacedo86 reviewed Oct 28, 2025

View reviewed changes

camilamacedo86 changed the title ~~✨ helm/v2: Extract image and resources from kustomize / Fixes #5113~~ ✨ (helm/v2alpha) Extract image and resources from kustomize Oct 28, 2025

k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Oct 28, 2025

camilamacedo86 mentioned this pull request Oct 29, 2025

🐛 (helm/v2alpha): allow manager values to be customized properly #5147

Merged

k8s-ci-robot closed this in #5147 Oct 29, 2025

✨ (helm/v2alpha) Extract image and resources from kustomize #5151

✨ (helm/v2alpha) Extract image and resources from kustomize #5151

Uh oh!

Conversation

BadisLaffet1 commented Oct 28, 2025

Changes

Uh oh!

k8s-ci-robot commented Oct 28, 2025

Uh oh!

linux-foundation-easycla bot commented Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Oct 28, 2025

Uh oh!

k8s-ci-robot commented Oct 28, 2025

Uh oh!

BadisLaffet1 commented Oct 28, 2025

Uh oh!

k8s-ci-robot commented Oct 28, 2025

Uh oh!

camilamacedo86 commented Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

camilamacedo86 Oct 28, 2025

Choose a reason for hiding this comment

Uh oh!

camilamacedo86 Oct 28, 2025

Choose a reason for hiding this comment

Uh oh!

camilamacedo86 Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

camilamacedo86 Oct 28, 2025

Choose a reason for hiding this comment

Uh oh!

camilamacedo86 commented Oct 28, 2025

Uh oh!

BadisLaffet1 commented Oct 28, 2025

Uh oh!

camilamacedo86 commented Oct 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

linux-foundation-easycla bot commented Oct 28, 2025 •

edited

Loading

camilamacedo86 commented Oct 28, 2025 •

edited

Loading

camilamacedo86 Oct 28, 2025 •

edited

Loading