From 9bf16646b663e63d889d57f89003363da632e270 Mon Sep 17 00:00:00 2001 From: Nicola Ferraro Date: Tue, 21 Jan 2020 15:21:58 +0100 Subject: [PATCH 1/2] Fix #1093: document how to update multiple trait properties --- cmd/util/doc-gen/generators/traitdocgen.go | 6 +++++- docs/modules/ROOT/pages/traits/affinity.adoc | 2 +- docs/modules/ROOT/pages/traits/builder.adoc | 2 +- docs/modules/ROOT/pages/traits/camel.adoc | 2 +- docs/modules/ROOT/pages/traits/container.adoc | 2 +- docs/modules/ROOT/pages/traits/deployer.adoc | 2 +- docs/modules/ROOT/pages/traits/deployment.adoc | 2 +- docs/modules/ROOT/pages/traits/environment.adoc | 2 +- docs/modules/ROOT/pages/traits/gc.adoc | 2 +- docs/modules/ROOT/pages/traits/ingress.adoc | 2 +- docs/modules/ROOT/pages/traits/istio.adoc | 2 +- docs/modules/ROOT/pages/traits/jolokia.adoc | 2 +- docs/modules/ROOT/pages/traits/knative-service.adoc | 2 +- docs/modules/ROOT/pages/traits/knative.adoc | 2 +- docs/modules/ROOT/pages/traits/owner.adoc | 2 +- docs/modules/ROOT/pages/traits/platform.adoc | 2 +- docs/modules/ROOT/pages/traits/probes.adoc | 2 +- docs/modules/ROOT/pages/traits/prometheus.adoc | 2 +- docs/modules/ROOT/pages/traits/pull-secret.adoc | 2 +- docs/modules/ROOT/pages/traits/quarkus.adoc | 2 +- docs/modules/ROOT/pages/traits/route.adoc | 2 +- docs/modules/ROOT/pages/traits/service.adoc | 2 +- 22 files changed, 26 insertions(+), 22 deletions(-) diff --git a/cmd/util/doc-gen/generators/traitdocgen.go b/cmd/util/doc-gen/generators/traitdocgen.go index da60de0d4d..f09f641782 100644 --- 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 index 6562fbaaeb..f0d035d879 100755 --- 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 index 2d4e98782b..ecfb1eece9 100755 --- 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 index c3c48e968b..f84ae4c046 100755 --- 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 index 7b9fefb1b5..1f982447d9 100755 --- 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 index 44976b6bd7..753fc3f4c6 100755 --- 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 index 3626683006..103b0e1b25 100755 --- 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 index 51c65b0dc3..5896751171 100755 --- 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 index f4589bce70..3f2a86411d 100755 --- 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 index 08efa26cc4..3024409994 100755 --- 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 index d431ab34ff..0814683445 100755 --- 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 index 9d1f0edc9d..59bcb4c056 100755 --- 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 index bdfd2b2a68..0aaba4faaa 100755 --- 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 index 50d27e6a7e..e8a9f67b83 100755 --- 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 index 98b518f33d..cd4b23c009 100755 --- 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 index 29d29ca49e..5e8a088531 100755 --- 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 index 80e050d749..3d2dbaf4ac 100755 --- 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 index f358769cc3..c5857c0373 100755 --- a/docs/modules/ROOT/pages/traits/prometheus.adoc +++ b/docs/modules/ROOT/pages/traits/prometheus.adoc @@ -19,7 +19,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 index bfafe0232e..49cc88e118 100755 --- 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 index cd4b030cff..896b05bbdc 100755 --- 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 index a9a01e6a4b..791a08fc2b 100755 --- 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 index 053b41983c..79d63bd25b 100755 --- 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: From 8aa6dc801c5a13b81236e4cdf5767bd31c32a5a0 Mon Sep 17 00:00:00 2001 From: Nicola Ferraro Date: Tue, 21 Jan 2020 15:36:35 +0100 Subject: [PATCH 2/2] chore(lint): increase timeout to 10m --- script/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/Makefile b/script/Makefile index 3ddaca8e3a..6768b7f57b 100644 --- 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