diff --git a/dev-site.yml b/dev-site.yml index 1a4b489c..aedb70c1 100644 --- a/dev-site.yml +++ b/dev-site.yml @@ -25,6 +25,9 @@ asciidoc: knative-eventing-version: v0.19.2 knative-sources-version: v0.19.0 kn-client-version: v0.19.1 + camel-source-version: v0.19.0 + kafka-source-version: v0.19.3 + kamel-version: 1.3.1 kubernetes-cli: kubectl release-version: master page-pagination: true diff --git a/documentation/modules/advanced/pages/_attributes.adoc b/documentation/modules/advanced/pages/_attributes.adoc index 83feddac..999f0837 100644 --- a/documentation/modules/advanced/pages/_attributes.adoc +++ b/documentation/modules/advanced/pages/_attributes.adoc @@ -2,16 +2,13 @@ :github-repo: https://github.com/redhat-developer-demos/knative-tutorial/blob/{branch} :advanced-module-github-repo-uri: https://github.com/redhat-developer-demos/knative-tutorial-advanced :advanced-github-repo-uri: https://github.com/redhat-developer-demos/knative-tutorial-advanced -:advanced-github-repo: {advanced-module-github-repo-uri}/blob/{branch} -:kamel-version: 1.2.0 +:advanced-github-re17po: {advanced-module-github-repo-uri}/blob/{branch} +:kamel-version: 1.3.1 :experimental: :maven-version: 3.6.3+ -:camel-source-version: -:camel-source-version: v0.17.7 -:knative-eventing-version: v0.17.0 -:kafka-source-version: v0.17.7 :strimzi-version: 0.20.0 :camelk-repo: advanced/camel-k :eventing-repo: eventing :observability-repo: advanced/observability :minikube-nip-io: 192.168.64.13.nip.io +:knative-kafka-repo: https://github.com/knative-sandbox/eventing-kafka diff --git a/documentation/modules/advanced/pages/_partials/adv-kubectl-queries.adoc b/documentation/modules/advanced/pages/_partials/adv-kubectl-queries.adoc index b390e579..317175f0 100644 --- a/documentation/modules/advanced/pages/_partials/adv-kubectl-queries.adoc +++ b/documentation/modules/advanced/pages/_partials/adv-kubectl-queries.adoc @@ -10,6 +10,6 @@ watch kubectl -n {tutorial-namespace} get pods [.console-input] [source,bash,subs="+quotes,+attributes,+macros"] ---- -kubectl -n {tutorial-namespace} get ksvc +kn -n {tutorial-namespace} service ls ---- #end::kgksvc[] \ No newline at end of file diff --git a/documentation/modules/advanced/pages/eventing-with-kafka.adoc b/documentation/modules/advanced/pages/eventing-with-kafka.adoc index cee2b152..58f3bb64 100644 --- a/documentation/modules/advanced/pages/eventing-with-kafka.adoc +++ b/documentation/modules/advanced/pages/eventing-with-kafka.adoc @@ -24,8 +24,7 @@ Knative Eventing `KafkaSource` need to be used to have the Kafka messages to flo [source,bash,subs="+quotes,attributes+,+macros"] ---- kubectl apply \ --f https://github.com/knative/eventing-contrib/\ -releases/download/{kafka-source-version}/kafka-source.yaml +-f {knative-kafka-repo}/releases/download/{kafka-source-version}/source.yaml ---- The previous step deploys Knative KafkaSource in the `knative-sources` namespace as well as a CRD, ServiceAccount, ClusterRole, etc. Verify that knative-source namespace includes the `kafka-controller-manager-0` pod: @@ -52,8 +51,8 @@ You should also deploy the Knative Kafka Channel that can be used to connect the [#kn-eventing-deploy-kafka-channel] [source,bash,subs="+quotes,attributes+,+macros"] ---- -curl -L "https://github.com/knative/eventing-contrib/\ -releases/download/{kafka-source-version}/kafka-channel.yaml" \ +curl -L "{knative-kafka-repo}/\ +releases/download/{kafka-source-version}/channel-consolidated.yaml" \ | sed 's/REPLACE_WITH_CLUSTER_URL/my-cluster-kafka-bootstrap.kafka:9092/' \ | kubectl apply --filename - ---- @@ -121,12 +120,13 @@ The command should show the following APIs in `sources.eventing.knative.dev` : [.console-output] [source,bash,subs="+quotes,attributes+,+macros"] ---- -NAME SHORTNAMES APIGROUP NAMESPACED KIND -apiserversources sources.knative.dev true ApiServerSource -containersources sources.knative.dev true ContainerSource -*kafkasources sources.knative.dev true KafkaSource* -pingsources sources.knative.dev true PingSource -sinkbindings sources.knative.dev true SinkBinding +TYPE NAME DESCRIPTION +ApiServerSource apiserversources.sources.knative.dev Watch and send Kubernetes API events to addressable +CamelSource camelsources.sources.knative.dev +ContainerSource containersources.sources.knative.dev Generate events by Container image and send to addressable +*KafkaSource kafkasources.sources.knative.dev Route events from Apache Kafka Server to addressable* +PingSource pingsources.sources.knative.dev Send periodically ping events to addressable +SinkBinding sinkbindings.sources.knative.dev Binding for connecting a PodSpecable to addressable ---- include: diff --git a/documentation/modules/camelk/pages/_attributes.adoc b/documentation/modules/camelk/pages/_attributes.adoc index 46249056..ed89b290 100644 --- a/documentation/modules/camelk/pages/_attributes.adoc +++ b/documentation/modules/camelk/pages/_attributes.adoc @@ -4,9 +4,8 @@ :camelk-demos-github-repo-uri: https://github.com/redhat-developer-demos/knative-tutorial-camelk :camelk-demos-github-repo: {camelk-demos-github-repo-uri}/blob/{branch} :camelk-repo: advanced/camel-k -:kamel-version: 1.2.0 +:kamel-version: 1.3.1 :experimental: :maven-version: 3.6.0+ -:camel-source-version: -:knative-version: v0.17.0 -:camel-source-version: v0.17.7 \ No newline at end of file +:camel-source-version: v0.19.0 +:eventing-camel-repo: https://github.com/knative-sandbox/eventing-camel \ No newline at end of file diff --git a/documentation/modules/camelk/pages/camel-k-eventing.adoc b/documentation/modules/camelk/pages/camel-k-eventing.adoc index 875deb2d..ed2f3179 100644 --- a/documentation/modules/camelk/pages/camel-k-eventing.adoc +++ b/documentation/modules/camelk/pages/camel-k-eventing.adoc @@ -29,7 +29,7 @@ To deploy CamelSource run the following command: [source,bash,subs="+quotes,+attributes,+macros"] ---- kubectl apply \ - -f "https://github.com/knative/eventing-contrib/releases/download/{camel-source-version}/camel.yaml" + -f "{eventing-camel-repo}/releases/download/{camel-source-version}/camel.yaml" ---- Once you deploy, thee following new pod showing up the `knative-sources` namespace, wait for the `camel-controller-manager-0` to be running: @@ -77,10 +77,20 @@ In order for you to view the events drained from the CamelSource `timed-greeter` [.console-input] [#deploy-ce-event-display] [source,bash,subs="+quotes,+attributes,+macros"] ----- -kubectl apply \ - -f https://github.com/knative/eventing-contrib/releases/download/{camel-source-version}/event-display.yaml ----- +----- +cat <