secretGenerator overwrites existing stringData on merge

[weber-software]

What happened?

The secretGenerator is overwriting/deleting an existing stringData entry when behavior is set to merge.

What did you expect to happen?

I would expect that the existing stringData is either kept or converted to additional data entries.

How can we reproduce it (as minimally and precisely as possible)?

resources:
  - secret.yaml
secretGenerator:
  - name: test
    literals:
      - property2=value2
    behavior: merge
    options:
      disableNameSuffixHash: false

kind: Secret
apiVersion: v1
metadata:
  name: test
type: Opaque
stringData:
  property1: value1

Expected output

apiVersion: v1
data:
  property1: dmFsdWUx
  property2: dmFsdWUy
kind: Secret
metadata:
  name: test
type: Opaque

Actual output

apiVersion: v1
data:
  property2: dmFsdWUy
kind: Secret
metadata:
  name: test
type: Opaque

Kustomize version

v5.7.1

Operating system

Linux

[adoramshoval]

Hi, can I work on this issue?

[adoramshoval]

/assign

[koba1t]

If this is a reproducible issue, I believe it should be fixed.
/triage accepted

@adoramshoval
If you would like to contribute to this task, you're welcome to do so!

[adoramshoval]

Hi @weber-software ,
It seems like #5894 should already fix your issue as it also addresses merge behavior with stringData, resulting the following Secret:

apiVersion: v1
data:
  property2: dmFsdWUy
kind: Secret
metadata:
  name: test
stringData:
  property1: value1
type: Opaque

See: https://github.com/kubernetes-sigs/kustomize/pull/5894/files#diff-3725194978232dfb5ab1f008fb3d8780758f31e48f51f549b45976a83eb7b8e3

[weber-software]

@adoramshoval yes, it seems like that line is fixing this bug. Thanks! 👍