kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-29 17:41:13 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix: use annotation to identify helm chart generated resources

Browse Source
This commit is contained in:
Niklas Wagner
2025-08-26 15:52:05 +02:00
parent c8186c7c6f
commit c77d1747fd
8 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go
View File

@@ -17,6 +17,7 @@ import (
"slices"
"strings"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/api/resmap"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kyaml/errors"
@@ -302,6 +303,12 @@ func (p *plugin) Generate() (rm resmap.ResMap, err error) {
rm, resMapErr := p.h.ResmapFactory().NewResMapFromBytes(stdout)
if resMapErr == nil {
// Mark all Helm-generated resources to skip namespace transformation
for _, r := range rm.Resources() {
if err := r.RNode.PipeE(kyaml.SetAnnotation(konfig.HelmGeneratedAnnotation, "true")); err != nil {
return nil, fmt.Errorf("failed to set helm annotation: %w", err)
}
}
return rm, nil
}
// try to remove the contents before first "---" because
@@ -317,6 +324,12 @@ func (p *plugin) Generate() (rm resmap.ResMap, err error) {
if err != nil {
return nil, fmt.Errorf("could not parse rnode slice into resource map: %w", err)
}
// Mark all Helm-generated resources to skip namespace transformation
for _, r := range rm.Resources() {
if err := r.RNode.PipeE(kyaml.SetAnnotation(konfig.HelmGeneratedAnnotation, "true")); err != nil {
return nil, fmt.Errorf("failed to set helm annotation: %w", err)
}
}
return rm, nil
}
return nil, fmt.Errorf("could not parse bytes into resource map: %w", resMapErr)

9
plugin/builtin/namespacetransformer/NamespaceTransformer.go
View File

@@ -8,6 +8,7 @@ import (
"fmt"
"sigs.k8s.io/kustomize/api/filters/namespace"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/api/resmap"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kyaml/errors"
@@ -56,11 +57,9 @@ func (p *plugin) Transform(m resmap.ResMap) error {
// Don't mutate empty objects?
continue
}
if origin, err := r.GetOrigin(); err == nil && origin != nil {
if origin.ConfiguredBy.Kind == "HelmChartInflationGenerator" {
// Don't apply namespace on Helm generated manifest. Helm should take care of it.
continue
}
if annotations := r.GetAnnotations(konfig.HelmGeneratedAnnotation); annotations[konfig.HelmGeneratedAnnotation] == "true" {
// Don't apply namespace on Helm generated manifest. Helm should take care of it.
continue
}
r.StorePreviousId()
if err := r.ApplyFilter(namespace.Filter{

11
plugin/builtin/namespacetransformer/NamespaceTransformer_test.go
View File

@@ -9,9 +9,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/api/provider"
"sigs.k8s.io/kustomize/api/resmap"
"sigs.k8s.io/kustomize/api/resource"
kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
)
@@ -782,12 +782,7 @@ metadata:
`))
require.NoError(t, err)
r := rm.Resources()[0]
origin := &resource.Origin{
ConfiguredBy: kyaml.ResourceIdentifier{
TypeMeta: kyaml.TypeMeta{APIVersion: "builtin", Kind: "HelmChartInflationGenerator"},
},
}
require.NoError(t, r.SetOrigin(origin))
require.NoError(t, r.RNode.PipeE(kyaml.SetAnnotation(konfig.HelmGeneratedAnnotation, "true")))
rm, err = th.RunTransformerFromResMap(`
apiVersion: builtin
@@ -801,6 +796,8 @@ metadata:
th.AssertActualEqualsExpectedNoIdAnnotations(rm, `apiVersion: v1
kind: Service
metadata:
annotations:
internal.config.kubernetes.io/helm-generated: "true"
name: svc
namespace: helm-ns
`)