You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ts...@apache.org on 2020/12/16 04:37:37 UTC
[camel-k] branch master updated: chore(doc): quote inline code
blocks in environment trait comment
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 7d00518 chore(doc): quote inline code blocks in environment trait comment
7d00518 is described below
commit 7d00518e04faca1a5ab38596956400b78d943fd8
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Tue Dec 15 14:07:30 2020 +0900
chore(doc): quote inline code blocks in environment trait comment
---
deploy/resources.go | 4 ++--
deploy/traits.yaml | 2 +-
docs/modules/traits/pages/environment.adoc | 2 +-
pkg/trait/environment.go | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/deploy/resources.go b/deploy/resources.go
index 5409381..78394f1 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -340,9 +340,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 33838,
+ uncompressedSize: 33922,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6d\x6f\x1c\x37\xd2\xe0\xf7\xfc\x0a\x42\x77\x80\x34\xc2\x74\x4b\xce\x22\x9b\xac\xee\x72\x81\x62\x3b\xbb\x72\x62\x5b\x67\x39\xc9\x1d\x72\x8b\x1d\x4e\x77\xcd\x0c\x2d\x36\xd9\x0f\xc9\x1e\x79\x72\xb8\xff\x7e\x60\xf1\xb5\x7b\x5a\x52\xcb\xb1\x02\x2d\xf0\xc0\x1f\x2c\x8d\xba\x8b\xc5\x62\xbd\xbf\x70\x8c\xa2\xcc\xe8\xb3\x2f\x0a\x22\x68\x03\x67\x84\xae\x56\x4c\x30\xb3\xfb\x82\x90\x96\x53\xb3\x92\xaa\x39\x23\x2b\xca\x35\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6d\x6f\x1c\x37\xd2\xe0\xf7\xfc\x0a\x42\x77\x80\x34\xc2\x74\x4b\xce\x22\x9b\xac\xee\x72\x81\x62\x3b\xbb\x72\x62\x5b\x67\x39\xc9\x1d\x72\x8b\x1d\x4e\x77\xcd\x0c\x2d\x36\xd9\x0f\xc9\x1e\x79\x72\xb8\xff\x7e\x60\xf1\xb5\x7b\x5a\x52\xcb\xb1\x02\x2d\xf0\xc0\x1f\x2c\x8d\xba\x8b\xc5\x62\xbd\xbf\x70\x8c\xa2\xcc\xe8\xb3\x2f\x0a\x22\x68\x03\x67\x84\xae\x56\x4c\x30\xb3\xfb\x82\x90\x96\x53\xb3\x92\xaa\x39\x23\x2b\xca\x35\x [...]
},
"/user-cluster-role.yaml": &vfsgen۰CompressedFileInfo{
name: "user-cluster-role.yaml",
diff --git a/deploy/traits.yaml b/deploy/traits.yaml
index 38cd336..9f18018 100755
--- a/deploy/traits.yaml
+++ b/deploy/traits.yaml
@@ -202,7 +202,7 @@ traits:
description: Can be used to enable or disable a trait. All traits share this common property.
- name: container-meta
type: bool
- description: Enables injection of NAMESPACE and POD_NAME environment variables (default `true`)
+ description: Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`)
- name: gc
platform: false
profiles:
diff --git a/docs/modules/traits/pages/environment.adoc b/docs/modules/traits/pages/environment.adoc
index 90e38f7..787c00e 100755
--- a/docs/modules/traits/pages/environment.adoc
+++ b/docs/modules/traits/pages/environment.adoc
@@ -29,7 +29,7 @@ The following configuration options are available:
| environment.container-meta
| bool
-| Enables injection of NAMESPACE and POD_NAME environment variables (default `true`)
+| Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`)
|===
diff --git a/pkg/trait/environment.go b/pkg/trait/environment.go
index f81fcd1..55c78b4 100644
--- a/pkg/trait/environment.go
+++ b/pkg/trait/environment.go
@@ -30,7 +30,7 @@ import (
// +camel-k:trait=environment
type environmentTrait struct {
BaseTrait `property:",squash"`
- // Enables injection of NAMESPACE and POD_NAME environment variables (default `true`)
+ // Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`)
ContainerMeta *bool `property:"container-meta" json:"containerMeta,omitempty"`
}