Merge pull request #1218 from nicolaferraro/trait

Fix #1093: document how to update multiple trait properties
apache · Jan 23, 2020 · 7ffcd69 · 7ffcd69
2 parents 4c5c963 + 8aa6dc8
commit 7ffcd69
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 23 deletions.
diff --git a/cmd/util/doc-gen/generators/traitdocgen.go b/cmd/util/doc-gen/generators/traitdocgen.go
@@ -210,7 +210,11 @@ func writeFields(t *types.Type, traitID string, content *[]string) {
 	res = append(res, adocConfigurationMarkerStart, "== Configuration", "")
 	res = append(res, "Trait properties can be specified when running any integration with the CLI:")
 	res = append(res, "```")
-	res = append(res, fmt.Sprintf("kamel run --trait %s.[key]=[value] integration.groovy", traitID))
+	if len(t.Members) > 1 {
+		res = append(res, fmt.Sprintf("kamel run --trait %s.[key]=[value] --trait %s.[key2]=[value2] integration.groovy", traitID, traitID))
+	} else {
+		res = append(res, fmt.Sprintf("kamel run --trait %s.[key]=[value] integration.groovy", traitID))
+	}
 	res = append(res, "```")
 	res = append(res, "The following configuration options are available:", "")
 	res = append(res, "[cols=\"2,1,5a\"]", "|===")

diff --git a/docs/modules/ROOT/pages/traits/affinity.adoc b/docs/modules/ROOT/pages/traits/affinity.adoc
@@ -15,7 +15,7 @@ This trait is available in the following profiles: **Kubernetes, Knative, OpenSh
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait affinity.[key]=[value] integration.groovy
+kamel run --trait affinity.[key]=[value] --trait affinity.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/builder.adoc b/docs/modules/ROOT/pages/traits/builder.adoc
@@ -15,7 +15,7 @@ WARNING: The builder trait is a *platform trait*: disabling it may compromise th
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait builder.[key]=[value] integration.groovy
+kamel run --trait builder.[key]=[value] --trait builder.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/camel.adoc b/docs/modules/ROOT/pages/traits/camel.adoc
@@ -14,7 +14,7 @@ WARNING: The camel trait is a *platform trait*: disabling it may compromise the
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait camel.[key]=[value] integration.groovy
+kamel run --trait camel.[key]=[value] --trait camel.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/container.adoc b/docs/modules/ROOT/pages/traits/container.adoc
@@ -16,7 +16,7 @@ WARNING: The container trait is a *platform trait*: disabling it may compromise
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait container.[key]=[value] integration.groovy
+kamel run --trait container.[key]=[value] --trait container.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/deployer.adoc b/docs/modules/ROOT/pages/traits/deployer.adoc
@@ -15,7 +15,7 @@ WARNING: The deployer trait is a *platform trait*: disabling it may compromise t
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait deployer.[key]=[value] integration.groovy
+kamel run --trait deployer.[key]=[value] --trait deployer.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/deployment.adoc b/docs/modules/ROOT/pages/traits/deployment.adoc
@@ -15,7 +15,7 @@ WARNING: The deployment trait is a *platform trait*: disabling it may compromise
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait deployment.[key]=[value] integration.groovy
+kamel run --trait deployment.[key]=[value] --trait deployment.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/environment.adoc b/docs/modules/ROOT/pages/traits/environment.adoc
@@ -15,7 +15,7 @@ WARNING: The environment trait is a *platform trait*: disabling it may compromis
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait environment.[key]=[value] integration.groovy
+kamel run --trait environment.[key]=[value] --trait environment.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/gc.adoc b/docs/modules/ROOT/pages/traits/gc.adoc
@@ -12,7 +12,7 @@ This trait is available in the following profiles: **Kubernetes, Knative, OpenSh
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait gc.[key]=[value] integration.groovy
+kamel run --trait gc.[key]=[value] --trait gc.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/ingress.adoc b/docs/modules/ROOT/pages/traits/ingress.adoc
@@ -15,7 +15,7 @@ This trait is available in the following profiles: **Kubernetes**.
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait ingress.[key]=[value] integration.groovy
+kamel run --trait ingress.[key]=[value] --trait ingress.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/istio.adoc b/docs/modules/ROOT/pages/traits/istio.adoc
@@ -13,7 +13,7 @@ This trait is available in the following profiles: **Kubernetes, Knative, OpenSh
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait istio.[key]=[value] integration.groovy
+kamel run --trait istio.[key]=[value] --trait istio.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/jolokia.adoc b/docs/modules/ROOT/pages/traits/jolokia.adoc
@@ -14,7 +14,7 @@ This trait is available in the following profiles: **Kubernetes, Knative, OpenSh
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait jolokia.[key]=[value] integration.groovy
+kamel run --trait jolokia.[key]=[value] --trait jolokia.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/knative-service.adoc b/docs/modules/ROOT/pages/traits/knative-service.adoc
@@ -16,7 +16,7 @@ This trait is available in the following profiles: **Knative**.
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait knative-service.[key]=[value] integration.groovy
+kamel run --trait knative-service.[key]=[value] --trait knative-service.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/knative.adoc b/docs/modules/ROOT/pages/traits/knative.adoc
@@ -18,7 +18,7 @@ This trait is available in the following profiles: **Knative**.
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait knative.[key]=[value] integration.groovy
+kamel run --trait knative.[key]=[value] --trait knative.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/owner.adoc b/docs/modules/ROOT/pages/traits/owner.adoc
@@ -15,7 +15,7 @@ WARNING: The owner trait is a *platform trait*: disabling it may compromise the
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait owner.[key]=[value] integration.groovy
+kamel run --trait owner.[key]=[value] --trait owner.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/platform.adoc b/docs/modules/ROOT/pages/traits/platform.adoc
@@ -18,7 +18,7 @@ WARNING: The platform trait is a *platform trait*: disabling it may compromise t
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait platform.[key]=[value] integration.groovy
+kamel run --trait platform.[key]=[value] --trait platform.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/probes.adoc b/docs/modules/ROOT/pages/traits/probes.adoc
@@ -12,7 +12,7 @@ This trait is available in the following profiles: **Kubernetes, Knative, OpenSh
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait probes.[key]=[value] integration.groovy
+kamel run --trait probes.[key]=[value] --trait probes.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/prometheus.adoc b/docs/modules/ROOT/pages/traits/prometheus.adoc
@@ -18,7 +18,7 @@ This trait is available in the following profiles: **Kubernetes, Knative, OpenSh
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait prometheus.[key]=[value] integration.groovy
+kamel run --trait prometheus.[key]=[value] --trait prometheus.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/pull-secret.adoc b/docs/modules/ROOT/pages/traits/pull-secret.adoc
@@ -21,7 +21,7 @@ This trait is available in the following profiles: **Kubernetes, Knative, OpenSh
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait pull-secret.[key]=[value] integration.groovy
+kamel run --trait pull-secret.[key]=[value] --trait pull-secret.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/quarkus.adoc b/docs/modules/ROOT/pages/traits/quarkus.adoc
@@ -14,7 +14,7 @@ This trait is available in the following profiles: **Kubernetes, Knative, OpenSh
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait quarkus.[key]=[value] integration.groovy
+kamel run --trait quarkus.[key]=[value] --trait quarkus.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/route.adoc b/docs/modules/ROOT/pages/traits/route.adoc
@@ -12,7 +12,7 @@ This trait is available in the following profiles: **OpenShift**.
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait route.[key]=[value] integration.groovy
+kamel run --trait route.[key]=[value] --trait route.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/docs/modules/ROOT/pages/traits/service.adoc b/docs/modules/ROOT/pages/traits/service.adoc
@@ -15,7 +15,7 @@ This trait is available in the following profiles: **Kubernetes, OpenShift**.
 
 Trait properties can be specified when running any integration with the CLI:
 ```
-kamel run --trait service.[key]=[value] integration.groovy
+kamel run --trait service.[key]=[value] --trait service.[key2]=[value2] integration.groovy
 ```
 The following configuration options are available:
 

diff --git a/script/Makefile b/script/Makefile
@@ -27,7 +27,7 @@ IMAGE_NAME := docker.io/apache/camel-k
 RELEASE_GIT_REMOTE := upstream
 GIT_COMMIT := $(shell git rev-list -1 HEAD)
 LINT_GOGC := 10
-LINT_DEADLINE := 5m
+LINT_DEADLINE := 10m
 
 # Used to push pre-relase artifacts
 STAGING_IMAGE_NAME := docker.io/camelk/camel-k