Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.2.x]: fix(crd): Remove traits default values #5077

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions addons/master/master.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,13 @@ type Trait struct {
// 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.
// +kubebuilder:default=true
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".
// Name of the configmap/lease resource that will be used to store the lock. Defaults to "<integration-name>-lock".
ResourceName *string `property:"resource-name" json:"resourceName,omitempty"`
// Type of Kubernetes resource to use for locking ("ConfigMap" or "Lease"). Defaults to "Lease".
// +kubebuilder:default="Lease"
ResourceType *string `property:"resource-type" json:"resourceType,omitempty"`
// Label that will be used to identify all pods contending the lock. Defaults to "camel.apache.org/integration".
// +kubebuilder:default="camel.apache.org/integration"
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" json:"labelValue,omitempty"`
Expand Down
3 changes: 0 additions & 3 deletions addons/telemetry/telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,16 @@ import (
type Trait struct {
traitv1.Trait `property:",squash" json:",inline"`
// Enables automatic configuration of the trait, including automatic discovery of the telemetry endpoint.
// +kubebuilder:default=true
Auto *bool `property:"auto" json:"auto,omitempty"`
// The name of the service that publishes telemetry data (defaults to the integration name)
ServiceName string `property:"service-name" json:"serviceName,omitempty"`
// The target endpoint of the Telemetry service (automatically discovered by default)
Endpoint string `property:"endpoint" json:"endpoint,omitempty"`
// The sampler of the telemetry used for tracing (default "on")
// +kubebuilder:default="on"
Sampler string `property:"sampler" json:"sampler,omitempty"`
// The sampler ratio of the telemetry used for tracing
SamplerRatio string `property:"sampler-ratio" json:"sampler-ratio,omitempty"`
// The sampler of the telemetry used for tracing is parent based (default "true")
// +kubebuilder:default=true
SamplerParentBased *bool `property:"sampler-parent-based" json:"sampler-parent-based,omitempty"`
}

Expand Down
4 changes: 0 additions & 4 deletions addons/threescale/3scale.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,12 @@ type Trait struct {
// Enables automatic configuration of the trait.
Auto *bool `property:"auto" json:"auto,omitempty"`
// The scheme to use to contact the service (default `http`)
// +kubebuilder:default="http"
Scheme string `property:"scheme" json:"scheme,omitempty"`
// The path where the API is published (default `/`)
// +kubebuilder:default="/"
Path string `property:"path" json:"path,omitempty"`
// The port where the service is exposed (default `80`)
// +kubebuilder:default=80
Port int `property:"port" json:"port,omitempty"`
// The path where the Open-API specification is published (default `/openapi.json`)
// +kubebuilder:default="/openapi.json"
DescriptionPath *string `property:"description-path" json:"descriptionPath,omitempty"`
}

Expand Down
3 changes: 0 additions & 3 deletions addons/tracing/tracing.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,14 @@ import (
type Trait struct {
traitv1.Trait `property:",squash" json:",inline"`
// Enables automatic configuration of the trait, including automatic discovery of the tracing endpoint.
// +kubebuilder:default=true
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" json:"serviceName,omitempty"`
// The target endpoint of the OpenTracing service (automatically discovered by default)
Endpoint string `property:"endpoint" json:"endpoint,omitempty"`
// The sampler type (default "const")
// +kubebuilder:default="const"
SamplerType *string `property:"sampler-type" json:"samplerType,omitempty"`
// The sampler specific param (default "1")
// +kubebuilder:default="1"
SamplerParam *string `property:"sampler-param" json:"samplerParam,omitempty"`
}

Expand Down
6 changes: 0 additions & 6 deletions config/crd/bases/camel.apache.org_integrationkits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ spec:
description: 'Deprecated: no longer in use.'
type: boolean
incrementalImageBuild:
default: true
description: Use the incremental image build option, to reuse
existing containers (default `true`)
type: boolean
Expand Down Expand Up @@ -246,7 +245,6 @@ spec:
to be scheduled on, based on labels on the node.
type: object
orderStrategy:
default: sequential
description: The build order strategy to use, either `dependencies`,
`fifo` or `sequential` (default `sequential`)
enum:
Expand All @@ -271,7 +269,6 @@ spec:
instead with task name `builder`.'
type: string
strategy:
default: routine
description: The strategy to use, either `pod` or `routine`
(default `routine`)
enum:
Expand Down Expand Up @@ -343,8 +340,6 @@ spec:
build must have enough memory available.'
properties:
buildMode:
default:
- jvm
description: 'The Quarkus mode to run: either `jvm` or `native`
(default `jvm`). In case both `jvm` and `native` are specified,
two `IntegrationKit` resources are created, with the `native`
Expand All @@ -365,7 +360,6 @@ spec:
description: 'Deprecated: no longer in use.'
type: boolean
nativeBaseImage:
default: quay.io/quarkus/quarkus-micro-image:2.0
description: The base image to use when running a native build
(default `quay.io/quarkus/quarkus-micro-image:2.0`)
type: string
Expand Down
Loading
Loading