[pull] master from apache:master

addons/master/master.go

@@ -43,18 +43,18 @@ import (
 type masterTrait struct {
 	trait.BaseTrait `property:",squash"`
 	// Enables automatic configuration of the trait.
-	Auto *bool `property:"auto"`
+	Auto *bool `property:"auto" json:"auto,omitempty"`
 	// When this flag is active, the operator analyzes the source code to add dependencies required by delegate endpoints.
 	// E.g. when using `master:lockname:timer`, then `camel:timer` is automatically added to the set of dependencies.
 	// It's enabled by default.
-	IncludeDelegateDependencies *bool `property:"include-delegate-dependencies"`
+	IncludeDelegateDependencies *bool `property:"include-delegate-dependencies" json:"includeDelegateDependencies,omitempty"`
 	// Name of the configmap that will be used to store the lock. Defaults to "<integration-name>-lock".
-	Configmap *string `property:"configmap"`
+	Configmap *string `property:"configmap" json:"configmap,omitempty"`
 	// Label that will be used to identify all pods contending the lock. Defaults to "camel.apache.org/integration".
-	LabelKey *string `property:"label-key"`
+	LabelKey *string `property:"label-key" json:"labelKey,omitempty"`
 	// Label value that will be used to identify all pods contending the lock. Defaults to the integration name.
-	LabelValue           *string `property:"label-value"`
-	delegateDependencies []string
+	LabelValue           *string  `property:"label-value" json:"labelValue,omitempty"`
+	delegateDependencies []string `json:"-"`
 }
 
 // NewMasterTrait --

addons/threescale/3scale.go

@@ -34,15 +34,15 @@ import (
 type threeScaleTrait struct {
 	trait.BaseTrait `property:",squash"`
 	// Enables automatic configuration of the trait.
-	Auto *bool `property:"auto"`
+	Auto *bool `property:"auto" json:"auto,omitempty"`
 	// The scheme to use to contact the service (default `http`)
-	Scheme string `property:"scheme"`
+	Scheme string `property:"scheme" json:"scheme,omitempty"`
 	// The path where the API is published (default `/`)
-	Path string `property:"path"`
+	Path string `property:"path" json:"path,omitempty"`
 	// The port where the service is exposed (default `80`)
-	Port int `property:"port"`
+	Port int `property:"port" json:"port,omitempty"`
 	// The path where the Open-API specification is published (default `/openapi.json`)
-	DescriptionPath *string `property:"description-path"`
+	DescriptionPath *string `property:"description-path" json:"descriptionPath,omitempty"`
 }
 
 const (

addons/tracing/tracing.go

@@ -35,15 +35,15 @@ import (
 type tracingTrait struct {
 	trait.BaseTrait `property:",squash"`
 	// Enables automatic configuration of the trait, including automatic discovery of the tracing endpoint.
-	Auto *bool `property:"auto"`
+	Auto *bool `property:"auto" json:"auto,omitempty"`
 	// The name of the service that publishes tracing data (defaults to the integration name)
-	ServiceName string `property:"service-name"`
+	ServiceName string `property:"service-name" json:"serviceName,omitempty"`
 	// The target endpoint of the OpenTracing service (automatically discovered by default)
-	Endpoint string `property:"endpoint"`
+	Endpoint string `property:"endpoint" json:"endpoint,omitempty"`
 	// The sampler type (default "const")
-	SamplerType *string `property:"sampler-type"`
+	SamplerType *string `property:"sampler-type" json:"samplerType,omitempty"`
 	// The sampler specific param (default "1")
-	SamplerParam *string `property:"sampler-param"`
+	SamplerParam *string `property:"sampler-param" json:"samplerParam,omitempty"`
 }
 
 const (

deploy/crd-integration-kit.yaml

@@ -94,12 +94,6 @@ spec:
               type: array
             traits:
               additionalProperties:
-                description: A TraitSpec contains the configuration of a trait
-                properties:
-                  configuration:
-                    additionalProperties:
-                      type: string
-                    type: object
                 type: object
               type: object
           type: object

deploy/crd-integration-platform.yaml

@@ -183,12 +183,6 @@ spec:
               type: object
             traits:
               additionalProperties:
-                description: A TraitSpec contains the configuration of a trait
-                properties:
-                  configuration:
-                    additionalProperties:
-                      type: string
-                    type: object
                 type: object
               type: object
           type: object
@@ -355,12 +349,6 @@ spec:
               type: object
             traits:
               additionalProperties:
-                description: A TraitSpec contains the configuration of a trait
-                properties:
-                  configuration:
-                    additionalProperties:
-                      type: string
-                    type: object
                 type: object
               type: object
             version:

deploy/crd-integration.yaml

@@ -160,9 +160,9 @@ spec:
                 description: A TraitSpec contains the configuration of a trait
                 properties:
                   configuration:
-                    additionalProperties:
-                      type: string
                     type: object
+                required:
+                  - configuration
                 type: object
               type: object
           type: object

deploy/olm-catalog/camel-k-dev/1.1.0-snapshot/integrations.camel.apache.org.crd.yaml

@@ -160,9 +160,9 @@ spec:
                 description: A TraitSpec contains the configuration of a trait
                 properties:
                   configuration:
-                    additionalProperties:
-                      type: string
                     type: object
+                required:
+                  - configuration
                 type: object
               type: object
           type: object