Merge pull request #2694 from monopole/switchToApiV0_5_0

Switch to kustomize/api v0.5.0
kubernetes-sigs · Jul 5, 2020 · 6a50372 · 6a50372
2 parents def0022 + 5a02286
commit 6a50372
Show file tree

Hide file tree

Showing 29 changed files with 63 additions and 63 deletions.
diff --git a/Makefile b/Makefile
@@ -14,8 +14,8 @@ all: verify-kustomize
 verify-kustomize: \
 	lint-kustomize \
 	test-unit-kustomize-all \
-	test-examples-kustomize-against-HEAD \
-	test-examples-kustomize-against-3.7.0
+	test-examples-kustomize-against-HEAD
+#	test-examples-kustomize-against-3.7.0
 
 # The following target referenced by a file in
 # https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes-sigs/kustomize
@@ -24,9 +24,9 @@ prow-presubmit-check: \
 	lint-kustomize \
 	test-unit-kustomize-all \
 	test-examples-kustomize-against-HEAD \
-	test-examples-kustomize-against-3.7.0 \
 	test-unit-cmd-all \
 	test-go-mod
+#	test-examples-kustomize-against-3.7.0 \
 
 .PHONY: verify-kustomize-e2e
 verify-kustomize-e2e: test-examples-e2e-kustomize

diff --git a/examples/patchMultipleObjects.md b/examples/patchMultipleObjects.md
@@ -162,16 +162,16 @@ spec:
         old-label: old-value
     spec:
       containers:
-      - args:
-        - proxy
-        - sidecar
-        image: docker.io/istio/proxyv2
-        name: istio-proxy
       - args:
         - one
         - two
         image: nginx
         name: nginx
+      - args:
+        - proxy
+        - sidecar
+        image: docker.io/istio/proxyv2
+        name: istio-proxy
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -184,13 +184,13 @@ spec:
         key: value
     spec:
       containers:
+      - image: busybox
+        name: busybox
       - args:
         - proxy
         - sidecar
         image: docker.io/istio/proxyv2
         name: istio-proxy
-      - image: busybox
-        name: busybox
 EOF
 ```
 

diff --git a/kustomize/go.mod b/kustomize/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
 	k8s.io/client-go v0.17.3
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/kustomize/cmd/config v0.2.0
 	sigs.k8s.io/yaml v1.2.0
 )

diff --git a/kustomize/go.sum b/kustomize/go.sum
@@ -750,8 +750,8 @@ sigs.k8s.io/controller-runtime v0.4.0 h1:wATM6/m+3w8lj8FXNaO6Fs/rq/vqoOjO1Q116Z9
 sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns=
 sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
 sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
-sigs.k8s.io/kustomize/api v0.4.2 h1:ETPJPgfpWYXxXZw8n4EzuoIzmb8vSEwNx4Lr4/E6hGs=
-sigs.k8s.io/kustomize/api v0.4.2/go.mod h1:OND6MoJxF5BoS3IiAqDjPKdI7c+oTSaxuXKbljPbwNU=
+sigs.k8s.io/kustomize/api v0.5.0 h1:LT/Yxm6J8M9BJoLxfYIwGWamvuGSPQl7ELQXdlOR/fY=
+sigs.k8s.io/kustomize/api v0.5.0/go.mod h1:OND6MoJxF5BoS3IiAqDjPKdI7c+oTSaxuXKbljPbwNU=
 sigs.k8s.io/kustomize/cmd/config v0.2.0 h1:VNAWKb1JLl7dFjMAD5MwdZpGjreN3qL63C8DKtsUYck=
 sigs.k8s.io/kustomize/cmd/config v0.2.0/go.mod h1:oXzY7QJS6JlmWgusEjra2O3cW7GSIICXa59/3DvjBfE=
 sigs.k8s.io/kustomize/kyaml v0.1.4/go.mod h1:461i94nj0h0ylJ6w83jLkR4SqqVhn1iY6fjD0JSTQeE=

diff --git a/plugin/builtin/annotationstransformer/go.mod b/plugin/builtin/annotationstransformer/go.mod
@@ -3,9 +3,9 @@ module sigs.k8s.io/kustomize/plugin/builtin/annotationstransformer
 go 1.14
 
 require (
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/kustomize/kyaml v0.3.4
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/builtin/configmapgenerator/go.mod b/plugin/builtin/configmapgenerator/go.mod
@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/builtin/configmapgenerator
 go 1.14
 
 require (
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/builtin/hashtransformer/go.mod b/plugin/builtin/hashtransformer/go.mod
@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/hashtransformer
 
 go 1.14
 
-require sigs.k8s.io/kustomize/api v0.4.2
+require sigs.k8s.io/kustomize/api v0.5.0
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/builtin/imagetagtransformer/go.mod b/plugin/builtin/imagetagtransformer/go.mod
@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/builtin/imagetagtransformer
 go 1.14
 
 require (
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/builtin/labeltransformer/go.mod b/plugin/builtin/labeltransformer/go.mod
@@ -3,9 +3,9 @@ module sigs.k8s.io/kustomize/plugin/builtin/labeltransformer
 go 1.14
 
 require (
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/kustomize/kyaml v0.3.4
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/builtin/legacyordertransformer/go.mod b/plugin/builtin/legacyordertransformer/go.mod
@@ -4,7 +4,7 @@ go 1.14
 
 require (
 	github.com/pkg/errors v0.8.1
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/builtin/namespacetransformer/go.mod b/plugin/builtin/namespacetransformer/go.mod
@@ -3,9 +3,9 @@ module sigs.k8s.io/kustomize/plugin/builtin/namespacetransformer
 go 1.14
 
 require (
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/kustomize/kyaml v0.3.4
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/builtin/patchjson6902transformer/go.mod b/plugin/builtin/patchjson6902transformer/go.mod
@@ -5,9 +5,9 @@ go 1.14
 require (
 	github.com/evanphx/json-patch v4.5.0+incompatible
 	github.com/pkg/errors v0.8.1
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/kustomize/kyaml v0.3.4
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/builtin/patchstrategicmergetransformer/go.mod b/plugin/builtin/patchstrategicmergetransformer/go.mod
@@ -3,9 +3,9 @@ module sigs.k8s.io/kustomize/plugin/builtin/patchstrategicmergetransformer
 go 1.14
 
 require (
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/kustomize/kyaml v0.3.4
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/builtin/patchtransformer/go.mod b/plugin/builtin/patchtransformer/go.mod
@@ -5,9 +5,9 @@ go 1.14
 require (
 	github.com/evanphx/json-patch v4.5.0+incompatible
 	github.com/pkg/errors v0.8.1
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/kustomize/kyaml v0.3.4
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/builtin/prefixsuffixtransformer/go.mod b/plugin/builtin/prefixsuffixtransformer/go.mod
@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/builtin/prefixsuffixtransformer
 go 1.14
 
 require (
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/builtin/replicacounttransformer/go.mod b/plugin/builtin/replicacounttransformer/go.mod
@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/builtin/replicacounttransformer
 go 1.14
 
 require (
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/builtin/secretgenerator/go.mod b/plugin/builtin/secretgenerator/go.mod
@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/builtin/secretgenerator
 go 1.14
 
 require (
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/builtin/valueaddtransformer/go.mod b/plugin/builtin/valueaddtransformer/go.mod
@@ -3,9 +3,9 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/valueaddtransformer
 go 1.14
 
 require (
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/kustomize/kyaml v0.3.4
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../api
diff --git a/plugin/someteam.example.com/v1/bashedconfigmap/go.mod b/plugin/someteam.example.com/v1/bashedconfigmap/go.mod
@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/bashedconfigmap
 
 go 1.14
 
-require sigs.k8s.io/kustomize/api v0.4.2
+require sigs.k8s.io/kustomize/api v0.5.0
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../../api
diff --git a/plugin/someteam.example.com/v1/chartinflator/go.mod b/plugin/someteam.example.com/v1/chartinflator/go.mod
@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/chartinflator
 
 go 1.14
 
-require sigs.k8s.io/kustomize/api v0.4.2
+require sigs.k8s.io/kustomize/api v0.5.0
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../../api
diff --git a/plugin/someteam.example.com/v1/dateprefixer/go.mod b/plugin/someteam.example.com/v1/dateprefixer/go.mod
@@ -4,8 +4,8 @@ go 1.14
 
 require (
 	github.com/pkg/errors v0.8.1
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../../api
diff --git a/plugin/someteam.example.com/v1/gogetter/go.mod b/plugin/someteam.example.com/v1/gogetter/go.mod
@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/gogetter
 
 go 1.14
 
-require sigs.k8s.io/kustomize/api v0.4.2
+require sigs.k8s.io/kustomize/api v0.5.0
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../../api
diff --git a/plugin/someteam.example.com/v1/printpluginenv/go.mod b/plugin/someteam.example.com/v1/printpluginenv/go.mod
@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/printworkdir
 
 go 1.14
 
-require sigs.k8s.io/kustomize/api v0.4.2
+require sigs.k8s.io/kustomize/api v0.5.0
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../../api
diff --git a/plugin/someteam.example.com/v1/replacementtransformer/go.mod b/plugin/someteam.example.com/v1/replacementtransformer/go.mod
@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/replacementtransform
 go 1.14
 
 require (
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../../api
diff --git a/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod b/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod
@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/secretsfromdatabase
 go 1.14
 
 require (
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../../api
diff --git a/plugin/someteam.example.com/v1/sedtransformer/go.mod b/plugin/someteam.example.com/v1/sedtransformer/go.mod
@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/sedtransformer
 
 go 1.14
 
-require sigs.k8s.io/kustomize/api v0.4.2
+require sigs.k8s.io/kustomize/api v0.5.0
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../../api
diff --git a/plugin/someteam.example.com/v1/someservicegenerator/go.mod b/plugin/someteam.example.com/v1/someservicegenerator/go.mod
@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/someservicegenerator
 go 1.14
 
 require (
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../../api
diff --git a/plugin/someteam.example.com/v1/stringprefixer/go.mod b/plugin/someteam.example.com/v1/stringprefixer/go.mod
@@ -4,8 +4,8 @@ go 1.14
 
 require (
 	github.com/pkg/errors v0.8.1
-	sigs.k8s.io/kustomize/api v0.4.2
+	sigs.k8s.io/kustomize/api v0.5.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../../api
diff --git a/plugin/someteam.example.com/v1/validator/go.mod b/plugin/someteam.example.com/v1/validator/go.mod
@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/validator
 
 go 1.14
 
-require sigs.k8s.io/kustomize/api v0.4.2
+require sigs.k8s.io/kustomize/api v0.5.0
 
-replace sigs.k8s.io/kustomize/api v0.4.2 => ../../../../api
+replace sigs.k8s.io/kustomize/api v0.5.0 => ../../../../api