diff --git a/addons/master/master.go b/addons/master/master.go index 2f2c837589..e2002e806d 100644 --- a/addons/master/master.go +++ b/addons/master/master.go @@ -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 "-lock". // Name of the configmap/lease resource that will be used to store the lock. Defaults to "-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"` diff --git a/addons/telemetry/telemetry.go b/addons/telemetry/telemetry.go index c5c08eacfc..a3975bd047 100644 --- a/addons/telemetry/telemetry.go +++ b/addons/telemetry/telemetry.go @@ -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"` } diff --git a/addons/threescale/3scale.go b/addons/threescale/3scale.go index 677645f8e1..2bab8ea219 100644 --- a/addons/threescale/3scale.go +++ b/addons/threescale/3scale.go @@ -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"` } diff --git a/addons/tracing/tracing.go b/addons/tracing/tracing.go index d28ac04891..0cf3852e09 100644 --- a/addons/tracing/tracing.go +++ b/addons/tracing/tracing.go @@ -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"` } diff --git a/config/crd/bases/camel.apache.org_integrationkits.yaml b/config/crd/bases/camel.apache.org_integrationkits.yaml index e3dece12f4..74625c9354 100644 --- a/config/crd/bases/camel.apache.org_integrationkits.yaml +++ b/config/crd/bases/camel.apache.org_integrationkits.yaml @@ -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 @@ -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: @@ -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: @@ -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` @@ -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 diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index f548fe157f..70fa8722e4 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -479,7 +479,6 @@ spec: type: string type: array podAffinity: - default: false description: Always co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -491,7 +490,6 @@ spec: type: string type: array podAntiAffinity: - default: false description: Never co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -518,7 +516,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 @@ -551,7 +548,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: @@ -576,7 +572,6 @@ spec: instead with task name `builder`.' type: string strategy: - default: routine description: The strategy to use, either `pod` or `routine` (default `routine`) enum: @@ -676,12 +671,10 @@ spec: description: The maximum amount of memory required. type: string name: - default: integration description: The main container name. It's named `integration` by default. type: string port: - default: 8080 description: To configure a different port exposed by the container (default `8080`). type: integer @@ -697,12 +690,10 @@ spec: description: The minimum amount of memory required. type: string servicePort: - default: 80 description: To configure under which service port the container port is to be exposed (default `80`). type: integer servicePortName: - default: http description: To configure under which service port name the container port is to be exposed (default `http`). type: string @@ -711,7 +702,6 @@ spec: description: The configuration of Cron trait properties: activeDeadlineSeconds: - default: 60 description: Specifies the duration in seconds, relative to the start time, that the job may be continuously active before it is considered to be failed. It defaults to 60s. @@ -727,7 +717,6 @@ spec: be expressed as `0/1 * * * *`, while `35m` or `50s` cannot)." type: boolean backoffLimit: - default: 2 description: Specifies the number of retries before marking the job failed. It defaults to 2. format: int32 @@ -813,7 +802,6 @@ spec: - knative-service type: string useSSA: - default: true description: Use server-side apply to update the owned resources (default `true`). Note that it automatically falls back to client-side patching, if SSA is not available, e.g., @@ -832,14 +820,12 @@ spec: description: 'Deprecated: no longer in use.' type: boolean progressDeadlineSeconds: - default: 60 description: The maximum time in seconds for the deployment to make progress before it is considered to be failed. It defaults to `60s`. format: int32 type: integer rollingUpdateMaxSurge: - default: 25 description: 'The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). @@ -848,7 +834,6 @@ spec: `25%`.' type: integer rollingUpdateMaxUnavailable: - default: 25 description: 'The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number @@ -872,7 +857,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true containerMeta: - default: true description: Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`) type: boolean @@ -880,7 +864,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean httpProxy: - default: true description: Propagates the `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables (default `true`) type: boolean @@ -918,7 +901,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: - default: memory description: 'Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). Deprecated: to be removed from trait configuration.' @@ -959,12 +941,10 @@ spec: format: int32 type: integer livenessProbeEnabled: - default: false description: Configures the liveness probe for the integration container (default `false`). type: boolean livenessScheme: - default: HTTP description: Scheme to use when connecting to the liveness probe (default `HTTP`). type: string @@ -993,12 +973,10 @@ spec: format: int32 type: integer readinessProbeEnabled: - default: true description: Configures the readiness probe for the integration container (default `true`). type: boolean readinessScheme: - default: HTTP description: Scheme to use when connecting to the readiness probe (default `HTTP`). type: string @@ -1027,12 +1005,10 @@ spec: format: int32 type: integer startupProbeEnabled: - default: false description: Configures the startup probe for the integration container (default `false`). type: boolean startupScheme: - default: HTTP description: Scheme to use when connecting to the startup probe (default `HTTP`). type: string @@ -1074,12 +1050,10 @@ spec: description: To configure the host exposed by the ingress. type: string path: - default: / description: To configure the path exposed by the ingress (default `/`). type: string pathType: - default: Prefix description: To configure the path type exposed by the ingress. One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`). @@ -1093,7 +1067,6 @@ spec: description: The configuration of Istio trait properties: allow: - default: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 description: Configures a (comma-separated) list of CIDR subnets that should not be intercepted by the Istio proxy (`10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` by default). @@ -1139,7 +1112,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryEnabled: - default: false description: Listen for multicast requests (default `false`) type: boolean enabled: @@ -1153,7 +1125,6 @@ spec: is `true` (default `true` for OpenShift). type: boolean host: - default: '*' description: The Host address to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, the servers binds to every network interface (default `"*"`). @@ -1170,7 +1141,6 @@ spec: when the `user` option is set. type: string port: - default: 8778 description: The Jolokia endpoint port (default `8778`). type: integer protocol: @@ -1202,7 +1172,6 @@ spec: can be attached to the JVM, e.g., using port-forwarding type: boolean debugAddress: - default: '*:5005' description: Transport address at which to listen for the newly launched JVM (default `*:5005`) type: string @@ -1220,7 +1189,6 @@ spec: type: string type: array printCommand: - default: true description: Prints the command used the start the JVM in the container logs (default `true`) type: boolean @@ -1229,7 +1197,6 @@ spec: description: The configuration of Kamelets trait properties: auto: - default: true description: Automatically inject all referenced Kamelets and their default configuration (enabled by default) type: boolean @@ -1247,7 +1214,6 @@ spec: into the current integration type: string mountPoint: - default: /etc/camel/kamelets description: The directory where the application mounts and reads Kamelet spec (default `/etc/camel/kamelets`) type: string @@ -1326,7 +1292,6 @@ spec: in newer versions of Knative, filtering is disabled by default. type: boolean namespaceLabel: - default: true description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" label to the namespace As Knative requires this label to perform injection of K_SINK URL into the service. If this @@ -1439,7 +1404,6 @@ spec: description: Enable "pretty printing" of the JSON logs type: boolean level: - default: INFO description: Adjust the logging level (defaults to `INFO`) enum: - FATAL @@ -1483,7 +1447,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean hotReload: - default: false description: Enable "hot reload" when a secret/configmap mounted is edited (default `false`) type: boolean @@ -1593,7 +1556,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean global: - default: true description: Indicates if the platform should be created globally in the case of global operator (default true). type: boolean @@ -1624,7 +1586,6 @@ spec: traits share this common property. type: boolean podMonitor: - default: true description: Whether a `PodMonitor` resource is created (default `true`). type: boolean @@ -1667,8 +1628,6 @@ spec: description: The configuration of Quarkus trait 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` @@ -1689,7 +1648,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 @@ -1845,7 +1803,6 @@ spec: traits share this common property. type: boolean nodePort: - default: false description: 'Enable Service to be exposed as NodePort (default `false`). Deprecated: Use service type instead.' type: boolean @@ -2362,7 +2319,6 @@ spec: type: string type: array podAffinity: - default: false description: Always co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -2374,7 +2330,6 @@ spec: type: string type: array podAntiAffinity: - default: false description: Never co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -2401,7 +2356,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 @@ -2434,7 +2388,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: @@ -2459,7 +2412,6 @@ spec: instead with task name `builder`.' type: string strategy: - default: routine description: The strategy to use, either `pod` or `routine` (default `routine`) enum: @@ -2559,12 +2511,10 @@ spec: description: The maximum amount of memory required. type: string name: - default: integration description: The main container name. It's named `integration` by default. type: string port: - default: 8080 description: To configure a different port exposed by the container (default `8080`). type: integer @@ -2580,12 +2530,10 @@ spec: description: The minimum amount of memory required. type: string servicePort: - default: 80 description: To configure under which service port the container port is to be exposed (default `80`). type: integer servicePortName: - default: http description: To configure under which service port name the container port is to be exposed (default `http`). type: string @@ -2594,7 +2542,6 @@ spec: description: The configuration of Cron trait properties: activeDeadlineSeconds: - default: 60 description: Specifies the duration in seconds, relative to the start time, that the job may be continuously active before it is considered to be failed. It defaults to 60s. @@ -2610,7 +2557,6 @@ spec: be expressed as `0/1 * * * *`, while `35m` or `50s` cannot)." type: boolean backoffLimit: - default: 2 description: Specifies the number of retries before marking the job failed. It defaults to 2. format: int32 @@ -2696,7 +2642,6 @@ spec: - knative-service type: string useSSA: - default: true description: Use server-side apply to update the owned resources (default `true`). Note that it automatically falls back to client-side patching, if SSA is not available, e.g., @@ -2715,14 +2660,12 @@ spec: description: 'Deprecated: no longer in use.' type: boolean progressDeadlineSeconds: - default: 60 description: The maximum time in seconds for the deployment to make progress before it is considered to be failed. It defaults to `60s`. format: int32 type: integer rollingUpdateMaxSurge: - default: 25 description: 'The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). @@ -2731,7 +2674,6 @@ spec: `25%`.' type: integer rollingUpdateMaxUnavailable: - default: 25 description: 'The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number @@ -2755,7 +2697,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true containerMeta: - default: true description: Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`) type: boolean @@ -2763,7 +2704,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean httpProxy: - default: true description: Propagates the `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables (default `true`) type: boolean @@ -2801,7 +2741,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: - default: memory description: 'Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). Deprecated: to be removed from trait configuration.' @@ -2842,12 +2781,10 @@ spec: format: int32 type: integer livenessProbeEnabled: - default: false description: Configures the liveness probe for the integration container (default `false`). type: boolean livenessScheme: - default: HTTP description: Scheme to use when connecting to the liveness probe (default `HTTP`). type: string @@ -2876,12 +2813,10 @@ spec: format: int32 type: integer readinessProbeEnabled: - default: true description: Configures the readiness probe for the integration container (default `true`). type: boolean readinessScheme: - default: HTTP description: Scheme to use when connecting to the readiness probe (default `HTTP`). type: string @@ -2910,12 +2845,10 @@ spec: format: int32 type: integer startupProbeEnabled: - default: false description: Configures the startup probe for the integration container (default `false`). type: boolean startupScheme: - default: HTTP description: Scheme to use when connecting to the startup probe (default `HTTP`). type: string @@ -2957,12 +2890,10 @@ spec: description: To configure the host exposed by the ingress. type: string path: - default: / description: To configure the path exposed by the ingress (default `/`). type: string pathType: - default: Prefix description: To configure the path type exposed by the ingress. One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`). @@ -2976,7 +2907,6 @@ spec: description: The configuration of Istio trait properties: allow: - default: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 description: Configures a (comma-separated) list of CIDR subnets that should not be intercepted by the Istio proxy (`10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` by default). @@ -3022,7 +2952,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryEnabled: - default: false description: Listen for multicast requests (default `false`) type: boolean enabled: @@ -3036,7 +2965,6 @@ spec: is `true` (default `true` for OpenShift). type: boolean host: - default: '*' description: The Host address to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, the servers binds to every network interface (default `"*"`). @@ -3053,7 +2981,6 @@ spec: when the `user` option is set. type: string port: - default: 8778 description: The Jolokia endpoint port (default `8778`). type: integer protocol: @@ -3085,7 +3012,6 @@ spec: can be attached to the JVM, e.g., using port-forwarding type: boolean debugAddress: - default: '*:5005' description: Transport address at which to listen for the newly launched JVM (default `*:5005`) type: string @@ -3103,7 +3029,6 @@ spec: type: string type: array printCommand: - default: true description: Prints the command used the start the JVM in the container logs (default `true`) type: boolean @@ -3112,7 +3037,6 @@ spec: description: The configuration of Kamelets trait properties: auto: - default: true description: Automatically inject all referenced Kamelets and their default configuration (enabled by default) type: boolean @@ -3130,7 +3054,6 @@ spec: into the current integration type: string mountPoint: - default: /etc/camel/kamelets description: The directory where the application mounts and reads Kamelet spec (default `/etc/camel/kamelets`) type: string @@ -3209,7 +3132,6 @@ spec: in newer versions of Knative, filtering is disabled by default. type: boolean namespaceLabel: - default: true description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" label to the namespace As Knative requires this label to perform injection of K_SINK URL into the service. If this @@ -3322,7 +3244,6 @@ spec: description: Enable "pretty printing" of the JSON logs type: boolean level: - default: INFO description: Adjust the logging level (defaults to `INFO`) enum: - FATAL @@ -3366,7 +3287,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean hotReload: - default: false description: Enable "hot reload" when a secret/configmap mounted is edited (default `false`) type: boolean @@ -3476,7 +3396,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean global: - default: true description: Indicates if the platform should be created globally in the case of global operator (default true). type: boolean @@ -3507,7 +3426,6 @@ spec: traits share this common property. type: boolean podMonitor: - default: true description: Whether a `PodMonitor` resource is created (default `true`). type: boolean @@ -3550,8 +3468,6 @@ spec: description: The configuration of Quarkus trait 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` @@ -3572,7 +3488,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 @@ -3728,7 +3643,6 @@ spec: traits share this common property. type: boolean nodePort: - default: false description: 'Enable Service to be exposed as NodePort (default `false`). Deprecated: Use service type instead.' type: boolean diff --git a/config/crd/bases/camel.apache.org_integrations.yaml b/config/crd/bases/camel.apache.org_integrations.yaml index fd9263a059..feb1ba790a 100644 --- a/config/crd/bases/camel.apache.org_integrations.yaml +++ b/config/crd/bases/camel.apache.org_integrations.yaml @@ -6392,7 +6392,6 @@ spec: type: string type: array podAffinity: - default: false description: Always co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -6404,7 +6403,6 @@ spec: type: string type: array podAntiAffinity: - default: false description: Never co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -6431,7 +6429,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 @@ -6464,7 +6461,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: @@ -6489,7 +6485,6 @@ spec: instead with task name `builder`.' type: string strategy: - default: routine description: The strategy to use, either `pod` or `routine` (default `routine`) enum: @@ -6589,12 +6584,10 @@ spec: description: The maximum amount of memory required. type: string name: - default: integration description: The main container name. It's named `integration` by default. type: string port: - default: 8080 description: To configure a different port exposed by the container (default `8080`). type: integer @@ -6610,12 +6603,10 @@ spec: description: The minimum amount of memory required. type: string servicePort: - default: 80 description: To configure under which service port the container port is to be exposed (default `80`). type: integer servicePortName: - default: http description: To configure under which service port name the container port is to be exposed (default `http`). type: string @@ -6624,7 +6615,6 @@ spec: description: The configuration of Cron trait properties: activeDeadlineSeconds: - default: 60 description: Specifies the duration in seconds, relative to the start time, that the job may be continuously active before it is considered to be failed. It defaults to 60s. @@ -6640,7 +6630,6 @@ spec: be expressed as `0/1 * * * *`, while `35m` or `50s` cannot)." type: boolean backoffLimit: - default: 2 description: Specifies the number of retries before marking the job failed. It defaults to 2. format: int32 @@ -6726,7 +6715,6 @@ spec: - knative-service type: string useSSA: - default: true description: Use server-side apply to update the owned resources (default `true`). Note that it automatically falls back to client-side patching, if SSA is not available, e.g., @@ -6745,14 +6733,12 @@ spec: description: 'Deprecated: no longer in use.' type: boolean progressDeadlineSeconds: - default: 60 description: The maximum time in seconds for the deployment to make progress before it is considered to be failed. It defaults to `60s`. format: int32 type: integer rollingUpdateMaxSurge: - default: 25 description: 'The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). @@ -6761,7 +6747,6 @@ spec: `25%`.' type: integer rollingUpdateMaxUnavailable: - default: 25 description: 'The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number @@ -6785,7 +6770,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true containerMeta: - default: true description: Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`) type: boolean @@ -6793,7 +6777,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean httpProxy: - default: true description: Propagates the `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables (default `true`) type: boolean @@ -6831,7 +6814,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: - default: memory description: 'Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). Deprecated: to be removed from trait configuration.' @@ -6872,12 +6854,10 @@ spec: format: int32 type: integer livenessProbeEnabled: - default: false description: Configures the liveness probe for the integration container (default `false`). type: boolean livenessScheme: - default: HTTP description: Scheme to use when connecting to the liveness probe (default `HTTP`). type: string @@ -6906,12 +6886,10 @@ spec: format: int32 type: integer readinessProbeEnabled: - default: true description: Configures the readiness probe for the integration container (default `true`). type: boolean readinessScheme: - default: HTTP description: Scheme to use when connecting to the readiness probe (default `HTTP`). type: string @@ -6940,12 +6918,10 @@ spec: format: int32 type: integer startupProbeEnabled: - default: false description: Configures the startup probe for the integration container (default `false`). type: boolean startupScheme: - default: HTTP description: Scheme to use when connecting to the startup probe (default `HTTP`). type: string @@ -6987,12 +6963,10 @@ spec: description: To configure the host exposed by the ingress. type: string path: - default: / description: To configure the path exposed by the ingress (default `/`). type: string pathType: - default: Prefix description: To configure the path type exposed by the ingress. One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`). @@ -7006,7 +6980,6 @@ spec: description: The configuration of Istio trait properties: allow: - default: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 description: Configures a (comma-separated) list of CIDR subnets that should not be intercepted by the Istio proxy (`10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` by default). @@ -7052,7 +7025,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryEnabled: - default: false description: Listen for multicast requests (default `false`) type: boolean enabled: @@ -7066,7 +7038,6 @@ spec: is `true` (default `true` for OpenShift). type: boolean host: - default: '*' description: The Host address to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, the servers binds to every network interface (default `"*"`). @@ -7083,7 +7054,6 @@ spec: when the `user` option is set. type: string port: - default: 8778 description: The Jolokia endpoint port (default `8778`). type: integer protocol: @@ -7115,7 +7085,6 @@ spec: can be attached to the JVM, e.g., using port-forwarding type: boolean debugAddress: - default: '*:5005' description: Transport address at which to listen for the newly launched JVM (default `*:5005`) type: string @@ -7133,7 +7102,6 @@ spec: type: string type: array printCommand: - default: true description: Prints the command used the start the JVM in the container logs (default `true`) type: boolean @@ -7142,7 +7110,6 @@ spec: description: The configuration of Kamelets trait properties: auto: - default: true description: Automatically inject all referenced Kamelets and their default configuration (enabled by default) type: boolean @@ -7160,7 +7127,6 @@ spec: into the current integration type: string mountPoint: - default: /etc/camel/kamelets description: The directory where the application mounts and reads Kamelet spec (default `/etc/camel/kamelets`) type: string @@ -7239,7 +7205,6 @@ spec: in newer versions of Knative, filtering is disabled by default. type: boolean namespaceLabel: - default: true description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" label to the namespace As Knative requires this label to perform injection of K_SINK URL into the service. If this @@ -7352,7 +7317,6 @@ spec: description: Enable "pretty printing" of the JSON logs type: boolean level: - default: INFO description: Adjust the logging level (defaults to `INFO`) enum: - FATAL @@ -7396,7 +7360,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean hotReload: - default: false description: Enable "hot reload" when a secret/configmap mounted is edited (default `false`) type: boolean @@ -7506,7 +7469,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean global: - default: true description: Indicates if the platform should be created globally in the case of global operator (default true). type: boolean @@ -7537,7 +7499,6 @@ spec: traits share this common property. type: boolean podMonitor: - default: true description: Whether a `PodMonitor` resource is created (default `true`). type: boolean @@ -7580,8 +7541,6 @@ spec: description: The configuration of Quarkus trait 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` @@ -7602,7 +7561,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 @@ -7758,7 +7716,6 @@ spec: traits share this common property. type: boolean nodePort: - default: false description: 'Enable Service to be exposed as NodePort (default `false`). Deprecated: Use service type instead.' type: boolean diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml index 0739d217f2..7283c46eb8 100644 --- a/config/crd/bases/camel.apache.org_kameletbindings.yaml +++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml @@ -6673,7 +6673,6 @@ spec: type: string type: array podAffinity: - default: false description: Always co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -6685,7 +6684,6 @@ spec: type: string type: array podAntiAffinity: - default: false description: Never co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -6713,7 +6711,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 @@ -6748,7 +6745,6 @@ spec: node. type: object orderStrategy: - default: sequential description: The build order strategy to use, either `dependencies`, `fifo` or `sequential` (default `sequential`) enum: @@ -6773,7 +6769,6 @@ spec: TasksRequestCPU instead with task name `builder`.' type: string strategy: - default: routine description: The strategy to use, either `pod` or `routine` (default `routine`) enum: @@ -6873,12 +6868,10 @@ spec: description: The maximum amount of memory required. type: string name: - default: integration description: The main container name. It's named `integration` by default. type: string port: - default: 8080 description: To configure a different port exposed by the container (default `8080`). type: integer @@ -6894,12 +6887,10 @@ spec: description: The minimum amount of memory required. type: string servicePort: - default: 80 description: To configure under which service port the container port is to be exposed (default `80`). type: integer servicePortName: - default: http description: To configure under which service port name the container port is to be exposed (default `http`). type: string @@ -6908,7 +6899,6 @@ spec: description: The configuration of Cron trait properties: activeDeadlineSeconds: - default: 60 description: Specifies the duration in seconds, relative to the start time, that the job may be continuously active before it is considered to be failed. It defaults @@ -6926,7 +6916,6 @@ spec: `35m` or `50s` cannot)." type: boolean backoffLimit: - default: 2 description: Specifies the number of retries before marking the job failed. It defaults to 2. format: int32 @@ -7012,7 +7001,6 @@ spec: - knative-service type: string useSSA: - default: true description: Use server-side apply to update the owned resources (default `true`). Note that it automatically falls back to client-side patching, if SSA is not available, @@ -7031,14 +7019,12 @@ spec: description: 'Deprecated: no longer in use.' type: boolean progressDeadlineSeconds: - default: 60 description: The maximum time in seconds for the deployment to make progress before it is considered to be failed. It defaults to `60s`. format: int32 type: integer rollingUpdateMaxSurge: - default: 25 description: 'The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: @@ -7047,7 +7033,6 @@ spec: Defaults to `25%`.' type: integer rollingUpdateMaxUnavailable: - default: 25 description: 'The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute @@ -7071,7 +7056,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true containerMeta: - default: true description: Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`) type: boolean @@ -7079,7 +7063,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean httpProxy: - default: true description: Propagates the `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables (default `true`) type: boolean @@ -7117,7 +7100,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: - default: memory description: 'Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). Deprecated: to be removed from trait configuration.' @@ -7158,12 +7140,10 @@ spec: format: int32 type: integer livenessProbeEnabled: - default: false description: Configures the liveness probe for the integration container (default `false`). type: boolean livenessScheme: - default: HTTP description: Scheme to use when connecting to the liveness probe (default `HTTP`). type: string @@ -7192,12 +7172,10 @@ spec: format: int32 type: integer readinessProbeEnabled: - default: true description: Configures the readiness probe for the integration container (default `true`). type: boolean readinessScheme: - default: HTTP description: Scheme to use when connecting to the readiness probe (default `HTTP`). type: string @@ -7226,12 +7204,10 @@ spec: format: int32 type: integer startupProbeEnabled: - default: false description: Configures the startup probe for the integration container (default `false`). type: boolean startupScheme: - default: HTTP description: Scheme to use when connecting to the startup probe (default `HTTP`). type: string @@ -7273,12 +7249,10 @@ spec: description: To configure the host exposed by the ingress. type: string path: - default: / description: To configure the path exposed by the ingress (default `/`). type: string pathType: - default: Prefix description: To configure the path type exposed by the ingress. One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`). @@ -7292,7 +7266,6 @@ spec: description: The configuration of Istio trait properties: allow: - default: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 description: Configures a (comma-separated) list of CIDR subnets that should not be intercepted by the Istio proxy (`10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` by @@ -7339,7 +7312,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryEnabled: - default: false description: Listen for multicast requests (default `false`) type: boolean enabled: @@ -7353,7 +7325,6 @@ spec: is `true` (default `true` for OpenShift). type: boolean host: - default: '*' description: The Host address to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, the servers binds to every network interface (default `"*"`). @@ -7370,7 +7341,6 @@ spec: when the `user` option is set. type: string port: - default: 8778 description: The Jolokia endpoint port (default `8778`). type: integer protocol: @@ -7402,7 +7372,6 @@ spec: can be attached to the JVM, e.g., using port-forwarding type: boolean debugAddress: - default: '*:5005' description: Transport address at which to listen for the newly launched JVM (default `*:5005`) type: string @@ -7420,7 +7389,6 @@ spec: type: string type: array printCommand: - default: true description: Prints the command used the start the JVM in the container logs (default `true`) type: boolean @@ -7429,7 +7397,6 @@ spec: description: The configuration of Kamelets trait properties: auto: - default: true description: Automatically inject all referenced Kamelets and their default configuration (enabled by default) type: boolean @@ -7447,7 +7414,6 @@ spec: load into the current integration type: string mountPoint: - default: /etc/camel/kamelets description: The directory where the application mounts and reads Kamelet spec (default `/etc/camel/kamelets`) type: string @@ -7530,7 +7496,6 @@ spec: by default. type: boolean namespaceLabel: - default: true description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" label to the namespace As Knative requires this label to perform injection @@ -7648,7 +7613,6 @@ spec: description: Enable "pretty printing" of the JSON logs type: boolean level: - default: INFO description: Adjust the logging level (defaults to `INFO`) enum: - FATAL @@ -7692,7 +7656,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean hotReload: - default: false description: Enable "hot reload" when a secret/configmap mounted is edited (default `false`) type: boolean @@ -7802,7 +7765,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean global: - default: true description: Indicates if the platform should be created globally in the case of global operator (default true). type: boolean @@ -7833,7 +7795,6 @@ spec: All traits share this common property. type: boolean podMonitor: - default: true description: Whether a `PodMonitor` resource is created (default `true`). type: boolean @@ -7876,8 +7837,6 @@ spec: description: The configuration of Quarkus trait 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, @@ -7900,7 +7859,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 @@ -8065,7 +8023,6 @@ spec: All traits share this common property. type: boolean nodePort: - default: false description: 'Enable Service to be exposed as NodePort (default `false`). Deprecated: Use service type instead.' type: boolean diff --git a/config/crd/bases/camel.apache.org_pipes.yaml b/config/crd/bases/camel.apache.org_pipes.yaml index 8063ab9817..e3424c779a 100644 --- a/config/crd/bases/camel.apache.org_pipes.yaml +++ b/config/crd/bases/camel.apache.org_pipes.yaml @@ -6671,7 +6671,6 @@ spec: type: string type: array podAffinity: - default: false description: Always co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -6683,7 +6682,6 @@ spec: type: string type: array podAntiAffinity: - default: false description: Never co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -6711,7 +6709,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 @@ -6746,7 +6743,6 @@ spec: node. type: object orderStrategy: - default: sequential description: The build order strategy to use, either `dependencies`, `fifo` or `sequential` (default `sequential`) enum: @@ -6771,7 +6767,6 @@ spec: TasksRequestCPU instead with task name `builder`.' type: string strategy: - default: routine description: The strategy to use, either `pod` or `routine` (default `routine`) enum: @@ -6871,12 +6866,10 @@ spec: description: The maximum amount of memory required. type: string name: - default: integration description: The main container name. It's named `integration` by default. type: string port: - default: 8080 description: To configure a different port exposed by the container (default `8080`). type: integer @@ -6892,12 +6885,10 @@ spec: description: The minimum amount of memory required. type: string servicePort: - default: 80 description: To configure under which service port the container port is to be exposed (default `80`). type: integer servicePortName: - default: http description: To configure under which service port name the container port is to be exposed (default `http`). type: string @@ -6906,7 +6897,6 @@ spec: description: The configuration of Cron trait properties: activeDeadlineSeconds: - default: 60 description: Specifies the duration in seconds, relative to the start time, that the job may be continuously active before it is considered to be failed. It defaults @@ -6924,7 +6914,6 @@ spec: `35m` or `50s` cannot)." type: boolean backoffLimit: - default: 2 description: Specifies the number of retries before marking the job failed. It defaults to 2. format: int32 @@ -7010,7 +6999,6 @@ spec: - knative-service type: string useSSA: - default: true description: Use server-side apply to update the owned resources (default `true`). Note that it automatically falls back to client-side patching, if SSA is not available, @@ -7029,14 +7017,12 @@ spec: description: 'Deprecated: no longer in use.' type: boolean progressDeadlineSeconds: - default: 60 description: The maximum time in seconds for the deployment to make progress before it is considered to be failed. It defaults to `60s`. format: int32 type: integer rollingUpdateMaxSurge: - default: 25 description: 'The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: @@ -7045,7 +7031,6 @@ spec: Defaults to `25%`.' type: integer rollingUpdateMaxUnavailable: - default: 25 description: 'The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute @@ -7069,7 +7054,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true containerMeta: - default: true description: Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`) type: boolean @@ -7077,7 +7061,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean httpProxy: - default: true description: Propagates the `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables (default `true`) type: boolean @@ -7115,7 +7098,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: - default: memory description: 'Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). Deprecated: to be removed from trait configuration.' @@ -7156,12 +7138,10 @@ spec: format: int32 type: integer livenessProbeEnabled: - default: false description: Configures the liveness probe for the integration container (default `false`). type: boolean livenessScheme: - default: HTTP description: Scheme to use when connecting to the liveness probe (default `HTTP`). type: string @@ -7190,12 +7170,10 @@ spec: format: int32 type: integer readinessProbeEnabled: - default: true description: Configures the readiness probe for the integration container (default `true`). type: boolean readinessScheme: - default: HTTP description: Scheme to use when connecting to the readiness probe (default `HTTP`). type: string @@ -7224,12 +7202,10 @@ spec: format: int32 type: integer startupProbeEnabled: - default: false description: Configures the startup probe for the integration container (default `false`). type: boolean startupScheme: - default: HTTP description: Scheme to use when connecting to the startup probe (default `HTTP`). type: string @@ -7271,12 +7247,10 @@ spec: description: To configure the host exposed by the ingress. type: string path: - default: / description: To configure the path exposed by the ingress (default `/`). type: string pathType: - default: Prefix description: To configure the path type exposed by the ingress. One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`). @@ -7290,7 +7264,6 @@ spec: description: The configuration of Istio trait properties: allow: - default: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 description: Configures a (comma-separated) list of CIDR subnets that should not be intercepted by the Istio proxy (`10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` by @@ -7337,7 +7310,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryEnabled: - default: false description: Listen for multicast requests (default `false`) type: boolean enabled: @@ -7351,7 +7323,6 @@ spec: is `true` (default `true` for OpenShift). type: boolean host: - default: '*' description: The Host address to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, the servers binds to every network interface (default `"*"`). @@ -7368,7 +7339,6 @@ spec: when the `user` option is set. type: string port: - default: 8778 description: The Jolokia endpoint port (default `8778`). type: integer protocol: @@ -7400,7 +7370,6 @@ spec: can be attached to the JVM, e.g., using port-forwarding type: boolean debugAddress: - default: '*:5005' description: Transport address at which to listen for the newly launched JVM (default `*:5005`) type: string @@ -7418,7 +7387,6 @@ spec: type: string type: array printCommand: - default: true description: Prints the command used the start the JVM in the container logs (default `true`) type: boolean @@ -7427,7 +7395,6 @@ spec: description: The configuration of Kamelets trait properties: auto: - default: true description: Automatically inject all referenced Kamelets and their default configuration (enabled by default) type: boolean @@ -7445,7 +7412,6 @@ spec: load into the current integration type: string mountPoint: - default: /etc/camel/kamelets description: The directory where the application mounts and reads Kamelet spec (default `/etc/camel/kamelets`) type: string @@ -7528,7 +7494,6 @@ spec: by default. type: boolean namespaceLabel: - default: true description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" label to the namespace As Knative requires this label to perform injection @@ -7646,7 +7611,6 @@ spec: description: Enable "pretty printing" of the JSON logs type: boolean level: - default: INFO description: Adjust the logging level (defaults to `INFO`) enum: - FATAL @@ -7690,7 +7654,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean hotReload: - default: false description: Enable "hot reload" when a secret/configmap mounted is edited (default `false`) type: boolean @@ -7800,7 +7763,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean global: - default: true description: Indicates if the platform should be created globally in the case of global operator (default true). type: boolean @@ -7831,7 +7793,6 @@ spec: All traits share this common property. type: boolean podMonitor: - default: true description: Whether a `PodMonitor` resource is created (default `true`). type: boolean @@ -7874,8 +7835,6 @@ spec: description: The configuration of Quarkus trait 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, @@ -7898,7 +7857,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 @@ -8063,7 +8021,6 @@ spec: All traits share this common property. type: boolean nodePort: - default: false description: 'Enable Service to be exposed as NodePort (default `false`). Deprecated: Use service type instead.' type: boolean diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go index 3ea3ba8f06..ab7094b13c 100644 --- a/e2e/common/config/config_test.go +++ b/e2e/common/config/config_test.go @@ -28,6 +28,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -120,6 +121,15 @@ func TestRunConfigExamples(t *testing.T) { Eventually(IntegrationPodPhase(ns, "property-secret-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning)) Eventually(IntegrationConditionStatus(ns, "property-secret-route", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) Eventually(IntegrationLogs(ns, "property-secret-route"), TestTimeoutShort).Should(ContainSubstring("my-secret-external-value")) + + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, "property-secret-route")).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, "property-secret-route")() + mountTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "mount") + Expect(mountTrait).ToNot(BeNil()) + Expect(len(mountTrait)).To(Equal(1)) + Expect(mountTrait["configs"]).ToNot(BeNil()) + Expect(Kamel("delete", "property-secret-route", "-n", ns).Execute()).To(Succeed()) }) diff --git a/e2e/common/misc/kamelet_test.go b/e2e/common/misc/kamelet_test.go index 6de1b1999c..66c8c38391 100644 --- a/e2e/common/misc/kamelet_test.go +++ b/e2e/common/misc/kamelet_test.go @@ -27,6 +27,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" ) @@ -119,6 +120,14 @@ spec: "-d", "camel:timer").Execute()).To(Succeed()) Eventually(IntegrationPodPhase(ns, "timer-kamelet-integration"), TestTimeoutLong).Should(Equal(corev1.PodRunning)) Eventually(IntegrationLogs(ns, "timer-kamelet-integration")).Should(ContainSubstring("important message")) + + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, "timer-kamelet-integration")).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, "timer-kamelet-integration")() + kameletsTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "kamelets") + Expect(kameletsTrait).ToNot(BeNil()) + Expect(len(kameletsTrait)).To(Equal(1)) + Expect(kameletsTrait["enabled"]).To(Equal(false)) }) Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) diff --git a/e2e/common/traits/affinity_test.go b/e2e/common/traits/affinity_test.go index 19fa2ccc27..7ce8a20eba 100644 --- a/e2e/common/traits/affinity_test.go +++ b/e2e/common/traits/affinity_test.go @@ -30,6 +30,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -48,21 +49,31 @@ func TestAffinityTrait(t *testing.T) { if hostname != "" { t.Run("Run Java with node affinity", func(t *testing.T) { + name1 := RandomizedSuffixName("java1") Expect(KamelRunWithID(operatorID, ns, "files/Java.java", - "--name", "java1", + "--name", name1, "-t", "affinity.enabled=true", "-t", fmt.Sprintf("affinity.node-affinity-labels=kubernetes.io/hostname in(%s)", hostname)).Execute()).To(Succeed()) - Eventually(IntegrationPodPhase(ns, "java1"), TestTimeoutLong).Should(Equal(corev1.PodRunning)) - Eventually(IntegrationConditionStatus(ns, "java1", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) - Eventually(IntegrationLogs(ns, "java1"), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) + Eventually(IntegrationPodPhase(ns, name1), TestTimeoutLong).Should(Equal(corev1.PodRunning)) + Eventually(IntegrationConditionStatus(ns, name1, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) + Eventually(IntegrationLogs(ns, name1), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - pod := IntegrationPod(ns, "java1")() + pod := IntegrationPod(ns, name1)() Expect(pod.Spec.Affinity).NotTo(BeNil()) Expect(pod.Spec.Affinity.NodeAffinity).To(Equal(&corev1.NodeAffinity{ RequiredDuringSchedulingIgnoredDuringExecution: nodeSelector("kubernetes.io/hostname", corev1.NodeSelectorOpIn, hostname), })) Expect(pod.Spec.NodeName).To(Equal(hostname)) + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, name1)).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, name1)() + affinityTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "affinity") + Expect(affinityTrait).NotTo(BeNil()) + Expect(len(affinityTrait)).To(Equal(2)) + Expect(affinityTrait["enabled"]).To(Equal(true)) + Expect(affinityTrait["nodeAffinityLabels"]).NotTo(BeNil()) + Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) }) } diff --git a/e2e/common/traits/builder_test.go b/e2e/common/traits/builder_test.go index a994c4ccd4..5a1df5d308 100644 --- a/e2e/common/traits/builder_test.go +++ b/e2e/common/traits/builder_test.go @@ -30,6 +30,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -66,7 +67,7 @@ func TestBuilderTrait(t *testing.T) { }) t.Run("Run build order strategy dependencies", func(t *testing.T) { - name := RandomizedSuffixName("java-fifo-strategy") + name := RandomizedSuffixName("java-dependencies-strategy") Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name, "-t", "builder.order-strategy=dependencies").Execute()).To(Succeed()) @@ -88,6 +89,14 @@ func TestBuilderTrait(t *testing.T) { Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil()) + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, name)() + builderTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "builder") + Expect(builderTrait).NotTo(BeNil()) + Expect(len(builderTrait)).To(Equal(1)) + Expect(builderTrait["orderStrategy"]).To(Equal("dependencies")) + // We need to remove the kit as well Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed()) }) diff --git a/e2e/common/traits/container_test.go b/e2e/common/traits/container_test.go index b379b79132..6bd6ba4ec6 100644 --- a/e2e/common/traits/container_test.go +++ b/e2e/common/traits/container_test.go @@ -28,6 +28,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -93,6 +94,14 @@ func TestContainerTrait(t *testing.T) { return podContainerName == containerName }), TestTimeoutShort).Should(BeTrue()) + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, name)() + containerTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "container") + Expect(containerTrait).ToNot(BeNil()) + Expect(len(containerTrait)).To(Equal(1)) + Expect(containerTrait["name"]).To(Equal(containerName)) + }) // Clean-up diff --git a/e2e/common/traits/deployment_test.go b/e2e/common/traits/deployment_test.go index 7b9f2e5b46..08a589e5ed 100644 --- a/e2e/common/traits/deployment_test.go +++ b/e2e/common/traits/deployment_test.go @@ -26,6 +26,7 @@ import ( "testing" appsv1 "k8s.io/api/apps/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" @@ -40,15 +41,17 @@ func TestRecreateDeploymentStrategyTrait(t *testing.T) { RegisterTestingT(t) t.Run("Run with Recreate Deployment Strategy", func(t *testing.T) { + name := RandomizedSuffixName("java") Expect(KamelRunWithID(operatorID, ns, "files/Java.java", + "--name", name, "-t", "deployment.strategy="+string(appsv1.RecreateDeploymentStrategyType)). Execute()).To(Succeed()) - Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning)) - Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) - Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) + Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning)) + Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) + Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - Eventually(Deployment(ns, "java"), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras, + Eventually(Deployment(ns, name), TestTimeoutMedium).Should(PointTo(MatchFields(IgnoreExtras, Fields{ "Spec": MatchFields(IgnoreExtras, Fields{ @@ -60,6 +63,14 @@ func TestRecreateDeploymentStrategyTrait(t *testing.T) { }), )) + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, name)() + deploymentTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "deployment") + Expect(deploymentTrait).ToNot(BeNil()) + Expect(len(deploymentTrait)).To(Equal(1)) + Expect(deploymentTrait["strategy"]).To(Equal(string(appsv1.RecreateDeploymentStrategyType))) + }) Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go index 0d4656b4d5..6cbdefb360 100644 --- a/e2e/common/traits/health_test.go +++ b/e2e/common/traits/health_test.go @@ -36,6 +36,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -72,6 +73,14 @@ func TestHealthTrait(t *testing.T) { // Finally check the readiness condition becomes truthy back Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue)) + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, name)() + healthTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "health") + Expect(healthTrait).ToNot(BeNil()) + Expect(len(healthTrait)).To(Equal(1)) + Expect(healthTrait["enabled"]).To(Equal(true)) + pods := IntegrationPods(ns, name)() for i, pod := range pods { diff --git a/e2e/common/traits/istio_test.go b/e2e/common/traits/istio_test.go index c2fcc07b33..5d507c8235 100644 --- a/e2e/common/traits/istio_test.go +++ b/e2e/common/traits/istio_test.go @@ -28,6 +28,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -51,6 +52,14 @@ func TestIstioTrait(t *testing.T) { Expect(annotations["sidecar.istio.io/inject"]).To(Equal("true")) Expect(annotations["traffic.sidecar.istio.io/includeOutboundIPRanges"]).To(Equal("10.0.0.0/8,172.16.0.0/12,192.168.0.0/16")) + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, name)() + istioTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "istio") + Expect(istioTrait).ToNot(BeNil()) + Expect(len(istioTrait)).To(Equal(1)) + Expect(istioTrait["enabled"]).To(Equal(true)) + }) Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) diff --git a/e2e/common/traits/jolokia_test.go b/e2e/common/traits/jolokia_test.go index 6145ffc3f9..c06e8d53a3 100644 --- a/e2e/common/traits/jolokia_test.go +++ b/e2e/common/traits/jolokia_test.go @@ -29,6 +29,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -38,21 +39,34 @@ func TestJolokiaTrait(t *testing.T) { RegisterTestingT(t) t.Run("Run Java with Jolokia", func(t *testing.T) { + name := RandomizedSuffixName("java") Expect(KamelRunWithID(operatorID, ns, "files/Java.java", + "--name", name, "-t", "jolokia.enabled=true", "-t", "jolokia.use-ssl-client-authentication=false", "-t", "jolokia.protocol=http", "-t", "jolokia.extended-client-check=false").Execute()).To(Succeed()) - Eventually(IntegrationPodPhase(ns, "java"), TestTimeoutLong).Should(Equal(corev1.PodRunning)) - Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) - Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) + Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning)) + Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) + Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - pod := IntegrationPod(ns, "java") + pod := IntegrationPod(ns, name) response, err := TestClient().CoreV1().RESTClient().Get(). AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/proxy/jolokia/", ns, pod().Name)).DoRaw(TestContext) Expect(err).To(BeNil()) Expect(response).To(ContainSubstring(`"status":200`)) + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, name)() + jolokiaTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "jolokia") + Expect(jolokiaTrait).ToNot(BeNil()) + Expect(len(jolokiaTrait)).To(Equal(4)) + Expect(jolokiaTrait["enabled"]).To(Equal(true)) + Expect(jolokiaTrait["useSSLClientAuthentication"]).To(Equal(false)) + Expect(jolokiaTrait["protocol"]).To(Equal("http")) + Expect(jolokiaTrait["extendedClientCheck"]).To(Equal(false)) + }) Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) diff --git a/e2e/common/traits/jvm_test.go b/e2e/common/traits/jvm_test.go index 3d8bde71c3..395a51705c 100644 --- a/e2e/common/traits/jvm_test.go +++ b/e2e/common/traits/jvm_test.go @@ -30,6 +30,7 @@ import ( "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -55,6 +56,15 @@ func TestJVMTrait(t *testing.T) { Eventually(IntegrationPodPhase(ns, "classpath"), TestTimeoutLong).Should(Equal(corev1.PodRunning)) Eventually(IntegrationConditionStatus(ns, "classpath", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) Eventually(IntegrationLogs(ns, "classpath"), TestTimeoutShort).Should(ContainSubstring("Hello World!")) + + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, "classpath")).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, "classpath")() + jvmTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "jvm") + Expect(jvmTrait).ToNot(BeNil()) + Expect(len(jvmTrait)).To(Equal(1)) + Expect(jvmTrait["classpath"]).To(Equal("/etc/camel/resources/my-deps/sample-1.0.jar")) + Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) }) } diff --git a/e2e/common/traits/master_test.go b/e2e/common/traits/master_test.go index fd53aa0148..111760b022 100644 --- a/e2e/common/traits/master_test.go +++ b/e2e/common/traits/master_test.go @@ -29,6 +29,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" ) @@ -44,25 +45,36 @@ func TestMasterTrait(t *testing.T) { }) t.Run("only one integration with master runs", func(t *testing.T) { + nameFirst := RandomizedSuffixName("first") Expect(KamelRunWithID(operatorID, ns, "files/Master.java", - "--name", "first", + "--name", nameFirst, "--label", "leader-group=same", "-t", "master.label-key=leader-group", "-t", "master.label-value=same", "-t", "owner.target-labels=leader-group").Execute()).To(Succeed()) - Eventually(IntegrationPodPhase(ns, "first"), TestTimeoutLong).Should(Equal(corev1.PodRunning)) - Eventually(IntegrationLogs(ns, "first"), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) + Eventually(IntegrationPodPhase(ns, nameFirst), TestTimeoutLong).Should(Equal(corev1.PodRunning)) + Eventually(IntegrationLogs(ns, nameFirst), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) // Start a second integration with the same lock (it should not start the route) + nameSecond := RandomizedSuffixName("second") Expect(KamelRunWithID(operatorID, ns, "files/Master.java", - "--name", "second", + "--name", nameSecond, "--label", "leader-group=same", "-t", "master.label-key=leader-group", "-t", "master.label-value=same", "-t", "master.resource-name=first-lock", "-t", "owner.target-labels=leader-group").Execute()).To(Succeed()) - Eventually(IntegrationPodPhase(ns, "second"), TestTimeoutLong).Should(Equal(corev1.PodRunning)) - Eventually(IntegrationLogs(ns, "second"), TestTimeoutShort).Should(ContainSubstring("started in")) - Eventually(IntegrationLogs(ns, "second"), 30*time.Second).ShouldNot(ContainSubstring("Magicstring!")) + Eventually(IntegrationPodPhase(ns, nameSecond), TestTimeoutLong).Should(Equal(corev1.PodRunning)) + Eventually(IntegrationLogs(ns, nameSecond), TestTimeoutShort).Should(ContainSubstring("started in")) + Eventually(IntegrationLogs(ns, nameSecond), 30*time.Second).ShouldNot(ContainSubstring("Magicstring!")) + + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, nameFirst)).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, nameFirst)() + builderTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "addons", "master") + Expect(builderTrait).ToNot(BeNil()) + Expect(len(builderTrait)).To(Equal(2)) + Expect(builderTrait["labelKey"]).To(Equal("leader-group")) + Expect(builderTrait["labelValue"]).To(Equal("same")) }) Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) diff --git a/e2e/common/traits/pdb_test.go b/e2e/common/traits/pdb_test.go index cc3b038c8e..7c43e1ff75 100644 --- a/e2e/common/traits/pdb_test.go +++ b/e2e/common/traits/pdb_test.go @@ -33,6 +33,7 @@ import ( policyv1 "k8s.io/api/policy/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/util/intstr" ctrl "sigs.k8s.io/controller-runtime/pkg/client" @@ -55,6 +56,15 @@ func TestPodDisruptionBudgetTrait(t *testing.T) { Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, name)() + pdbTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "pdb") + Expect(pdbTrait).ToNot(BeNil()) + Expect(len(pdbTrait)).To(Equal(2)) + Expect(pdbTrait["enabled"]).To(Equal(true)) + Expect(pdbTrait["minAvailable"]).To(Equal("2")) + // Check PodDisruptionBudget Eventually(podDisruptionBudget(ns, name), TestTimeoutShort).ShouldNot(BeNil()) pdb := podDisruptionBudget(ns, name)() diff --git a/e2e/common/traits/prometheus_test.go b/e2e/common/traits/prometheus_test.go index 7a63772c7e..1a40ddab74 100644 --- a/e2e/common/traits/prometheus_test.go +++ b/e2e/common/traits/prometheus_test.go @@ -31,6 +31,7 @@ import ( corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ctrl "sigs.k8s.io/controller-runtime/pkg/client" @@ -55,6 +56,14 @@ func TestPrometheusTrait(t *testing.T) { Eventually(IntegrationConditionStatus(ns, "java", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) Eventually(IntegrationLogs(ns, "java"), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, "java")).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, "java")() + prometheusTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "prometheus") + Expect(prometheusTrait).ToNot(BeNil()) + Expect(len(prometheusTrait)).To(Equal(2)) + Expect(prometheusTrait["enabled"]).To(Equal(true)) + Expect(prometheusTrait["podMonitor"]).ToNot(BeNil()) t.Run("Metrics endpoint works", func(t *testing.T) { pod := IntegrationPod(ns, "java") response, err := TestClient().CoreV1().RESTClient().Get(). diff --git a/e2e/common/traits/pull_secret_test.go b/e2e/common/traits/pull_secret_test.go index eab6d7c83d..ade72f1447 100644 --- a/e2e/common/traits/pull_secret_test.go +++ b/e2e/common/traits/pull_secret_test.go @@ -28,6 +28,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -61,6 +62,14 @@ func TestPullSecretTrait(t *testing.T) { Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, name)() + pullSecretTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "pull-secret") + Expect(pullSecretTrait).ToNot(BeNil()) + Expect(len(pullSecretTrait)).To(Equal(1)) + Expect(pullSecretTrait["enabled"]).To(Equal(false)) + pod := IntegrationPod(ns, name)() if ocp { // OpenShift `default` service account has imagePullSecrets so it's always set diff --git a/e2e/common/traits/route_test.go b/e2e/common/traits/route_test.go index ee90e16ac1..a06b03bbbe 100644 --- a/e2e/common/traits/route_test.go +++ b/e2e/common/traits/route_test.go @@ -41,6 +41,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" "github.com/apache/camel-k/v2/pkg/util" @@ -211,6 +212,15 @@ func TestRunRoutes(t *testing.T) { time.Sleep(waitBeforeHttpRequest) var annotations = route.ObjectMeta.Annotations Expect(annotations["haproxy.router.openshift.io/balance"]).To(Equal("roundrobin")) + + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, integrationName)).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, integrationName)() + routeTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "route") + Expect(routeTrait).ToNot(BeNil()) + Expect(len(routeTrait)).To(Equal(1)) + Expect(routeTrait["enabled"]).To(Equal(true)) + Expect(Kamel("delete", "--all", "-n", ns).Execute()).Should(BeNil()) }) Expect(TestClient().Delete(TestContext, &secret)).To(Succeed()) diff --git a/e2e/common/traits/service_test.go b/e2e/common/traits/service_test.go index 401eeb842f..8b5e5f168c 100644 --- a/e2e/common/traits/service_test.go +++ b/e2e/common/traits/service_test.go @@ -28,6 +28,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" ) @@ -91,6 +92,15 @@ func TestServiceTrait(t *testing.T) { // Eventually(ServicesByType(ns, corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty()) + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, "platform-http-server")).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, "platform-http-server")() + serviceTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "service") + Expect(serviceTrait).ToNot(BeNil()) + Expect(len(serviceTrait)).To(Equal(2)) + Expect(serviceTrait["enabled"]).To(Equal(true)) + Expect(serviceTrait["type"]).To(Equal("ClusterIP")) + Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) }) diff --git a/e2e/commonwithcustominstall/environment_test.go b/e2e/commonwithcustominstall/environment_test.go index 469ecbc367..3b8f13c5d7 100644 --- a/e2e/commonwithcustominstall/environment_test.go +++ b/e2e/commonwithcustominstall/environment_test.go @@ -31,6 +31,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -151,6 +152,14 @@ func TestEnvironmentTrait(t *testing.T) { Not(ContainElement(corev1.EnvVar{Name: "HTTP_PROXY", Value: httpProxy})), Not(ContainElement(corev1.EnvVar{Name: "NO_PROXY", Value: strings.Join(noProxy, ",")})), ))) + + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, name)() + envTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "environment") + Expect(envTrait).ToNot(BeNil()) + Expect(len(envTrait)).To(Equal(1)) + Expect(envTrait["httpProxy"]).To(Equal(false)) }) Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) diff --git a/e2e/native/native_test.go b/e2e/native/native_test.go index 88b5916df9..b4d0cc8b67 100644 --- a/e2e/native/native_test.go +++ b/e2e/native/native_test.go @@ -28,6 +28,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -53,7 +54,15 @@ func TestNativeIntegrations(t *testing.T) { Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionKitAvailable)). Should(Equal(corev1.ConditionFalse)) - // Clean up + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, name)).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, name)() + quarkusTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "quarkus") + Expect(quarkusTrait).ToNot(BeNil()) + Expect(len(quarkusTrait)).To(Equal(1)) + Expect(quarkusTrait["buildMode"]).ToNot(BeNil()) + + // Clean up Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed()) }) diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go index 4b67c6dc65..434d5ecd8d 100644 --- a/e2e/support/test_support.go +++ b/e2e/support/test_support.go @@ -54,6 +54,7 @@ import ( rbacv1 "k8s.io/api/rbac/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" @@ -1012,6 +1013,28 @@ func Integration(ns string, name string) func() *v1.Integration { } } +func UnstructuredIntegration(ns string, name string) func() *unstructured.Unstructured { + return func() *unstructured.Unstructured { + gvk := schema.GroupVersionKind{Group: v1.SchemeGroupVersion.Group, Version: v1.SchemeGroupVersion.Version, Kind: v1.IntegrationKind} + return UnstructuredObject(ns, name, gvk)() + } +} + +func UnstructuredObject(ns string, name string, gvk schema.GroupVersionKind) func() *unstructured.Unstructured { + return func() *unstructured.Unstructured { + object := &unstructured.Unstructured{} + object.SetNamespace(ns) + object.SetName(name) + object.SetGroupVersionKind(gvk) + if err := TestClient().Get(TestContext, ctrl.ObjectKeyFromObject(object), object); err != nil && !k8serrors.IsNotFound(err) { + failTest(err) + } else if err != nil && k8serrors.IsNotFound(err) { + return nil + } + return object + } +} + func IntegrationVersion(ns string, name string) func() string { return func() string { it := Integration(ns, name)() diff --git a/e2e/support/test_util.go b/e2e/support/test_util.go index 88842a85da..61fbc3f2f6 100644 --- a/e2e/support/test_util.go +++ b/e2e/support/test_util.go @@ -76,9 +76,7 @@ func ExpectExecSucceed(t *testing.T, command *exec.Cmd) { assert.NotContains(t, strings.ToUpper(cmdErr.String()), "ERROR") } -// // Expect a command error with an exit code of 1 -// func ExpectExecError(t *testing.T, command *exec.Cmd) { t.Helper() diff --git a/e2e/telemetry/telemetry_test.go b/e2e/telemetry/telemetry_test.go index 0d772e7bc1..b327300923 100644 --- a/e2e/telemetry/telemetry_test.go +++ b/e2e/telemetry/telemetry_test.go @@ -29,6 +29,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" . "github.com/apache/camel-k/v2/e2e/support" ) @@ -67,6 +68,15 @@ func TestTelemetryTrait(t *testing.T) { Eventually(TailedLogs(pod.Namespace, pod.Name, 100), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("http.target: Str(/customers/%s)", name))) Eventually(TailedLogs(pod.Namespace, pod.Name, 100), TestTimeoutLong).Should(ContainSubstring(fmt.Sprintf("http.url: Str(http://rest-consumer/customers/%s)", name))) + // check integration schema does not contains unwanted default trait value. + Eventually(UnstructuredIntegration(ns, "rest-consumer")).ShouldNot(BeNil()) + unstructuredIntegration := UnstructuredIntegration(ns, "rest-consumer")() + builderTrait, _, _ := unstructured.NestedMap(unstructuredIntegration.Object, "spec", "traits", "addons", "telemetry") + Expect(builderTrait).NotTo(BeNil()) + Expect(len(builderTrait)).To(Equal(2)) + Expect(builderTrait["enabled"]).To(Equal(true)) + Expect(builderTrait["endpoint"]).To(Equal("http://opentelemetrycollector.otlp.svc.cluster.local:4317")) + // Clean up Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) }) diff --git a/helm/camel-k/crds/crd-integration-kit.yaml b/helm/camel-k/crds/crd-integration-kit.yaml index e3dece12f4..74625c9354 100644 --- a/helm/camel-k/crds/crd-integration-kit.yaml +++ b/helm/camel-k/crds/crd-integration-kit.yaml @@ -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 @@ -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: @@ -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: @@ -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` @@ -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 diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml index f548fe157f..70fa8722e4 100644 --- a/helm/camel-k/crds/crd-integration-platform.yaml +++ b/helm/camel-k/crds/crd-integration-platform.yaml @@ -479,7 +479,6 @@ spec: type: string type: array podAffinity: - default: false description: Always co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -491,7 +490,6 @@ spec: type: string type: array podAntiAffinity: - default: false description: Never co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -518,7 +516,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 @@ -551,7 +548,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: @@ -576,7 +572,6 @@ spec: instead with task name `builder`.' type: string strategy: - default: routine description: The strategy to use, either `pod` or `routine` (default `routine`) enum: @@ -676,12 +671,10 @@ spec: description: The maximum amount of memory required. type: string name: - default: integration description: The main container name. It's named `integration` by default. type: string port: - default: 8080 description: To configure a different port exposed by the container (default `8080`). type: integer @@ -697,12 +690,10 @@ spec: description: The minimum amount of memory required. type: string servicePort: - default: 80 description: To configure under which service port the container port is to be exposed (default `80`). type: integer servicePortName: - default: http description: To configure under which service port name the container port is to be exposed (default `http`). type: string @@ -711,7 +702,6 @@ spec: description: The configuration of Cron trait properties: activeDeadlineSeconds: - default: 60 description: Specifies the duration in seconds, relative to the start time, that the job may be continuously active before it is considered to be failed. It defaults to 60s. @@ -727,7 +717,6 @@ spec: be expressed as `0/1 * * * *`, while `35m` or `50s` cannot)." type: boolean backoffLimit: - default: 2 description: Specifies the number of retries before marking the job failed. It defaults to 2. format: int32 @@ -813,7 +802,6 @@ spec: - knative-service type: string useSSA: - default: true description: Use server-side apply to update the owned resources (default `true`). Note that it automatically falls back to client-side patching, if SSA is not available, e.g., @@ -832,14 +820,12 @@ spec: description: 'Deprecated: no longer in use.' type: boolean progressDeadlineSeconds: - default: 60 description: The maximum time in seconds for the deployment to make progress before it is considered to be failed. It defaults to `60s`. format: int32 type: integer rollingUpdateMaxSurge: - default: 25 description: 'The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). @@ -848,7 +834,6 @@ spec: `25%`.' type: integer rollingUpdateMaxUnavailable: - default: 25 description: 'The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number @@ -872,7 +857,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true containerMeta: - default: true description: Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`) type: boolean @@ -880,7 +864,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean httpProxy: - default: true description: Propagates the `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables (default `true`) type: boolean @@ -918,7 +901,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: - default: memory description: 'Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). Deprecated: to be removed from trait configuration.' @@ -959,12 +941,10 @@ spec: format: int32 type: integer livenessProbeEnabled: - default: false description: Configures the liveness probe for the integration container (default `false`). type: boolean livenessScheme: - default: HTTP description: Scheme to use when connecting to the liveness probe (default `HTTP`). type: string @@ -993,12 +973,10 @@ spec: format: int32 type: integer readinessProbeEnabled: - default: true description: Configures the readiness probe for the integration container (default `true`). type: boolean readinessScheme: - default: HTTP description: Scheme to use when connecting to the readiness probe (default `HTTP`). type: string @@ -1027,12 +1005,10 @@ spec: format: int32 type: integer startupProbeEnabled: - default: false description: Configures the startup probe for the integration container (default `false`). type: boolean startupScheme: - default: HTTP description: Scheme to use when connecting to the startup probe (default `HTTP`). type: string @@ -1074,12 +1050,10 @@ spec: description: To configure the host exposed by the ingress. type: string path: - default: / description: To configure the path exposed by the ingress (default `/`). type: string pathType: - default: Prefix description: To configure the path type exposed by the ingress. One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`). @@ -1093,7 +1067,6 @@ spec: description: The configuration of Istio trait properties: allow: - default: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 description: Configures a (comma-separated) list of CIDR subnets that should not be intercepted by the Istio proxy (`10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` by default). @@ -1139,7 +1112,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryEnabled: - default: false description: Listen for multicast requests (default `false`) type: boolean enabled: @@ -1153,7 +1125,6 @@ spec: is `true` (default `true` for OpenShift). type: boolean host: - default: '*' description: The Host address to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, the servers binds to every network interface (default `"*"`). @@ -1170,7 +1141,6 @@ spec: when the `user` option is set. type: string port: - default: 8778 description: The Jolokia endpoint port (default `8778`). type: integer protocol: @@ -1202,7 +1172,6 @@ spec: can be attached to the JVM, e.g., using port-forwarding type: boolean debugAddress: - default: '*:5005' description: Transport address at which to listen for the newly launched JVM (default `*:5005`) type: string @@ -1220,7 +1189,6 @@ spec: type: string type: array printCommand: - default: true description: Prints the command used the start the JVM in the container logs (default `true`) type: boolean @@ -1229,7 +1197,6 @@ spec: description: The configuration of Kamelets trait properties: auto: - default: true description: Automatically inject all referenced Kamelets and their default configuration (enabled by default) type: boolean @@ -1247,7 +1214,6 @@ spec: into the current integration type: string mountPoint: - default: /etc/camel/kamelets description: The directory where the application mounts and reads Kamelet spec (default `/etc/camel/kamelets`) type: string @@ -1326,7 +1292,6 @@ spec: in newer versions of Knative, filtering is disabled by default. type: boolean namespaceLabel: - default: true description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" label to the namespace As Knative requires this label to perform injection of K_SINK URL into the service. If this @@ -1439,7 +1404,6 @@ spec: description: Enable "pretty printing" of the JSON logs type: boolean level: - default: INFO description: Adjust the logging level (defaults to `INFO`) enum: - FATAL @@ -1483,7 +1447,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean hotReload: - default: false description: Enable "hot reload" when a secret/configmap mounted is edited (default `false`) type: boolean @@ -1593,7 +1556,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean global: - default: true description: Indicates if the platform should be created globally in the case of global operator (default true). type: boolean @@ -1624,7 +1586,6 @@ spec: traits share this common property. type: boolean podMonitor: - default: true description: Whether a `PodMonitor` resource is created (default `true`). type: boolean @@ -1667,8 +1628,6 @@ spec: description: The configuration of Quarkus trait 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` @@ -1689,7 +1648,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 @@ -1845,7 +1803,6 @@ spec: traits share this common property. type: boolean nodePort: - default: false description: 'Enable Service to be exposed as NodePort (default `false`). Deprecated: Use service type instead.' type: boolean @@ -2362,7 +2319,6 @@ spec: type: string type: array podAffinity: - default: false description: Always co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -2374,7 +2330,6 @@ spec: type: string type: array podAntiAffinity: - default: false description: Never co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -2401,7 +2356,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 @@ -2434,7 +2388,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: @@ -2459,7 +2412,6 @@ spec: instead with task name `builder`.' type: string strategy: - default: routine description: The strategy to use, either `pod` or `routine` (default `routine`) enum: @@ -2559,12 +2511,10 @@ spec: description: The maximum amount of memory required. type: string name: - default: integration description: The main container name. It's named `integration` by default. type: string port: - default: 8080 description: To configure a different port exposed by the container (default `8080`). type: integer @@ -2580,12 +2530,10 @@ spec: description: The minimum amount of memory required. type: string servicePort: - default: 80 description: To configure under which service port the container port is to be exposed (default `80`). type: integer servicePortName: - default: http description: To configure under which service port name the container port is to be exposed (default `http`). type: string @@ -2594,7 +2542,6 @@ spec: description: The configuration of Cron trait properties: activeDeadlineSeconds: - default: 60 description: Specifies the duration in seconds, relative to the start time, that the job may be continuously active before it is considered to be failed. It defaults to 60s. @@ -2610,7 +2557,6 @@ spec: be expressed as `0/1 * * * *`, while `35m` or `50s` cannot)." type: boolean backoffLimit: - default: 2 description: Specifies the number of retries before marking the job failed. It defaults to 2. format: int32 @@ -2696,7 +2642,6 @@ spec: - knative-service type: string useSSA: - default: true description: Use server-side apply to update the owned resources (default `true`). Note that it automatically falls back to client-side patching, if SSA is not available, e.g., @@ -2715,14 +2660,12 @@ spec: description: 'Deprecated: no longer in use.' type: boolean progressDeadlineSeconds: - default: 60 description: The maximum time in seconds for the deployment to make progress before it is considered to be failed. It defaults to `60s`. format: int32 type: integer rollingUpdateMaxSurge: - default: 25 description: 'The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). @@ -2731,7 +2674,6 @@ spec: `25%`.' type: integer rollingUpdateMaxUnavailable: - default: 25 description: 'The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number @@ -2755,7 +2697,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true containerMeta: - default: true description: Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`) type: boolean @@ -2763,7 +2704,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean httpProxy: - default: true description: Propagates the `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables (default `true`) type: boolean @@ -2801,7 +2741,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: - default: memory description: 'Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). Deprecated: to be removed from trait configuration.' @@ -2842,12 +2781,10 @@ spec: format: int32 type: integer livenessProbeEnabled: - default: false description: Configures the liveness probe for the integration container (default `false`). type: boolean livenessScheme: - default: HTTP description: Scheme to use when connecting to the liveness probe (default `HTTP`). type: string @@ -2876,12 +2813,10 @@ spec: format: int32 type: integer readinessProbeEnabled: - default: true description: Configures the readiness probe for the integration container (default `true`). type: boolean readinessScheme: - default: HTTP description: Scheme to use when connecting to the readiness probe (default `HTTP`). type: string @@ -2910,12 +2845,10 @@ spec: format: int32 type: integer startupProbeEnabled: - default: false description: Configures the startup probe for the integration container (default `false`). type: boolean startupScheme: - default: HTTP description: Scheme to use when connecting to the startup probe (default `HTTP`). type: string @@ -2957,12 +2890,10 @@ spec: description: To configure the host exposed by the ingress. type: string path: - default: / description: To configure the path exposed by the ingress (default `/`). type: string pathType: - default: Prefix description: To configure the path type exposed by the ingress. One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`). @@ -2976,7 +2907,6 @@ spec: description: The configuration of Istio trait properties: allow: - default: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 description: Configures a (comma-separated) list of CIDR subnets that should not be intercepted by the Istio proxy (`10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` by default). @@ -3022,7 +2952,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryEnabled: - default: false description: Listen for multicast requests (default `false`) type: boolean enabled: @@ -3036,7 +2965,6 @@ spec: is `true` (default `true` for OpenShift). type: boolean host: - default: '*' description: The Host address to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, the servers binds to every network interface (default `"*"`). @@ -3053,7 +2981,6 @@ spec: when the `user` option is set. type: string port: - default: 8778 description: The Jolokia endpoint port (default `8778`). type: integer protocol: @@ -3085,7 +3012,6 @@ spec: can be attached to the JVM, e.g., using port-forwarding type: boolean debugAddress: - default: '*:5005' description: Transport address at which to listen for the newly launched JVM (default `*:5005`) type: string @@ -3103,7 +3029,6 @@ spec: type: string type: array printCommand: - default: true description: Prints the command used the start the JVM in the container logs (default `true`) type: boolean @@ -3112,7 +3037,6 @@ spec: description: The configuration of Kamelets trait properties: auto: - default: true description: Automatically inject all referenced Kamelets and their default configuration (enabled by default) type: boolean @@ -3130,7 +3054,6 @@ spec: into the current integration type: string mountPoint: - default: /etc/camel/kamelets description: The directory where the application mounts and reads Kamelet spec (default `/etc/camel/kamelets`) type: string @@ -3209,7 +3132,6 @@ spec: in newer versions of Knative, filtering is disabled by default. type: boolean namespaceLabel: - default: true description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" label to the namespace As Knative requires this label to perform injection of K_SINK URL into the service. If this @@ -3322,7 +3244,6 @@ spec: description: Enable "pretty printing" of the JSON logs type: boolean level: - default: INFO description: Adjust the logging level (defaults to `INFO`) enum: - FATAL @@ -3366,7 +3287,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean hotReload: - default: false description: Enable "hot reload" when a secret/configmap mounted is edited (default `false`) type: boolean @@ -3476,7 +3396,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean global: - default: true description: Indicates if the platform should be created globally in the case of global operator (default true). type: boolean @@ -3507,7 +3426,6 @@ spec: traits share this common property. type: boolean podMonitor: - default: true description: Whether a `PodMonitor` resource is created (default `true`). type: boolean @@ -3550,8 +3468,6 @@ spec: description: The configuration of Quarkus trait 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` @@ -3572,7 +3488,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 @@ -3728,7 +3643,6 @@ spec: traits share this common property. type: boolean nodePort: - default: false description: 'Enable Service to be exposed as NodePort (default `false`). Deprecated: Use service type instead.' type: boolean diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml index fd9263a059..feb1ba790a 100644 --- a/helm/camel-k/crds/crd-integration.yaml +++ b/helm/camel-k/crds/crd-integration.yaml @@ -6392,7 +6392,6 @@ spec: type: string type: array podAffinity: - default: false description: Always co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -6404,7 +6403,6 @@ spec: type: string type: array podAntiAffinity: - default: false description: Never co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -6431,7 +6429,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 @@ -6464,7 +6461,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: @@ -6489,7 +6485,6 @@ spec: instead with task name `builder`.' type: string strategy: - default: routine description: The strategy to use, either `pod` or `routine` (default `routine`) enum: @@ -6589,12 +6584,10 @@ spec: description: The maximum amount of memory required. type: string name: - default: integration description: The main container name. It's named `integration` by default. type: string port: - default: 8080 description: To configure a different port exposed by the container (default `8080`). type: integer @@ -6610,12 +6603,10 @@ spec: description: The minimum amount of memory required. type: string servicePort: - default: 80 description: To configure under which service port the container port is to be exposed (default `80`). type: integer servicePortName: - default: http description: To configure under which service port name the container port is to be exposed (default `http`). type: string @@ -6624,7 +6615,6 @@ spec: description: The configuration of Cron trait properties: activeDeadlineSeconds: - default: 60 description: Specifies the duration in seconds, relative to the start time, that the job may be continuously active before it is considered to be failed. It defaults to 60s. @@ -6640,7 +6630,6 @@ spec: be expressed as `0/1 * * * *`, while `35m` or `50s` cannot)." type: boolean backoffLimit: - default: 2 description: Specifies the number of retries before marking the job failed. It defaults to 2. format: int32 @@ -6726,7 +6715,6 @@ spec: - knative-service type: string useSSA: - default: true description: Use server-side apply to update the owned resources (default `true`). Note that it automatically falls back to client-side patching, if SSA is not available, e.g., @@ -6745,14 +6733,12 @@ spec: description: 'Deprecated: no longer in use.' type: boolean progressDeadlineSeconds: - default: 60 description: The maximum time in seconds for the deployment to make progress before it is considered to be failed. It defaults to `60s`. format: int32 type: integer rollingUpdateMaxSurge: - default: 25 description: 'The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). @@ -6761,7 +6747,6 @@ spec: `25%`.' type: integer rollingUpdateMaxUnavailable: - default: 25 description: 'The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number @@ -6785,7 +6770,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true containerMeta: - default: true description: Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`) type: boolean @@ -6793,7 +6777,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean httpProxy: - default: true description: Propagates the `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables (default `true`) type: boolean @@ -6831,7 +6814,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: - default: memory description: 'Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). Deprecated: to be removed from trait configuration.' @@ -6872,12 +6854,10 @@ spec: format: int32 type: integer livenessProbeEnabled: - default: false description: Configures the liveness probe for the integration container (default `false`). type: boolean livenessScheme: - default: HTTP description: Scheme to use when connecting to the liveness probe (default `HTTP`). type: string @@ -6906,12 +6886,10 @@ spec: format: int32 type: integer readinessProbeEnabled: - default: true description: Configures the readiness probe for the integration container (default `true`). type: boolean readinessScheme: - default: HTTP description: Scheme to use when connecting to the readiness probe (default `HTTP`). type: string @@ -6940,12 +6918,10 @@ spec: format: int32 type: integer startupProbeEnabled: - default: false description: Configures the startup probe for the integration container (default `false`). type: boolean startupScheme: - default: HTTP description: Scheme to use when connecting to the startup probe (default `HTTP`). type: string @@ -6987,12 +6963,10 @@ spec: description: To configure the host exposed by the ingress. type: string path: - default: / description: To configure the path exposed by the ingress (default `/`). type: string pathType: - default: Prefix description: To configure the path type exposed by the ingress. One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`). @@ -7006,7 +6980,6 @@ spec: description: The configuration of Istio trait properties: allow: - default: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 description: Configures a (comma-separated) list of CIDR subnets that should not be intercepted by the Istio proxy (`10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` by default). @@ -7052,7 +7025,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryEnabled: - default: false description: Listen for multicast requests (default `false`) type: boolean enabled: @@ -7066,7 +7038,6 @@ spec: is `true` (default `true` for OpenShift). type: boolean host: - default: '*' description: The Host address to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, the servers binds to every network interface (default `"*"`). @@ -7083,7 +7054,6 @@ spec: when the `user` option is set. type: string port: - default: 8778 description: The Jolokia endpoint port (default `8778`). type: integer protocol: @@ -7115,7 +7085,6 @@ spec: can be attached to the JVM, e.g., using port-forwarding type: boolean debugAddress: - default: '*:5005' description: Transport address at which to listen for the newly launched JVM (default `*:5005`) type: string @@ -7133,7 +7102,6 @@ spec: type: string type: array printCommand: - default: true description: Prints the command used the start the JVM in the container logs (default `true`) type: boolean @@ -7142,7 +7110,6 @@ spec: description: The configuration of Kamelets trait properties: auto: - default: true description: Automatically inject all referenced Kamelets and their default configuration (enabled by default) type: boolean @@ -7160,7 +7127,6 @@ spec: into the current integration type: string mountPoint: - default: /etc/camel/kamelets description: The directory where the application mounts and reads Kamelet spec (default `/etc/camel/kamelets`) type: string @@ -7239,7 +7205,6 @@ spec: in newer versions of Knative, filtering is disabled by default. type: boolean namespaceLabel: - default: true description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" label to the namespace As Knative requires this label to perform injection of K_SINK URL into the service. If this @@ -7352,7 +7317,6 @@ spec: description: Enable "pretty printing" of the JSON logs type: boolean level: - default: INFO description: Adjust the logging level (defaults to `INFO`) enum: - FATAL @@ -7396,7 +7360,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean hotReload: - default: false description: Enable "hot reload" when a secret/configmap mounted is edited (default `false`) type: boolean @@ -7506,7 +7469,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean global: - default: true description: Indicates if the platform should be created globally in the case of global operator (default true). type: boolean @@ -7537,7 +7499,6 @@ spec: traits share this common property. type: boolean podMonitor: - default: true description: Whether a `PodMonitor` resource is created (default `true`). type: boolean @@ -7580,8 +7541,6 @@ spec: description: The configuration of Quarkus trait 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` @@ -7602,7 +7561,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 @@ -7758,7 +7716,6 @@ spec: traits share this common property. type: boolean nodePort: - default: false description: 'Enable Service to be exposed as NodePort (default `false`). Deprecated: Use service type instead.' type: boolean diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml index 0739d217f2..7283c46eb8 100644 --- a/helm/camel-k/crds/crd-kamelet-binding.yaml +++ b/helm/camel-k/crds/crd-kamelet-binding.yaml @@ -6673,7 +6673,6 @@ spec: type: string type: array podAffinity: - default: false description: Always co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -6685,7 +6684,6 @@ spec: type: string type: array podAntiAffinity: - default: false description: Never co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -6713,7 +6711,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 @@ -6748,7 +6745,6 @@ spec: node. type: object orderStrategy: - default: sequential description: The build order strategy to use, either `dependencies`, `fifo` or `sequential` (default `sequential`) enum: @@ -6773,7 +6769,6 @@ spec: TasksRequestCPU instead with task name `builder`.' type: string strategy: - default: routine description: The strategy to use, either `pod` or `routine` (default `routine`) enum: @@ -6873,12 +6868,10 @@ spec: description: The maximum amount of memory required. type: string name: - default: integration description: The main container name. It's named `integration` by default. type: string port: - default: 8080 description: To configure a different port exposed by the container (default `8080`). type: integer @@ -6894,12 +6887,10 @@ spec: description: The minimum amount of memory required. type: string servicePort: - default: 80 description: To configure under which service port the container port is to be exposed (default `80`). type: integer servicePortName: - default: http description: To configure under which service port name the container port is to be exposed (default `http`). type: string @@ -6908,7 +6899,6 @@ spec: description: The configuration of Cron trait properties: activeDeadlineSeconds: - default: 60 description: Specifies the duration in seconds, relative to the start time, that the job may be continuously active before it is considered to be failed. It defaults @@ -6926,7 +6916,6 @@ spec: `35m` or `50s` cannot)." type: boolean backoffLimit: - default: 2 description: Specifies the number of retries before marking the job failed. It defaults to 2. format: int32 @@ -7012,7 +7001,6 @@ spec: - knative-service type: string useSSA: - default: true description: Use server-side apply to update the owned resources (default `true`). Note that it automatically falls back to client-side patching, if SSA is not available, @@ -7031,14 +7019,12 @@ spec: description: 'Deprecated: no longer in use.' type: boolean progressDeadlineSeconds: - default: 60 description: The maximum time in seconds for the deployment to make progress before it is considered to be failed. It defaults to `60s`. format: int32 type: integer rollingUpdateMaxSurge: - default: 25 description: 'The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: @@ -7047,7 +7033,6 @@ spec: Defaults to `25%`.' type: integer rollingUpdateMaxUnavailable: - default: 25 description: 'The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute @@ -7071,7 +7056,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true containerMeta: - default: true description: Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`) type: boolean @@ -7079,7 +7063,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean httpProxy: - default: true description: Propagates the `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables (default `true`) type: boolean @@ -7117,7 +7100,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: - default: memory description: 'Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). Deprecated: to be removed from trait configuration.' @@ -7158,12 +7140,10 @@ spec: format: int32 type: integer livenessProbeEnabled: - default: false description: Configures the liveness probe for the integration container (default `false`). type: boolean livenessScheme: - default: HTTP description: Scheme to use when connecting to the liveness probe (default `HTTP`). type: string @@ -7192,12 +7172,10 @@ spec: format: int32 type: integer readinessProbeEnabled: - default: true description: Configures the readiness probe for the integration container (default `true`). type: boolean readinessScheme: - default: HTTP description: Scheme to use when connecting to the readiness probe (default `HTTP`). type: string @@ -7226,12 +7204,10 @@ spec: format: int32 type: integer startupProbeEnabled: - default: false description: Configures the startup probe for the integration container (default `false`). type: boolean startupScheme: - default: HTTP description: Scheme to use when connecting to the startup probe (default `HTTP`). type: string @@ -7273,12 +7249,10 @@ spec: description: To configure the host exposed by the ingress. type: string path: - default: / description: To configure the path exposed by the ingress (default `/`). type: string pathType: - default: Prefix description: To configure the path type exposed by the ingress. One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`). @@ -7292,7 +7266,6 @@ spec: description: The configuration of Istio trait properties: allow: - default: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 description: Configures a (comma-separated) list of CIDR subnets that should not be intercepted by the Istio proxy (`10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` by @@ -7339,7 +7312,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryEnabled: - default: false description: Listen for multicast requests (default `false`) type: boolean enabled: @@ -7353,7 +7325,6 @@ spec: is `true` (default `true` for OpenShift). type: boolean host: - default: '*' description: The Host address to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, the servers binds to every network interface (default `"*"`). @@ -7370,7 +7341,6 @@ spec: when the `user` option is set. type: string port: - default: 8778 description: The Jolokia endpoint port (default `8778`). type: integer protocol: @@ -7402,7 +7372,6 @@ spec: can be attached to the JVM, e.g., using port-forwarding type: boolean debugAddress: - default: '*:5005' description: Transport address at which to listen for the newly launched JVM (default `*:5005`) type: string @@ -7420,7 +7389,6 @@ spec: type: string type: array printCommand: - default: true description: Prints the command used the start the JVM in the container logs (default `true`) type: boolean @@ -7429,7 +7397,6 @@ spec: description: The configuration of Kamelets trait properties: auto: - default: true description: Automatically inject all referenced Kamelets and their default configuration (enabled by default) type: boolean @@ -7447,7 +7414,6 @@ spec: load into the current integration type: string mountPoint: - default: /etc/camel/kamelets description: The directory where the application mounts and reads Kamelet spec (default `/etc/camel/kamelets`) type: string @@ -7530,7 +7496,6 @@ spec: by default. type: boolean namespaceLabel: - default: true description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" label to the namespace As Knative requires this label to perform injection @@ -7648,7 +7613,6 @@ spec: description: Enable "pretty printing" of the JSON logs type: boolean level: - default: INFO description: Adjust the logging level (defaults to `INFO`) enum: - FATAL @@ -7692,7 +7656,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean hotReload: - default: false description: Enable "hot reload" when a secret/configmap mounted is edited (default `false`) type: boolean @@ -7802,7 +7765,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean global: - default: true description: Indicates if the platform should be created globally in the case of global operator (default true). type: boolean @@ -7833,7 +7795,6 @@ spec: All traits share this common property. type: boolean podMonitor: - default: true description: Whether a `PodMonitor` resource is created (default `true`). type: boolean @@ -7876,8 +7837,6 @@ spec: description: The configuration of Quarkus trait 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, @@ -7900,7 +7859,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 @@ -8065,7 +8023,6 @@ spec: All traits share this common property. type: boolean nodePort: - default: false description: 'Enable Service to be exposed as NodePort (default `false`). Deprecated: Use service type instead.' type: boolean diff --git a/helm/camel-k/crds/crd-pipe.yaml b/helm/camel-k/crds/crd-pipe.yaml index 8063ab9817..e3424c779a 100644 --- a/helm/camel-k/crds/crd-pipe.yaml +++ b/helm/camel-k/crds/crd-pipe.yaml @@ -6671,7 +6671,6 @@ spec: type: string type: array podAffinity: - default: false description: Always co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -6683,7 +6682,6 @@ spec: type: string type: array podAntiAffinity: - default: false description: Never co-locates multiple replicas of the integration in the same node (default `false`). type: boolean @@ -6711,7 +6709,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 @@ -6746,7 +6743,6 @@ spec: node. type: object orderStrategy: - default: sequential description: The build order strategy to use, either `dependencies`, `fifo` or `sequential` (default `sequential`) enum: @@ -6771,7 +6767,6 @@ spec: TasksRequestCPU instead with task name `builder`.' type: string strategy: - default: routine description: The strategy to use, either `pod` or `routine` (default `routine`) enum: @@ -6871,12 +6866,10 @@ spec: description: The maximum amount of memory required. type: string name: - default: integration description: The main container name. It's named `integration` by default. type: string port: - default: 8080 description: To configure a different port exposed by the container (default `8080`). type: integer @@ -6892,12 +6885,10 @@ spec: description: The minimum amount of memory required. type: string servicePort: - default: 80 description: To configure under which service port the container port is to be exposed (default `80`). type: integer servicePortName: - default: http description: To configure under which service port name the container port is to be exposed (default `http`). type: string @@ -6906,7 +6897,6 @@ spec: description: The configuration of Cron trait properties: activeDeadlineSeconds: - default: 60 description: Specifies the duration in seconds, relative to the start time, that the job may be continuously active before it is considered to be failed. It defaults @@ -6924,7 +6914,6 @@ spec: `35m` or `50s` cannot)." type: boolean backoffLimit: - default: 2 description: Specifies the number of retries before marking the job failed. It defaults to 2. format: int32 @@ -7010,7 +6999,6 @@ spec: - knative-service type: string useSSA: - default: true description: Use server-side apply to update the owned resources (default `true`). Note that it automatically falls back to client-side patching, if SSA is not available, @@ -7029,14 +7017,12 @@ spec: description: 'Deprecated: no longer in use.' type: boolean progressDeadlineSeconds: - default: 60 description: The maximum time in seconds for the deployment to make progress before it is considered to be failed. It defaults to `60s`. format: int32 type: integer rollingUpdateMaxSurge: - default: 25 description: 'The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: @@ -7045,7 +7031,6 @@ spec: Defaults to `25%`.' type: integer rollingUpdateMaxUnavailable: - default: 25 description: 'The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute @@ -7069,7 +7054,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true containerMeta: - default: true description: Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`) type: boolean @@ -7077,7 +7061,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean httpProxy: - default: true description: Propagates the `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables (default `true`) type: boolean @@ -7115,7 +7098,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryCache: - default: memory description: 'Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). Deprecated: to be removed from trait configuration.' @@ -7156,12 +7138,10 @@ spec: format: int32 type: integer livenessProbeEnabled: - default: false description: Configures the liveness probe for the integration container (default `false`). type: boolean livenessScheme: - default: HTTP description: Scheme to use when connecting to the liveness probe (default `HTTP`). type: string @@ -7190,12 +7170,10 @@ spec: format: int32 type: integer readinessProbeEnabled: - default: true description: Configures the readiness probe for the integration container (default `true`). type: boolean readinessScheme: - default: HTTP description: Scheme to use when connecting to the readiness probe (default `HTTP`). type: string @@ -7224,12 +7202,10 @@ spec: format: int32 type: integer startupProbeEnabled: - default: false description: Configures the startup probe for the integration container (default `false`). type: boolean startupScheme: - default: HTTP description: Scheme to use when connecting to the startup probe (default `HTTP`). type: string @@ -7271,12 +7247,10 @@ spec: description: To configure the host exposed by the ingress. type: string path: - default: / description: To configure the path exposed by the ingress (default `/`). type: string pathType: - default: Prefix description: To configure the path type exposed by the ingress. One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`). @@ -7290,7 +7264,6 @@ spec: description: The configuration of Istio trait properties: allow: - default: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 description: Configures a (comma-separated) list of CIDR subnets that should not be intercepted by the Istio proxy (`10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` by @@ -7337,7 +7310,6 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true discoveryEnabled: - default: false description: Listen for multicast requests (default `false`) type: boolean enabled: @@ -7351,7 +7323,6 @@ spec: is `true` (default `true` for OpenShift). type: boolean host: - default: '*' description: The Host address to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, the servers binds to every network interface (default `"*"`). @@ -7368,7 +7339,6 @@ spec: when the `user` option is set. type: string port: - default: 8778 description: The Jolokia endpoint port (default `8778`). type: integer protocol: @@ -7400,7 +7370,6 @@ spec: can be attached to the JVM, e.g., using port-forwarding type: boolean debugAddress: - default: '*:5005' description: Transport address at which to listen for the newly launched JVM (default `*:5005`) type: string @@ -7418,7 +7387,6 @@ spec: type: string type: array printCommand: - default: true description: Prints the command used the start the JVM in the container logs (default `true`) type: boolean @@ -7427,7 +7395,6 @@ spec: description: The configuration of Kamelets trait properties: auto: - default: true description: Automatically inject all referenced Kamelets and their default configuration (enabled by default) type: boolean @@ -7445,7 +7412,6 @@ spec: load into the current integration type: string mountPoint: - default: /etc/camel/kamelets description: The directory where the application mounts and reads Kamelet spec (default `/etc/camel/kamelets`) type: string @@ -7528,7 +7494,6 @@ spec: by default. type: boolean namespaceLabel: - default: true description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" label to the namespace As Knative requires this label to perform injection @@ -7646,7 +7611,6 @@ spec: description: Enable "pretty printing" of the JSON logs type: boolean level: - default: INFO description: Adjust the logging level (defaults to `INFO`) enum: - FATAL @@ -7690,7 +7654,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean hotReload: - default: false description: Enable "hot reload" when a secret/configmap mounted is edited (default `false`) type: boolean @@ -7800,7 +7763,6 @@ spec: description: 'Deprecated: no longer in use.' type: boolean global: - default: true description: Indicates if the platform should be created globally in the case of global operator (default true). type: boolean @@ -7831,7 +7793,6 @@ spec: All traits share this common property. type: boolean podMonitor: - default: true description: Whether a `PodMonitor` resource is created (default `true`). type: boolean @@ -7874,8 +7835,6 @@ spec: description: The configuration of Quarkus trait 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, @@ -7898,7 +7857,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 @@ -8063,7 +8021,6 @@ spec: All traits share this common property. type: boolean nodePort: - default: false description: 'Enable Service to be exposed as NodePort (default `false`). Deprecated: Use service type instead.' type: boolean diff --git a/pkg/apis/camel/v1/trait/affinity.go b/pkg/apis/camel/v1/trait/affinity.go index ed19599f8a..f2a7c45ae6 100644 --- a/pkg/apis/camel/v1/trait/affinity.go +++ b/pkg/apis/camel/v1/trait/affinity.go @@ -25,10 +25,8 @@ package trait // +camel-k:trait=affinity. type AffinityTrait struct { Trait `property:",squash" json:",inline"` - // +kubebuilder:default=false // Always co-locates multiple replicas of the integration in the same node (default `false`). PodAffinity *bool `property:"pod-affinity" json:"podAffinity,omitempty"` - // +kubebuilder:default=false // Never co-locates multiple replicas of the integration in the same node (default `false`). PodAntiAffinity *bool `property:"pod-anti-affinity" json:"podAntiAffinity,omitempty"` // Defines a set of nodes the integration pod(s) are eligible to be scheduled on, based on labels on the node. diff --git a/pkg/apis/camel/v1/trait/builder.go b/pkg/apis/camel/v1/trait/builder.go index 69441859fa..f92ef2d67c 100644 --- a/pkg/apis/camel/v1/trait/builder.go +++ b/pkg/apis/camel/v1/trait/builder.go @@ -29,16 +29,13 @@ type BuilderTrait struct { Properties []string `property:"properties" json:"properties,omitempty"` // The strategy to use, either `pod` or `routine` (default `routine`) // +kubebuilder:validation:Enum=pod;routine - // +kubebuilder:default="routine" Strategy string `property:"strategy" json:"strategy,omitempty"` // Specify a base image BaseImage string `property:"base-image" json:"baseImage,omitempty"` // Use the incremental image build option, to reuse existing containers (default `true`) - // +kubebuilder:default=true IncrementalImageBuild *bool `property:"incremental-image-build" json:"incrementalImageBuild,omitempty"` // The build order strategy to use, either `dependencies`, `fifo` or `sequential` (default `sequential`) // +kubebuilder:validation:Enum=dependencies;fifo;sequential - // +kubebuilder:default="sequential" OrderStrategy string `property:"order-strategy" json:"orderStrategy,omitempty"` // When using `pod` strategy, the minimum amount of CPU required by the pod builder. // Deprecated: use TasksRequestCPU instead with task name `builder`. diff --git a/pkg/apis/camel/v1/trait/container.go b/pkg/apis/camel/v1/trait/container.go index 4745c179cd..d5791ec389 100644 --- a/pkg/apis/camel/v1/trait/container.go +++ b/pkg/apis/camel/v1/trait/container.go @@ -40,18 +40,14 @@ type ContainerTrait struct { // Can be used to enable/disable exposure via kubernetes Service. Expose *bool `property:"expose" json:"expose,omitempty"` // To configure a different port exposed by the container (default `8080`). - // +kubebuilder:default=8080 Port int `property:"port" json:"port,omitempty"` // To configure a different port name for the port exposed by the container. It defaults to `http` only when the `expose` parameter is true. PortName string `property:"port-name" json:"portName,omitempty"` // To configure under which service port the container port is to be exposed (default `80`). - // +kubebuilder:default=80 ServicePort int `property:"service-port" json:"servicePort,omitempty"` // To configure under which service port name the container port is to be exposed (default `http`). - // +kubebuilder:default="http" ServicePortName string `property:"service-port-name" json:"servicePortName,omitempty"` // The main container name. It's named `integration` by default. - // +kubebuilder:default="integration" Name string `property:"name" json:"name,omitempty"` // The main container image Image string `property:"image" json:"image,omitempty"` diff --git a/pkg/apis/camel/v1/trait/cron.go b/pkg/apis/camel/v1/trait/cron.go index d1ded9b6ad..33f095a875 100644 --- a/pkg/apis/camel/v1/trait/cron.go +++ b/pkg/apis/camel/v1/trait/cron.go @@ -68,10 +68,8 @@ type CronTrait struct { // Specifies the duration in seconds, relative to the start time, that the job // may be continuously active before it is considered to be failed. // It defaults to 60s. - // +kubebuilder:default=60 ActiveDeadlineSeconds *int64 `property:"active-deadline-seconds" json:"activeDeadlineSeconds,omitempty"` // Specifies the number of retries before marking the job failed. // It defaults to 2. - // +kubebuilder:default=2 BackoffLimit *int32 `property:"backoff-limit" json:"backoffLimit,omitempty"` } diff --git a/pkg/apis/camel/v1/trait/deployer.go b/pkg/apis/camel/v1/trait/deployer.go index 673fb91e3a..70d140ec49 100644 --- a/pkg/apis/camel/v1/trait/deployer.go +++ b/pkg/apis/camel/v1/trait/deployer.go @@ -28,6 +28,5 @@ type DeployerTrait struct { Kind string `property:"kind" json:"kind,omitempty"` // Use server-side apply to update the owned resources (default `true`). // Note that it automatically falls back to client-side patching, if SSA is not available, e.g., on old Kubernetes clusters. - // +kubebuilder:default=true UseSSA *bool `property:"use-ssa" json:"useSSA,omitempty"` } diff --git a/pkg/apis/camel/v1/trait/deployment.go b/pkg/apis/camel/v1/trait/deployment.go index 86db8a1a74..3e8092df6c 100644 --- a/pkg/apis/camel/v1/trait/deployment.go +++ b/pkg/apis/camel/v1/trait/deployment.go @@ -29,7 +29,6 @@ type DeploymentTrait struct { PlatformBaseTrait `property:",squash" json:",inline"` // The maximum time in seconds for the deployment to make progress before it // is considered to be failed. It defaults to `60s`. - // +kubebuilder:default=60 ProgressDeadlineSeconds *int32 `property:"progress-deadline-seconds" json:"progressDeadlineSeconds,omitempty"` // The deployment strategy to use to replace existing pods with new ones. // +kubebuilder:validation:Enum=Recreate;RollingUpdate @@ -39,7 +38,6 @@ type DeploymentTrait struct { // Absolute number is calculated from percentage by rounding down. // This can not be 0 if MaxSurge is 0. // Defaults to `25%`. - // +kubebuilder:default=25 RollingUpdateMaxUnavailable *int `property:"rolling-update-max-unavailable" json:"rollingUpdateMaxUnavailable,omitempty"` // The maximum number of pods that can be scheduled above the desired number of // pods. @@ -47,6 +45,5 @@ type DeploymentTrait struct { // This can not be 0 if MaxUnavailable is 0. // Absolute number is calculated from percentage by rounding up. // Defaults to `25%`. - // +kubebuilder:default=25 RollingUpdateMaxSurge *int `property:"rolling-update-max-surge" json:"rollingUpdateMaxSurge,omitempty"` } diff --git a/pkg/apis/camel/v1/trait/environment.go b/pkg/apis/camel/v1/trait/environment.go index a96b03fb7d..da3c423e5e 100644 --- a/pkg/apis/camel/v1/trait/environment.go +++ b/pkg/apis/camel/v1/trait/environment.go @@ -24,10 +24,8 @@ package trait type EnvironmentTrait struct { PlatformBaseTrait `property:",squash" json:",inline"` // Enables injection of `NAMESPACE` and `POD_NAME` environment variables (default `true`) - // +kubebuilder:default=true ContainerMeta *bool `property:"container-meta" json:"containerMeta,omitempty"` // Propagates the `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables (default `true`) - // +kubebuilder:default=true HTTPProxy *bool `property:"http-proxy" json:"httpProxy,omitempty"` // A list of environment variables to be added to the integration container. // The syntax is KEY=VALUE, e.g., `MY_VAR="my value"`. diff --git a/pkg/apis/camel/v1/trait/gc.go b/pkg/apis/camel/v1/trait/gc.go index b9ce879462..e61b161f1a 100644 --- a/pkg/apis/camel/v1/trait/gc.go +++ b/pkg/apis/camel/v1/trait/gc.go @@ -24,7 +24,6 @@ type GCTrait struct { Trait `property:",squash" json:",inline"` // Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`). // Deprecated: to be removed from trait configuration. - // +kubebuilder:default="memory" DiscoveryCache *DiscoveryCacheType `property:"discovery-cache" json:"discoveryCache,omitempty"` } diff --git a/pkg/apis/camel/v1/trait/health.go b/pkg/apis/camel/v1/trait/health.go index 1d09aff4bd..587249afe2 100644 --- a/pkg/apis/camel/v1/trait/health.go +++ b/pkg/apis/camel/v1/trait/health.go @@ -26,10 +26,8 @@ type HealthTrait struct { Trait `property:",squash" json:",inline"` // Configures the liveness probe for the integration container (default `false`). - // +kubebuilder:default=false LivenessProbeEnabled *bool `property:"liveness-probe-enabled" json:"livenessProbeEnabled,omitempty"` // Scheme to use when connecting to the liveness probe (default `HTTP`). - // +kubebuilder:default="HTTP" LivenessScheme string `property:"liveness-scheme" json:"livenessScheme,omitempty"` // Number of seconds after the container has started before the liveness probe is initiated. LivenessInitialDelay int32 `property:"liveness-initial-delay" json:"livenessInitialDelay,omitempty"` @@ -43,10 +41,8 @@ type HealthTrait struct { LivenessFailureThreshold int32 `property:"liveness-failure-threshold" json:"livenessFailureThreshold,omitempty"` // Configures the readiness probe for the integration container (default `true`). - // +kubebuilder:default=true ReadinessProbeEnabled *bool `property:"readiness-probe-enabled" json:"readinessProbeEnabled,omitempty"` // Scheme to use when connecting to the readiness probe (default `HTTP`). - // +kubebuilder:default="HTTP" ReadinessScheme string `property:"readiness-scheme" json:"readinessScheme,omitempty"` // Number of seconds after the container has started before the readiness probe is initiated. ReadinessInitialDelay int32 `property:"readiness-initial-delay" json:"readinessInitialDelay,omitempty"` @@ -60,10 +56,8 @@ type HealthTrait struct { ReadinessFailureThreshold int32 `property:"readiness-failure-threshold" json:"readinessFailureThreshold,omitempty"` // Configures the startup probe for the integration container (default `false`). - // +kubebuilder:default=false StartupProbeEnabled *bool `property:"startup-probe-enabled" json:"startupProbeEnabled,omitempty"` // Scheme to use when connecting to the startup probe (default `HTTP`). - // +kubebuilder:default="HTTP" StartupScheme string `property:"startup-scheme" json:"startupScheme,omitempty"` // Number of seconds after the container has started before the startup probe is initiated. StartupInitialDelay int32 `property:"startup-initial-delay" json:"startupInitialDelay,omitempty"` diff --git a/pkg/apis/camel/v1/trait/ingress.go b/pkg/apis/camel/v1/trait/ingress.go index 71ce634eb7..128b36f028 100644 --- a/pkg/apis/camel/v1/trait/ingress.go +++ b/pkg/apis/camel/v1/trait/ingress.go @@ -34,12 +34,10 @@ type IngressTrait struct { // To configure the host exposed by the ingress. Host string `property:"host" json:"host,omitempty"` // To configure the path exposed by the ingress (default `/`). - // +kubebuilder:default="/" Path string `property:"path" json:"path,omitempty"` // To configure the path type exposed by the ingress. // One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`). // +kubebuilder:validation:Enum=Exact;Prefix;ImplementationSpecific - // +kubebuilder:default="Prefix" PathType *networkingv1.PathType `property:"path-type" json:"pathType,omitempty"` // To automatically add an ingress whenever the integration uses an HTTP endpoint consumer. Auto *bool `property:"auto" json:"auto,omitempty"` diff --git a/pkg/apis/camel/v1/trait/istio.go b/pkg/apis/camel/v1/trait/istio.go index 63045b6adc..b7dbba5742 100644 --- a/pkg/apis/camel/v1/trait/istio.go +++ b/pkg/apis/camel/v1/trait/istio.go @@ -24,7 +24,6 @@ package trait type IstioTrait struct { Trait `property:",squash" json:",inline"` // Configures a (comma-separated) list of CIDR subnets that should not be intercepted by the Istio proxy (`10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` by default). - // +kubebuilder:default="10.0.0.0/8,172.16.0.0/12,192.168.0.0/16" Allow string `property:"allow" json:"allow,omitempty"` // Forces the value for labels `sidecar.istio.io/inject`. By default the label is set to `true` on deployment and not set on Knative Service. Inject *bool `property:"inject" json:"inject,omitempty"` diff --git a/pkg/apis/camel/v1/trait/jolokia.go b/pkg/apis/camel/v1/trait/jolokia.go index fa76ec8a96..af81888258 100644 --- a/pkg/apis/camel/v1/trait/jolokia.go +++ b/pkg/apis/camel/v1/trait/jolokia.go @@ -34,7 +34,6 @@ type JolokiaTrait struct { // (default `clientPrincipal=cn=system:master-proxy`, `cn=hawtio-online.hawtio.svc` and `cn=fuse-console.fuse.svc` for OpenShift). ClientPrincipal []string `property:"client-principal" json:"clientPrincipal,omitempty"` // Listen for multicast requests (default `false`) - // +kubebuilder:default=false DiscoveryEnabled *bool `property:"discovery-enabled" json:"discoveryEnabled,omitempty"` // Mandate the client certificate contains a client flag in the extended key usage section, // applicable when `protocol` is `https` and `use-ssl-client-authentication` is `true` @@ -42,12 +41,10 @@ type JolokiaTrait struct { ExtendedClientCheck *bool `property:"extended-client-check" json:"extendedClientCheck,omitempty"` // The Host address to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, // the servers binds to every network interface (default `"*"`). - // +kubebuilder:default="*" Host *string `property:"host" json:"host,omitempty"` // The password used for authentication, applicable when the `user` option is set. Password *string `property:"password" json:"password,omitempty"` // The Jolokia endpoint port (default `8778`). - // +kubebuilder:default=8778 Port int `property:"port" json:"port,omitempty"` // The protocol to use, either `http` or `https` (default `https` for OpenShift) Protocol *string `property:"protocol" json:"protocol,omitempty"` diff --git a/pkg/apis/camel/v1/trait/jvm.go b/pkg/apis/camel/v1/trait/jvm.go index 3570e4440f..2a08fcf0b2 100644 --- a/pkg/apis/camel/v1/trait/jvm.go +++ b/pkg/apis/camel/v1/trait/jvm.go @@ -31,10 +31,8 @@ type JVMTrait struct { // Suspends the target JVM immediately before the main class is loaded DebugSuspend *bool `property:"debug-suspend" json:"debugSuspend,omitempty"` // Prints the command used the start the JVM in the container logs (default `true`) - // +kubebuilder:default=true PrintCommand *bool `property:"print-command" json:"printCommand,omitempty"` // Transport address at which to listen for the newly launched JVM (default `*:5005`) - // +kubebuilder:default="*:5005" DebugAddress string `property:"debug-address" json:"debugAddress,omitempty"` // A list of JVM options Options []string `property:"options" json:"options,omitempty"` diff --git a/pkg/apis/camel/v1/trait/kamelets.go b/pkg/apis/camel/v1/trait/kamelets.go index 1072ea2c78..8b9cfd6b03 100644 --- a/pkg/apis/camel/v1/trait/kamelets.go +++ b/pkg/apis/camel/v1/trait/kamelets.go @@ -23,11 +23,9 @@ package trait type KameletsTrait struct { Trait `property:",squash" json:",inline"` // Automatically inject all referenced Kamelets and their default configuration (enabled by default) - // +kubebuilder:default=true Auto *bool `property:"auto" json:"auto,omitempty"` // Comma separated list of Kamelet names to load into the current integration List string `property:"list" json:"list,omitempty"` // The directory where the application mounts and reads Kamelet spec (default `/etc/camel/kamelets`) - // +kubebuilder:default="/etc/camel/kamelets" MountPoint string `property:"mount-point" json:"mountPoint,omitempty"` } diff --git a/pkg/apis/camel/v1/trait/knative.go b/pkg/apis/camel/v1/trait/knative.go index 160f106c27..4495c6a487 100644 --- a/pkg/apis/camel/v1/trait/knative.go +++ b/pkg/apis/camel/v1/trait/knative.go @@ -60,6 +60,5 @@ type KnativeTrait struct { // Enables the camel-k-operator to set the "bindings.knative.dev/include=true" label to the namespace // As Knative requires this label to perform injection of K_SINK URL into the service. // If this is false, the integration pod may start and fail, read the SinkBinding Knative documentation. (default: true) - // +kubebuilder:default=true NamespaceLabel *bool `property:"namespace-label" json:"namespaceLabel,omitempty"` } diff --git a/pkg/apis/camel/v1/trait/logging.go b/pkg/apis/camel/v1/trait/logging.go index 3da324651f..11c083ad35 100644 --- a/pkg/apis/camel/v1/trait/logging.go +++ b/pkg/apis/camel/v1/trait/logging.go @@ -29,7 +29,6 @@ type LoggingTrait struct { Format string `property:"format" json:"format,omitempty"` // Adjust the logging level (defaults to `INFO`) // +kubebuilder:validation:Enum=FATAL;WARN;INFO;DEBUG;TRACE - // +kubebuilder:default="INFO" Level string `property:"level" json:"level,omitempty"` // Output the logs in JSON JSON *bool `property:"json" json:"json,omitempty"` diff --git a/pkg/apis/camel/v1/trait/mount.go b/pkg/apis/camel/v1/trait/mount.go index 3542d01451..48b44f20e4 100644 --- a/pkg/apis/camel/v1/trait/mount.go +++ b/pkg/apis/camel/v1/trait/mount.go @@ -36,6 +36,5 @@ type MountTrait struct { // A list of Persistent Volume Claims to be mounted. Syntax: [pvcname:/container/path] Volumes []string `property:"volumes" json:"volumes,omitempty"` // Enable "hot reload" when a secret/configmap mounted is edited (default `false`) - // +kubebuilder:default=false HotReload *bool `property:"hot-reload" json:"hotReload,omitempty"` } diff --git a/pkg/apis/camel/v1/trait/platform.go b/pkg/apis/camel/v1/trait/platform.go index a7f4a78b9d..116de6ad0f 100644 --- a/pkg/apis/camel/v1/trait/platform.go +++ b/pkg/apis/camel/v1/trait/platform.go @@ -29,7 +29,6 @@ type PlatformTrait struct { // To create a default (empty) platform when the platform is missing. CreateDefault *bool `property:"create-default" json:"createDefault,omitempty"` // Indicates if the platform should be created globally in the case of global operator (default true). - // +kubebuilder:default=true Global *bool `property:"global" json:"global,omitempty"` // To automatically detect from the environment if a default platform can be created (it will be created on OpenShift only). Auto *bool `property:"auto" json:"auto,omitempty"` diff --git a/pkg/apis/camel/v1/trait/prometheus.go b/pkg/apis/camel/v1/trait/prometheus.go index 56c3a3bc8b..552375c4a6 100644 --- a/pkg/apis/camel/v1/trait/prometheus.go +++ b/pkg/apis/camel/v1/trait/prometheus.go @@ -34,7 +34,6 @@ package trait type PrometheusTrait struct { Trait `property:",squash" json:",inline"` // Whether a `PodMonitor` resource is created (default `true`). - // +kubebuilder:default=true PodMonitor *bool `property:"pod-monitor" json:"podMonitor,omitempty"` // The `PodMonitor` resource labels, applicable when `pod-monitor` is `true`. PodMonitorLabels []string `property:"pod-monitor-labels" json:"podMonitorLabels,omitempty"` diff --git a/pkg/apis/camel/v1/trait/quarkus.go b/pkg/apis/camel/v1/trait/quarkus.go index fa83375240..21752dc29e 100644 --- a/pkg/apis/camel/v1/trait/quarkus.go +++ b/pkg/apis/camel/v1/trait/quarkus.go @@ -39,10 +39,8 @@ type QuarkusTrait struct { // 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` kit having precedence over the `jvm` one once ready. - // +kubebuilder:default={"jvm"} Modes []QuarkusMode `property:"build-mode" json:"buildMode,omitempty"` // The base image to use when running a native build (default `quay.io/quarkus/quarkus-micro-image:2.0`) - // +kubebuilder:default="quay.io/quarkus/quarkus-micro-image:2.0" NativeBaseImage string `property:"native-base-image" json:"nativeBaseImage,omitempty"` // The image containing the tooling required for a native build (by default it will use the one provided in the runtime catalog) NativeBuilderImage string `property:"native-builder-image" json:"nativeBuilderImage,omitempty"` diff --git a/pkg/apis/camel/v1/trait/service.go b/pkg/apis/camel/v1/trait/service.go index dcb0853f26..d16baae425 100644 --- a/pkg/apis/camel/v1/trait/service.go +++ b/pkg/apis/camel/v1/trait/service.go @@ -29,7 +29,6 @@ type ServiceTrait struct { Auto *bool `property:"auto" json:"auto,omitempty"` // Enable Service to be exposed as NodePort (default `false`). // Deprecated: Use service type instead. - // +kubebuilder:default=false NodePort *bool `property:"node-port" json:"nodePort,omitempty"` // The type of service to be used, either 'ClusterIP', 'NodePort' or 'LoadBalancer'. // +kubebuilder:validation:Enum=ClusterIP;NodePort;LoadBalancer