From 8c57c1e9740ad35367639883f8d286046e3b93c5 Mon Sep 17 00:00:00 2001
From: Jeffrey Regan <jregan@google.com>
Date: Fri, 13 Apr 2018 13:32:08 -0700
Subject: [PATCH] Some kustomization field renaming.

---
 demos/helloWorld.md | 10 ++++------
 demos/mySql.md      |  2 +-
 demos/springboot.md |  4 ++--
 docs/kustomize.yaml |  6 ++----
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/demos/helloWorld.md b/demos/helloWorld.md
index f9a92bf58..807625466 100644
--- a/demos/helloWorld.md
+++ b/demos/helloWorld.md
@@ -133,12 +133,11 @@ defining a new name prefix, and some different labels.
 <!-- @makeStagingKustomization @test -->
 ```
 cat <<'EOF' >$OVERLAYS/staging/kustomize.yaml
-kustomizationName: makes-staging-hello
 namePrefix: staging-
-objectLabels:
+labelsToAdd:
   instance: staging
   org: acmeCorporation
-objectAnnotations:
+annotationsToAdd:
   note: Hello, I am staging!
 bases:
 - ../../base
@@ -175,12 +174,11 @@ with a different name prefix and labels.
 <!-- @makeProductionKustomization @test -->
 ```
 cat <<EOF >$OVERLAYS/production/kustomize.yaml
-kustomizationName: makes-production-tuthello
 namePrefix: production-
-objectLabels:
+labelsToAdd:
   instance: production
   org: acmeCorporation
-objectAnnotations:
+annotationsToAdd:
   note: Hello, I am production!
 bases:
 - ../../base
diff --git a/demos/mySql.md b/demos/mySql.md
index ceb22374e..6464da841 100644
--- a/demos/mySql.md
+++ b/demos/mySql.md
@@ -131,7 +131,7 @@ selector.
 `kustomize` does not have `set label` command to add
 label, but we can edit `kustomize.yaml` file under
 `prod` directory and add the production labels under
-`objectLabels` fields as highlighted below.
+`labelsToAdd` fields as highlighted below.
 
 <!-- @customizeLabels @test -->
 ```
diff --git a/demos/springboot.md b/demos/springboot.md
index 6bf839f0c..a34e0f574 100644
--- a/demos/springboot.md
+++ b/demos/springboot.md
@@ -156,7 +156,7 @@ cat kustomize.yaml
 
 > ```
 > namePrefix: prod-
-> objectAnnotations:
+> annotationsToAdd:
 >  note: This is a example annotation
 > ```
 
@@ -206,7 +206,7 @@ selector.
 `kustomize` does not have `edit set label` command to add
 label, but we can edit `kustomize.yaml` file under
 `prod` directory and add the production labels under
-`objectLabels` fields as highlighted below.
+`labelsToAdd` fields as highlighted below.
 
 <!-- @customizeLabels @test -->
 ```
diff --git a/docs/kustomize.yaml b/docs/kustomize.yaml
index 9252a37b2..8db80898b 100644
--- a/docs/kustomize.yaml
+++ b/docs/kustomize.yaml
@@ -1,12 +1,10 @@
-kustomizationName: helloworld
-description: helloworld does useful stuff.
 namePrefix: some-prefix
 # Labels to add to all objects and selectors.
 # These labels would also be used to form the selector for apply --prune
 # Named differently than “labels” to avoid confusion with metadata for this object
-objectLabels:
+labelsToAdd:
   app: helloworld
-objectAnnotations:
+annotationsToAdd:
   note: This is an example annotation
 resources: []
 #- service.yaml