From bf1c801a5e825aaef71d42c8aa75bf5c7e8949e0 Mon Sep 17 00:00:00 2001 From: Don Bowman Date: Thu, 21 Feb 2019 11:31:54 -0500 Subject: [PATCH 1/2] Add doc indicating existing of 'behavior' in configMapGenerator It appears from the code that configMapGenerator can take a parameter of 'behavior' which is 'merge','create','replace'. Add note to the 'docs/kustomization.yaml' indicating so. Signed-off-by: Don Bowman --- docs/kustomization.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/kustomization.yaml b/docs/kustomization.yaml index dba67d75c..2674cf3f4 100644 --- a/docs/kustomization.yaml +++ b/docs/kustomization.yaml @@ -76,6 +76,9 @@ resources: # The example below creates two ConfigMaps. One with the # names and contents of the given files, the other with # key/value as data. +# The configMapGenerator accepts a paramter of +# behavior: [create|replace|merge]. This can allow +# an overlay to augment the configMapGenerator of the parent configMapGenerator: - name: myJavaServerProps files: From 773c1f21991ddbbddea26fdaa98a482b3b6a8bba Mon Sep 17 00:00:00 2001 From: Don Bowman Date: Thu, 21 Feb 2019 11:53:12 -0500 Subject: [PATCH 2/2] Make requested wording changes from PR for behavior document Signed-off-by: Don Bowman --- docs/kustomization.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/kustomization.yaml b/docs/kustomization.yaml index 2674cf3f4..75e1701fe 100644 --- a/docs/kustomization.yaml +++ b/docs/kustomization.yaml @@ -76,9 +76,9 @@ resources: # The example below creates two ConfigMaps. One with the # names and contents of the given files, the other with # key/value as data. -# The configMapGenerator accepts a paramter of -# behavior: [create|replace|merge]. This can allow -# an overlay to augment the configMapGenerator of the parent +# Each configMapGenerator item accepts a parameter of +# behavior: [create|replace|merge]. This allows an overlay to modify or +# replace an existing configMap from the parent. configMapGenerator: - name: myJavaServerProps files: