You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/01/25 09:34:45 UTC
[camel-k] branch master updated: Fix trait properties to kebab case
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli 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 4d78db4 Fix trait properties to kebab case
4d78db4 is described below
commit 4d78db4508fdc2fb9313017272d55978a01ccc54
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Fri Jan 25 09:40:49 2019 +0100
Fix trait properties to kebab case
---
docs/traits.adoc | 4 ++--
pkg/trait/jolokia.go | 4 ++--
pkg/trait/knative_service.go | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/traits.adoc b/docs/traits.adoc
index 40bac81..338272c 100644
--- a/docs/traits.adoc
+++ b/docs/traits.adoc
@@ -164,13 +164,13 @@ The following is a list of common traits that can be configured by the end users
! jolokia.port
! The Jolokia endpoint port (default `8778`).
-! jolokia.openshiftSSLAuth
+! jolokia.openshift-ssl-auth
! Configures OpenShift proxy SSL client authentication (only applicable for the OpenShift profile, default `true`)
! jolokia.options
! A comma-separared list of Jolokia options as defined in https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM agent configuration options], e.g.: `protocol=https,extendedClientCheck=false`
-! jolokia.randomPassword
+! jolokia.random-password
! Generates a random password for basic authentication
!===
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index 01c7cfd..c3ffbc8 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -28,10 +28,10 @@ import (
type jolokiaTrait struct {
BaseTrait `property:",squash"`
- OpenShiftSSLAuth *bool `property:"openshiftSSLAuth"`
+ OpenShiftSSLAuth *bool `property:"openshift-ssl-auth"`
Options *string `property:"options"`
Port int `property:"port"`
- RandomPassword *bool `property:"randomPassword"`
+ RandomPassword *bool `property:"random-password"`
}
// The Jolokia trait must be executed prior to the deployment trait
diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go
index 1577082..08a3e91 100644
--- a/pkg/trait/knative_service.go
+++ b/pkg/trait/knative_service.go
@@ -39,8 +39,8 @@ const (
type knativeServiceTrait struct {
BaseTrait `property:",squash"`
- MinScale *int `property:"minScale"`
- MaxScale *int `property:"maxScale"`
+ MinScale *int `property:"min-scale"`
+ MaxScale *int `property:"max-scale"`
Auto *bool `property:"auto"`
}