Merge pull request #810 from laverya/upgrade-helm-and-kuberentes

move off of kustomize branch
replicatedhq · Jan 30, 2019 · b99f3ae · b99f3ae
2 parents d9712ec + 940db66
commit b99f3ae
Show file tree

Hide file tree

Showing 12 changed files with 208 additions and 199 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -89,9 +89,7 @@ ignored = [
 
 [[constraint]]
   name = "sigs.k8s.io/kustomize"
-  #branch = "master"
-  source = "https://github.com/laverya/kustomize.git"
-  branch = "skip-empty-object-validation"
+  branch = "master"
 
 [[override]]
   name = "k8s.io/kubernetes"

diff --git a/vendor/sigs.k8s.io/kustomize/pkg/git/cloner.go b/vendor/sigs.k8s.io/kustomize/pkg/git/cloner.go
diff --git a/vendor/sigs.k8s.io/kustomize/pkg/git/repospec.go b/vendor/sigs.k8s.io/kustomize/pkg/git/repospec.go
diff --git a/vendor/sigs.k8s.io/kustomize/pkg/image/append.go b/vendor/sigs.k8s.io/kustomize/pkg/image/append.go
diff --git a/...gs.k8s.io/kustomize/pkg/image/imagetag.go → ...io/kustomize/pkg/image/deprecatedimage.go b/...gs.k8s.io/kustomize/pkg/image/imagetag.go → ...io/kustomize/pkg/image/deprecatedimage.go