Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Fix 1401 #1432

Merged
merged 2 commits into from
Apr 27, 2020
Merged

Fix 1401 #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c34e1f
Camel Cron trait page is rendered incorrectly
oscerd Apr 27, 2020
594d181
Regen docs
oscerd Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deploy/traits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ traits:
a Kubernetes CronJob are the following:- `timer`: when periods can be written
as cron expressions. E.g. `timer:tick?period=60000`.- `cron`, `quartz`: when the
cron expression does not contain seconds (or the "seconds" part is set to 0).
E.g. `cron:tab?schedule=0/2+*+*+*+?` or `quartz:trigger?cron=0+0/2+*+*+*+?`.'
E.g. `cron:tab?schedule=0/2${plus}*{plus}*{plus}*{plus}?` or `quartz:trigger?cron=0{plus}0/2{plus}*{plus}*{plus}*{plus}?`.'
properties:
- name: enabled
type: bool
Expand Down Expand Up @@ -288,7 +288,7 @@ traits:
description: Can be used to enable or disable a trait. All traits share this common
property.
- name: discovery-cache
type: ./pkg/trait.discoveryCacheType
type: github.com/apache/camel-k/pkg/trait.discoveryCacheType
description: Discovery client cache to be used, either `disabled`, `disk` or `memory`
(default `memory`)
- name: ingress
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/traits/cron.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Integrations that start from the following components are evaluated by the cron
The rules for using a Kubernetes CronJob are the following:
- `timer`: when periods can be written as cron expressions. E.g. `timer:tick?period=60000`.
- `cron`, `quartz`: when the cron expression does not contain seconds (or the "seconds" part is set to 0). E.g.
`cron:tab?schedule=0/2+*+*+*+?` or `quartz:trigger?cron=0+0/2+*+*+*+?`.
`cron:tab?schedule=0/2${plus}*{plus}*{plus}*{plus}?` or `quartz:trigger?cron=0{plus}0/2{plus}*{plus}*{plus}*{plus}?`.


This trait is available in the following profiles: **Kubernetes, Knative, OpenShift**.
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/traits/gc.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The following configuration options are available:
| Can be used to enable or disable a trait. All traits share this common property.

| gc.discovery-cache
| ./pkg/trait.discoveryCacheType
| github.com/apache/camel-k/pkg/trait.discoveryCacheType
| Discovery client cache to be used, either `disabled`, `disk` or `memory` (default `memory`)

|===
Expand Down
2 changes: 1 addition & 1 deletion pkg/trait/cron.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import (
// The rules for using a Kubernetes CronJob are the following:
// - `timer`: when periods can be written as cron expressions. E.g. `timer:tick?period=60000`.
// - `cron`, `quartz`: when the cron expression does not contain seconds (or the "seconds" part is set to 0). E.g.
// `cron:tab?schedule=0/2+*+*+*+?` or `quartz:trigger?cron=0+0/2+*+*+*+?`.
// `cron:tab?schedule=0/2${plus}*{plus}*{plus}*{plus}?` or `quartz:trigger?cron=0{plus}0/2{plus}*{plus}*{plus}*{plus}?`.
//
// +camel-k:trait=cron
type cronTrait struct {
Expand Down