Merge pull request #2693 from t0rr3sp3dr0/master

Update function annotation on docs
Merge pull request #2694 from monopole/switchToApiV0_5_0
2026-06-26 16:28:17 +00:00 · 2020-07-05 18:06:50 -07:00 · 2020-07-04 21:22:19 -07:00 · 2020-07-04 19:45:45 -07:00 · 2020-07-04 18:19:28 -03:00
32 changed files with 69 additions and 69 deletions
--- a/6
+++ b/6
@@ -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
--- a/cmd/config/docs/api-conventions/functions-impl.md
+++ b/cmd/config/docs/api-conventions/functions-impl.md
@@ -116,14 +116,14 @@ metadata:
  name: my-instance
  annotations:
    config.kubernetes.io/local-config: "true"
-    config.k8s.io/function: |
+    config.kubernetes.io/function: |
      container:
        image: gcr.io/example-functions/nginx-template:v1.0.0
 spec:
  replicas: 5
 ```

- `annotations[config.k8s.io/function].container.image`: the image to use for this API
+- `annotations[config.kubernetes.io/function].container.image`: the image to use for this API
 - `annotations[config.kubernetes.io/local-config]`: mark this as not a Resource that should
  be applied

--- a/cmd/config/docs/api-conventions/functions-spec.md
+++ b/cmd/config/docs/api-conventions/functions-spec.md
@@ -114,7 +114,7 @@ functionConfig:
    name: staging
    metadata:
      annotations:
-        config.k8s.io/function: |
+        config.kubernetes.io/function: |
          container:
            image: gcr.io/example/foo:v1.0.0
  spec:
--- a/cmd/config/internal/generateddocs/api/docs.go
+++ b/cmd/config/internal/generateddocs/api/docs.go
@@ -175,13 +175,13 @@ are passed to the Function through the ` + "`" + `ResourceList.functionConfig` +
 	  name: my-instance
 	  annotations:
 	    config.kubernetes.io/local-config: "true"
-	    config.k8s.io/function: |
+	    config.kubernetes.io/function: |
 	      container:
 	        image: gcr.io/example-functions/nginx-template:v1.0.0
 	spec:
 	  replicas: 5

- ` + "`" + `annotations[config.k8s.io/function].container.image` + "`" + `: the image to use for this API
+- ` + "`" + `annotations[config.kubernetes.io/function].container.image` + "`" + `: the image to use for this API
 - ` + "`" + `annotations[config.kubernetes.io/local-config]` + "`" + `: mark this as not a Resource that should
  be applied

@@ -343,7 +343,7 @@ An example using ` + "`" + `config.kubernetes.io/v1beta1/ResourceList` + "`" + `
 	    name: staging
 	    metadata:
 	      annotations:
-	        config.k8s.io/function: |
+	        config.kubernetes.io/function: |
 	          container:
 	            image: gcr.io/example/foo:v1.0.0
 	  spec:
--- 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
 ```

--- 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
 )
--- 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=
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
Author	SHA1	Message	Date
Kubernetes Prow Robot	855ce1a8db	Merge pull request #2693 from t0rr3sp3dr0/master Update function annotation on docs	2020-07-05 18:06:50 -07:00
Jeff Regan	6a50372dd5	Merge pull request #2694 from monopole/switchToApiV0_5_0 Switch to kustomize/api v0.5.0	2020-07-04 21:22:19 -07:00
jregan	5a0228629f	Switch kustomize to api/v0.5.0	2020-07-04 19:45:45 -07:00
Pedro Tôrres	94095a63ff	Update function annotation on docs Signed-off-by: Pedro Tôrres <t0rr3sp3dr0@gmail.com>	2020-07-04 18:19:28 -03:00