Merge pull request #349 from Liujingfang1/master

fix the release and build files
2026-06-14 10:30:59 +00:00 · 2018-09-13 12:00:36 -07:00 · 2018-09-13 11:51:47 -07:00 · 2018-09-13 09:24:09 -07:00 · 2018-09-13 09:56:04 +10:00 · 2018-09-12 12:41:38 -07:00
3334 changed files with 2008350 additions and 1075 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ language: go
 go:
  - 1.10.x

-# go_import_path: k8s.io/kubectl
+go_import_path: sigs.k8s.io/kustomize

 before_install:
  - source ./bin/consider-early-travis-exit.sh
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -2,175 +2,359 @@


 [[projects]]
+  digest = "1:8e47871087b94913898333f37af26732faaab30cdb41571136cf7aec9921dae7"
  name = "github.com/PuerkitoBio/purell"
  packages = ["."]
+  pruneopts = ""
  revision = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"
  version = "v1.1.0"

 [[projects]]
  branch = "master"
+  digest = "1:331a419049c2be691e5ba1d24342fc77c7e767a80c666a18fd8a9f7b82419c1c"
  name = "github.com/PuerkitoBio/urlesc"
  packages = ["."]
+  pruneopts = ""
  revision = "de5bf2ad457846296e2031421a34e2568e304e35"

 [[projects]]
+  digest = "1:9299ad32dcec0f92ad06773f73426bd46a21efa96f6a8138c287bb185933e77e"
+  name = "github.com/aws/aws-sdk-go"
+  packages = [
+    "aws",
+    "aws/awserr",
+    "aws/awsutil",
+    "aws/client",
+    "aws/client/metadata",
+    "aws/corehandlers",
+    "aws/credentials",
+    "aws/credentials/ec2rolecreds",
+    "aws/credentials/endpointcreds",
+    "aws/credentials/stscreds",
+    "aws/csm",
+    "aws/defaults",
+    "aws/ec2metadata",
+    "aws/endpoints",
+    "aws/request",
+    "aws/session",
+    "aws/signer/v4",
+    "internal/sdkio",
+    "internal/sdkrand",
+    "internal/sdkuri",
+    "internal/shareddefaults",
+    "private/protocol",
+    "private/protocol/eventstream",
+    "private/protocol/eventstream/eventstreamapi",
+    "private/protocol/query",
+    "private/protocol/query/queryutil",
+    "private/protocol/rest",
+    "private/protocol/restxml",
+    "private/protocol/xml/xmlutil",
+    "service/s3",
+    "service/sts",
+  ]
+  pruneopts = ""
+  revision = "daed0c76021ea9c4e659e3ec80bcd2d657297100"
+  version = "v1.15.12"
+
+[[projects]]
+  branch = "master"
+  digest = "1:98e84060475ed245c3b355042afd43a74aa7d32efe50658f4f995977916f9fc3"
+  name = "github.com/bgentry/go-netrc"
+  packages = ["netrc"]
+  pruneopts = ""
+  revision = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"
+
+[[projects]]
+  digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b"
  name = "github.com/davecgh/go-spew"
  packages = ["spew"]
+  pruneopts = ""
  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
  version = "v1.1.0"

 [[projects]]
+  digest = "1:971e9ba63a417c5f1f83ab358677bc59e96ff04285f26c6646ff089fb60b15e8"
  name = "github.com/emicklei/go-restful"
  packages = [
    ".",
-    "log"
+    "log",
  ]
+  pruneopts = ""
  revision = "3658237ded108b4134956c1b3050349d93e7b895"
  version = "v2.7.1"

 [[projects]]
+  digest = "1:dcefbadf4534c5ecac8573698fba6e6e601157bfa8f96aafe29df31ae582ef2a"
  name = "github.com/evanphx/json-patch"
  packages = ["."]
+  pruneopts = ""
  revision = "afac545df32f2287a079e2dfb7ba2745a643747e"
  version = "v3.0.0"

 [[projects]]
+  digest = "1:b13707423743d41665fd23f0c36b2f37bb49c30e94adb813319c44188a51ba22"
  name = "github.com/ghodss/yaml"
  packages = ["."]
+  pruneopts = ""
  revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
  version = "v1.0.0"

+[[projects]]
+  digest = "1:858b7fe7b0f4bc7ef9953926828f2816ea52d01a88d72d1c45bc8c108f23c356"
+  name = "github.com/go-ini/ini"
+  packages = ["."]
+  pruneopts = ""
+  revision = "358ee7663966325963d4e8b2e1fbd570c5195153"
+  version = "v1.38.1"
+
 [[projects]]
  branch = "master"
+  digest = "1:e116a4866bffeec941056a1fcfd37e520fad1ee60e4e3579719f19a43c392e10"
  name = "github.com/go-openapi/jsonpointer"
  packages = ["."]
+  pruneopts = ""
  revision = "3a0015ad55fa9873f41605d3e8f28cd279c32ab2"

 [[projects]]
  branch = "master"
+  digest = "1:3830527ef0f4f9b268d9286661c0f52f9115f8aefd9f45ee7352516f93489ac9"
  name = "github.com/go-openapi/jsonreference"
  packages = ["."]
+  pruneopts = ""
  revision = "3fb327e6747da3043567ee86abd02bb6376b6be2"

 [[projects]]
  branch = "master"
+  digest = "1:238a056875c4b053b4b29984765ee335bf8c539fdf17e527fd9b7aa72521c8dd"
  name = "github.com/go-openapi/spec"
  packages = ["."]
+  pruneopts = ""
  revision = "bcff419492eeeb01f76e77d2ebc714dc97b607f5"

 [[projects]]
  branch = "master"
+  digest = "1:7b067ca8b94982960860d18c42e29f15bbd0e8d9ae8145a83a218296e75393cf"
  name = "github.com/go-openapi/swag"
  packages = ["."]
+  pruneopts = ""
  revision = "811b1089cde9dad18d4d0c2d09fbdbf28dbd27a5"

 [[projects]]
+  digest = "1:0a3f6a0c68ab8f3d455f8892295503b179e571b7fefe47cc6c556405d1f83411"
  name = "github.com/gogo/protobuf"
  packages = [
    "proto",
-    "sortkeys"
+    "sortkeys",
  ]
+  pruneopts = ""
  revision = "1adfc126b41513cc696b209667c8656ea7aac67c"
  version = "v1.0.0"

 [[projects]]
  branch = "master"
+  digest = "1:107b233e45174dbab5b1324201d092ea9448e58243ab9f039e4c0f332e121e3a"
  name = "github.com/golang/glog"
  packages = ["."]
+  pruneopts = ""
  revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"

 [[projects]]
+  digest = "1:f958a1c137db276e52f0b50efee41a1a389dcdded59a69711f3e872757dab34b"
  name = "github.com/golang/protobuf"
  packages = [
    "proto",
    "ptypes",
    "ptypes/any",
    "ptypes/duration",
-    "ptypes/timestamp"
+    "ptypes/timestamp",
  ]
+  pruneopts = ""
  revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
  version = "v1.1.0"

 [[projects]]
  branch = "master"
+  digest = "1:754f77e9c839b24778a4b64422236d38515301d2baeb63113aa3edc42e6af692"
  name = "github.com/google/gofuzz"
  packages = ["."]
+  pruneopts = ""
  revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1"

 [[projects]]
+  digest = "1:2a131706ff80636629ab6373f2944569b8252ecc018cda8040931b05d32e3c16"
  name = "github.com/googleapis/gnostic"
  packages = [
    "OpenAPIv2",
    "compiler",
-    "extensions"
+    "extensions",
  ]
+  pruneopts = ""
  revision = "ee43cbb60db7bd22502942cccbc39059117352ab"
  version = "v0.1.0"

 [[projects]]
+  branch = "master"
+  digest = "1:f5d25fd7bdda08e39e01193ef94a1ebf7547b1b931bcdec785d08050598f306c"
+  name = "github.com/hashicorp/go-cleanhttp"
+  packages = ["."]
+  pruneopts = ""
+  revision = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"
+
+[[projects]]
+  branch = "master"
+  digest = "1:fd15b3f6aac9d0fe68c6e38922282e0d2e88cd77b927ac3dd842e363645522c0"
+  name = "github.com/hashicorp/go-getter"
+  packages = [
+    ".",
+    "helper/url",
+  ]
+  pruneopts = ""
+  revision = "4bda8fa99001c61db3cad96b421d4c12a81f256d"
+
+[[projects]]
+  branch = "master"
+  digest = "1:2cf6c60c74eacadd31652674364af55c8d54a86b8ea193548f1c37f8c9af8f9c"
+  name = "github.com/hashicorp/go-safetemp"
+  packages = ["."]
+  pruneopts = ""
+  revision = "b1a1dbde6fdc11e3ae79efd9039009e22d4ae240"
+
+[[projects]]
+  branch = "master"
+  digest = "1:139bdc2c89779b8ff8b1150be28f889b0ed964e6da96f32cbc9035bd4642881c"
+  name = "github.com/hashicorp/go-version"
+  packages = ["."]
+  pruneopts = ""
+  revision = "270f2f71b1ee587f3b609f00f422b76a6b28f348"
+
+[[projects]]
+  digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be"
  name = "github.com/inconshreveable/mousetrap"
  packages = ["."]
+  pruneopts = ""
  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
  version = "v1.0"

 [[projects]]
+  digest = "1:6f49eae0c1e5dab1dafafee34b207aeb7a42303105960944828c2079b92fc88e"
+  name = "github.com/jmespath/go-jmespath"
+  packages = ["."]
+  pruneopts = ""
+  revision = "0b12d6b5"
+
+[[projects]]
+  digest = "1:9eab2325abbed0ebcee9d44bb3660a69d5d10e42d5ac4a0e77f7a6ea22bfce88"
  name = "github.com/json-iterator/go"
  packages = ["."]
+  pruneopts = ""
  revision = "ca39e5af3ece67bbcda3d0f4f56a8e24d9f2dad4"
  version = "1.1.3"

+[[projects]]
+  digest = "1:10e1dfc240bcd0fce14366215fd2b070e79d9b9460b27382db4423ad74204f2b"
+  name = "github.com/krishicks/yaml-patch"
+  packages = ["."]
+  pruneopts = ""
+  revision = "83cc9ac50becbbfafb86a89167f3bc5372e8e530"
+  version = "v0.0.10"
+
 [[projects]]
  branch = "master"
+  digest = "1:d9e483f4b9e306facf126bd90b02d512bd22ea4471e1568867e32221a8abbb16"
  name = "github.com/mailru/easyjson"
  packages = [
    "buffer",
    "jlexer",
-    "jwriter"
+    "jwriter",
  ]
+  pruneopts = ""
  revision = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"

 [[projects]]
+  branch = "master"
+  digest = "1:83854f6b1d2ce047b69657e3a87ba7602f4c5505e8bdfd02ab857db8e983bde1"
+  name = "github.com/mitchellh/go-homedir"
+  packages = ["."]
+  pruneopts = ""
+  revision = "58046073cbffe2f25d425fe1331102f55cf719de"
+
+[[projects]]
+  branch = "master"
+  digest = "1:51c98e2c9a8d0a724a69f46421876af14e12132cb02f1d0e144785d752247162"
+  name = "github.com/mitchellh/go-testing-interface"
+  packages = ["."]
+  pruneopts = ""
+  revision = "a61a99592b77c9ba629d254a693acffaeb4b7e28"
+
+[[projects]]
+  digest = "1:0c0ff2a89c1bb0d01887e1dac043ad7efbf3ec77482ef058ac423d13497e16fd"
  name = "github.com/modern-go/concurrent"
  packages = ["."]
+  pruneopts = ""
  revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
  version = "1.0.3"

 [[projects]]
+  digest = "1:420f9231f816eeca3ff5aab070caac3ed7f27e4d37ded96ce9de3d7a7a2e31ad"
  name = "github.com/modern-go/reflect2"
  packages = ["."]
+  pruneopts = ""
  revision = "1df9eeb2bb81f327b96228865c5687bc2194af3f"
  version = "1.0.0"

 [[projects]]
+  digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca"
  name = "github.com/pkg/errors"
  packages = ["."]
+  pruneopts = ""
  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
  version = "v0.8.0"

 [[projects]]
+  digest = "1:74c32990510c9f188556aa17600313e867d1d06f5a9db244056a95d144ec34ce"
  name = "github.com/spf13/cobra"
  packages = ["."]
+  pruneopts = ""
  revision = "a1f051bc3eba734da4772d60e2d677f47cf93ef4"
  version = "v0.0.2"

 [[projects]]
+  digest = "1:8e243c568f36b09031ec18dff5f7d2769dcf5ca4d624ea511c8e3197dc3d352d"
  name = "github.com/spf13/pflag"
  packages = ["."]
+  pruneopts = ""
  revision = "583c0c0531f06d5278b7d917446061adc344b5cd"
  version = "v1.0.1"

+[[projects]]
+  digest = "1:ee723e6a1962a196eeba1b24f82af61a4f60f8821d7aa96d48e787f8337bcffc"
+  name = "github.com/ulikunitz/xz"
+  packages = [
+    ".",
+    "internal/hash",
+    "internal/xlog",
+    "lzma",
+  ]
+  pruneopts = ""
+  revision = "0c6b41e72360850ca4f98dc341fd999726ea007f"
+  version = "v0.5.4"
+
 [[projects]]
  branch = "master"
+  digest = "1:9e548233d0dc00e74be262e54a9d1bbe7e4c19e5951083520261740e37daeb02"
  name = "golang.org/x/net"
  packages = [
    "http/httpguts",
    "http2",
    "http2/hpack",
-    "idna"
+    "idna",
  ]
+  pruneopts = ""
  revision = "2491c5de3490fced2f6cff376127c667efeed857"

 [[projects]]
+  digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4"
  name = "golang.org/x/text"
  packages = [
    "collate",
@@ -187,25 +371,31 @@
    "unicode/cldr",
    "unicode/norm",
    "unicode/rangetable",
-    "width"
+    "width",
  ]
+  pruneopts = ""
  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
  version = "v0.3.0"

 [[projects]]
+  digest = "1:75fb3fcfc73a8c723efde7777b40e8e8ff9babf30d8c56160d01beffea8a95a6"
  name = "gopkg.in/inf.v0"
  packages = ["."]
+  pruneopts = ""
  revision = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"
  version = "v0.9.1"

 [[projects]]
+  digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2"
  name = "gopkg.in/yaml.v2"
  packages = ["."]
+  pruneopts = ""
  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
  version = "v2.2.1"

 [[projects]]
  branch = "master"
+  digest = "1:663df6da5560210fc39194a0a2c4fceba09ead717c330f1174bb15597cf18ce8"
  name = "k8s.io/api"
  packages = [
    "admissionregistration/v1alpha1",
@@ -235,17 +425,24 @@
    "settings/v1alpha1",
    "storage/v1",
    "storage/v1alpha1",
-    "storage/v1beta1"
+    "storage/v1beta1",
  ]
+  pruneopts = ""
  revision = "53d615ae3f440f957cb9989d989d597f047262d9"

 [[projects]]
  branch = "master"
+  digest = "1:bcb2285bb525712de7903a5d254c2789df65c8b58d2cfac5a26d950ad94c2079"
  name = "k8s.io/apimachinery"
  packages = [
+    "pkg/api/equality",
+    "pkg/api/meta",
    "pkg/api/resource",
+    "pkg/api/validation",
    "pkg/apis/meta/v1",
    "pkg/apis/meta/v1/unstructured",
+    "pkg/apis/meta/v1/validation",
+    "pkg/apis/meta/v1beta1",
    "pkg/conversion",
    "pkg/conversion/queryparams",
    "pkg/fields",
@@ -274,28 +471,57 @@
    "pkg/util/yaml",
    "pkg/watch",
    "third_party/forked/golang/json",
-    "third_party/forked/golang/reflect"
+    "third_party/forked/golang/reflect",
  ]
+  pruneopts = ""
  revision = "13b73596e4b63e03203e86f6d9c7bcc1b937c62f"

 [[projects]]
+  digest = "1:071cc2f032b701b9dba26568e040940f26931a49e3a3985f3375f17f7f6d9c5f"
  name = "k8s.io/client-go"
  packages = ["kubernetes/scheme"]
+  pruneopts = ""
  revision = "23781f4d6632d88e869066eaebb743857aa1ef9b"
  version = "v7.0.0"

 [[projects]]
  branch = "master"
+  digest = "1:386c5d69077ce740614e8309ddf107dde91a5db25d3d779143f452fb4fbdfd1e"
  name = "k8s.io/kube-openapi"
  packages = [
    "pkg/common",
-    "pkg/util/proto"
+    "pkg/util/proto",
  ]
+  pruneopts = ""
  revision = "b3f03f55328800731ce03a164b80973014ecd455"

 [solve-meta]
  analyzer-name = "dep"
  analyzer-version = 1
-  inputs-digest = "74d444cd05ac6f803960180ec8ccfd5a4358077f7c79a5218a243554cb599274"
+  input-imports = [
+    "github.com/evanphx/json-patch",
+    "github.com/ghodss/yaml",
+    "github.com/golang/glog",
+    "github.com/hashicorp/go-getter",
+    "github.com/krishicks/yaml-patch",
+    "github.com/pkg/errors",
+    "github.com/spf13/cobra",
+    "gopkg.in/yaml.v2",
+    "k8s.io/api/core/v1",
+    "k8s.io/apimachinery/pkg/api/validation",
+    "k8s.io/apimachinery/pkg/apis/meta/v1",
+    "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
+    "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
+    "k8s.io/apimachinery/pkg/runtime",
+    "k8s.io/apimachinery/pkg/runtime/schema",
+    "k8s.io/apimachinery/pkg/util/mergepatch",
+    "k8s.io/apimachinery/pkg/util/sets",
+    "k8s.io/apimachinery/pkg/util/strategicpatch",
+    "k8s.io/apimachinery/pkg/util/validation",
+    "k8s.io/apimachinery/pkg/util/validation/field",
+    "k8s.io/apimachinery/pkg/util/yaml",
+    "k8s.io/client-go/kubernetes/scheme",
+    "k8s.io/kube-openapi/pkg/common",
+  ]
  solver-name = "gps-cdcl"
  solver-version = 1
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -49,10 +49,18 @@
  name = "k8s.io/client-go"
  version = "7.0.0"

-[[constraint]]
+[[override]]
  branch = "master"
  name = "k8s.io/utils"

-[[constraint]]
+[[override]]
  branch = "master"
  name = "github.com/go-openapi/spec"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/hashicorp/go-getter"
+
+[[constraint]]
+  name = "github.com/krishicks/yaml-patch"
+  version = "0.0.10"
--- a/README.md
+++ b/README.md
@@ -127,7 +127,7 @@ This tool is sponsored by [sig-cli] ([KEP]).
 [examples]: examples/README.md
 [imageBase]: docs/base.jpg
 [imageOverlay]: docs/overlay.jpg
-[install]: INSTALL.md
+[install]: docs/INSTALL.md
 [kubernetes style]: docs/glossary.md#kubernetes-style-object
 [kustomization]: docs/glossary.md#kustomization
 [overlay]: docs/glossary.md#overlay
--- a/bin/pre-commit.sh
+++ b/bin/pre-commit.sh
@@ -41,14 +41,14 @@ function testGoLint {
  diff -u <(echo -n) <(go_dirs | xargs -0 golint --min_confidence 0.85 )
 }

+# Not using the 'goimports' check because it reports hyphens in imported
+# package names as errors, and we vendor in packages that have
+# hyphens in their names.
 function testGoMetalinter {
  diff -u <(echo -n) <(go_dirs | xargs -0 gometalinter.v2 --disable-all --deadline 5m \
  --enable=misspell \
  --enable=structcheck \
  --enable=deadcode \
-# Disabling 'goimports' because it reports hyphens in imported package \
-# names as errors, and we have to vendor them in regardless. \
-#  --enable=goimports \
  --enable=varcheck \
  --enable=goconst \
  --enable=unparam \
@@ -60,7 +60,6 @@ function testGoMetalinter {
  --dupl-threshold=400 --enable=dupl)
 }

-
 function testGoVet {
  go vet -all ./...
 }
--- a/build/README.md
+++ b/build/README.md
@@ -1,16 +1,16 @@
 [releases page]: https://github.com/kubernetes-sigs/kustomize/releases
-[`container-builder-local`]: https://github.com/GoogleCloudPlatform/container-builder-local
-[Google Container Builder]: https://cloud.google.com/container-builder
+[`cloud-build-local`]: https://github.com/GoogleCloudPlatform/cloud-build-local
+[Google Cloud Build]: https://cloud.google.com/cloud-build

 Scripts and configuration files for publishing a
 `kustomize` release on the [releases page].

 ### Build a release locally

-Install [`container-builder-local`], then run
+Install [`cloud-build-local`], then run

 ```
-container-builder-local \
+cloud-build-local \
   --config=build/cloudbuild_local.yaml \
   --dryrun=false --write-workspace=/tmp/w .
 ```
@@ -41,5 +41,5 @@ Push the tag upstream:
 git push upstream $version
 ```

-The new tag will trigger a job in [Google Container
-Builder] to put a new release on the [releases page].
+The new tag will trigger a job in [Google Cloud
+Build] to put a new release on the [releases page].
--- a/build/build.sh
+++ b/build/build.sh
@@ -23,10 +23,10 @@ set -x
 # - Use /go as the default GOPATH because this is what the image uses
 # - Link our current directory (containing the source code) to the package location in the GOPATH

-OWNER="kubernetes-sigs"
+OWNER="sigs.k8s.io"
 REPO="kustomize"

-GO_PKG_OWNER=$GOPATH/src/github.com/$OWNER
+GO_PKG_OWNER=$GOPATH/src/$OWNER
 GO_PKG_PATH=$GO_PKG_OWNER/$REPO

 mkdir -p $GO_PKG_OWNER
--- a/build/goreleaser.yaml
+++ b/build/goreleaser.yaml
@@ -4,7 +4,7 @@ project_name: kustomize
 builds:
 - main: ./kustomize.go
  binary: kustomize
-  ldflags: -s -X github.com/kubernetes-sigs/kustomize/pkg/commands.kustomizeVersion={{.Version}} -X github.com/kubernetes-sigs/kustomize/pkg/commands.gitCommit={{.Commit}} -X github.com/kubernetes-sigs/kustomize/pkg/commands.buildDate={{.Date}}
+  ldflags: -s -X sigs.k8s.io/kustomize/pkg/commands.kustomizeVersion={{.Version}} -X sigs.k8s.io/kustomize/pkg/commands.gitCommit={{.Commit}} -X sigs.k8s.io/kustomize/pkg/commands.buildDate={{.Date}}
  goos:
  - darwin
  - linux
--- a/code-of-conduct.md
+++ b/code-of-conduct.md
@@ -1,6 +0,0 @@
-[Kubernetes Community Code of Conduct]: https://git.k8s.io/community/code-of-conduct.md
-
-# Code of Conduct
-
-This project has adopted the
-[Kubernetes Community Code of Conduct].
--- a/docs/CODE_OF_CONDUCT.md
+++ b/docs/CODE_OF_CONDUCT.md
@@ -0,0 +1,4 @@
+# Kustomize Community Code of Conduct
+
+Kustomize contributers expected to adhere to
+the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -11,12 +11,12 @@
   can be considered.
 1. Submit an issue describing your proposed change to
   the repo in question.
-1. The [repo owners](OWNERS) will respond to your issue
+1. The [repo owners](../OWNERS) will respond to your issue
   promptly.
 1. Fork the repo, develop and test your code.
   See the [github workflow guide].
 1. For _new features_, provide a markdown-based demo following
-   the pattern established in the [examples](examples) directory.
+   the pattern established in the [examples](../examples) directory.
   Run `bin/pre-commit.sh` to test your demo.
 1. Submit a pull request.

--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -3,7 +3,13 @@

 ## Installation

-Download a binary from the [release page].
+On macOS, you can install kustomize with Homebrew package
+manager:
+
+    brew install kustomize
+
+For all operating systems, download a binary from the
+[release page].

 Or try this to grab the latest official release
 using the command line:
--- a/docs/README.md
+++ b/docs/README.md
@@ -0,0 +1,23 @@
+# Kustomize docs
+ 
+ * [installation instructions](INSTALL.md)
+ 
+ * [kustomization.yaml](kustomization.yaml) - Example of a
+   [kustomization](glossary.md#kustomization)
+   with explanations of each field.
+
+ * [workflow](workflows.md) - Some steps one might take in using
+   bespoke and off-the-shelf configurations.
+  
+ * [glossary](glossary.md) - An attempt to disambiguiate terminology.
+   
+ * [eschewed features](eschewedFeatures.md) - Why certain features are (currently)
+   not supported in Kustomize.
+
+ * [contributing guidelines](CONTRIBUTING.md) - Please read before sending a PR.
+ 
+ * [code of conduct](CODE_OF_CONDUCT.md)
+ 
+ 
+ 
+ 
--- a/docs/SECURITY_CONTACTS
+++ b/docs/SECURITY_CONTACTS
--- a/docs/eschewedFeatures.md
+++ b/docs/eschewedFeatures.md
@@ -0,0 +1,80 @@
+# Eschewed Features
+
+## Removal directives
+
+`kustomize` supports configurations that can be reasoned about as
+_compositions_ or _mixins_ - concepts that are widely accepted as
+a best practice in various programming languages.
+
+To this end, `kustomize` offers various _addition_ directives.  One
+can add labels, annotations, patches, resources and bases.
+Corresponding _removal_ directives are not offered.
+
+Removal semantics would introduce many possibilities for
+inconsistency, and the need to add code to detect, report and
+reject it.  It would also allow, and possibly encourage,
+unnecessarily complex configuration layouts.
+
+When faced with a situation where removal is desirable, it's
+always possible to remove things from a base like labels and
+annotations, and/or split multi-resource manifests into individual
+resource files - then add things back as desired via the
+[kustomization].
+
+If the underlying base is outside of one's control, an [OTS
+workflow] is the recommended best practice.  Fork the base, remove
+what you don't want and commit it to your private fork, then use
+kustomize on your fork.  As often as desired, use _git rebase_ to
+capture improvements from the upstream base.
+
+## Build-time side effects from CLI args or env variables
+
+`kustomize` supports the best practice of storing one's
+entire configuration in a version control system.
+
+Changing `kustomize build` configuration output as a result
+of additional arguments or flags to `build`, or by
+consulting shell environment variable values in `build`
+code, would violate that goal.
+
+`kustomize` insteads offers [kustomization] file `edit`
+commands.  Like any shell command, they can accept
+environment variable arguments.
+
+For example, to set the tag used on an image to match an
+environment variable, run
+
+```
+kustomize edit set imagetag nginx:$MY_NGINX_VERSION
+```
+
+as part of some encapsulating work flow executed before
+`kustomize build`.
+
+
+## Globs in kustomization files
+
+`kustomize` supports the best practice of storing one's
+entire configuration in a version control system.
+
+Globbing the local file system for files not explicitly
+declared in the [kustomization] file at `kustomize build` time
+would violate that goal.
+
+Allowing globbing in a kustomization file would also introduce
+the same problems as allowing globbing in [java import]
+declarations or BUILD/Makefile dependency rules.
+
+`kustomize` will instead provide kustomization file editting
+commands that accept globbed arguments, expand them at _edit
+time_ relative to the local file system, and store the resulting
+explicit names into the kustomization file.
+
+In this way the resources, patches and bases used at _build time_
+remain explicitly declared in version control.
+
+
+[base]: glossary.md#base
+[kustomization]: glossary.md#kustomization
+[OTS workflow]: workflows.md#off-the-shelf-configuration
+[java import]: https://www.codebyamir.com/blog/pitfalls-java-import-wildcards
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -2,6 +2,7 @@

 [DAM]: #declarative-application-management
 [JSON]: https://www.json.org/
+[JSONPatch]: https://tools.ietf.org/html/rfc6902
 [Resource]: #resource
 [YAML]: http://www.yaml.org/start.html
 [application]: #application
@@ -15,16 +16,19 @@
 [kubernetes]: #kubernetes
 [kustomize]: #kustomize
 [kustomization]: #kustomization
-[off-the-shelf]: #off-the-shelf
+[off-the-shelf]: #off-the-shelf-configuration
 [overlay]: #overlay
 [overlays]: #overlay
 [patch]: #patch
 [patches]: #patch
+[patchJson6902]: #patchJson6902
+[patchesJson6902]: #patchjson6902
 [proposal]: https://github.com/kubernetes/community/pull/1629
 [rebase]: https://git-scm.com/docs/git-rebase
 [resource]: #resource
 [resources]: #resource
 [rpm]: https://en.wikipedia.org/wiki/Rpm_(software)
+[strategic merge]: https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md
 [target]: #target
 [variant]: #variant
 [variants]: #variant
@@ -254,6 +258,15 @@ dependencies.  Since any resource file can be used as a
 patch, one cannot reliably distinguish a resource from
 a patch just by looking at the file's [YAML].

+## patchJson6902
+A _patchJson6902_ refers to a kubernetes object and a [JSONPatch]
+that can patch the object. A [JSONPatch] contains a list of operations to change the object's field directly. 
+This is different from [patch], which is
+applied to a target kubernetes object by [strategic merge]. 
+
+_patchesJson6902_ is a field in kustomization. It contains a list of
+_patchJson6902_.
+
 ## resource

 A _resource_, in the context of kustomize, is a path to
@@ -285,7 +298,7 @@ The _target_ is the argument to `kustomize build`, e.g.:
 >  kustomize build $target
 > ```

-`$target` must be a path to a directory that
+`$target` must be a path or a url to a directory that
 immediately contains a [kustomization].

 The target contains, or refers to, all the information
--- a/docs/kustomization.yaml
+++ b/docs/kustomization.yaml
@@ -83,15 +83,29 @@ secretGenerator:
    tls.key: "cat secret/tls.key"
  type: "kubernetes.io/tls"
 - name: downloaded_secret
+  # timeoutSeconds specifies the number of seconds to
+  # wait for the commands below. It defaults to 5 seconds.
+  timeoutSeconds: 30
  commands:
    username: "curl -s https://path/to/secrets/username.yaml"
    password: "curl -s https://path/to/secrets/password.yaml"
  type: Opaque
+- name: env_file_secret
+  # envCommand is similar to command but outputs lines of key=val pairs
+  # i.e. a Docker .env file or a .ini file.
+  # you can only specify one envCommand per secret.
+  envCommand: printf \"DB_USERNAME=admin\nDB_PASSWORD=somepw\"
+  type: Opaque

 # Each entry in this list should resolve to a directory
 # containing a kustomization file, else the
 # customization fails.
 #
+# The entry could be a relative path pointing to a local directory
+# or a url pointing to a directory in a remote repo.
+# The url should follow hashicorp/go-getter URL format
+# https://github.com/hashicorp/go-getter#url-format
+#
 # The presence of this field means this file (the file
 # you a reading) is an _overlay_ that further
 # customizes information coming from these _bases_.
@@ -102,6 +116,9 @@ secretGenerator:
 # etc. that differ from the common base).
 bases:
 - ../../base
+- github.com/kubernetes-sigs/kustomize//examples/multibases?ref=v1.0.6
+- github.com/Liujingfang1/mysql
+- github.com/Liujingfang1/kustomize//examples/helloWorld?ref=test-branch

 # Each entry in this list should resolve to
 # a partial or complete resource definition file.
@@ -121,6 +138,41 @@ patches:
 - deployment_increase_replicas.yaml
 - deployment_increase_memory.yaml

+# Each entry in this list should resolve to
+# a kubernetes object and a JSON patch that will be applied
+# to the object.
+# The JSON patch is documented at https://tools.ietf.org/html/rfc6902
+#
+# target field points to a kubernetes object within the same kustomization
+# by the object's group, version, kind, name and namespace.
+# path field is a relative file path of a JSON patch file.
+# The content in this patch file can be either in JSON format as
+#
+#  [
+#    {"op": "add", "path": "/some/new/path", "value": "value"},
+#    {"op": "replace", "path": "/some/existing/path", "value": "new value"}
+#  ]
+#
+# or in YAML format as
+#
+# - op: add
+#   path: /some/new/path
+#   value: value
+# - op:replace
+#   path: /some/existing/path
+#   value: new value
+#
+patchesJson6902
+- target:
+    version: v1
+    kind: Deployment
+    name: my-deployment
+  path: add_init_container.yaml
+- target:
+    version: v1
+    kind: Service
+    name: my-service
+  path: add_service_annotation.yaml

 # Each entry in this list should be a relative path to
 # a file for custom resource definition(CRD).
@@ -195,8 +247,12 @@ vars:
 #      image: nginx:1.7.9
 #```
 # one can change the tag of myimage to v1 and the tag of nginx to 1.8.0 with the following:
+#
+# It also supports digests. If digest is present newTag is ignored.
 imageTags:
  - name: mycontainerregistry/myimage
    newTag: v1
  - name: nginx
    newTag: 1.8.0
+  - name: alpine
+    digest: sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d3
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -1,11 +1,11 @@
-[OTS]: glossary.md#off-the-shelf
+[OTS]: glossary.md#off-the-shelf-configuration
 [apply]: glossary.md#apply
 [applying]: glossary.md#apply
 [base]: glossary.md#base
 [fork]: https://guides.github.com/activities/forking/
 [variants]: glossary.md#variant
 [kustomization]: glossary.md#kustomization
-[off-the-shelf]: glossary.md#off-the-shelf
+[off-the-shelf]: glossary.md#off-the-shelf-configuration
 [overlays]: glossary.md#overlay
 [patch]: glossary.md#patch
 [patches]: glossary.md#patch
@@ -21,14 +21,17 @@ use and maintain a configuration.

 ## Bespoke configuration

-In this workflow, all configuration files are owned by
-the user.  No content is incorporated from version
+In this workflow, all configuration (resource YAML) files
+are owned by the user.  No content is incorporated from version
 control repositories owned by others.

 ![bespoke config workflow image][workflowBespoke]

 #### 1) create a directory in version control

+Speculate some overall cluster application called _ldap_;
+we want to keep its configuration in its own repo.
+
 > ```
 > git init ~/ldap
 > ```
--- a/examples/README.md
+++ b/examples/README.md
@@ -7,7 +7,7 @@ tests, and should work with HEAD

 <!-- @installkustomize @test -->
 ```
-go get github.com/kubernetes-sigs/kustomize
+go get sigs.k8s.io/kustomize
 ```

 * [hello world](helloWorld/README.md) - Deploy multiple
@@ -36,3 +36,9 @@ go get github.com/kubernetes-sigs/kustomize
 * [container args](wordpress/README.md) - Injecting k8s runtime data into container arguments (e.g. to point wordpress to a SQL service).
 
 * [image tags](imageTags.md) - Updating image tags without applying a patch.
+
+ * [multibases](multibases/README.md) - Composing three variants (dev, staging, production) with a common base.
+
+ * [remote target](remoteBuild.md) - Building a kustomization from a github URL
+ 
+ * [json patch](jsonpatch.md) - Apply a json patch in a kustomization
--- a/examples/breakfast.md
+++ b/examples/breakfast.md
@@ -73,7 +73,7 @@ commonLabels:
  who: alice
 bases:
 - ../../base
-patches:
+patchesStrategicMerge:
 - temperature.yaml
 EOF

@@ -96,7 +96,7 @@ commonLabels:
  who: bob
 bases:
 - ../../base
-patches:
+patchesStrategicMerge:
 - topping.yaml
 EOF

--- a/examples/configGeneration.md
+++ b/examples/configGeneration.md
@@ -1,6 +1,6 @@
-[patch]: ../../docs/glossary.md#patch
-[resource]: ../../docs/glossary.md#resource
-[variant]: ../../docs/glossary.md#variant
+[patch]: ../docs/glossary.md#patch
+[resource]: ../docs/glossary.md#resource
+[variant]: ../docs/glossary.md#variant

 ## ConfigMap generation and rolling updates

@@ -67,7 +67,7 @@ commonAnnotations:
  note: Hello, I am staging!
 bases:
 - ../../base
-patches:
+patchesStrategicMerge:
 - map.yaml
 EOF

@@ -109,8 +109,8 @@ configuration is to

 This latter change initiates rolling update to the pods
 in the deployment.  The older configMap, when no longer
-referenced by any other resource, is eventually garbage
-collected.
+referenced by any other resource, is eventually [garbage
+collected](https://github.com/kubernetes-sigs/kustomize/issues/242).

 ### How this works with kustomize

--- a/examples/helloWorld/README.md
+++ b/examples/helloWorld/README.md
@@ -156,7 +156,7 @@ commonAnnotations:
  note: Hello, I am staging!
 bases:
 - ../../base
-patches:
+patchesStrategicMerge:
 - map.yaml
 EOF
 ```
@@ -197,7 +197,7 @@ commonAnnotations:
  note: Hello, I am production!
 bases:
 - ../../base
-patches:
+patchesStrategicMerge:
 - deployment.yaml
 EOF
 ```
--- a/examples/jsonpatch.md
+++ b/examples/jsonpatch.md
@@ -0,0 +1,77 @@
+# Demo: applying a json patch
+
+A kustomization file supports customizing resources via [JSON patches](https://tools.ietf.org/html/rfc6902).
+
+The example below modifies an `Ingress` object with such a patch.
+
+Make a `kustomization` containing an ingress resource.
+
+<!-- @createIngress @test -->
+```
+DEMO_HOME=$(mktemp -d)
+
+cat <<EOF >$DEMO_HOME/kustomization.yaml
+resources:
+- ingress.yaml
+EOF
+
+cat <<EOF >$DEMO_HOME/ingress.yaml
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: my-ingress
+spec:
+  rules:
+  - host: foo.bar.com
+    http:
+      paths:
+      - backend:
+          serviceName: my-api
+          servicePort: 80
+EOF
+```
+
+Declare a JSON patch file to update two fields of the Ingress object:
+
+- change host from `foo.bar.com` to `foo.bar.io`
+- change servicePort from `80` to `8080`
+
+<!-- @addJsonPatch @test -->
+```
+cat <<EOF >$DEMO_HOME/ingress_patch.json
+[
+  {"op": "replace", "path": "/spec/rules/0/host", "value": "foo.bar.io"},
+  {"op": "replace", "path": "/spec/rules/0/http/paths/0/backend/servicePort", "value": 8080}
+]
+EOF
+```
+
+Apply the patch by adding _patchesJson6902_ field in kustomization.yaml
+
+<!-- @applyJsonPatch @test -->
+```
+cat <<EOF >>$DEMO_HOME/kustomization.yaml
+patchesJson6902:
+- target:
+    group: extensions
+    version: v1beta1
+    kind: Ingress
+    name: my-ingress
+  path: ingress_patch.json
+EOF
+```
+
+Running `kustomize build $DEMO_HOME`, in the ourput confirm that host has been updated correctly.
+<!-- @confirmHost @test -->
+```
+test 1 == \
+  $(kustomize build $DEMO_HOME | grep "host: foo.bar.io" | wc -l); \
+  echo $?
+```
+Running `kustomize build $DEMO_HOME`, in the ourput confirm that the servicePort has been updated correctly.
+<!-- @confirmServicePort @test -->
+```
+test 1 == \
+  $(kustomize build $DEMO_HOME | grep "servicePort: 8080" | wc -l); \
+  echo $?
+```
--- a/examples/ldap/overlays/production/kustomization.yaml
+++ b/examples/ldap/overlays/production/kustomization.yaml
@@ -1,5 +1,5 @@
 bases:
  - ../../base
-patches:
+patchesStrategicMerge:
  - deployment.yaml
 namePrefix: production-
--- a/examples/ldap/overlays/staging/kustomization.yaml
+++ b/examples/ldap/overlays/staging/kustomization.yaml
@@ -1,6 +1,6 @@
 bases:
  - ../../base
-patches:
+patchesStrategicMerge:
  - deployment.yaml
 nameprefix: staging-
 configMapGenerator:
--- a/examples/multibases/README.md
+++ b/examples/multibases/README.md
@@ -0,0 +1,127 @@
+# Demo: multibases with a common base
+
+`kustomize` encourages defining multiple variants - e.g. dev, staging and prod, as overlays on a common base.
+
+It's possible to create an additional overlay to compose these variants together - just declare the overlays as the bases of a new kustomization.
+
+This is also a means to apply a common label or annotation across the variants, if for some reason the base isn't under your control. It also allows one to define a left-most namePrefix across the variants - something that cannot be done by modifying the common base.
+
+The following demonstrates this using a base that's just one pod.
+
+Define a place to work:
+
+<!-- @makeWorkplace @test -->
+```
+DEMO_HOME=$(mktemp -d)
+```
+
+Define a common base:
+<!-- @makeBase @test -->
+```
+BASE=$DEMO_HOME/base
+mkdir $BASE
+
+cat <<EOF >$BASE/kustomization.yaml
+resources:
+- pod.yaml
+EOF
+
+cat <<EOF >$BASE/pod.yaml
+apiVersion: v1
+kind: Pod
+metadata:
+  name: myapp-pod
+  labels:
+    app: myapp
+spec:
+  containers:
+  - name: nginx
+    image: nginx:1.7.9
+EOF
+```
+
+Define a dev variant overlaying base:
+<!-- @makeDev @test -->
+```
+DEV=$DEMO_HOME/dev
+mkdir $DEV
+
+cat <<EOF >$DEV/kustomization.yaml
+bases:
+- ./../base
+namePrefix: dev-
+EOF
+```
+
+Define a staging variant overlaying base:
+<!-- @makeStaging @test -->
+```
+STAG=$DEMO_HOME/staging
+mkdir $STAG
+
+cat <<EOF >$STAG/kustomization.yaml
+bases:
+- ./../base
+namePrefix: stag-
+EOF
+```
+
+Define a production variant overlaying base:
+<!-- @makeProd @test -->
+```
+PROD=$DEMO_HOME/production
+mkdir $PROD
+
+cat <<EOF >$PROD/kustomization.yaml
+bases:
+- ./../base
+namePrefix: prod-
+EOF
+```
+
+Then define a _Kustomization_ composing three variants together:
+<!-- @makeTopLayer @test -->
+```
+cat <<EOF >$DEMO_HOME/kustomization.yaml
+bases:
+- ./dev
+- ./staging
+- ./production
+
+namePrefix: cluster-a-
+EOF
+```
+
+Now the workspace has following directories
+> ```
+> .
+> ├── base
+> │   ├── kustomization.yaml
+> │   └── pod.yaml
+> ├── dev
+> │   └── kustomization.yaml
+> ├── kustomization.yaml
+> ├── production
+> │   └── kustomization.yaml
+> └── staging
+>     └── kustomization.yaml
+> ```
+
+Confirm that the `kustomize build` output contains three pod objects from dev, staging and production variants.
+
+<!-- @confirmVariants @test -->
+```
+test 1 == \
+  $(kustomize build $DEMO_HOME | grep cluster-a-dev-myapp-pod | wc -l); \
+  echo $?
+  
+test 1 == \
+  $(kustomize build $DEMO_HOME | grep cluster-a-stag-myapp-pod | wc -l); \
+  echo $?
+  
+test 1 == \
+  $(kustomize build $DEMO_HOME | grep cluster-a-prod-myapp-pod | wc -l); \
+  echo $?    
+```
+Similarly to adding different `namePrefix` in different variants, one can also add different `namespace` and compose those variants in
+one _kustomization_. For more details, take a look at [multi-namespaces](multi-namespace.md).
--- a/examples/multibases/base/kustomization.yaml
+++ b/examples/multibases/base/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+- pod.yaml
--- a/examples/multibases/base/pod.yaml
+++ b/examples/multibases/base/pod.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: myapp-pod
+  labels:
+    app: myapp
+spec:
+  containers:
+  - name: nginx
+    image: nginx:1.7.9
--- a/examples/multibases/dev/kustomization.yaml
+++ b/examples/multibases/dev/kustomization.yaml
@@ -0,0 +1,4 @@
+bases:
+- ./../base
+
+namePrefix: dev-
--- a/examples/multibases/kustomization.yaml
+++ b/examples/multibases/kustomization.yaml
@@ -0,0 +1,6 @@
+bases:
+- ./dev
+- ./staging
+- ./production
+
+namePrefix: cluster-a-
--- a/examples/multibases/multi-namespace.md
+++ b/examples/multibases/multi-namespace.md
@@ -0,0 +1,115 @@
+# Demo: multi namespaces with a common base
+
+`kustomize` supports defining multiple variants with different namespace, as overlays on a common base.
+
+It's possible to create an additional overlay to compose these variants together - just declare the overlays as the bases of a new kustomization. The following demonstrates this using a base that's just one pod.
+
+Define a place to work:
+
+<!-- @makeWorkplace @test -->
+```
+DEMO_HOME=$(mktemp -d)
+```
+
+Define a common base:
+<!-- @makeBase @test -->
+```
+BASE=$DEMO_HOME/base
+mkdir $BASE
+
+cat <<EOF >$BASE/kustomization.yaml
+resources:
+- pod.yaml
+EOF
+
+cat <<EOF >$BASE/pod.yaml
+apiVersion: v1
+kind: Pod
+metadata:
+  name: myapp-pod
+  labels:
+    app: myapp
+spec:
+  containers:
+  - name: nginx
+    image: nginx:1.7.9
+EOF
+```
+
+Define a variant in namespace-a overlaying base:
+<!-- @makeNamespaceA @test -->
+```
+NSA=$DEMO_HOME/namespace-a
+mkdir $NSA
+
+cat <<EOF >$NSA/kustomization.yaml
+bases:
+- ./../base
+resources:
+- namespace.yaml
+namespace: namespace-a
+EOF
+
+cat <<EOF >$NSA/namespace.yaml
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: namespace-a
+EOF
+```
+
+Define a variant in namespace-b overlaying base:
+<!-- @makeNamespaceB @test -->
+```
+NSB=$DEMO_HOME/namespace-b
+mkdir $NSB
+
+cat <<EOF >$NSB/kustomization.yaml
+bases:
+- ./../base
+resources:
+- namespace.yaml
+namespace: namespace-b
+EOF
+
+cat <<EOF >$NSB/namespace.yaml
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: namespace-b
+EOF
+```
+
+Then define a _Kustomization_ composing two variants together:
+<!-- @makeTopLayer @test -->
+```
+cat <<EOF >$DEMO_HOME/kustomization.yaml
+bases:
+- ./namespace-a
+- ./namespace-b
+EOF
+```
+
+Now the workspace has following directories
+> ```
+> .
+> ├── base
+> │   ├── kustomization.yaml
+> │   └── pod.yaml
+> ├── kustomization.yaml
+> ├── namespace-a
+> │   ├── kustomization.yaml
+> │   └── namespace.yaml
+> └── namespace-b
+>     ├── kustomization.yaml
+>     └── namespace.yaml
+> ```
+
+Confirm that the `kustomize build` output contains two pod objects from namespace-a and namespace-b.
+
+<!-- @confirmVariants @test -->
+```
+test 2 == \
+  $(kustomize build $DEMO_HOME| grep -B 4 "namespace: namespace-[ab]" | grep "name: myapp-pod" | wc -l); \
+  echo $?  
+```
--- a/examples/multibases/production/kustomization.yaml
+++ b/examples/multibases/production/kustomization.yaml
@@ -0,0 +1,4 @@
+bases:
+- ./../base
+
+namePrefix: prod-
--- a/examples/multibases/staging/kustomization.yaml
+++ b/examples/multibases/staging/kustomization.yaml
@@ -0,0 +1,4 @@
+bases:
+- ./../base
+
+namePrefix: staging-
--- a/examples/mySql/README.md
+++ b/examples/mySql/README.md
@@ -150,7 +150,7 @@ Off the shelf MySQL uses `emptyDir` type volume, which
 gets wiped away if the MySQL Pod is recreated, and that
 is certainly not desirable for production
 environment. So we want to use Persistent Disk in
-production. kustomize lets you apply `patches` to the
+production. kustomize lets you apply `patchesStrategicMerge` to the
 resources.

 <!-- @createPatchFile @test -->
@@ -176,7 +176,7 @@ Add the patch file to `kustomization.yaml`:
 <!-- @specifyPatch @test -->
 ```
 cat <<'EOF' >> $DEMO_HOME/kustomization.yaml
-patches:
+patchesStrategicMerge:
 - persistent-disk.yaml
 EOF
 ```
@@ -188,7 +188,7 @@ Lets break this down:
  in deployment.yaml

 - Then we added `persistent-disk.yaml` to list of
-  `patches` in `kustomization.yaml`. `kustomize build`
+  `patchesStrategicMerge` in `kustomization.yaml`. `kustomize build`
  will apply this patch to the deployment resource with
  the name `mysql` as defined in the patch.

--- a/examples/remoteBuild.md
+++ b/examples/remoteBuild.md
@@ -0,0 +1,69 @@
+# remote targets
+
+`kustomize build` can be run against a url. The effect is the same as cloing the repo, checking out the specified ref,
+then running `kustomize build` against the desired directory in the local copy.
+
+Take `github.com/kubernetes-sigs/kustomize//examples/multibases?ref=v1.0.6` as an example.
+According to [multibases](multibases/README.md) demo, this kustomization contains three Pod objects with names as
+`cluster-a-dev-myapp-pod`, `cluster-a-stag-myapp-pod`, `cluster-a-prod-myapp-pod`.
+Running `kustomize build` against the url gives the same output.
+
+<!-- @remoteBuild @test -->
+```
+target=github.com/kubernetes-sigs/kustomize//examples/multibases?ref=v1.0.6
+test 3 == \
+  $(kustomize build $target | grep cluster-a-.*-myapp-pod | wc -l); \
+  echo $?
+```
+
+Overlays can be remote as well:
+
+<!-- @remoteOverlayBuild @test -->
+
+```
+target=github.com/kubernetes-sigs/kustomize//examples/multibases/dev/?ref=v1.0.6
+test 1 == \
+  $(kustomize build $target | grep cluster-a-dev-myapp-pod | wc -l); \
+  echo $?
+```
+
+A base can also be specified as a URL:
+
+<!-- @createOverlay @test -->
+```
+DEMO_HOME=$(mktemp -d)
+
+cat <<EOF >$DEMO_HOME/kustomization.yaml
+bases:
+- github.com/kubernetes-sigs/kustomize//examples/multibases?ref=v1.0.6
+namePrefix: remote-
+EOF
+```
+Running `kustomize build $DEMO_HOME` and confirm the output contains three Pods and all have `remote-` prefix.
+<!-- @remoteBases @test -->
+```
+test 3 == \
+  $(kustomize build $DEMO_HOME | grep remote-.*-myapp-pod | wc -l); \
+  echo $?
+```
+
+## URL format
+The url should follow
+[hashicorp/go-getter URL format](https://github.com/hashicorp/go-getter#url-format).
+Here are some example urls pointing to Github repos following this convention.
+
+- a repo with a root level kustomization.yaml
+
+  `github.com/Liujingfang1/mysql`
+- a repo with a root level kustomization.yaml on branch test
+
+  `github.com/Liujingfang1/mysql?ref=test`
+- a subdirectory in a repo on version v1.0.6
+
+  `github.com/kubernetes-sigs/kustomize//examples/multibases?ref=v1.0.6`
+- a subdirectory in a repo on branch repoUrl2
+
+  `github.com/Liujingfang1/kustomize//examples/helloWorld?ref=repoUrl2`
+- a subdirectory in a repo on commit `7050a45134e9848fca214ad7e7007e96e5042c03`
+
+  `github.com/Liujingfang1/kustomize//examples/helloWorld?ref=7050a45134e9848fca214ad7e7007e96e5042c03`
--- a/examples/springboot/README.md
+++ b/examples/springboot/README.md
@@ -291,7 +291,7 @@ kustomize edit add patch healthcheck_patch.yaml
 `kustomization.yaml` should have patches field:

 > ```
-> patches:
+> patchesStrategicMerge:
 > - patch.yaml
 > - memorylimit_patch.yaml
 > - healthcheck_patch.yaml
--- a/examples/springboot/overlays/production/kustomization.yaml
+++ b/examples/springboot/overlays/production/kustomization.yaml
@@ -1,6 +1,6 @@
 bases:
 - ../../base
-patches:
+patchesStrategicMerge:
 - patch.yaml
 - healthcheck_patch.yaml
 - memorylimit_patch.yaml
--- a/examples/wordpress/README.md
+++ b/examples/wordpress/README.md
@@ -53,6 +53,8 @@ bases:
  - wordpress
  - mysql
 namePrefix: demo-
+patchesStrategicMerge:
+  - patch.yaml
 EOF
 ```

@@ -65,7 +67,7 @@ In the new kustomization, apply a patch for wordpress deployment. The patch does
 ```
 CONTENT="https://raw.githubusercontent.com\
 /kubernetes-sigs/kustomize\
-/master/examples/patch.yaml"
+/master/examples/wordpress"

 curl -s -o "$DEMO_HOME/#1.yaml" \
  "$CONTENT/{patch}.yaml"
--- a/examples/wordpress/kustomization.yaml
+++ b/examples/wordpress/kustomization.yaml
@@ -1,7 +1,7 @@
 bases:
  - wordpress
  - mysql
-patches:
+patchesStrategicMerge:
  - patch.yaml
 namePrefix: demo-

--- a/kustomize.go
+++ b/kustomize.go
@@ -21,7 +21,7 @@ import (

 	"github.com/golang/glog"

-	"github.com/kubernetes-sigs/kustomize/pkg/commands"
+	"sigs.k8s.io/kustomize/pkg/commands"
 )

 func main() {
--- a/pkg/app/application.go
+++ b/pkg/app/application.go
@@ -26,17 +26,19 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/golang/glog"

-	"github.com/kubernetes-sigs/kustomize/pkg/configmapandsecret"
-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/crds"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
-	interror "github.com/kubernetes-sigs/kustomize/pkg/internal/error"
-	"github.com/kubernetes-sigs/kustomize/pkg/loader"
-	"github.com/kubernetes-sigs/kustomize/pkg/resmap"
-	"github.com/kubernetes-sigs/kustomize/pkg/resource"
-	"github.com/kubernetes-sigs/kustomize/pkg/transformers"
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/kustomize/pkg/configmapandsecret"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/crds"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	interror "sigs.k8s.io/kustomize/pkg/internal/error"
+	"sigs.k8s.io/kustomize/pkg/loader"
+	"sigs.k8s.io/kustomize/pkg/patch"
+	patchtransformer "sigs.k8s.io/kustomize/pkg/patch/transformer"
+	"sigs.k8s.io/kustomize/pkg/resmap"
+	"sigs.k8s.io/kustomize/pkg/resource"
+	"sigs.k8s.io/kustomize/pkg/transformers"
+	"sigs.k8s.io/kustomize/pkg/types"
 )

 // Application implements the guts of the kustomize 'build' command.
@@ -61,7 +63,6 @@ func NewApplication(ldr loader.Loader, fSys fs.FileSystem) (*Application, error)
 	if err != nil {
 		return nil, err
 	}
-
 	return &Application{kustomization: &m, ldr: ldr, fSys: fSys}, nil
 }

@@ -86,20 +87,6 @@ func (a *Application) MakeCustomizedResMap() (resmap.ResMap, error) {
 	return a.resolveRefsToGeneratedResources(m)
 }

-// MakeUncustomizedResMap purports to create a ResMap without customization.
-// The Resources in the returned ResMap include all resources mentioned
-// in the kustomization file and transitively reachable via its Bases,
-// and all generated secrets and configMaps.
-// Meant for use in generating a diff against customized resources.
-// TODO: See https://github.com/kubernetes-sigs/kustomize/issues/85
-func (a *Application) MakeUncustomizedResMap() (resmap.ResMap, error) {
-	m, err := a.loadResMapFromBasesAndResources()
-	if err != nil {
-		return nil, err
-	}
-	return a.resolveRefsToGeneratedResources(m)
-}
-
 // resolveRefsToGeneratedResources fixes all name references.
 func (a *Application) resolveRefsToGeneratedResources(m resmap.ResMap) (resmap.ResMap, error) {
 	err := transformers.NewNameHashTransformer().Transform(m)
@@ -138,7 +125,7 @@ func (a *Application) loadCustomizedResMap() (resmap.ResMap, error) {
 	if err != nil {
 		errs.Append(errors.Wrap(err, "loadResMapFromBasesAndResources"))
 	}
-	err = crds.RegisterCRDs(a.ldr, a.kustomization.CRDs)
+	err = crds.RegisterCRDs(a.ldr, a.kustomization.Crds)
 	if err != nil {
 		errs.Append(errors.Wrap(err, "RegisterCRDs"))
 	}
@@ -164,7 +151,8 @@ func (a *Application) loadCustomizedResMap() (resmap.ResMap, error) {
 		return nil, err
 	}

-	patches, err := resmap.NewResourceSliceFromPatches(a.ldr, a.kustomization.Patches)
+	a.kustomization.PatchesStrategicMerge = patch.Append(a.kustomization.PatchesStrategicMerge, a.kustomization.Patches...)
+	patches, err := resmap.NewResourceSliceFromPatches(a.ldr, a.kustomization.PatchesStrategicMerge)
 	if err != nil {
 		errs.Append(errors.Wrap(err, "NewResourceSliceFromPatches"))
 	}
@@ -179,6 +167,11 @@ func (a *Application) loadCustomizedResMap() (resmap.ResMap, error) {
 		return nil, err
 	}
 	r = append(r, t)
+	t, err = patchtransformer.NewPatchJson6902Factory(a.ldr).MakePatchJson6902Transformer(a.kustomization.PatchesJson6902)
+	if err != nil {
+		return nil, err
+	}
+	r = append(r, t)
 	t, err = transformers.NewImageTagTransformer(a.kustomization.ImageTags)
 	if err != nil {
 		return nil, err
@@ -226,6 +219,7 @@ func (a *Application) loadCustomizedBases() (resmap.ResMap, *interror.Kustomizat
 			errs.Append(errors.Wrap(err, "SemiResources"))
 			continue
 		}
+		ldr.Cleanup()
 		list = append(list, resMap)
 	}
 	result, err := resmap.MergeWithoutOverride(list...)
@@ -292,7 +286,7 @@ func (a *Application) resolveRefVars(m resmap.ResMap) (map[string]string, error)
 	}
 	for _, v := range vars {
 		id := resource.NewResId(v.ObjRef.GroupVersionKind(), v.ObjRef.Name)
-		if r, found := m[id]; found {
+		if r, found := m.DemandOneMatchForId(id); found {
 			s, err := r.GetFieldValue(v.FieldRef.FieldPath)
 			if err != nil {
 				return nil, fmt.Errorf("failed to resolve referred var: %+v", v)
@@ -322,6 +316,7 @@ func (a *Application) getAllVars() ([]types.Var, error) {
 			errs.Append(err)
 			continue
 		}
+		b.ldr.Cleanup()
 		result = append(result, vars...)
 	}
 	for _, v := range a.kustomization.Vars {
--- a/pkg/app/application_test.go
+++ b/pkg/app/application_test.go
@@ -19,16 +19,17 @@ package app
 import (
 	"encoding/base64"
 	"reflect"
+	"strings"
 	"testing"

-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
-	"github.com/kubernetes-sigs/kustomize/pkg/internal/loadertest"
-	"github.com/kubernetes-sigs/kustomize/pkg/loader"
-	"github.com/kubernetes-sigs/kustomize/pkg/resmap"
-	"github.com/kubernetes-sigs/kustomize/pkg/resource"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/internal/loadertest"
+	"sigs.k8s.io/kustomize/pkg/loader"
+	"sigs.k8s.io/kustomize/pkg/resmap"
+	"sigs.k8s.io/kustomize/pkg/resource"
 )

 const (
@@ -53,6 +54,21 @@ secretGenerator:
    DB_USERNAME: "printf admin"
    DB_PASSWORD: "printf somepw"
  type: Opaque
+patchesJson6902:
+- target:
+    group: apps
+    version: v1
+    kind: Deployment
+    name: dply1
+  path: jsonpatch.json
+`
+	kustomizationContent2 = `
+secretGenerator:
+- name: secret
+  timeoutSeconds: 1
+  commands:
+    USER: "sleep 2"
+  type: Opaque
 `
 	deploymentContent = `apiVersion: apps/v1
 metadata:
@@ -64,6 +80,9 @@ kind: Namespace
 metadata:
  name: ns1
 `
+	jsonpatchContent = `[
+    {"op": "add", "path": "/spec/replica", "value": "3"}
+]`
 )

 func makeLoader1(t *testing.T) loader.Loader {
@@ -80,6 +99,10 @@ func makeLoader1(t *testing.T) loader.Loader {
 	if err != nil {
 		t.Fatalf("Failed to setup fake ldr.")
 	}
+	err = ldr.AddFile("/testpath/jsonpatch.json", []byte(jsonpatchContent))
+	if err != nil {
+		t.Fatalf("Failed to setup fake ldr.")
+	}
 	return ldr
 }

@@ -87,11 +110,10 @@ var deploy = schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "Deploy
 var cmap = schema.GroupVersionKind{Version: "v1", Kind: "ConfigMap"}
 var secret = schema.GroupVersionKind{Version: "v1", Kind: "Secret"}
 var ns = schema.GroupVersionKind{Version: "v1", Kind: "Namespace"}
-var svc = schema.GroupVersionKind{Version: "v1", Kind: "Service"}

 func TestResources1(t *testing.T) {
 	expected := resmap.ResMap{
-		resource.NewResId(deploy, "dply1"): resource.NewResourceFromMap(
+		resource.NewResIdWithPrefixNamespace(deploy, "dply1", "foo-", "ns1"): resource.NewResourceFromMap(
 			map[string]interface{}{
 				"apiVersion": "apps/v1",
 				"kind":       "Deployment",
@@ -106,6 +128,7 @@ func TestResources1(t *testing.T) {
 					},
 				},
 				"spec": map[string]interface{}{
+					"replica": "3",
 					"selector": map[string]interface{}{
 						"matchLabels": map[string]interface{}{
 							"app": "nginx",
@@ -123,7 +146,7 @@ func TestResources1(t *testing.T) {
 					},
 				},
 			}),
-		resource.NewResId(cmap, "literalConfigMap"): resource.NewResourceFromMap(
+		resource.NewResIdWithPrefixNamespace(cmap, "literalConfigMap", "foo-", "ns1"): resource.NewResourceFromMap(
 			map[string]interface{}{
 				"apiVersion": "v1",
 				"kind":       "ConfigMap",
@@ -143,7 +166,7 @@ func TestResources1(t *testing.T) {
 					"DB_PASSWORD": "somepw",
 				},
 			}).SetBehavior(resource.BehaviorCreate),
-		resource.NewResId(secret, "secret"): resource.NewResourceFromMap(
+		resource.NewResIdWithPrefixNamespace(secret, "secret", "foo-", "ns1"): resource.NewResourceFromMap(
 			map[string]interface{}{
 				"apiVersion": "v1",
 				"kind":       "Secret",
@@ -164,7 +187,7 @@ func TestResources1(t *testing.T) {
 					"DB_PASSWORD": base64.StdEncoding.EncodeToString([]byte("somepw")),
 				},
 			}).SetBehavior(resource.BehaviorCreate),
-		resource.NewResId(ns, "ns1"): resource.NewResourceFromMap(
+		resource.NewResIdWithPrefixNamespace(ns, "ns1", "foo-", ""): resource.NewResourceFromMap(
 			map[string]interface{}{
 				"apiVersion": "v1",
 				"kind":       "Namespace",
@@ -197,146 +220,44 @@ func TestResources1(t *testing.T) {
 	}
 }

-func TestRawResources1(t *testing.T) {
-	expected := resmap.ResMap{
-		resource.NewResId(deploy, "dply1"): resource.NewResourceFromMap(
-			map[string]interface{}{
-				"apiVersion": "apps/v1",
-				"kind":       "Deployment",
-				"metadata": map[string]interface{}{
-					"name": "dply1",
-				},
-			}),
-		resource.NewResId(ns, "ns1"): resource.NewResourceFromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "Namespace",
-				"metadata": map[string]interface{}{
-					"name": "ns1",
-				},
-			}),
+func TestResourceNotFound(t *testing.T) {
+	l := loadertest.NewFakeLoader("/testpath")
+	err := l.AddFile("/testpath/"+constants.KustomizationFileName, []byte(kustomizationContent1))
+	if err != nil {
+		t.Fatalf("Failed to setup fake ldr.")
 	}
-	l := makeLoader1(t)
-	app, err := NewApplication(l, fs.MakeFakeFS())
+	fakeFs := fs.MakeFakeFS()
+	fakeFs.Mkdir("/")
+	app, err := NewApplication(l, fakeFs)
 	if err != nil {
 		t.Fatalf("Unexpected construction error %v", err)
 	}
-	actual, err := app.MakeUncustomizedResMap()
-	if err != nil {
-		t.Fatalf("Unexpected RawResources error %v", err)
+	_, err = app.MakeCustomizedResMap()
+	if err == nil {
+		t.Fatalf("Didn't get the expected error for an unknown resource")
 	}
-
-	if err := expected.ErrorIfNotEqual(actual); err != nil {
-		t.Fatalf("unexpected inequality: %v", err)
+	if !strings.Contains(err.Error(), `cannot read file "/testpath/deployment.yaml"`) {
+		t.Fatalf("Unpexpected error message %q", err)
 	}
 }

-const (
-	kustomizationContentBase = `
-namePrefix: foo-
-commonLabels:
-  app: banana
-resources:
-  - deployment.yaml
-`
-	kustomizationContentOverlay = `
-commonLabels:
-  env: staging
-resources:
-  - service.yaml
-bases:
-  - base
-`
-	serviceContent = `apiVersion: v1
-kind: Service
-metadata:
-  name: svc
-spec:
-  type: LoadBalancer
-`
-)
-
-func makeLoader2(t *testing.T) loader.Loader {
-	ldr := loadertest.NewFakeLoader("/testpath")
-	err := ldr.AddFile("/testpath/"+constants.KustomizationFileName, []byte(kustomizationContentOverlay))
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = ldr.AddFile("/testpath/service.yaml", []byte(serviceContent))
+func TestSecretTimeout(t *testing.T) {
+	l := loadertest.NewFakeLoader("/testpath")
+	err := l.AddFile("/testpath/"+constants.KustomizationFileName, []byte(kustomizationContent2))
 	if err != nil {
 		t.Fatalf("Failed to setup fake ldr.")
 	}
-	err = ldr.AddDirectory("/testpath/base")
-	if err != nil {
-		t.Fatalf("Failed to setup fake ldr.")
-	}
-	err = ldr.AddFile("/testpath/base/"+constants.KustomizationFileName, []byte(kustomizationContentBase))
-	if err != nil {
-		t.Fatalf("Failed to setup fake ldr.")
-	}
-	err = ldr.AddFile("/testpath/base/deployment.yaml", []byte(deploymentContent))
-	if err != nil {
-		t.Fatalf("Failed to setup fake ldr.")
-	}
-	return ldr
-}
-
-// TODO: This test covers incorrect behavior; it should not pass.
-// It asks for raw resources.  The Service resource is returned in raw form,
-// but the resources in the base are modified to have the banana label,
-// the 'foo' name prefix, etc.  This method exists only to support the
-// diff command comparing customized to non-customized resources;
-// perhaps it's not worth supporting the command.
-func TestRawResources2(t *testing.T) {
-	expected := resmap.ResMap{
-		resource.NewResId(deploy, "dply1"): resource.NewResourceFromMap(
-			map[string]interface{}{
-				"apiVersion": "apps/v1",
-				"kind":       "Deployment",
-				"metadata": map[string]interface{}{
-					"name": "foo-dply1",
-					"labels": map[string]interface{}{
-						"app": "banana",
-					},
-				},
-				"spec": map[string]interface{}{
-					"selector": map[string]interface{}{
-						"matchLabels": map[string]interface{}{
-							"app": "banana",
-						},
-					},
-					"template": map[string]interface{}{
-						"metadata": map[string]interface{}{
-							"labels": map[string]interface{}{
-								"app": "banana",
-							},
-						},
-					},
-				},
-			}),
-		resource.NewResId(svc, "svc"): resource.NewResourceFromMap(
-			map[string]interface{}{
-				"apiVersion": "v1",
-				"kind":       "Service",
-				"metadata": map[string]interface{}{
-					"name": "svc",
-				},
-				"spec": map[string]interface{}{
-					"type": "LoadBalancer",
-				},
-			}),
-	}
-	l := makeLoader2(t)
-	app, err := NewApplication(l, fs.MakeFakeFS())
+	fakeFs := fs.MakeFakeFS()
+	fakeFs.Mkdir("/")
+	app, err := NewApplication(l, fakeFs)
 	if err != nil {
 		t.Fatalf("Unexpected construction error %v", err)
 	}
-	actual, err := app.MakeUncustomizedResMap()
-	if err != nil {
-		t.Fatalf("Unexpected RawResources error %v", err)
+	_, err = app.MakeCustomizedResMap()
+	if err == nil {
+		t.Fatalf("Didn't get the expected error for an unknown resource")
 	}
-
-	if err := expected.ErrorIfNotEqual(actual); err != nil {
-		t.Fatalf("unexpected inequality: %v", err)
+	if !strings.Contains(err.Error(), "killed") {
+		t.Fatalf("Unpexpected error message %q", err)
 	}
 }
--- a/pkg/commands/addbase.go
+++ b/pkg/commands/addbase.go
@@ -23,8 +23,8 @@ import (

 	"github.com/spf13/cobra"

-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
 )

 type addBaseOptions struct {
--- a/pkg/commands/addbase_test.go
+++ b/pkg/commands/addbase_test.go
@@ -21,8 +21,8 @@ import (

 	"strings"

-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
 )

 const (
--- a/pkg/commands/addmetadata.go
+++ b/pkg/commands/addmetadata.go
@@ -0,0 +1,175 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package commands
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/spf13/cobra"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/types"
+	"sigs.k8s.io/kustomize/pkg/validators"
+)
+
+// kindOfAdd is the kind of metadata being added: label or annotation
+type kindOfAdd int
+
+const (
+	annotation kindOfAdd = iota
+	label
+)
+
+func (k kindOfAdd) String() string {
+	kinds := [...]string{
+		"annotation",
+		"label",
+	}
+	if k < 0 || k > 1 {
+		return "Unknown metadatakind"
+	}
+	return kinds[k]
+}
+
+type addMetadataOptions struct {
+	metadata     map[string]string
+	mapValidator validators.MapValidatorFunc
+	kind         kindOfAdd
+}
+
+// newCmdAddAnnotation adds one or more commonAnnotations to the kustomization file.
+func newCmdAddAnnotation(fSys fs.FileSystem, v validators.MapValidatorFunc) *cobra.Command {
+	var o addMetadataOptions
+	o.kind = annotation
+	o.mapValidator = v
+	cmd := &cobra.Command{
+		Use:   "annotation",
+		Short: "Adds one or more commonAnnotations to " + constants.KustomizationFileName,
+		Example: `
+		add annotation {annotationKey1:annotationValue1},{annotationKey2:annotationValue2}`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return o.runE(args, fSys, o.addAnnotations)
+		},
+	}
+	return cmd
+}
+
+// newCmdAddLabel adds one or more commonLabels to the kustomization file.
+func newCmdAddLabel(fSys fs.FileSystem, v validators.MapValidatorFunc) *cobra.Command {
+	var o addMetadataOptions
+	o.kind = label
+	o.mapValidator = v
+	cmd := &cobra.Command{
+		Use:   "label",
+		Short: "Adds one or more commonLabels to " + constants.KustomizationFileName,
+		Example: `
+		add label {labelKey1:labelValue1},{labelKey2:labelValue2}`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return o.runE(args, fSys, o.addLabels)
+		},
+	}
+	return cmd
+}
+
+func (o *addMetadataOptions) runE(
+	args []string, fSys fs.FileSystem, adder func(*types.Kustomization) error) error {
+	err := o.validateAndParse(args)
+	if err != nil {
+		return err
+	}
+	kf, err := newKustomizationFile(constants.KustomizationFileName, fSys)
+	if err != nil {
+		return err
+	}
+	m, err := kf.read()
+	if err != nil {
+		return err
+	}
+	err = adder(m)
+	if err != nil {
+		return err
+	}
+	return kf.write(m)
+}
+
+// validateAndParse validates `add` commands and parses them into o.metadata
+func (o *addMetadataOptions) validateAndParse(args []string) error {
+	if len(args) < 1 {
+		return fmt.Errorf("must specify %s", o.kind)
+	}
+	if len(args) > 1 {
+		return fmt.Errorf("%ss must be comma-separated, with no spaces", o.kind)
+	}
+	m, err := o.convertToMap(args[0])
+	if err != nil {
+		return err
+	}
+	if err = o.mapValidator(m); err != nil {
+		return err
+	}
+	o.metadata = m
+	return nil
+}
+
+func (o *addMetadataOptions) convertToMap(arg string) (map[string]string, error) {
+	result := make(map[string]string)
+	inputs := strings.Split(arg, ",")
+	for _, input := range inputs {
+		kv := strings.Split(input, ":")
+		if len(kv[0]) < 1 {
+			return nil, o.makeError(input, "empty key")
+		}
+		if len(kv) > 2 {
+			return nil, o.makeError(input, "too many colons")
+		}
+		if len(kv) > 1 {
+			result[kv[0]] = kv[1]
+		} else {
+			result[kv[0]] = ""
+		}
+	}
+	return result, nil
+}
+
+func (o *addMetadataOptions) addAnnotations(m *types.Kustomization) error {
+	if m.CommonAnnotations == nil {
+		m.CommonAnnotations = make(map[string]string)
+	}
+	return o.writeToMap(m.CommonAnnotations, annotation)
+}
+
+func (o *addMetadataOptions) addLabels(m *types.Kustomization) error {
+	if m.CommonLabels == nil {
+		m.CommonLabels = make(map[string]string)
+	}
+	return o.writeToMap(m.CommonLabels, label)
+}
+
+func (o *addMetadataOptions) writeToMap(m map[string]string, kind kindOfAdd) error {
+	for k, v := range o.metadata {
+		if _, ok := m[k]; ok {
+			return fmt.Errorf("%s %s already in kustomization file", kind, k)
+		}
+		m[k] = v
+	}
+	return nil
+}
+
+func (o *addMetadataOptions) makeError(input string, message string) error {
+	return fmt.Errorf("invalid %s: %s (%s)", o.kind, input, message)
+}
--- a/pkg/commands/addmetadata_test.go
+++ b/pkg/commands/addmetadata_test.go
@@ -0,0 +1,273 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package commands
+
+import (
+	"testing"
+
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/types"
+	"sigs.k8s.io/kustomize/pkg/validators"
+)
+
+func makeKustomization(t *testing.T) *types.Kustomization {
+	fakeFS := fs.MakeFakeFS()
+	fakeFS.WriteFile(constants.KustomizationFileName, []byte(kustomizationContent))
+	kf, err := newKustomizationFile(constants.KustomizationFileName, fakeFS)
+	if err != nil {
+		t.Errorf("unexpected new error %v", err)
+	}
+	m, err := kf.read()
+	if err != nil {
+		t.Errorf("unexpected read error %v", err)
+	}
+	return m
+}
+
+func TestRunAddAnnotation(t *testing.T) {
+	var o addMetadataOptions
+	o.metadata = map[string]string{"owls": "cute", "otters": "adorable"}
+
+	m := makeKustomization(t)
+	err := o.addAnnotations(m)
+	if err != nil {
+		t.Errorf("unexpected error: could not write to kustomization file")
+	}
+	// adding the same test input should not work
+	err = o.addAnnotations(m)
+	if err == nil {
+		t.Errorf("expected already in kustomization file error")
+	}
+	// adding new annotations should work
+	o.metadata = map[string]string{"new": "annotation"}
+	err = o.addAnnotations(m)
+	if err != nil {
+		t.Errorf("unexpected error: could not write to kustomization file")
+	}
+}
+
+func TestAddAnnotationNoArgs(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	v := validators.MakeHappyMapValidator(t)
+	cmd := newCmdAddAnnotation(fakeFS, v.Validator)
+	err := cmd.Execute()
+	v.VerifyNoCall()
+	if err == nil {
+		t.Errorf("expected an error")
+	}
+	if err.Error() != "must specify annotation" {
+		t.Errorf("incorrect error: %v", err.Error())
+	}
+}
+
+func TestAddAnnotationInvalidFormat(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	v := validators.MakeSadMapValidator(t)
+	cmd := newCmdAddAnnotation(fakeFS, v.Validator)
+	args := []string{"whatever:whatever"}
+	err := cmd.RunE(cmd, args)
+	v.VerifyCall()
+	if err == nil {
+		t.Errorf("expected an error")
+	}
+	if err.Error() != validators.SAD {
+		t.Errorf("incorrect error: %v", err.Error())
+	}
+}
+
+func TestAddAnnotationManyArgs(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	fakeFS.WriteFile(constants.KustomizationFileName, []byte(kustomizationContent))
+	v := validators.MakeHappyMapValidator(t)
+	cmd := newCmdAddAnnotation(fakeFS, v.Validator)
+	args := []string{"k1:v1,k2:v2,k3:v3,k4:v5"}
+	err := cmd.RunE(cmd, args)
+	v.VerifyCall()
+	if err != nil {
+		t.Errorf("unexpected error: %v", err.Error())
+	}
+}
+
+func TestAddAnnotationNoKey(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	v := validators.MakeHappyMapValidator(t)
+	cmd := newCmdAddAnnotation(fakeFS, v.Validator)
+	args := []string{":nokey"}
+	err := cmd.RunE(cmd, args)
+	v.VerifyNoCall()
+	if err == nil {
+		t.Errorf("expected an error")
+	}
+	if err.Error() != "invalid annotation: :nokey (empty key)" {
+		t.Errorf("incorrect error: %v", err.Error())
+	}
+}
+
+func TestAddAnnotationTooManyColons(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	v := validators.MakeHappyMapValidator(t)
+	cmd := newCmdAddAnnotation(fakeFS, v.Validator)
+	args := []string{"key:v1:v2"}
+	err := cmd.RunE(cmd, args)
+	v.VerifyNoCall()
+	if err == nil {
+		t.Errorf("expected an error")
+	}
+	if err.Error() != "invalid annotation: key:v1:v2 (too many colons)" {
+		t.Errorf("incorrect error: %v", err.Error())
+	}
+}
+
+func TestAddAnnotationNoValue(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	fakeFS.WriteFile(constants.KustomizationFileName, []byte(kustomizationContent))
+	v := validators.MakeHappyMapValidator(t)
+	cmd := newCmdAddAnnotation(fakeFS, v.Validator)
+	args := []string{"no:,value"}
+	err := cmd.RunE(cmd, args)
+	v.VerifyCall()
+	if err != nil {
+		t.Errorf("unexpected error: %v", err.Error())
+	}
+}
+
+func TestAddAnnotationMultipleArgs(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	fakeFS.WriteFile(constants.KustomizationFileName, []byte(kustomizationContent))
+	v := validators.MakeHappyMapValidator(t)
+	cmd := newCmdAddAnnotation(fakeFS, v.Validator)
+	args := []string{"this:annotation", "has:spaces"}
+	err := cmd.RunE(cmd, args)
+	v.VerifyNoCall()
+	if err == nil {
+		t.Errorf("expected an error")
+	}
+	if err.Error() != "annotations must be comma-separated, with no spaces" {
+		t.Errorf("incorrect error: %v", err.Error())
+	}
+}
+
+func TestRunAddLabel(t *testing.T) {
+	var o addMetadataOptions
+	o.metadata = map[string]string{"owls": "cute", "otters": "adorable"}
+
+	m := makeKustomization(t)
+	err := o.addLabels(m)
+	if err != nil {
+		t.Errorf("unexpected error: could not write to kustomization file")
+	}
+	// adding the same test input should not work
+	err = o.addLabels(m)
+	if err == nil {
+		t.Errorf("expected already in kustomization file error")
+	}
+	// adding new labels should work
+	o.metadata = map[string]string{"new": "label"}
+	err = o.addLabels(m)
+	if err != nil {
+		t.Errorf("unexpected error: could not write to kustomization file")
+	}
+}
+
+func TestAddLabelNoArgs(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	v := validators.MakeHappyMapValidator(t)
+	cmd := newCmdAddLabel(fakeFS, v.Validator)
+	err := cmd.Execute()
+	v.VerifyNoCall()
+	if err == nil {
+		t.Errorf("expected an error")
+	}
+	if err.Error() != "must specify label" {
+		t.Errorf("incorrect error: %v", err.Error())
+	}
+}
+
+func TestAddLabelInvalidFormat(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	v := validators.MakeSadMapValidator(t)
+	cmd := newCmdAddLabel(fakeFS, v.Validator)
+	args := []string{"exclamation!:point"}
+	err := cmd.RunE(cmd, args)
+	v.VerifyCall()
+	if err == nil {
+		t.Errorf("expected an error")
+	}
+	if err.Error() != validators.SAD {
+		t.Errorf("incorrect error: %v", err.Error())
+	}
+}
+
+func TestAddLabelNoKey(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	v := validators.MakeHappyMapValidator(t)
+	cmd := newCmdAddLabel(fakeFS, v.Validator)
+	args := []string{":nokey"}
+	err := cmd.RunE(cmd, args)
+	v.VerifyNoCall()
+	if err == nil {
+		t.Errorf("expected an error")
+	}
+	if err.Error() != "invalid label: :nokey (empty key)" {
+		t.Errorf("incorrect error: %v", err.Error())
+	}
+}
+
+func TestAddLabelTooManyColons(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	v := validators.MakeHappyMapValidator(t)
+	cmd := newCmdAddLabel(fakeFS, v.Validator)
+	args := []string{"key:v1:v2"}
+	err := cmd.RunE(cmd, args)
+	v.VerifyNoCall()
+	if err == nil {
+		t.Errorf("expected an error")
+	}
+	if err.Error() != "invalid label: key:v1:v2 (too many colons)" {
+		t.Errorf("incorrect error: %v", err.Error())
+	}
+}
+
+func TestAddLabelNoValue(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	fakeFS.WriteFile(constants.KustomizationFileName, []byte(kustomizationContent))
+	v := validators.MakeHappyMapValidator(t)
+	cmd := newCmdAddLabel(fakeFS, v.Validator)
+	args := []string{"no,value:"}
+	err := cmd.RunE(cmd, args)
+	v.VerifyCall()
+	if err != nil {
+		t.Errorf("unexpected error: %v", err.Error())
+	}
+}
+
+func TestAddLabelMultipleArgs(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	fakeFS.WriteFile(constants.KustomizationFileName, []byte(kustomizationContent))
+	v := validators.MakeHappyMapValidator(t)
+	cmd := newCmdAddLabel(fakeFS, v.Validator)
+	args := []string{"this:input", "has:spaces"}
+	err := cmd.RunE(cmd, args)
+	v.VerifyNoCall()
+	if err == nil {
+		t.Errorf("expected an error")
+	}
+	if err.Error() != "labels must be comma-separated, with no spaces" {
+		t.Errorf("incorrect error: %v", err.Error())
+	}
+}
--- a/pkg/commands/addpatch.go
+++ b/pkg/commands/addpatch.go
@@ -18,16 +18,17 @@ package commands

 import (
 	"errors"
-	"fmt"
+	"log"

 	"github.com/spf13/cobra"

-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/patch"
 )

 type addPatchOptions struct {
-	patchFilePath string
+	patchFilePaths []string
 }

 // newCmdAddPatch adds the name of a file containing a patch to the kustomization file.
@@ -56,10 +57,10 @@ func newCmdAddPatch(fsys fs.FileSystem) *cobra.Command {

 // Validate validates addPatch command.
 func (o *addPatchOptions) Validate(args []string) error {
-	if len(args) != 1 {
+	if len(args) == 0 {
 		return errors.New("must specify a patch file")
 	}
-	o.patchFilePath = args[0]
+	o.patchFilePaths = args
 	return nil
 }

@@ -70,8 +71,12 @@ func (o *addPatchOptions) Complete(cmd *cobra.Command, args []string) error {

 // RunAddPatch runs addPatch command (do real work).
 func (o *addPatchOptions) RunAddPatch(fsys fs.FileSystem) error {
-	if !fsys.Exists(o.patchFilePath) {
-		return errors.New(o.patchFilePath + " doesn't exist")
+	patches, err := globPatterns(fsys, o.patchFilePaths)
+	if err != nil {
+		return err
+	}
+	if len(patches) == 0 {
+		return nil
 	}

 	mf, err := newKustomizationFile(constants.KustomizationFileName, fsys)
@@ -84,11 +89,13 @@ func (o *addPatchOptions) RunAddPatch(fsys fs.FileSystem) error {
 		return err
 	}

-	if stringInSlice(o.patchFilePath, m.Patches) {
-		return fmt.Errorf("patch %s already in kustomization file", o.patchFilePath)
+	for _, p := range patches {
+		if patch.Exist(m.PatchesStrategicMerge, p) || stringInSlice(p, m.Patches) {
+			log.Printf("patch %s already in kustomization file", p)
+			continue
+		}
+		m.PatchesStrategicMerge = patch.Append(m.PatchesStrategicMerge, p)
 	}

-	m.Patches = append(m.Patches, o.patchFilePath)
-
 	return mf.write(m)
 }
--- a/pkg/commands/addpatch_test.go
+++ b/pkg/commands/addpatch_test.go
@@ -21,8 +21,8 @@ import (

 	"strings"

-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
 )

 const (
@@ -36,10 +36,11 @@ sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 func TestAddPatchHappyPath(t *testing.T) {
 	fakeFS := fs.MakeFakeFS()
 	fakeFS.WriteFile(patchFileName, []byte(patchFileContent))
+	fakeFS.WriteFile(patchFileName+"another", []byte(patchFileContent))
 	fakeFS.WriteFile(constants.KustomizationFileName, []byte(kustomizationContent))

 	cmd := newCmdAddPatch(fakeFS)
-	args := []string{patchFileName}
+	args := []string{patchFileName + "*"}
 	err := cmd.RunE(cmd, args)
 	if err != nil {
 		t.Errorf("unexpected cmd error: %v", err)
@@ -51,6 +52,9 @@ func TestAddPatchHappyPath(t *testing.T) {
 	if !strings.Contains(string(content), patchFileName) {
 		t.Errorf("expected patch name in kustomization")
 	}
+	if !strings.Contains(string(content), patchFileName+"another") {
+		t.Errorf("expected patch name in kustomization")
+	}
 }

 func TestAddPatchAlreadyThere(t *testing.T) {
@@ -65,13 +69,10 @@ func TestAddPatchAlreadyThere(t *testing.T) {
 		t.Fatalf("unexpected cmd error: %v", err)
 	}

-	// adding an existing patch should return an error
+	// adding an existing patch shouldn't return an error
 	err = cmd.RunE(cmd, args)
-	if err == nil {
-		t.Errorf("expected already there problem")
-	}
-	if err.Error() != "patch "+patchFileName+" already in kustomization file" {
-		t.Errorf("unexpected error %v", err)
+	if err != nil {
+		t.Errorf("unexpected cmd error: %v", err)
 	}
 }

--- a/pkg/commands/addresource.go
+++ b/pkg/commands/addresource.go
@@ -18,16 +18,16 @@ package commands

 import (
 	"errors"
-	"fmt"
+	"log"

 	"github.com/spf13/cobra"

-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
 )

 type addResourceOptions struct {
-	resourceFilePath string
+	resourceFilePaths []string
 }

 // newCmdAddResource adds the name of a file containing a resource to the kustomization file.
@@ -56,10 +56,10 @@ func newCmdAddResource(fsys fs.FileSystem) *cobra.Command {

 // Validate validates addResource command.
 func (o *addResourceOptions) Validate(args []string) error {
-	if len(args) != 1 {
+	if len(args) == 0 {
 		return errors.New("must specify a resource file")
 	}
-	o.resourceFilePath = args[0]
+	o.resourceFilePaths = args
 	return nil
 }

@@ -70,9 +70,14 @@ func (o *addResourceOptions) Complete(cmd *cobra.Command, args []string) error {

 // RunAddResource runs addResource command (do real work).
 func (o *addResourceOptions) RunAddResource(fsys fs.FileSystem) error {
-	if !fsys.Exists(o.resourceFilePath) {
-		return errors.New(o.resourceFilePath + " does not exist")
+	resources, err := globPatterns(fsys, o.resourceFilePaths)
+	if err != nil {
+		return err
 	}
+	if len(resources) == 0 {
+		return nil
+	}
+
 	mf, err := newKustomizationFile(constants.KustomizationFileName, fsys)
 	if err != nil {
 		return err
@@ -83,11 +88,13 @@ func (o *addResourceOptions) RunAddResource(fsys fs.FileSystem) error {
 		return err
 	}

-	if stringInSlice(o.resourceFilePath, m.Resources) {
-		return fmt.Errorf("resource %s already in kustomization file", o.resourceFilePath)
+	for _, resource := range resources {
+		if stringInSlice(resource, m.Resources) {
+			log.Printf("resource %s already in kustomization file", resource)
+			continue
+		}
+		m.Resources = append(m.Resources, resource)
 	}

-	m.Resources = append(m.Resources, o.resourceFilePath)
-
 	return mf.write(m)
 }
--- a/pkg/commands/addresource_test.go
+++ b/pkg/commands/addresource_test.go
@@ -17,12 +17,11 @@ limitations under the License.
 package commands

 import (
+	"strings"
 	"testing"

-	"strings"
-
-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
 )

 const (
@@ -52,10 +51,11 @@ secretGenerator: []
 func TestAddResourceHappyPath(t *testing.T) {
 	fakeFS := fs.MakeFakeFS()
 	fakeFS.WriteFile(resourceFileName, []byte(resourceFileContent))
+	fakeFS.WriteFile(resourceFileName+"another", []byte(resourceFileContent))
 	fakeFS.WriteFile(constants.KustomizationFileName, []byte(kustomizationContent))

 	cmd := newCmdAddResource(fakeFS)
-	args := []string{resourceFileName}
+	args := []string{resourceFileName + "*"}
 	err := cmd.RunE(cmd, args)
 	if err != nil {
 		t.Errorf("unexpected cmd error: %v", err)
@@ -67,6 +67,9 @@ func TestAddResourceHappyPath(t *testing.T) {
 	if !strings.Contains(string(content), resourceFileName) {
 		t.Errorf("expected resource name in kustomization")
 	}
+	if !strings.Contains(string(content), resourceFileName+"another") {
+		t.Errorf("expected resource name in kustomization")
+	}
 }

 func TestAddResourceAlreadyThere(t *testing.T) {
@@ -81,13 +84,10 @@ func TestAddResourceAlreadyThere(t *testing.T) {
 		t.Fatalf("unexpected cmd error: %v", err)
 	}

-	// adding an existing resource should return an error
+	// adding an existing resource doesn't return an error
 	err = cmd.RunE(cmd, args)
-	if err == nil {
-		t.Errorf("expected already there problem")
-	}
-	if err.Error() != "resource "+resourceFileName+" already in kustomization file" {
-		t.Errorf("unexpected error %v", err)
+	if err != nil {
+		t.Errorf("unexpected cmd error :%v", err)
 	}
 }

--- a/pkg/commands/build.go
+++ b/pkg/commands/build.go
@@ -18,31 +18,45 @@ package commands

 import (
 	"io"
-	"path/filepath"

 	"github.com/spf13/cobra"

 	"errors"

-	"github.com/kubernetes-sigs/kustomize/pkg/app"
-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
-	"github.com/kubernetes-sigs/kustomize/pkg/loader"
+	"sigs.k8s.io/kustomize/pkg/app"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/loader"
 )

 type buildOptions struct {
 	kustomizationPath string
+	outputPath        string
 }

+var examples = `
+Use the file somedir/kustomization.yaml to generate a set of api resources:
+    build somedir
+
+Use a url pointing to a remote directory/kustomization.yaml to generate a set of api resources:
+    build url
+The url should follow hashicorp/go-getter URL format described in
+https://github.com/hashicorp/go-getter#url-format
+
+url examples:
+  sigs.k8s.io/kustomize//examples/multibases?ref=v1.0.6
+  github.com/Liujingfang1/mysql
+  github.com/Liujingfang1/kustomize//examples/helloWorld?ref=repoUrl2
+`
+
 // newCmdBuild creates a new build command.
 func newCmdBuild(out io.Writer, fs fs.FileSystem) *cobra.Command {
 	var o buildOptions

 	cmd := &cobra.Command{
-		Use:   "build [path]",
-		Short: "Print current configuration per contents of " + constants.KustomizationFileName,
-		Example: "Use the file somedir/" + constants.KustomizationFileName +
-			" to generate a set of api resources:\nbuild somedir/",
+		Use:          "build [path]",
+		Short:        "Print current configuration per contents of " + constants.KustomizationFileName,
+		Example:      examples,
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			err := o.Validate(args)
@@ -52,6 +66,10 @@ func newCmdBuild(out io.Writer, fs fs.FileSystem) *cobra.Command {
 			return o.RunBuild(out, fs)
 		},
 	}
+	cmd.Flags().StringVarP(
+		&o.outputPath,
+		"output", "o", "",
+		"If specified, write the build output to this path.")
 	return cmd
 }

@@ -70,17 +88,11 @@ func (o *buildOptions) Validate(args []string) error {

 // RunBuild runs build command.
 func (o *buildOptions) RunBuild(out io.Writer, fSys fs.FileSystem) error {
-	l := loader.NewLoader(loader.NewFileLoader(fSys))
-
-	absPath, err := filepath.Abs(o.kustomizationPath)
-	if err != nil {
-		return err
-	}
-
-	rootLoader, err := l.New(absPath)
+	rootLoader, err := loader.NewLoader(o.kustomizationPath, "", fSys)
 	if err != nil {
 		return err
 	}
+	defer rootLoader.Cleanup()

 	application, err := app.NewApplication(rootLoader, fSys)
 	if err != nil {
@@ -98,6 +110,10 @@ func (o *buildOptions) RunBuild(out io.Writer, fSys fs.FileSystem) error {
 	if err != nil {
 		return err
 	}
+
+	if o.outputPath != "" {
+		return fSys.WriteFile(o.outputPath, res)
+	}
 	_, err = out.Write(res)
 	return err
 }
--- a/pkg/commands/build_test.go
+++ b/pkg/commands/build_test.go
@@ -27,9 +27,9 @@ import (

 	"github.com/ghodss/yaml"

-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
 )

 type buildTestCase struct {
--- a/pkg/commands/cmapflagsandargs.go
+++ b/pkg/commands/cmapflagsandargs.go
@@ -18,6 +18,8 @@ package commands

 import (
 	"fmt"
+
+	"sigs.k8s.io/kustomize/pkg/fs"
 )

 // cMapFlagsAndArgs encapsulates the options for add configmap commands.
@@ -48,3 +50,12 @@ func (a *cMapFlagsAndArgs) Validate(args []string) error {
 	// TODO: Should we check if the path exists? if it's valid, if it's within the same (sub-)directory?
 	return nil
 }
+
+func (a *cMapFlagsAndArgs) ExpandFileSource(fSys fs.FileSystem) error {
+	result, err := globPatterns(fSys, a.FileSources)
+	if err != nil {
+		return err
+	}
+	a.FileSources = result
+	return nil
+}
--- a/pkg/commands/cmapflagsandargs_test.go
+++ b/pkg/commands/cmapflagsandargs_test.go
@@ -17,7 +17,10 @@ limitations under the License.
 package commands

 import (
+	"reflect"
 	"testing"
+
+	"sigs.k8s.io/kustomize/pkg/fs"
 )

 func TestDataConfigValidation_NoName(t *testing.T) {
@@ -81,3 +84,21 @@ func TestDataConfigValidation_Flags(t *testing.T) {
 		}
 	}
 }
+
+func TestExpandFileSource(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	fakeFS.Create("dir/config1")
+	fakeFS.Create("dir/config2")
+	fakeFS.Create("dir/reademe")
+	config := cMapFlagsAndArgs{
+		FileSources: []string{"dir/config*"},
+	}
+	config.ExpandFileSource(fakeFS)
+	expected := []string{
+		"dir/config1",
+		"dir/config2",
+	}
+	if !reflect.DeepEqual(config.FileSources, expected) {
+		t.Fatalf("FileSources is not correctly expanded: %v", config.FileSources)
+	}
+}
--- a/pkg/commands/commands.go
+++ b/pkg/commands/commands.go
@@ -21,14 +21,15 @@ import (
 	"flag"
 	"os"

-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/validators"
 )

 // NewDefaultCommand returns the default (aka root) command for kustomize command.
 func NewDefaultCommand() *cobra.Command {
 	fsys := fs.MakeRealFS()
-	stdOut, stdErr := os.Stdout, os.Stderr
+	stdOut := os.Stdout

 	c := &cobra.Command{
 		Use:   "kustomize",
@@ -36,14 +37,13 @@ func NewDefaultCommand() *cobra.Command {
 		Long: `
 kustomize manages declarative configuration of Kubernetes.

-See https://github.com/kubernetes-sigs/kustomize
+See https://sigs.k8s.io/kustomize
 `,
 	}

 	c.AddCommand(
 		// TODO: Make consistent API for newCmd* functions.
 		newCmdBuild(stdOut, fsys),
-		newCmdDiff(stdOut, stdErr, fsys),
 		newCmdEdit(fsys),
 		newCmdVersion(stdOut),
 	)
@@ -96,6 +96,12 @@ func newCmdAdd(fsys fs.FileSystem) *cobra.Command {
 	# Adds one or more base directories to the kustomization
 	kustomize edit add base <filepath>
 	kustomize edit add base <filepath1>,<filepath2>,<filepath3>
+
+	# Adds one or more commonLabels to the kustomization
+	kustomize edit add label {labelKey1:labelValue1},{labelKey2:labelValue2}
+
+	# Adds one or more commonAnnotations to the kustomization
+	kustomize edit add annotation {annotationKey1:annotationValue1},{annotationKey2:annotationValue2}
 `,
 		Args: cobra.MinimumNArgs(1),
 	}
@@ -104,6 +110,8 @@ func newCmdAdd(fsys fs.FileSystem) *cobra.Command {
 		newCmdAddPatch(fsys),
 		newCmdAddConfigMap(fsys),
 		newCmdAddBase(fsys),
+		newCmdAddLabel(fsys, validators.MakeLabelValidator()),
+		newCmdAddAnnotation(fsys, validators.MakeAnnotationValidator()),
 	)
 	return c
 }
@@ -123,6 +131,7 @@ func newCmdSet(fsys fs.FileSystem) *cobra.Command {

 	c.AddCommand(
 		newCmdSetNamePrefix(fsys),
+		newCmdSetNamespace(fsys),
 		newCmdSetImageTag(fsys),
 	)
 	return c
--- a/pkg/commands/configmap.go
+++ b/pkg/commands/configmap.go
@@ -21,11 +21,11 @@ import (

 	"github.com/spf13/cobra"

-	"github.com/kubernetes-sigs/kustomize/pkg/configmapandsecret"
-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
-	"github.com/kubernetes-sigs/kustomize/pkg/loader"
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
+	"sigs.k8s.io/kustomize/pkg/configmapandsecret"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/loader"
+	"sigs.k8s.io/kustomize/pkg/types"
 )

 func newCmdAddConfigMap(fSys fs.FileSystem) *cobra.Command {
@@ -45,7 +45,12 @@ func newCmdAddConfigMap(fSys fs.FileSystem) *cobra.Command {
 	kustomize edit add configmap my-configmap --from-env-file=env/path.env
 `,
 		RunE: func(_ *cobra.Command, args []string) error {
-			err := flagsAndArgs.Validate(args)
+			err := flagsAndArgs.ExpandFileSource(fSys)
+			if err != nil {
+				return err
+			}
+
+			err = flagsAndArgs.Validate(args)
 			if err != nil {
 				return err
 			}
@@ -65,7 +70,7 @@ func newCmdAddConfigMap(fSys fs.FileSystem) *cobra.Command {
 			err = addConfigMap(
 				kustomization, flagsAndArgs,
 				configmapandsecret.NewConfigMapFactory(
-					fSys, loader.NewLoader(loader.NewFileLoader(fSys))))
+					fSys, loader.NewFileLoader(fSys)))
 			if err != nil {
 				return err
 			}
--- a/pkg/commands/configmap_test.go
+++ b/pkg/commands/configmap_test.go
@@ -19,8 +19,8 @@ package commands
 import (
 	"testing"

-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/types"
 )

 func TestNewAddConfigMapIsNotNil(t *testing.T) {
--- a/pkg/commands/diff.go
+++ b/pkg/commands/diff.go
@@ -1,97 +0,0 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package commands
-
-import (
-	"errors"
-	"io"
-	"path/filepath"
-
-	"github.com/spf13/cobra"
-
-	"github.com/kubernetes-sigs/kustomize/pkg/app"
-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/diff"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
-	"github.com/kubernetes-sigs/kustomize/pkg/loader"
-)
-
-type diffOptions struct {
-	kustomizationPath string
-}
-
-// newCmdDiff makes the diff command.
-func newCmdDiff(out, errOut io.Writer, fs fs.FileSystem) *cobra.Command {
-	var o diffOptions
-
-	cmd := &cobra.Command{
-		Use:   "diff [path]",
-		Short: "diff between customized resources and uncustomized resources",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			err := o.Validate(args)
-			if err != nil {
-				return err
-			}
-			return o.RunDiff(out, errOut, fs)
-		},
-	}
-	return cmd
-}
-
-// Validate validates diff command.
-func (o *diffOptions) Validate(args []string) error {
-	if len(args) > 1 {
-		return errors.New("specify one path to " + constants.KustomizationFileName)
-	}
-	if len(args) == 0 {
-		o.kustomizationPath = "./"
-		return nil
-	}
-	o.kustomizationPath = args[0]
-	return nil
-}
-
-// RunDiff gets the differences between Application.MakeCustomizedResMap() and Application.MakeUncustomizedResMap().
-func (o *diffOptions) RunDiff(out, errOut io.Writer, fSys fs.FileSystem) error {
-
-	l := loader.NewLoader(loader.NewFileLoader(fSys))
-
-	absPath, err := filepath.Abs(o.kustomizationPath)
-	if err != nil {
-		return err
-	}
-
-	rootLoader, err := l.New(absPath)
-	if err != nil {
-		return err
-	}
-
-	application, err := app.NewApplication(rootLoader, fSys)
-	if err != nil {
-		return err
-	}
-	transformedResources, err := application.MakeCustomizedResMap()
-	if err != nil {
-		return err
-	}
-	rawResources, err := application.MakeUncustomizedResMap()
-	if err != nil {
-		return err
-	}
-
-	return diff.RunDiff(rawResources, transformedResources, out, errOut)
-}
--- a/pkg/commands/diff_test.go
+++ b/pkg/commands/diff_test.go
@@ -1,131 +0,0 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package commands
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"regexp"
-	"strings"
-	"testing"
-
-	"github.com/ghodss/yaml"
-
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
-	"k8s.io/apimachinery/pkg/util/sets"
-)
-
-type DiffTestCase struct {
-	Description string   `yaml:"description"`
-	Args        []string `yaml:"args"`
-	Filename    string   `yaml:"filename"`
-	// path to the file that contains the expected output
-	ExpectedDiff  string `yaml:"expectedDiff"`
-	ExpectedError string `yaml:"expectedError"`
-}
-
-func TestDiff(t *testing.T) {
-	const updateEnvVar = "UPDATE_KUSTOMIZE_EXPECTED_DATA"
-	updateKustomizeExpected := os.Getenv(updateEnvVar) == "true"
-
-	tempDir := regexp.QuoteMeta(filepath.Clean(os.TempDir()))
-	noopDir, _ := regexp.Compile(tempDir + `/noop-[0-9]*/`)
-	transformedDir, _ := regexp.Compile(tempDir + `/transformed-[0-9]*/`)
-	timestamp, _ := regexp.Compile(`[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]) (2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9].[0-9]* [+-]{1}[0-9]{4}`)
-
-	fSys := fs.MakeRealFS()
-
-	testcases := sets.NewString()
-	filepath.Walk("testdata", func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if path == "testdata" {
-			return nil
-		}
-		name := filepath.Base(path)
-		if info.IsDir() {
-			if strings.HasPrefix(name, "testcase-") {
-				testcases.Insert(strings.TrimPrefix(name, "testcase-"))
-			}
-			return filepath.SkipDir
-		}
-		return nil
-	})
-	// sanity check that we found the right folder
-	if !testcases.Has("simple") {
-		t.Fatalf("Error locating testcases")
-	}
-
-	for _, testcaseName := range testcases.List() {
-		t.Run(testcaseName, func(t *testing.T) {
-			runDiffTestCase(t, testcaseName, updateKustomizeExpected, fSys,
-				noopDir, transformedDir, timestamp)
-		})
-	}
-}
-
-func runDiffTestCase(t *testing.T, testcaseName string, updateKustomizeExpected bool, fs fs.FileSystem,
-	noopDir, transformedDir, timestamp *regexp.Regexp) {
-	name := testcaseName
-	testcase := DiffTestCase{}
-	testcaseDir := filepath.Join("testdata", "testcase-"+name)
-	testcaseData, err := ioutil.ReadFile(filepath.Join(testcaseDir, "test.yaml"))
-	if err != nil {
-		t.Fatalf("%s: %v", name, err)
-	}
-	if err := yaml.Unmarshal(testcaseData, &testcase); err != nil {
-		t.Fatalf("%s: %v", name, err)
-	}
-
-	diffOps := &diffOptions{
-		kustomizationPath: testcase.Filename,
-	}
-	buf := bytes.NewBuffer([]byte{})
-	err = diffOps.RunDiff(buf, os.Stderr, fs)
-	switch {
-	case err != nil && len(testcase.ExpectedError) == 0:
-		t.Errorf("unexpected error: %v", err)
-	case err != nil && len(testcase.ExpectedError) != 0:
-		if !strings.Contains(err.Error(), testcase.ExpectedError) {
-			t.Errorf("expected error to contain %q but got: %v", testcase.ExpectedError, err)
-		}
-		return
-	case err == nil && len(testcase.ExpectedError) != 0:
-		t.Errorf("unexpected no error")
-	}
-
-	actualString := string(buf.Bytes())
-	actualString = noopDir.ReplaceAllString(actualString, "/tmp/noop/")
-	actualString = transformedDir.ReplaceAllString(actualString, "/tmp/transformed/")
-	actualString = timestamp.ReplaceAllString(actualString, "YYYY-MM-DD HH:MM:SS")
-	actualBytes := []byte(actualString)
-	if !updateKustomizeExpected {
-		expectedBytes, err := ioutil.ReadFile(testcase.ExpectedDiff)
-		if err != nil {
-			t.Errorf("unexpected error: %v", err)
-		}
-		if !reflect.DeepEqual(actualBytes, expectedBytes) {
-			t.Errorf("%s\ndoesn't equal expected:\n%s\n", actualBytes, expectedBytes)
-		}
-	} else {
-		ioutil.WriteFile(testcase.ExpectedDiff, actualBytes, 0644)
-	}
-
-}
--- a/pkg/commands/kustomizationfile.go
+++ b/pkg/commands/kustomizationfile.go
@@ -17,22 +17,64 @@ limitations under the License.
 package commands

 import (
+	"bytes"
 	"errors"
 	"fmt"
+	"io"
 	"path"
+	"reflect"
+	"regexp"
 	"strings"

 	"github.com/ghodss/yaml"

-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
-	interror "github.com/kubernetes-sigs/kustomize/pkg/internal/error"
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/types"
 )

+var (
+	// These field names are the exact kustomization fields
+	kustomizationFields = []string{
+		"APIVersion",
+		"Kind",
+		"Resources",
+		"Bases",
+		"NamePrefix",
+		"Namespace",
+		"Crds",
+		"CommonLabels",
+		"CommonAnnotations",
+		"Patches",
+		"PatchesStrategicMerge",
+		"PatchesJson6902",
+		"ConfigMapGenerator",
+		"SecretGenerator",
+		"Vars",
+		"ImageTags",
+	}
+)
+
+// commentedField records the comment associated with a kustomization field
+// field has to be a recognized kustomization field
+// comment can be empty
+type commentedField struct {
+	field   string
+	comment []byte
+}
+
+func (cf *commentedField) appendComment(comment []byte) {
+	cf.comment = append(cf.comment, comment...)
+}
+
+func squash(x [][]byte) []byte {
+	return bytes.Join(x, []byte(``))
+}
+
 type kustomizationFile struct {
-	path string
-	fsys fs.FileSystem
+	path           string
+	fsys           fs.FileSystem
+	originalFields []*commentedField
 }

 func newKustomizationFile(mPath string, fsys fs.FileSystem) (*kustomizationFile, error) { // nolint
@@ -46,34 +88,33 @@ func newKustomizationFile(mPath string, fsys fs.FileSystem) (*kustomizationFile,

 func (mf *kustomizationFile) validate() error {
 	if !mf.fsys.Exists(mf.path) {
-		errorMsg := fmt.Sprintf("Missing kustomization file '%s'.\n", mf.path)
-		merr := interror.KustomizationError{KustomizationPath: mf.path, ErrorMsg: errorMsg}
-		return merr
+		return fmt.Errorf("Missing kustomization file '%s'.\n", mf.path)
 	}
 	if mf.fsys.IsDir(mf.path) {
 		mf.path = path.Join(mf.path, constants.KustomizationFileName)
 		if !mf.fsys.Exists(mf.path) {
-			errorMsg := fmt.Sprintf("Missing kustomization file '%s'.\n", mf.path)
-			merr := interror.KustomizationError{KustomizationPath: mf.path, ErrorMsg: errorMsg}
-			return merr
+			return fmt.Errorf("Missing kustomization file '%s'.\n", mf.path)
 		}
 	} else {
 		if !strings.HasSuffix(mf.path, constants.KustomizationFileName) {
-			errorMsg := fmt.Sprintf("Kustomization file path (%s) should have %s suffix\n",
+			return fmt.Errorf("Kustomization file path (%s) should have %s suffix\n",
 				mf.path, constants.KustomizationFileSuffix)
-			return interror.KustomizationError{KustomizationPath: mf.path, ErrorMsg: errorMsg}
 		}
 	}
 	return nil
 }

 func (mf *kustomizationFile) read() (*types.Kustomization, error) {
-	bytes, err := mf.fsys.ReadFile(mf.path)
+	data, err := mf.fsys.ReadFile(mf.path)
 	if err != nil {
 		return nil, err
 	}
 	var kustomization types.Kustomization
-	err = yaml.Unmarshal(bytes, &kustomization)
+	err = yaml.Unmarshal(data, &kustomization)
+	if err != nil {
+		return nil, err
+	}
+	err = mf.parseCommentedFields(data)
 	if err != nil {
 		return nil, err
 	}
@@ -84,12 +125,11 @@ func (mf *kustomizationFile) write(kustomization *types.Kustomization) error {
 	if kustomization == nil {
 		return errors.New("util: kustomization file arg is nil")
 	}
-	bytes, err := yaml.Marshal(kustomization)
+	data, err := mf.marshal(kustomization)
 	if err != nil {
 		return err
 	}
-
-	return mf.fsys.WriteFile(mf.path, bytes)
+	return mf.fsys.WriteFile(mf.path, data)
 }

 func stringInSlice(str string, list []string) bool {
@@ -100,3 +140,106 @@ func stringInSlice(str string, list []string) bool {
 	}
 	return false
 }
+
+func (mf *kustomizationFile) parseCommentedFields(content []byte) error {
+	buffer := bytes.NewBuffer(content)
+	var comments [][]byte
+
+	line, err := buffer.ReadBytes('\n')
+	for err == nil {
+		if isCommentOrBlankLine(line) {
+			comments = append(comments, line)
+		} else {
+			matched, field := findMatchedField(line)
+			if matched {
+				mf.originalFields = append(mf.originalFields, &commentedField{field: field, comment: squash(comments)})
+				comments = [][]byte{}
+			} else if len(comments) > 0 {
+				mf.originalFields[len(mf.originalFields)-1].appendComment(squash(comments))
+				comments = [][]byte{}
+			}
+		}
+		line, err = buffer.ReadBytes('\n')
+	}
+
+	if err != io.EOF {
+		return err
+	}
+	return nil
+}
+
+func (mf *kustomizationFile) marshal(kustomization *types.Kustomization) ([]byte, error) {
+	var output []byte
+	for _, comment := range mf.originalFields {
+		output = append(output, comment.comment...)
+		content, err := marshalField(comment.field, kustomization)
+		if err != nil {
+			return content, err
+		}
+		output = append(output, content...)
+	}
+	for _, field := range kustomizationFields {
+		if mf.hasField(field) {
+			continue
+		}
+		content, err := marshalField(field, kustomization)
+		if err != nil {
+			return content, nil
+		}
+		output = append(output, content...)
+
+	}
+	return output, nil
+}
+
+func (mf *kustomizationFile) hasField(name string) bool {
+	for _, n := range mf.originalFields {
+		if n.field == name {
+			return true
+		}
+	}
+	return false
+}
+
+/*
+ isCommentOrBlankLine determines if a line is a comment or blank line
+ Return true for following lines
+ # This line is a comment
+       # This line is also a comment with several leading white spaces
+
+ (The line above is a blank line)
+*/
+func isCommentOrBlankLine(line []byte) bool {
+	s := bytes.TrimRight(bytes.TrimLeft(line, " "), "\n")
+	return len(s) == 0 || bytes.HasPrefix(s, []byte(`#`))
+}
+
+func findMatchedField(line []byte) (bool, string) {
+	for _, field := range kustomizationFields {
+		// (?i) is for case insensitive regexp matching
+		r := regexp.MustCompile("^(" + "(?i)" + field + "):")
+		if r.Match(line) {
+			return true, field
+		}
+	}
+	return false, ""
+}
+
+// marshalField marshal a given field of a kustomization object into yaml format.
+// If the field wasn't in the original kustomization.yaml file or wasn't added,
+// an empty []byte is returned.
+func marshalField(field string, kustomization *types.Kustomization) ([]byte, error) {
+	r := reflect.ValueOf(*kustomization)
+	v := r.FieldByName(strings.Title(field))
+
+	if !v.IsValid() || v.Len() == 0 {
+		return []byte{}, nil
+	}
+
+	k := &types.Kustomization{}
+	kr := reflect.ValueOf(k)
+	kv := kr.Elem().FieldByName(strings.Title(field))
+	kv.Set(v)
+
+	return yaml.Marshal(k)
+}
--- a/pkg/commands/kustomizationfile_test.go
+++ b/pkg/commands/kustomizationfile_test.go
@@ -21,9 +21,9 @@ import (
 	"strings"
 	"testing"

-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/types"
 )

 func TestWriteAndRead(t *testing.T) {
@@ -88,3 +88,140 @@ func TestNewNotExist(t *testing.T) {
 		t.Fatalf("expect an error contains %q, but got %v", contained, err)
 	}
 }
+
+func TestPreserveComments(t *testing.T) {
+	kustomizationContentWithComments := []byte(
+		`# shem qing some comments
+# This is some comment we should preserve
+# don't delete it
+resources:
+- pod.yaml
+- service.yaml
+# something you may want to keep
+vars:
+- fieldref:
+    fieldPath: metadata.name
+  name: MY_SERVICE_NAME
+  objref:
+    apiVersion: v1
+    kind: Service
+    name: my-service
+bases:
+- ../namespaces
+# some descriptions for the patches
+patchesStrategicMerge:
+- service.yaml
+- pod.yaml
+`)
+	fsys := fs.MakeFakeFS()
+	fsys.Create(constants.KustomizationFileName)
+	fsys.WriteFile(constants.KustomizationFileName, kustomizationContentWithComments)
+	mf, err := newKustomizationFile(constants.KustomizationFileName, fsys)
+	if err != nil {
+		t.Fatalf("Unexpected Error: %v", err)
+	}
+	kustomization, err := mf.read()
+	if err != nil {
+		t.Fatalf("Unexpected Error: %v", err)
+	}
+	if err = mf.write(kustomization); err != nil {
+		t.Fatalf("Unexpected Error: %v", err)
+	}
+	bytes, _ := fsys.ReadFile(mf.path)
+
+	if !reflect.DeepEqual(kustomizationContentWithComments, bytes) {
+		t.Fatal("written kustomization with comments is not the same as original one")
+	}
+}
+
+func TestPreserveCommentsWithAdjust(t *testing.T) {
+	kustomizationContentWithComments := []byte(`
+
+    
+
+# shem qing some comments
+# This is some comment we should preserve
+# don't delete it
+resources:
+- pod.yaml
+  # See which field this comment goes into
+- service.yaml
+
+APIVersion: v1beta1
+kind: kustomization.yaml
+
+# something you may want to keep
+vars:
+- fieldref:
+    fieldPath: metadata.name
+  name: MY_SERVICE_NAME
+  objref:
+    apiVersion: v1
+    kind: Service
+    name: my-service
+
+BASES:
+- ../namespaces
+
+# some descriptions for the patches
+
+patchesStrategicMerge:
+- service.yaml
+- pod.yaml
+`)
+
+	expected := []byte(`
+
+    
+
+# shem qing some comments
+# This is some comment we should preserve
+# don't delete it
+  # See which field this comment goes into
+resources:
+- pod.yaml
+- service.yaml
+
+apiVersion: v1beta1
+kind: kustomization.yaml
+
+# something you may want to keep
+vars:
+- fieldref:
+    fieldPath: metadata.name
+  name: MY_SERVICE_NAME
+  objref:
+    apiVersion: v1
+    kind: Service
+    name: my-service
+
+bases:
+- ../namespaces
+
+# some descriptions for the patches
+
+patchesStrategicMerge:
+- service.yaml
+- pod.yaml
+`)
+	fsys := fs.MakeFakeFS()
+	fsys.Create(constants.KustomizationFileName)
+	fsys.WriteFile(constants.KustomizationFileName, kustomizationContentWithComments)
+	mf, err := newKustomizationFile(constants.KustomizationFileName, fsys)
+	if err != nil {
+		t.Fatalf("Unexpected Error: %v", err)
+	}
+
+	kustomization, err := mf.read()
+	if err != nil {
+		t.Fatalf("Unexpected Error: %v", err)
+	}
+	if err = mf.write(kustomization); err != nil {
+		t.Fatalf("Unexpected Error: %v", err)
+	}
+	bytes, _ := fsys.ReadFile(mf.path)
+
+	if !reflect.DeepEqual(expected, bytes) {
+		t.Fatal("written kustomization with comments is not the same as original one\n", string(bytes))
+	}
+}
--- a/pkg/commands/set_name_prefix.go
+++ b/pkg/commands/set_name_prefix.go
@@ -21,8 +21,8 @@ import (

 	"github.com/spf13/cobra"

-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
 )

 type setNamePrefixOptions struct {
--- a/pkg/commands/set_name_prefix_test.go
+++ b/pkg/commands/set_name_prefix_test.go
@@ -21,8 +21,8 @@ import (

 	"strings"

-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
 )

 const (
--- a/pkg/commands/setimagetag.go
+++ b/pkg/commands/setimagetag.go
@@ -18,30 +18,33 @@ package commands

 import (
 	"errors"
+	"regexp"
+	"sort"
 	"strings"

 	"github.com/spf13/cobra"

-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
-	"sort"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/types"
 )

 type setImageTagOptions struct {
-	imageTagMap map[string]string
+	imageTagMap map[string]types.ImageTag
 }

+var pattern = regexp.MustCompile("^(.*):([a-zA-Z0-9._-]*)$")
+
 // newCmdSetImageTag sets the new tags for images in the kustomization.
 func newCmdSetImageTag(fsys fs.FileSystem) *cobra.Command {
 	var o setImageTagOptions

 	cmd := &cobra.Command{
 		Use:   "imagetag",
-		Short: "Sets images and their new tags in the kustomization file",
+		Short: "Sets images and their new tags or digests in the kustomization file",
 		Example: `
 The command
-  set imagetag nginx:1.8.0 my-app:latest
+  set imagetag nginx:1.8.0 my-app:latest alpine@sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d3
 will add 

 imageTags:
@@ -49,9 +52,11 @@ imageTags:
  newTag: 1.8.0
 - name: my-app
  newTag: latest
+- name: alpine
+  digest: sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d3

 to the kustomization file if it doesn't exist,
-and overwrite the previous newTag if the image name exists.
+and overwrite the previous ones if the image tag exists.
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			err := o.Validate(args)
@@ -67,15 +72,28 @@ and overwrite the previous newTag if the image name exists.
 // Validate validates setImageTag command.
 func (o *setImageTagOptions) Validate(args []string) error {
 	if len(args) == 0 {
-		return errors.New("No image and newTag specified.")
+		return errors.New("no image specified")
 	}
-	o.imageTagMap = make(map[string]string)
+
+	o.imageTagMap = make(map[string]types.ImageTag)
+
 	for _, arg := range args {
-		imagetag := strings.Split(arg, ":")
-		if len(imagetag) != 2 {
-			return errors.New("Invalid format of imagetag, must specify it as <image>:<newtag>")
+		if s := strings.Split(arg, "@"); len(s) > 1 {
+			o.imageTagMap[s[0]] = types.ImageTag{
+				Name:   s[0],
+				Digest: s[1],
+			}
+			continue
+		}
+
+		s := pattern.FindStringSubmatch(arg)
+		if len(s) != 3 {
+			return errors.New("invalid format of imagetag, must specify it as <image>:<newtag> or <image>@<digest>")
+		}
+		o.imageTagMap[s[1]] = types.ImageTag{
+			Name:   s[1],
+			NewTag: s[2],
 		}
-		o.imageTagMap[imagetag[0]] = imagetag[1]
 	}
 	return nil
 }
@@ -90,16 +108,18 @@ func (o *setImageTagOptions) RunSetImageTags(fsys fs.FileSystem) error {
 	if err != nil {
 		return err
 	}
-	imageTagMap := map[string]string{}
+
 	for _, it := range m.ImageTags {
-		imageTagMap[it.Name] = it.NewTag
-	}
-	for key, value := range o.imageTagMap {
-		imageTagMap[key] = value
+		if _, ok := o.imageTagMap[it.Name]; ok {
+			continue
+		}
+
+		o.imageTagMap[it.Name] = it
 	}
+
 	var imageTags []types.ImageTag
-	for key, value := range imageTagMap {
-		imageTags = append(imageTags, types.ImageTag{Name: key, NewTag: value})
+	for _, v := range o.imageTagMap {
+		imageTags = append(imageTags, v)
 	}
 	sort.Slice(imageTags, func(i, j int) bool {
 		return imageTags[i].Name < imageTags[j].Name
--- a/pkg/commands/setimagetag_test.go
+++ b/pkg/commands/setimagetag_test.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 	"testing"

-	"github.com/kubernetes-sigs/kustomize/pkg/constants"
-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
 )

 func TestSetImageTagsHappyPath(t *testing.T) {
@@ -29,7 +29,8 @@ func TestSetImageTagsHappyPath(t *testing.T) {
 	fakeFS.WriteFile(constants.KustomizationFileName, []byte(kustomizationContent))

 	cmd := newCmdSetImageTag(fakeFS)
-	args := []string{"image1:tag1", "image2:tag2"}
+	args := []string{"image1:tag1", "image2:tag2", "localhost:5000/operator:1.0.0",
+		"foo.bar.baz:5000/one/two@sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d3"}
 	err := cmd.RunE(cmd, args)
 	if err != nil {
 		t.Errorf("unexpected cmd error: %v", err)
@@ -40,10 +41,14 @@ func TestSetImageTagsHappyPath(t *testing.T) {
 	}
 	expected := []byte(`
 imageTags:
+- digest: sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d3
+  name: foo.bar.baz:5000/one/two
 - name: image1
  newTag: tag1
 - name: image2
  newTag: tag2
+- name: localhost:5000/operator
+  newTag: 1.0.0
 `)
 	if !strings.Contains(string(content), string(expected)) {
 		t.Errorf("expected imageTags in kustomization file")
@@ -91,7 +96,7 @@ func TestSetImageTagsNoArgs(t *testing.T) {
 	if err == nil {
 		t.Errorf("expected error: %v", err)
 	}
-	if err.Error() != "No image and newTag specified." {
+	if err.Error() != "no image specified" {
 		t.Errorf("incorrect error: %v", err.Error())
 	}
 }
--- a/pkg/commands/setnamespace.go
+++ b/pkg/commands/setnamespace.go
@@ -0,0 +1,83 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package commands
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+
+	"github.com/spf13/cobra"
+	"k8s.io/apimachinery/pkg/util/validation"
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
+)
+
+type setNamespaceOptions struct {
+	namespace string
+}
+
+// newCmdSetNamespace sets the value of the namespace field in the kustomization.
+func newCmdSetNamespace(fsys fs.FileSystem) *cobra.Command {
+	var o setNamespaceOptions
+
+	cmd := &cobra.Command{
+		Use:   "namespace",
+		Short: "Sets the value of the namespace field in the kustomization file",
+		Example: `
+The command
+	set namespace staging
+will add the field "namespace: staging" to the kustomization file if it doesn't exist,
+and overwrite the value with "staging" if the field does exist.
+`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			err := o.Validate(args)
+			if err != nil {
+				return err
+			}
+			return o.RunSetNamespace(fsys)
+		},
+	}
+	return cmd
+}
+
+// Validate validates setNamespace command.
+func (o *setNamespaceOptions) Validate(args []string) error {
+	if len(args) != 1 {
+		return errors.New("must specify exactly one namespace value")
+	}
+	ns := args[0]
+	if errs := validation.IsDNS1123Label(ns); len(errs) != 0 {
+		return fmt.Errorf("%q is not a valid namespace name: %s", ns, strings.Join(errs, ";"))
+	}
+	o.namespace = ns
+	return nil
+}
+
+// RunSetNamespace runs setNamespace command (does real work).
+func (o *setNamespaceOptions) RunSetNamespace(fsys fs.FileSystem) error {
+	mf, err := newKustomizationFile(constants.KustomizationFileName, fsys)
+	if err != nil {
+		return err
+	}
+	m, err := mf.read()
+	if err != nil {
+		return err
+	}
+	m.Namespace = o.namespace
+	return mf.write(m)
+}
--- a/pkg/commands/setnamespace_test.go
+++ b/pkg/commands/setnamespace_test.go
@@ -0,0 +1,103 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package commands
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+
+	"sigs.k8s.io/kustomize/pkg/constants"
+	"sigs.k8s.io/kustomize/pkg/fs"
+)
+
+const (
+	goodNamespaceValue = "staging"
+)
+
+func TestSetNamespaceHappyPath(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	fakeFS.WriteFile(constants.KustomizationFileName, []byte(kustomizationContent))
+
+	cmd := newCmdSetNamespace(fakeFS)
+	args := []string{goodNamespaceValue}
+	err := cmd.RunE(cmd, args)
+	if err != nil {
+		t.Errorf("unexpected cmd error: %v", err)
+	}
+	content, err := fakeFS.ReadFile(constants.KustomizationFileName)
+	if err != nil {
+		t.Errorf("unexpected read error: %v", err)
+	}
+	expected := []byte(fmt.Sprintf("namespace: %s", goodNamespaceValue))
+	if !strings.Contains(string(content), string(expected)) {
+		t.Errorf("expected namespace in kustomization file")
+	}
+}
+
+func TestSetNamespaceOverride(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	fakeFS.WriteFile(constants.KustomizationFileName, []byte(kustomizationContent))
+
+	cmd := newCmdSetNamespace(fakeFS)
+	args := []string{goodNamespaceValue}
+	err := cmd.RunE(cmd, args)
+	if err != nil {
+		t.Errorf("unexpected cmd error: %v", err)
+	}
+	args = []string{"newnamespace"}
+	err = cmd.RunE(cmd, args)
+	if err != nil {
+		t.Errorf("unexpected cmd error: %v", err)
+	}
+	content, err := fakeFS.ReadFile(constants.KustomizationFileName)
+	if err != nil {
+		t.Errorf("unexpected read error: %v", err)
+	}
+	expected := []byte("namespace: newnamespace")
+	if !strings.Contains(string(content), string(expected)) {
+		t.Errorf("expected namespace in kustomization file %s", string(content))
+	}
+}
+
+func TestSetNamespaceNoArgs(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+
+	cmd := newCmdSetNamespace(fakeFS)
+	err := cmd.Execute()
+	if err == nil {
+		t.Errorf("expected error: %v", err)
+	}
+	if err.Error() != "must specify exactly one namespace value" {
+		t.Errorf("incorrect error: %v", err.Error())
+	}
+}
+
+func TestSetNamespaceInvalid(t *testing.T) {
+	fakeFS := fs.MakeFakeFS()
+	fakeFS.WriteFile(constants.KustomizationFileName, []byte(kustomizationContent))
+
+	cmd := newCmdSetNamespace(fakeFS)
+	args := []string{"/badnamespace/"}
+	err := cmd.RunE(cmd, args)
+	if err == nil {
+		t.Errorf("expected error: %v", err)
+	}
+	if !strings.Contains(err.Error(), "is not a valid namespace name") {
+		t.Errorf("unexpected error: %v", err.Error())
+	}
+}
--- a/pkg/commands/testdata/testcase-base-only/in/kustomization.yaml
+++ b/pkg/commands/testdata/testcase-base-only/in/kustomization.yaml
@@ -6,4 +6,6 @@ commonLabels:
 commonAnnotations:
  note: This is a test annotation
 resources:
-  - resources/*.yaml
+  - resources/deployment.yaml
+  - resources/networkpolicy.yaml
+  - resources/service.yaml
--- a/pkg/commands/testdata/testcase-multibases-conflict/base/kustomization.yaml
+++ b/pkg/commands/testdata/testcase-multibases-conflict/base/kustomization.yaml
@@ -0,0 +1,4 @@
+resources:
+- serviceaccount.yaml
+- rolebinding.yaml
+namePrefix: base-
--- a/pkg/commands/testdata/testcase-multibases-conflict/base/rolebinding.yaml
+++ b/pkg/commands/testdata/testcase-multibases-conflict/base/rolebinding.yaml
@@ -0,0 +1,11 @@
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: RoleBinding
+metadata:
+  name: rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: role
+subjects:
+- kind: ServiceAccount
+  name: serviceaccount
--- a/pkg/commands/testdata/testcase-multibases-conflict/base/serviceaccount.yaml
+++ b/pkg/commands/testdata/testcase-multibases-conflict/base/serviceaccount.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: serviceaccount
--- a/pkg/commands/testdata/testcase-multibases-conflict/combined/kustomization.yaml
+++ b/pkg/commands/testdata/testcase-multibases-conflict/combined/kustomization.yaml
@@ -0,0 +1,3 @@
+bases:
+- ../overlays/a
+- ../overlays/b
--- a/pkg/commands/testdata/testcase-multibases-conflict/overlays/a/kustomization.yaml
+++ b/pkg/commands/testdata/testcase-multibases-conflict/overlays/a/kustomization.yaml
@@ -0,0 +1,7 @@
+bases:
+- ../../base/
+
+namePrefix: a-
+
+resources:
+- serviceaccount.yaml
--- a/pkg/commands/testdata/testcase-multibases-conflict/overlays/a/serviceaccount.yaml
+++ b/pkg/commands/testdata/testcase-multibases-conflict/overlays/a/serviceaccount.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: serviceaccount
--- a/pkg/commands/testdata/testcase-multibases-conflict/overlays/b/kustomization.yaml
+++ b/pkg/commands/testdata/testcase-multibases-conflict/overlays/b/kustomization.yaml
@@ -0,0 +1,4 @@
+bases:
+- ../../base/
+
+namePrefix: b-
--- a/pkg/commands/testdata/testcase-multibases-conflict/test.yaml
+++ b/pkg/commands/testdata/testcase-multibases-conflict/test.yaml
@@ -0,0 +1,4 @@
+description: multibases with name reference
+args: []
+filename: testdata/testcase-multibases-conflict/combined
+expectedError: detected conflicts when resolving name references serviceaccount
--- a/pkg/commands/testdata/testcase-multibases-nonconflict/base/kustomization.yaml
+++ b/pkg/commands/testdata/testcase-multibases-nonconflict/base/kustomization.yaml
@@ -0,0 +1,4 @@
+resources:
+- serviceaccount.yaml
+- rolebinding.yaml
+namePrefix: base-
--- a/pkg/commands/testdata/testcase-multibases-nonconflict/base/rolebinding.yaml
+++ b/pkg/commands/testdata/testcase-multibases-nonconflict/base/rolebinding.yaml
@@ -0,0 +1,11 @@
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: RoleBinding
+metadata:
+  name: rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: role
+subjects:
+- kind: ServiceAccount
+  name: serviceaccount
--- a/pkg/commands/testdata/testcase-multibases-nonconflict/base/serviceaccount.yaml
+++ b/pkg/commands/testdata/testcase-multibases-nonconflict/base/serviceaccount.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: serviceaccount
--- a/pkg/commands/testdata/testcase-multibases-nonconflict/combined/kustomization.yaml
+++ b/pkg/commands/testdata/testcase-multibases-nonconflict/combined/kustomization.yaml
@@ -0,0 +1,3 @@
+bases:
+- ../overlays/a
+- ../overlays/b
--- a/pkg/commands/testdata/testcase-multibases-nonconflict/expected.yaml
+++ b/pkg/commands/testdata/testcase-multibases-nonconflict/expected.yaml
@@ -0,0 +1,33 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: a-base-serviceaccount
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: b-base-serviceaccount
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: RoleBinding
+metadata:
+  name: a-base-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: role
+subjects:
+- kind: ServiceAccount
+  name: a-base-serviceaccount
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: RoleBinding
+metadata:
+  name: b-base-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: role
+subjects:
+- kind: ServiceAccount
+  name: b-base-serviceaccount
--- a/pkg/commands/testdata/testcase-multibases-nonconflict/overlays/a/kustomization.yaml
+++ b/pkg/commands/testdata/testcase-multibases-nonconflict/overlays/a/kustomization.yaml
@@ -0,0 +1,4 @@
+bases:
+- ../../base/
+
+namePrefix: a-
--- a/pkg/commands/testdata/testcase-multibases-nonconflict/overlays/b/kustomization.yaml
+++ b/pkg/commands/testdata/testcase-multibases-nonconflict/overlays/b/kustomization.yaml
@@ -0,0 +1,4 @@
+bases:
+- ../../base/
+
+namePrefix: b-
--- a/pkg/commands/testdata/testcase-multibases-nonconflict/test.yaml
+++ b/pkg/commands/testdata/testcase-multibases-nonconflict/test.yaml
@@ -0,0 +1,4 @@
+description: multibases with name reference
+args: []
+filename: testdata/testcase-multibases-nonconflict/combined
+expectedStdout: testdata/testcase-multibases-nonconflict/expected.yaml
--- a/pkg/commands/testdata/testcase-multiple-patches-conflict/in/overlay/kustomization.yaml
+++ b/pkg/commands/testdata/testcase-multiple-patches-conflict/in/overlay/kustomization.yaml
@@ -1,7 +1,7 @@
 namePrefix: staging-
 commonLabels:
  env: staging
-patches:
+patchesStrategicMerge:
  - deployment-patch2.yaml
  - deployment-patch1.yaml
 bases:
--- a/pkg/commands/testdata/testcase-multiple-patches-noconflict/in/overlay/kustomization.yaml
+++ b/pkg/commands/testdata/testcase-multiple-patches-noconflict/in/overlay/kustomization.yaml
@@ -1,7 +1,7 @@
 namePrefix: staging-
 commonLabels:
  env: staging
-patches:
+patchesStrategicMerge:
  - patches/deployment-patch1.yaml
  - patches/deployment-patch2.yaml
 bases:
--- a/pkg/commands/testdata/testcase-single-overlay/in/overlay/kustomization.yaml
+++ b/pkg/commands/testdata/testcase-single-overlay/in/overlay/kustomization.yaml
@@ -2,7 +2,7 @@ namePrefix: staging-
 commonLabels:
  env: staging
  team: override-foo
-patches:
+patchesStrategicMerge:
  - deployment.yaml
 bases:
  - ../package/
--- a/pkg/commands/testdata/testcase-variable-ref/expected.yaml
+++ b/pkg/commands/testdata/testcase-variable-ref/expected.yaml
@@ -78,16 +78,10 @@ metadata:
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    prometheus.io/path: _status/vars
-    prometheus.io/port: "8080"
-    prometheus.io/scrape: "true"
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
  labels:
    app: cockroachdb
-  name: dev-base-cockroachdb
+  name: dev-base-cockroachdb-public
 spec:
-  clusterIP: None
  ports:
  - name: grpc
    port: 26257
@@ -101,10 +95,16 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
+  annotations:
+    prometheus.io/path: _status/vars
+    prometheus.io/port: "8080"
+    prometheus.io/scrape: "true"
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
  labels:
    app: cockroachdb
-  name: dev-base-cockroachdb-public
+  name: dev-base-cockroachdb
 spec:
+  clusterIP: None
  ports:
  - name: grpc
    port: 26257
--- a/pkg/commands/util.go
+++ b/pkg/commands/util.go
@@ -0,0 +1,39 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package commands
+
+import (
+	"log"
+
+	"sigs.k8s.io/kustomize/pkg/fs"
+)
+
+func globPatterns(fsys fs.FileSystem, patterns []string) ([]string, error) {
+	var result []string
+	for _, pattern := range patterns {
+		files, err := fsys.Glob(pattern)
+		if err != nil {
+			return nil, err
+		}
+		if len(files) == 0 {
+			log.Printf("%s has no match", pattern)
+			continue
+		}
+		result = append(result, files...)
+	}
+	return result, nil
+}
--- a/pkg/configmapandsecret/configmapfactory.go
+++ b/pkg/configmapandsecret/configmapfactory.go
@@ -23,16 +23,16 @@ import (
 	"path"
 	"strings"

-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
-	"github.com/kubernetes-sigs/kustomize/pkg/hash"
-	"github.com/kubernetes-sigs/kustomize/pkg/loader"
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
 	"github.com/pkg/errors"
 	"k8s.io/api/core/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/hash"
+	"sigs.k8s.io/kustomize/pkg/loader"
+	"sigs.k8s.io/kustomize/pkg/types"
 )

 // ConfigMapFactory makes ConfigMaps.
@@ -212,6 +212,5 @@ func parseLiteralSource(source string) (keyName, value string, err error) {
 	if len(items) != 2 {
 		return "", "", fmt.Errorf("invalid literal source %v, expected key=value", source)
 	}
-
-	return items[0], items[1], nil
+	return items[0], strings.Trim(items[1], "\"'"), nil
 }
--- a/pkg/configmapandsecret/configmapfactory_test.go
+++ b/pkg/configmapandsecret/configmapfactory_test.go
@@ -20,12 +20,12 @@ import (
 	"reflect"
 	"testing"

-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
-	"github.com/kubernetes-sigs/kustomize/pkg/loader"
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/loader"
+	"sigs.k8s.io/kustomize/pkg/types"
 )

 func makeEnvConfigMap(name string) *corev1.ConfigMap {
@@ -90,6 +90,8 @@ func makeLiteralConfigMap(name string) *corev1.ConfigMap {
 		Data: map[string]string{
 			"a": "x",
 			"b": "y",
+			"c": "Hello World",
+			"d": "true",
 		},
 	}
 }
@@ -127,7 +129,7 @@ func TestConstructConfigMap(t *testing.T) {
 			input: types.ConfigMapArgs{
 				Name: "literalConfigMap",
 				DataSources: types.DataSources{
-					LiteralSources: []string{"a=x", "b=y"},
+					LiteralSources: []string{"a=x", "b=y", "c=\"Hello World\"", "d='true'"},
 				},
 			},
 			expected: makeLiteralConfigMap("literalConfigMap"),
@@ -136,8 +138,7 @@ func TestConstructConfigMap(t *testing.T) {

 	// TODO: all tests should use a FakeFs
 	fSys := fs.MakeRealFS()
-	f := NewConfigMapFactory(fSys,
-		loader.NewLoader(loader.NewFileLoader(fSys)))
+	f := NewConfigMapFactory(fSys, loader.NewFileLoader(fSys))
 	for _, tc := range testCases {
 		cm, err := f.MakeConfigMap(&tc.input)
 		if err != nil {
--- a/pkg/configmapandsecret/secretfactory.go
+++ b/pkg/configmapandsecret/secretfactory.go
@@ -1,15 +1,38 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package configmapandsecret

 import (
 	"context"
+	"fmt"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"time"

-	"github.com/kubernetes-sigs/kustomize/pkg/fs"
-	"github.com/kubernetes-sigs/kustomize/pkg/types"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/util/validation"
+	"sigs.k8s.io/kustomize/pkg/fs"
+	"sigs.k8s.io/kustomize/pkg/types"
+)
+
+const (
+	defaultCommandTimeout = 5 * time.Second
 )

 // SecretFactory makes Secrets.
@@ -23,8 +46,7 @@ func NewSecretFactory(fSys fs.FileSystem, wd string) *SecretFactory {
 	return &SecretFactory{fSys: fSys, wd: wd}
 }

-// MakeSecret returns a new secret.
-func (f *SecretFactory) MakeSecret(args types.SecretArgs) (*corev1.Secret, error) {
+func (f *SecretFactory) makeFreshSecret(args *types.SecretArgs) *corev1.Secret {
 	s := &corev1.Secret{}
 	s.APIVersion = "v1"
 	s.Kind = "Secret"
@@ -34,25 +56,86 @@ func (f *SecretFactory) MakeSecret(args types.SecretArgs) (*corev1.Secret, error
 		s.Type = corev1.SecretTypeOpaque
 	}
 	s.Data = map[string][]byte{}
-	for k, v := range args.Commands {
-		out, err := f.createSecretKey(v)
-		if err != nil {
-			return nil, errors.Wrap(err, "createSecretKey")
-		}
-		s.Data[k] = out
+	return s
+}
+
+// MakeSecret returns a new secret.
+func (f *SecretFactory) MakeSecret(args *types.SecretArgs) (*corev1.Secret, error) {
+	var all []kvPair
+	var err error
+	s := f.makeFreshSecret(args)
+
+	timeout := defaultCommandTimeout
+	if args.TimeoutSeconds != nil {
+		timeout = time.Duration(*args.TimeoutSeconds) * time.Second
 	}
+
+	pairs, err := f.keyValuesFromEnvFileCommand(args.EnvCommand, timeout)
+	if err != nil {
+		return nil, errors.Wrap(err, fmt.Sprintf(
+			"env source file: %s",
+			args.EnvCommand))
+	}
+	all = append(all, pairs...)
+
+	pairs, err = f.keyValuesFromCommands(args.Commands, timeout)
+	if err != nil {
+		return nil, errors.Wrap(err, fmt.Sprintf(
+			"commands %v", args.Commands))
+	}
+	all = append(all, pairs...)
+
+	for _, kv := range all {
+		err = addKvToSecret(s, kv.key, kv.value)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	return s, nil
 }

+func addKvToSecret(secret *corev1.Secret, keyName, data string) error {
+	// Note, the rules for SecretKeys  keys are the exact same as the ones for ConfigMap.
+	if errs := validation.IsConfigMapKey(keyName); len(errs) != 0 {
+		return fmt.Errorf("%q is not a valid key name for a Secret: %s", keyName, strings.Join(errs, ";"))
+	}
+	if _, entryExists := secret.Data[keyName]; entryExists {
+		return fmt.Errorf("cannot add key %s, another key by that name already exists", keyName)
+	}
+	secret.Data[keyName] = []byte(data)
+	return nil
+}
+
+func (f *SecretFactory) keyValuesFromEnvFileCommand(cmd string, timeout time.Duration) ([]kvPair, error) {
+	content, err := f.createSecretKey(cmd, timeout)
+	if err != nil {
+		return nil, err
+	}
+	return keyValuesFromLines(content)
+}
+
+func (f *SecretFactory) keyValuesFromCommands(sources map[string]string, timeout time.Duration) ([]kvPair, error) {
+	var kvs []kvPair
+	for k, cmd := range sources {
+		content, err := f.createSecretKey(cmd, timeout)
+		if err != nil {
+			return nil, err
+		}
+		kvs = append(kvs, kvPair{key: k, value: string(content)})
+	}
+	return kvs, nil
+}
+
 // Run a command, return its output as the secret.
-func (f *SecretFactory) createSecretKey(command string) ([]byte, error) {
+func (f *SecretFactory) createSecretKey(command string, timeout time.Duration) ([]byte, error) {
 	if !f.fSys.IsDir(f.wd) {
 		f.wd = filepath.Dir(f.wd)
 		if !f.fSys.IsDir(f.wd) {
 			return nil, errors.New("not a directory: " + f.wd)
 		}
 	}
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 	cmd := exec.CommandContext(ctx, "sh", "-c", command)
 	cmd.Dir = f.wd
--- a/pkg/crds/crds.go
+++ b/pkg/crds/crds.go
@@ -23,10 +23,10 @@ import (
 	"strings"

 	"github.com/ghodss/yaml"
-	"github.com/kubernetes-sigs/kustomize/pkg/loader"
-	"github.com/kubernetes-sigs/kustomize/pkg/transformers"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/kube-openapi/pkg/common"
+	"sigs.k8s.io/kustomize/pkg/loader"
+	"sigs.k8s.io/kustomize/pkg/transformers"
 )

 type pathConfigs struct {
--- a/pkg/crds/crds_test.go
+++ b/pkg/crds/crds_test.go
@@ -21,10 +21,10 @@ import (
 	"sort"
 	"testing"

-	"github.com/kubernetes-sigs/kustomize/pkg/internal/loadertest"
-	"github.com/kubernetes-sigs/kustomize/pkg/loader"
-	"github.com/kubernetes-sigs/kustomize/pkg/transformers"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/kustomize/pkg/internal/loadertest"
+	"sigs.k8s.io/kustomize/pkg/loader"
+	"sigs.k8s.io/kustomize/pkg/transformers"
 )

 const (
--- a/pkg/diff/directory.go
+++ b/pkg/diff/directory.go
@@ -1,38 +0,0 @@
-package diff
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-)
-
-// directory represents a new temp directory and lets one create files in it.
-type directory struct {
-	n string
-}
-
-// newDirectory makes a directory instance holding a new temp directory on disk.
-// The directory name is the given prefix following by a random string.
-func newDirectory(prefix string) (*directory, error) {
-	name, err := ioutil.TempDir("", prefix+"-")
-	if err != nil {
-		return nil, err
-	}
-
-	return &directory{n: name}, nil
-}
-
-// newFile creates a new file in the directory.
-func (d *directory) newFile(name string) (*os.File, error) {
-	return os.OpenFile(filepath.Join(d.n, name), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0700)
-}
-
-// delete removes the directory recursively.
-func (d *directory) delete() error {
-	return os.RemoveAll(d.n)
-}
-
-// name is the name of the directory.
-func (d *directory) name() string {
-	return d.n
-}
--- a/pkg/diff/program.go
+++ b/pkg/diff/program.go
@@ -1,58 +0,0 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package diff
-
-import (
-	"io"
-	"os"
-
-	"github.com/kubernetes-sigs/kustomize/pkg/exec"
-)
-
-// program wraps the system diff program.
-// If specified, the value of KUBERNETES_EXTERNAL_DIFF environment variable
-// will be used instead of simply `diff(1)`.
-type program struct {
-	stdout io.Writer
-	stderr io.Writer
-}
-
-func newProgram(out, errOut io.Writer) *program {
-	return &program{
-		stdout: out,
-		stderr: errOut,
-	}
-}
-
-func (d *program) makeCommand(args ...string) exec.Cmd {
-	diff := "diff"
-	if envDiff := os.Getenv("KUBERNETES_EXTERNAL_DIFF"); envDiff != "" {
-		diff = envDiff
-	} else {
-		args = append([]string{"-u", "-N"}, args...)
-	}
-	cmd := exec.New().Command(diff, args...)
-	cmd.SetStdout(d.stdout)
-	cmd.SetStderr(d.stderr)
-	return cmd
-}
-
-// run runs the detected diff program. `from` and `to` are the directory to diff.
-func (d *program) run(from, to string) error {
-	d.makeCommand(from, to).Run() // Ignore diff return code
-	return nil
-}
--- a/pkg/diff/rundiff.go
+++ b/pkg/diff/rundiff.go
@@ -1,83 +0,0 @@
-/*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package diff runs system `diff` to compare resource collections.
-package diff
-
-import (
-	"github.com/ghodss/yaml"
-
-	"io"
-
-	"github.com/kubernetes-sigs/kustomize/pkg/resmap"
-)
-
-// RunDiff runs system diff program to compare two Maps.
-func RunDiff(raw, transformed resmap.ResMap, out, errOut io.Writer) (err error) {
-	transformedDir, err := writeYamlToNewDir(transformed, "transformed")
-	if err != nil {
-		return err
-	}
-	defer func() {
-		err = transformedDir.delete()
-	}()
-
-	noopDir, err := writeYamlToNewDir(raw, "noop")
-	if err != nil {
-		return err
-	}
-	defer func() {
-		err = noopDir.delete()
-	}()
-
-	return newProgram(out, errOut).run(noopDir.name(), transformedDir.name())
-}
-
-// writeYamlToNewDir writes each obj in ResMap to a file in a new directory.
-// The directory's name will begin with the given prefix.
-// Each file is named with GroupVersionKindName.
-func writeYamlToNewDir(in resmap.ResMap, prefix string) (*directory, error) {
-	dir, err := newDirectory(prefix)
-	if err != nil {
-		return nil, err
-	}
-
-	for id, obj := range in {
-		f, err := dir.newFile(id.String())
-		if err != nil {
-			return nil, err
-		}
-		err = write(obj, f)
-		f.Close()
-		if err != nil {
-			return nil, err
-		}
-	}
-	return dir, nil
-}
-
-// Write the object as YAML.
-func write(obj interface{}, w io.Writer) error {
-	if obj == nil {
-		return nil
-	}
-	data, err := yaml.Marshal(obj)
-	if err != nil {
-		return err
-	}
-	_, err = w.Write(data)
-	return err
-}
--- a/pkg/examplelayout/simple/instances/exampleinstance/kustomization.yaml
+++ b/pkg/examplelayout/simple/instances/exampleinstance/kustomization.yaml
@@ -7,7 +7,7 @@ commonAnnotations:
  note: This is a test annotation
 bases:
 - ../../package/
-patches:
+patchesStrategicMerge:
 - deployment/deployment.yaml
 configMapGenerator:
 - name: app-env
--- a/pkg/exec/new_test.go
+++ b/pkg/exec/new_test.go
@@ -20,7 +20,7 @@ import (
 	"bytes"
 	"fmt"

-	"github.com/kubernetes-sigs/kustomize/pkg/exec"
+	"sigs.k8s.io/kustomize/pkg/exec"
 )

 func ExampleNew() {
--- a/pkg/fs/fakefs.go
+++ b/pkg/fs/fakefs.go
@@ -18,6 +18,8 @@ package fs

 import (
 	"fmt"
+	"path/filepath"
+	"sort"
 )

 var _ FileSystem = &FakeFS{}
@@ -60,6 +62,18 @@ func (fs *FakeFS) Exists(name string) bool {
 	return found
 }

+// Glob returns the list of matching files
+func (fs *FakeFS) Glob(pattern string) ([]string, error) {
+	var result []string
+	for p := range fs.m {
+		if fs.pathMatch(p, pattern) {
+			result = append(result, p)
+		}
+	}
+	sort.Strings(result)
+	return result, nil
+}
+
 // IsDir returns true if the file exists and is a directory.
 func (fs *FakeFS) IsDir(name string) bool {
 	f, found := fs.m[name]
@@ -77,18 +91,6 @@ func (fs *FakeFS) ReadFile(name string) ([]byte, error) {
 	return nil, fmt.Errorf("cannot read file %q", name)
 }

-// ReadFiles looks through all files in the fake filesystem
-// and find the matching files and then read content from all of them
-func (fs *FakeFS) ReadFiles(name string) (map[string][]byte, error) {
-	result := map[string][]byte{}
-	for p, f := range fs.m {
-		if fs.pathMatch(p, name) {
-			result[p] = f.content
-		}
-	}
-	return result, nil
-}
-
 // WriteFile always succeeds and does nothing.
 func (fs *FakeFS) WriteFile(name string, c []byte) error {
 	ff := &FakeFile{}
@@ -98,8 +100,6 @@ func (fs *FakeFS) WriteFile(name string, c []byte) error {
 }

 func (fs *FakeFS) pathMatch(path, pattern string) bool {
-	if path == pattern {
-		return true
-	}
-	return false
+	match, _ := filepath.Match(pattern, path)
+	return match
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
k8s-ci-robot	58492e2d83	Merge pull request #349 from Liujingfang1/master fix the release and build files	2018-09-13 12:00:36 -07:00
Jingfang Liu	a9f44aa259	fix the release and build files	2018-09-13 11:51:47 -07:00
k8s-ci-robot	b17d7fbbfd	Merge pull request #339 from lswith/master treat sub paths correctly	2018-09-13 09:24:09 -07:00
Luke Swithenbank	d78e77fb92	fix remote build's for subdirectories	2018-09-13 09:56:04 +10:00
Jingfang Liu	64fdb8d760	change github.com/kubernetes-sigs to sigs.k8s.io (#343 ) * change github.com/kubernetes-sigs to sigs.k8s.io * change go_import_path in .travis.yml	2018-09-12 12:41:38 -07:00
Jeff Regan	a377ec1dde	Merge pull request #342 from Liujingfang1/master remove dependency on internal error	2018-09-12 11:08:52 -07:00
Jingfang Liu	87e9964091	Merge pull request #341 from ebriand/patch-1 Fix typo in multibases readme	2018-09-12 09:17:21 -07:00
Jingfang Liu	60d8334fed	remove dependency on internal error	2018-09-11 15:23:30 -07:00
Eric Briand	71f5105a86	Fix typo on staging	2018-09-11 13:33:28 +02:00
Jeff Regan	09a62efe88	Merge pull request #331 from burdiyan/master Implement support for digests in imageTags	2018-09-10 10:57:53 -07:00
Alexandr Burdiyan	6dbf4b5b60	Apply code review recommendations	2018-09-10 11:48:47 +02:00
Alexandr Burdiyan	5401bd367b	Implement support for digests in imageTags This commit adds a new field to imageTags transformer so that digests can be used instead of image tags if needed. Closes https://github.com/kubernetes-sigs/kustomize/issues/326	2018-09-10 11:21:53 +02:00
Jeff Regan	f7def79764	Merge pull request #333 from monopole/deleteCode Remove duplicate code.	2018-09-09 13:51:54 -07:00
jregan	cda909a609	Remove duplicate code.	2018-09-09 12:33:23 -07:00
k8s-ci-robot	6f61cadf9f	Merge pull request #325 from Liujingfang1/master Add examples and docs for patchesJson6902	2018-09-07 13:14:34 -07:00
Jingfang Liu	1c616b1962	Add examples and docs for patchesJson6902	2018-09-07 11:55:12 -07:00
Jeff Regan	849343fb41	Merge pull request #324 from Liujingfang1/master Enable jsonpath transformers in application	2018-09-06 14:18:47 -07:00
Jingfang Liu	8810027d89	Enable jsonpath transformers in application	2018-09-06 14:02:30 -07:00
k8s-ci-robot	548ea8a9fb	Merge pull request #323 from Liujingfang1/master remove inline json patch format	2018-09-06 13:36:19 -07:00
Jingfang Liu	81b5cf65d6	remove inline json patch format	2018-09-06 11:18:19 -07:00
Jeff Regan	dc9ae64646	Merge pull request #321 from Liujingfang1/multibases filter by namespace, prefix and detect conflict when resolving name reference	2018-09-05 16:10:53 -07:00
Jingfang Liu	829cb2baa3	address comments	2018-09-05 16:08:24 -07:00
Jingfang Liu	7b301446fa	filter by namespace and nameprefix in namereference transformer	2018-09-05 13:17:44 -07:00
Jingfang Liu	4a297fa138	improve idslice	2018-09-05 13:02:51 -07:00
Jingfang Liu	7811d9f2bc	Add multibases test with namereference conflict	2018-09-05 13:01:56 -07:00
Jingfang Liu	21ff81b758	Add multibases test with namereference nonconflict	2018-09-05 13:01:15 -07:00
Jingfang Liu	485bbddd3e	Merge pull request #320 from Liujingfang1/master remove go get varcheck	2018-09-04 15:43:59 -07:00
Jingfang Liu	6dc80293a6	remove go get varcheck	2018-09-04 15:07:38 -07:00
Jeff Regan	b649ad5c69	Merge pull request #310 from Liujingfang1/patchtransformer Update patch factory and add multi transformer with checking conflicts	2018-09-04 09:32:08 -07:00
Jingfang Liu	d782abb214	Update patch factory and add multi transformer with checking conflicts	2018-09-04 09:13:26 -07:00
k8s-ci-robot	95f5becee1	Merge pull request #312 from monopole/fixSomeImports Remove some unnecessary import renames.	2018-09-04 08:31:31 -07:00
k8s-ci-robot	694d809f33	Merge pull request #313 from monopole/fixMarkdownLinks Fix some busted documentation links.	2018-08-31 18:30:41 -07:00
k8s-ci-robot	df3c3c3357	Merge pull request #314 from monopole/noCleanup Remove unread variable.	2018-08-31 18:29:25 -07:00
Jeffrey Regan	99e770b05a	Remove unused variable.	2018-08-31 17:25:00 -07:00
Jeffrey Regan	340cb2b385	Remove unnecessary import aliases.	2018-08-31 17:20:03 -07:00
Jeffrey Regan	cdbd83a645	Fix some busted documentation links.	2018-08-31 17:05:32 -07:00
Jeff Regan	fab2a5a5d7	Merge pull request #311 from monopole/updateDeps Add gopkg.in/yaml.v2 to Gopkg.lock	2018-08-31 16:24:16 -07:00
Jeffrey Regan	8da2f37181	Add gopkg.in/yaml.v2 to Gopkg.lock	2018-08-31 16:20:18 -07:00
k8s-ci-robot	c906a0c16e	Merge pull request #309 from monopole/cleanupAddLabels Simplify addmetadata.	2018-08-31 16:13:31 -07:00
Jeffrey Regan	93618166b6	Cleanup addmetadata.	2018-08-31 15:58:36 -07:00
k8s-ci-robot	babfb3faa9	Merge pull request #300 from Liujingfang1/patchtransformer Add transformer to apply json patch6902	2018-08-31 12:07:17 -07:00
Jingfang Liu	cedf215445	add PatchJson6902Factory to make transformer	2018-08-31 10:21:58 -07:00
Jeff Regan	51a4907f89	Merge pull request #307 from khrisrichardson/apimachinery-validation use apimachinery for annotation/label validation	2018-08-31 09:42:47 -07:00
Khris Richardson	6457162383	use apimachinery for annotation/label validation	2018-08-31 07:40:00 -07:00
Jingfang Liu	7f0e9e3a6a	Add patchJson6902 transformer	2018-08-30 15:34:42 -07:00
Jingfang Liu	95cf508b2b	Add github.com/krishicks/yaml-patch to vendor	2018-08-30 13:45:25 -07:00
Jeff Regan	4a565ffdb8	Merge pull request #303 from gitirabassi/all-git-repos if the prefix of the base is 'git::' will make the use of go-getter to download repo	2018-08-30 10:06:46 -07:00
Jeff Regan	17f1779a48	Merge pull request #302 from gitirabassi/storageClassSecret Storage class secret	2018-08-30 10:03:03 -07:00
gitirabassi	a76cb0b008	force using the git protocol to downlaod every kind of repo non just from github	2018-08-30 11:02:03 +02:00
gitirabassi	9700bc3298	added all the documented secret for storageclasses	2018-08-29 23:05:40 +02:00
gitirabassi	ce31dac24f	added storageclass paramether secret for glusterfs configuration with kustomize	2018-08-29 22:55:32 +02:00
k8s-ci-robot	a81b2e32e0	Merge pull request #299 from Liujingfang1/patch change patches to patchesStrategicMerge in tests and examples	2018-08-28 13:57:00 -07:00
Jingfang Liu	b713d5a1cc	change patches to patchesStrategicMerge in tests and examples	2018-08-28 09:40:34 -07:00
k8s-ci-robot	e11ba17248	Merge pull request #286 from Liujingfang1/master Add patchesJson6902 and patchesStategicMerge to kustomization	2018-08-27 16:09:49 -07:00
Jingfang Liu	3d9d4bd36f	address comments	2018-08-27 15:44:42 -07:00
Jingfang Liu	6a3e3c3a71	Add JSONPatch to kustomization	2018-08-27 13:52:21 -07:00
Jeff Regan	633c43a672	Merge pull request #292 from babiel/pdb-matchlabels Disable creation of PDB matchLabels	2018-08-24 09:27:41 -07:00
Maximilian Gaß	0833693372	Disable creation of PDB matchLabels Allow for using matchExpressions on its own	2018-08-24 13:51:05 +02:00
Jeff Regan	77c07ba96e	Merge pull request #290 from philoserf/patch-1 trivial: Change dep constraint to an override	2018-08-23 17:07:44 -07:00
Mark Ayers	6847bb7924	trivial: Change dep constraint to an override fixes #289	2018-08-23 15:58:27 -07:00
k8s-ci-robot	f0deaf707d	Merge pull request #287 from emosbaugh/fix-gopath-isrepourl Fix loader loader when run from gopath	2018-08-23 15:08:25 -07:00
Ethan Mosbaugh	e113944027	fix loader loader when run from gopath	2018-08-23 14:54:58 -07:00
k8s-ci-robot	1cf9131ae2	Merge pull request #285 from monopole/declutter Move some docs to docs dir (declutter the top).	2018-08-23 13:33:06 -07:00
Jeffrey Regan	da142a8e97	Move some docs to docs dir (declutter the top).	2018-08-23 11:33:12 -07:00
Jeff Regan	6c81e3b95f	Merge pull request #284 from Liujingfang1/vendor Add missing files when running dep ensure	2018-08-23 11:27:47 -07:00
Jingfang Liu	a0089a2521	Add missing files when running dep ensure	2018-08-23 11:07:42 -07:00
k8s-ci-robot	11768f6232	Merge pull request #280 from monopole/fixntis Fix some Go nits.	2018-08-23 10:37:58 -07:00
Jeff Regan	675c17737f	Merge pull request #279 from Liujingfang1/quote fix the double quotation problem in ConfigMapGenerator	2018-08-23 10:35:34 -07:00
Jeffrey Regan	735a93d000	Fix some Go nits.	2018-08-23 10:30:32 -07:00
Jeff Regan	67d2c2ed4a	Merge pull request #281 from monopole/addVarCheck Add varcheck to presubmit.	2018-08-23 10:25:32 -07:00
Jeffrey Regan	f931e15653	Add varcheck to presubmit.	2018-08-23 10:17:37 -07:00
Jingfang Liu	34169174a8	fix the double quotation problem in ConfigMapGenerator	2018-08-23 09:36:50 -07:00
Jeff Regan	ebf33964c7	Merge pull request #276 from kubernetes-sigs/add-code-of-conduct-1 Create CODE_OF_CONDUCT.md	2018-08-22 20:05:47 -07:00
Jeff Regan	38a5e12d66	Create CODE_OF_CONDUCT.md	2018-08-22 20:05:19 -07:00
k8s-ci-robot	04ab218fa0	Merge pull request #275 from monopole/deletediff Delete diff command and code it uses.	2018-08-22 18:38:39 -07:00
Jeffrey Regan	950c353f90	Delete diff command and code it uses.	2018-08-22 17:18:39 -07:00
Jeff Regan	aff09b1108	Merge pull request #271 from Liujingfang1/cleanup cleanup after handling remote bases	2018-08-22 17:14:11 -07:00
Jingfang Liu	6da691f874	cleanup after handling remote bases	2018-08-22 13:22:45 -07:00
Jeff Regan	22c99aa535	Merge pull request #274 from monopole/docsreadme Tweak docs readme	2018-08-22 12:21:32 -07:00
Jeffrey Regan	5fa209acfa	Tweak docs readme	2018-08-22 12:20:13 -07:00
Jeff Regan	d72879e109	Merge pull request #147 from guineveresaenger/labels-and-annotations Edit add label/annotation	2018-08-22 10:33:00 -07:00
Jeff Regan	337f3631ff	Merge pull request #272 from Liujingfang1/docs Add docs README.md	2018-08-22 10:22:00 -07:00
guineveresaenger	b3993dc874	Adds starter validation framework for semantic validation of inputs.	2018-08-22 18:20:51 +02:00
guineveresaenger	11c04dd6c4	Removes semantic validation from addmetadata.go and tests. Due to moving some input parsing to the Validate method, it was renamed to reflect this additional purpose. Tests were removed where appropriate.	2018-08-22 18:15:34 +02:00
Jingfang Liu	b29e449d4a	Add docs README.md	2018-08-22 09:05:54 -07:00
Jingfang Liu	430f2f84fb	Merge pull request #270 from Liujingfang1/docs fix bug in the example download links	2018-08-21 12:08:32 -07:00
Jingfang Liu	52c6b5755b	fix bug in the example download links	2018-08-21 12:04:53 -07:00
k8s-ci-robot	958bc63293	Merge pull request #269 from Liujingfang1/pvc Add namereference of PersistentVolume in PersistentVolumeClain	2018-08-21 09:48:33 -07:00
Jingfang Liu	94ed0fe515	Add namereference of PersistentVolume in PersistentVolumeClain	2018-08-21 09:37:25 -07:00
Jeff Regan	bb8233ceff	Merge pull request #265 from Liujingfang1/metadata add typemeta to kustomization	2018-08-20 13:59:43 -07:00
Jingfang Liu	6221bed190	add typemeta to kustomization	2018-08-20 13:47:33 -07:00
k8s-ci-robot	1ffeb181e7	Merge pull request #264 from Liujingfang1/docs Add example for kustomize build {url} and remote bases	2018-08-20 12:19:00 -07:00
Jingfang Liu	759ba1cbf4	Add example for kustomize build {url}	2018-08-20 09:52:32 -07:00
k8s-ci-robot	12f2c41273	Merge pull request #266 from ahmetb/patch-1 add homebrew package to INSTALL.md	2018-08-17 10:48:01 -07:00
Ahmet Alp Balkan	2174741376	add homebrew package to INSTALL.md	2018-08-17 07:50:28 -07:00
guineveresaenger	31dd8fc5b1	Restructured tests	2018-08-16 13:32:42 -07:00
guineveresaenger	77f4811779	Tests test Validate function	2018-08-16 02:36:11 -07:00
Jeff Regan	7050a45134	Merge pull request #262 from Liujingfang1/repoUrl3 Add all dependency of go-getter	2018-08-15 15:47:35 -07:00
k8s-ci-robot	3b64f1e102	Merge pull request #260 from Liujingfang1/repoUrl2 Add kustomize build {repoUrl}	2018-08-15 15:45:00 -07:00
Jingfang Liu	6c4c79e2cc	Merge pull request #263 from Liujingfang1/gc Add garbage collection KEP link	2018-08-15 15:22:21 -07:00
Jingfang Liu	3975ebc21a	Add garbage collection KEP link	2018-08-15 15:19:18 -07:00
Jingfang Liu	ec95e5f97e	Add all dependency of go-getter	2018-08-15 11:37:03 -07:00
Jingfang Liu	72b1a4bc5c	combine fileLoader.New and NewLoader into one function: NewLoader	2018-08-15 11:04:31 -07:00
k8s-ci-robot	16447efca3	Merge pull request #255 from sethpollack/secret add docs for envCommand	2018-08-15 09:35:02 -07:00
guineveresaenger	524d593c5c	Separate functions for RunnAddLabel and RunAddAnnotation	2018-08-15 03:51:56 -07:00
guineveresaenger	3b644474c4	Parse data into string map for easy access in RunAddMetadata	2018-08-15 03:13:03 -07:00
Seth Pollack	42e6ced2b0	add docs	2018-08-14 20:55:26 -04:00
Jingfang Liu	f018370628	Add kustomize build {repoUrl}	2018-08-14 16:10:51 -07:00
Jeff Regan	c9a8bc1121	Merge pull request #256 from ivan4th/command-timeout-1 Add timeoutSeconds to secretArgs	2018-08-14 14:54:50 -07:00
k8s-ci-robot	8c7cbb12dd	Merge pull request #257 from Liujingfang1/repoUrl2 Add dependency: github.com/hashicorp/go-getter	2018-08-14 14:49:29 -07:00
Jingfang Liu	b02f7775c5	manually add dependency on go-getter	2018-08-14 14:37:31 -07:00
Ivan Shvedunov	f9a0e671b7	Add timeoutSeconds to secretArgs	2018-08-14 22:55:59 +03:00
Jeff Regan	70fb22cad6	Merge pull request #250 from ivan4th/fix-resource-load-crash Don't crash on resource load errors	2018-08-14 12:53:24 -07:00
Ivan Shvedunov	2ae00db6a9	Don't crash on resource load errors	2018-08-14 22:14:12 +03:00
k8s-ci-robot	f9577ab540	Merge pull request #247 from ryane/setnamespace add support for `kustomize edit set namespace`	2018-08-13 11:17:06 -07:00
guineveresaenger	6a2786a5c4	Remove Complete function and references	2018-08-13 07:49:51 -07:00
guineveresaenger	924aa6fb29	Use iota declaration for constants and implements string method for KindOfAdd metadata	2018-08-13 07:46:06 -07:00
ryane	e2cd44f9d8	add support for `kustomize edit set namespace` fixes #246	2018-08-10 22:42:50 -04:00
Jeff Regan	017c4ae0aa	Merge pull request #245 from Liujingfang1/output Add -o flag to kustomize build	2018-08-09 16:49:25 -07:00
Jingfang Liu	7b2baad390	Add -o flag to kustomize build	2018-08-09 13:15:39 -07:00
Jeff Regan	bc2d69f4f9	Merge pull request #241 from sethpollack/secret add env sources to secrets	2018-08-09 13:05:21 -07:00
Jeff Regan	e913a71fad	Merge pull request #244 from Liujingfang1/deprecation Add deprecation message for namePrefix behavior change	2018-08-09 13:04:36 -07:00
Seth Pollack	7406dda074	fixes	2018-08-09 14:45:56 -04:00
Jingfang Liu	0b4df3d414	Add deprecation message for namePrefix behavior change	2018-08-09 11:25:37 -07:00
Jeff Regan	7d38916d63	Merge pull request #243 from monopole/updateDeps Automated update of Gopkg.lock via dep ensure	2018-08-09 11:08:47 -07:00
Jeffrey Regan	79d1abe573	dep ensure run	2018-08-09 10:54:29 -07:00
Jeff Regan	9563052094	Merge pull request #233 from Liujingfang1/glob2 preserve order and comments in edit	2018-08-09 09:49:30 -07:00
Seth Pollack	f881c19bb6	add env sources to secrets	2018-08-09 09:17:53 -04:00
Jingfang Liu	8d7b5f82c4	preserve order and comments in edit	2018-08-08 15:03:16 -07:00
Jingfang Liu	7554406c61	Merge pull request #240 from kubernetes-sigs/revert-239-namespace2 Revert "Skip adding nameprefix to namespace"	2018-08-08 13:41:38 -07:00
Jingfang Liu	cf17050170	Revert "Skip adding nameprefix to namespace"	2018-08-08 13:39:01 -07:00
k8s-ci-robot	3857a67701	Merge pull request #239 from Liujingfang1/namespace2 Skip adding nameprefix to namespace	2018-08-08 11:56:15 -07:00
Jingfang Liu	10665c6fc9	Skip adding nameprefix to namespace	2018-08-08 10:02:42 -07:00
k8s-ci-robot	e0a09f4755	Merge pull request #237 from Liujingfang1/ingress add namepreference for secret in ingress annotation	2018-08-08 09:49:06 -07:00
Jingfang Liu	31c6a55747	add namepreference for secret in ingress annotation	2018-08-07 13:26:39 -07:00
Jeff Regan	8332a70d19	Merge pull request #231 from bendory/master Container Builder has been renamed Cloud Build	2018-08-03 10:29:23 -07:00
David Bendory	7fe2338acd	Container Builder has been renamed Cloud Build	2018-08-03 13:22:49 -04:00
k8s-ci-robot	43d4dbc07a	Merge pull request #228 from Liujingfang1/glob2 Change the order of validate and expandFileSource in add configmap	2018-08-02 16:26:27 -07:00
Jingfang Liu	f0cf4579d2	Change the order of validate and expandFileSource in add configmap subcommand	2018-08-02 11:39:27 -07:00
k8s-ci-robot	68ba37f139	Merge pull request #226 from Liujingfang1/glob2 Add glob support in subcommands `add patch` and `add configmap`	2018-08-02 11:19:27 -07:00
Jingfang Liu	bf73633cda	Add glob support in subcommands add patch and add configmap	2018-08-02 11:01:20 -07:00
Jeff Regan	55f8828ba1	Merge pull request #222 from Liujingfang1/glob Add glob support in edit add resource	2018-08-01 15:51:45 -07:00
Jeff Regan	0e1307dccf	Merge pull request #224 from Liujingfang1/imagetag Use regexp in set imagetag	2018-08-01 15:50:50 -07:00
Jingfang Liu	4471b75912	Use regexp in set imagetag	2018-08-01 11:58:21 -07:00
k8s-ci-robot	75c6204337	Merge pull request #225 from Liujingfang1/pathconfig Add ingress annotations to the namereference path config	2018-08-01 11:52:40 -07:00
Jingfang Liu	1b7171ac9e	Add glob support in edit add resource	2018-08-01 11:43:28 -07:00
Jingfang Liu	5193d6b4a8	Add ingress annotations to the namereference path config	2018-08-01 10:47:01 -07:00
Jeff Regan	6a834b6262	Merge pull request #223 from monopole/noFlags More description of eschewed features	2018-07-31 11:49:56 -07:00
Jeffrey Regan	083d3cbb65	More description of eschewed features	2018-07-31 11:48:36 -07:00
k8s-ci-robot	e68411b71e	Merge pull request #220 from monopole/noglobbing Eschew globbing doc	2018-07-31 10:04:47 -07:00
Jeff Regan	664774576c	Merge pull request #219 from Liujingfang1/glob remove glob support from kustomization.yaml	2018-07-30 17:03:53 -07:00
Jeffrey Regan	37e97084f9	Eschew globbing doc	2018-07-30 16:57:16 -07:00
Jingfang Liu	de4d8b7dfa	remove glob support from kustomization.yaml	2018-07-30 16:28:40 -07:00
k8s-ci-robot	7f97108686	Merge pull request #216 from Liujingfang1/namespace Add multibases example with different namespace	2018-07-30 15:54:46 -07:00
Jingfang Liu	71f069cf95	Add multibases example with different namespace	2018-07-30 15:21:53 -07:00
k8s-ci-robot	3dbe732cb5	Merge pull request #215 from monopole/eschewed Enumerate eschewed features in a document.	2018-07-30 15:01:40 -07:00
Jeff Regan	e5aea4423b	Merge pull request #214 from Liujingfang1/namespace add namespace in ResId	2018-07-30 15:00:10 -07:00
Jeff Regan	100f05260e	Merge pull request #209 from Liujingfang1/yaml ignore the empty YAML object	2018-07-30 14:57:15 -07:00
Jeffrey Regan	02f9329747	Enumerate eschewed features in docs	2018-07-30 14:56:20 -07:00
Jingfang Liu	b6abd7600c	add namespace in ResId	2018-07-30 14:04:35 -07:00
Jingfang Liu	2e7093e67f	ignore the empty YAML object	2018-07-30 12:58:11 -07:00
k8s-ci-robot	3b3a272d27	Merge pull request #213 from Liujingfang1/imagetags use regexp to determine if the image matched in imagetag transformer	2018-07-30 11:58:56 -07:00
Jingfang Liu	36115a7fa3	use regexp to determin if the image matched in imagetag transformer	2018-07-30 11:09:32 -07:00
k8s-ci-robot	4d9d54e2c7	Merge pull request #204 from Liujingfang1/diamond Add support for using common base	2018-07-27 14:00:57 -07:00
Jingfang Liu	88aec95628	remove commented code update multibases/README.md	2018-07-27 13:45:49 -07:00
Jingfang Liu	e30401489d	Add example for multibases	2018-07-27 10:43:16 -07:00
Jingfang Liu	58bc4b14a2	Add support for using common base	2018-07-27 10:16:44 -07:00
Jeff Regan	2824c28e08	Merge pull request #203 from mortent/BetterSecretGenErrorMessage More information in error message when secret gen fails	2018-07-26 15:45:40 -07:00
Morten Torkildsen	d7cbb95d9c	More information in error message when secret gen fails	2018-07-26 12:50:07 -07:00
k8s-ci-robot	e771ec1169	Merge pull request #201 from monopole/meh Combine loaderImpl and fileLoader.	2018-07-26 10:09:56 -07:00
Jeffrey Regan	9e5374e725	Combine loaderImpl and fileLoader.	2018-07-25 17:23:04 -07:00
guineveresaenger	187415430f	Removed individual files in favor of combined metadata file	2018-07-18 17:09:41 -07:00
guineveresaenger	afac2fb46a	Uses single file for both addLabel and addAnnotation commands, as the code is nearly identical. Tests included.	2018-07-18 17:09:41 -07:00
guineveresaenger	20fd433f75	Add tests	2018-07-18 17:09:41 -07:00
guineveresaenger	1e3824057b	Implements labels and annotations as subcommands of edit	2018-07-18 17:09:41 -07:00