Jeff Regan 6c4e8019f8 Merge pull request #4094 from brianpursley/merge3-test ...

Add unit tests to cover existing behavior of three way merge and strategic merge patch

2021-08-19 07:41:18 -07:00

..

builtins

Merge pull request #3898 from dmizelle/add-helm-include-crds

2021-05-27 16:04:07 -07:00

filesys

Move api/filesys to kyaml/filesys (#3997)

2021-06-16 11:42:00 -07:00

filters

replace Resource.options with annotations (#4061)

2021-07-23 18:19:05 -07:00

hasher

Allow patch removal of emptyDir {}

2021-03-15 18:34:36 -07:00

ifc

Drop uses of 'unstructured' terminology.

2021-03-15 15:59:06 -07:00

image

Add imagetag filter based on kayml libraries

2020-04-03 15:00:09 -07:00

internal

option for origin data as annotation

2021-08-12 20:09:41 -07:00

konfig

replace Resource.options with annotations (#4061)

2021-07-23 18:19:05 -07:00

krusty

Merge pull request #4065 from natasha41575/originDataAsAnnotation

2021-08-18 19:08:54 -07:00

kv

Move api/filesys to kyaml/filesys (#3997)

2021-06-16 11:42:00 -07:00

loader

Move api/filesys to kyaml/filesys (#3997)

2021-06-16 11:42:00 -07:00

provenance

fix invalid managed-by label value

2020-11-16 14:05:21 -08:00

provider

Remove dead merge conflict code.

2021-03-17 06:35:30 -07:00

resmap

option for origin data as annotation

2021-08-12 20:09:41 -07:00

resource

Merge pull request #4094 from brianpursley/merge3-test

2021-08-19 07:41:18 -07:00

testutils

replace Resource.options with annotations (#4061)

2021-07-23 18:19:05 -07:00

types

option for origin data as annotation

2021-08-12 20:09:41 -07:00

go.mod

Unpin modules

2021-07-02 14:10:05 -07:00

go.sum

Automated changes under go 1.16.6

2021-07-24 09:18:58 -07:00

main.go

Raise the golinter bar.

2019-11-14 16:37:49 -08:00