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

Update setter comments during 3-way merge

Browse Source
This commit is contained in:
Phani Teja Marupaka
2020-08-02 18:24:56 -07:00
parent 17f935452f
commit 4e74947731
6 changed files with 222 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kyaml/yaml/merge3/kustomization_test.go
View File

@@ -6,7 +6,8 @@ package merge3_test
var kustomizationTestCases = []testCase{
// Kustomization Test Cases
{description: `ConfigMapGenerator merge`,
{
description: `ConfigMapGenerator merge`,
origin: `
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
@@ -48,7 +49,8 @@ configMapGenerator:
- configkey=configs/another_configfile2
name: a-configmap2`},
{description: `SecretGenerator merge`,
{
description: `SecretGenerator merge`,
origin: `
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization