kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2693 from t0rr3sp3dr0/master

Browse Source 
Update function annotation on docs
This commit is contained in:
Kubernetes Prow Robot
2020-07-05 18:06:50 -07:00
committed by GitHub
parent 6a50372dd5 94095a63ff
commit 855ce1a8db
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/config/docs/api-conventions/functions-impl.md
View File

@@ -116,14 +116,14 @@ metadata:
name: my-instance name: my-instance
annotations: annotations:
config.kubernetes.io/local-config: "true" config.kubernetes.io/local-config: "true"
config.k8s.io/function: | config.kubernetes.io/function: |
container: container:
image: gcr.io/example-functions/nginx-template:v1.0.0 image: gcr.io/example-functions/nginx-template:v1.0.0
spec: spec:
replicas: 5 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 - `annotations[config.kubernetes.io/local-config]`: mark this as not a Resource that should
be applied be applied

2
cmd/config/docs/api-conventions/functions-spec.md
View File

@@ -114,7 +114,7 @@ functionConfig:
name: staging name: staging
metadata: metadata:
annotations: annotations:
config.k8s.io/function: | config.kubernetes.io/function: |
container: container:
image: gcr.io/example/foo:v1.0.0 image: gcr.io/example/foo:v1.0.0
spec: spec:

6
cmd/config/internal/generateddocs/api/docs.go
View File

@@ -175,13 +175,13 @@ are passed to the Function through the ` + "`" + `ResourceList.functionConfig` +
name: my-instance name: my-instance
annotations: annotations:
config.kubernetes.io/local-config: "true" config.kubernetes.io/local-config: "true"
config.k8s.io/function: | config.kubernetes.io/function: |
container: container:
image: gcr.io/example-functions/nginx-template:v1.0.0 image: gcr.io/example-functions/nginx-template:v1.0.0
spec: spec:
replicas: 5 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 - ` + "`" + `annotations[config.kubernetes.io/local-config]` + "`" + `: mark this as not a Resource that should
be applied be applied
@@ -343,7 +343,7 @@ An example using ` + "`" + `config.kubernetes.io/v1beta1/ResourceList` + "`" + `
name: staging name: staging
metadata: metadata:
annotations: annotations:
config.k8s.io/function: | config.kubernetes.io/function: |
container: container:
image: gcr.io/example/foo:v1.0.0 image: gcr.io/example/foo:v1.0.0
spec: spec: