fix: support helm v4 beside v3

[hmilkovi]

This PR fixes Helm V4 issues.

Helm V4 is backward compatible with V3 helm charts and -c is not needed for V3 Helm (tested it).

This is fix for error I experience also #6013

Many thanks in advance for viewing this PR.

[k8s-ci-robot]

Welcome @hmilkovi!

It looks like this is your first PR to kubernetes-sigs/kustomize 🎉. 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/kustomize 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. 😃

[linux-foundation-easycla]

The committers listed above are authorized under a signed CLA.

• ✅ login: hmilkovi / name: Hrvoje Milković (54848c1, c6ccb4f)

[k8s-ci-robot]

Hi @hmilkovi. 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.

Details

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.

[k8s-ci-robot]

This PR has multiple commits, and the default merge method is: merge.
You can request commits to be squashed using the label: tide/merge-method-squash

Details

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.

[hmilkovi]

I have changed tests to be done with V4. I was thinking if I should implement to run tests with both versions of Helm?

[koba1t]

Considering that Helm v3 is likely installed in the environment, I believe we need code and tests that can support both v3 and v4 environments.

[koba1t]

/ok-to-test

[koba1t]

Helm V4 is backward compatible with V3 helm charts and -c is not needed for V3 Helm (tested it).

OK, I understand.
Please add tests for both v3 and v4 binaries.
This ensures backward compatibility in kustomize.

[hmilkovi]

I agree as I didn't want to make it only Helm V4 as many people will still use V3 and that would be a breaking change.

I have added wrapper for Helm tests to be run for multiple versions in HelmChartInflationGenerator_test.go, example test logs:

--- PASS: TestHelmChartInflationGeneratorWithDebug (0.48s)
    --- PASS: TestHelmChartInflationGeneratorWithDebug/HelmV3 (0.24s)
    --- PASS: TestHelmChartInflationGeneratorWithDebug/HelmV4 (0.24s)

[hmilkovi]

/retest

[hmilkovi]

/retest-required

[hmilkovi]

@koba1t can you please check when you have time, sorry for direct ping

[tcaddy]

What can be done to get this across the finish line? I'd like to see #6013 resolved. @hmilkovi can you please squash your commits? If there is anything else holding up the approved/LGTM labels, can someone comment about what else is needed?

[hmilkovi]

Sorry for misunderstanding message.

After checking I propose that we add install of Helm before tests.
https://github.com/kubernetes-sigs/kustomize/blob/master/.github/workflows/go.yml#L139

make $(go env GOPATH)/bin/helmV4

I just not sure if we should support also Windows here as I don't have a Windows installation and want to avoid if possible.

If I see correctly on master branch Helm tests are also skipped, checked random commit where tests passed:
https://github.com/kubernetes-sigs/kustomize/actions/runs/19710588332/job/56469821183#step:4:2979

[hmilkovi]

/retest-required

[hmilkovi]

Tested it with Helm V3 and V4 locally. Discovered relation to #5971:

Helm chart resources are now tagged with kustomize.config.k8s.io/helm-chart-generated: "true" annotation during generation

$ go test ./api/krusty -run TestHelmChartDifferentNamespaces
===== ACTUAL BEGIN ========================================
apiVersion: v1
kind: Service
metadata:
  annotations:
    helm-namespace: helm-ns
  name: test-service
  namespace: helm-ns
===== ACTUAL END ==========================================
   EXPECTED                                                     ACTUAL
   --------                                                     ------
   apiVersion: v1                                               apiVersion: v1
   kind: Service                                                kind: Service
   metadata:                                                    metadata:
     annotations:                                                 annotations:
       helm-namespace: helm-ns                                      helm-namespace: helm-ns
X      internal.config.kubernetes.io/helm-generated: "true"       name: test-service
X    name: test-service                                           namespace: helm-ns
X    namespace: helm-ns
--- FAIL: TestHelmChartDifferentNamespaces (0.06s)
    hasgett.go:22: Expected not equal to actual
FAIL
FAIL	sigs.k8s.io/kustomize/api/krusty	0.509s
FAIL

@Skaronator Can you please jump in to give a bit more light if we expect it to render this internal annotation or remove it?
Currently kustomizer.Run() unconditionally calls m.RemoveBuildAnnotations(), which removes the internal.config.kubernetes.io/helm-generated: "true" annotation as it's part of the BuildAnnotations slice:

kustomize/api/resource/resource.go

Line 52 in 008b7a0

konfig.HelmGeneratedAnnotation,

I can do either way, I want to fix the Helm integration tests. Many thanks for your time.

[hmilkovi]

/retest-required

[hmilkovi]

@koba1t Can you please check when you have time? Tests should pass now.

[koba1t]

Hi @hmilkovi
So sorry to delay resnponse and can't spend time on this problem. (I started working at a new company this month.)

After seeing your PR, I realized that it is difficult to balance helmv3 and helmv4 tests with the current test code. I think that the current test seems to be tested only with helmv4 binary.

So, could you please modify this PR to include only the following file without including any changes to testing or CI?
plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go
I checked, and since helmv4 is trying to maintain backward compatibility with helmv3, the above code should work even if tested with a helmv3 binary.

I'm thinking of introducing testing for helmv4 in a separate PR.

I'm sorry that the implementation policy has changed, but please update this PR or create a separate PR.

[hmilkovi]

I agree, all fine don't worry. I have kept changes related only to Helm:

• api/internal/builtins/HelmChartInflationGenerator.go
• plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go

Related to tests I want to just keep this as it fixes tests to pass (not related to Helm version):

• api/krusty/helmchartinflationgenerator_test.go

[koba1t]

Thank you @hmilkovi

/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hmilkovi, koba1t, Skaronator

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [koba1t]

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

[erikgb]

We have been waiting very long for this bugfix, so I am really glad to see it finally merged. Would it be possible to cut a release containing the fix ASAP, @koba1t?

[koba1t]

@erikgb

I plan to make a new release after #6044 is merged.

[koba1t]

A new release has been created that fixes this issue
https://github.com/kubernetes-sigs/kustomize/releases/tag/kustomize%2Fv5.8.1