Skip to content

Commit 3868149

Browse files
DonSchenckDonSchenck
authored
Merge pull request #302 from rafaeltuelho/patch-1
Components upgrade and minor fixes
2 parents 01430ea + 1e67715 commit 3868149

16 files changed

Lines changed: 382 additions & 66 deletions

File tree

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,7 @@ staging-gh-pages
4646

4747
yarn.lock
4848

49-
.DS_Store
49+
.DS_Store
50+
51+
#camel-jbang
52+
**/.camel-jbang

‎advanced/camel-k/eip/fruit-processor-to-knative.yaml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

advanced/camel-k/eip/fruit-processor-kamelet.yaml renamed to advanced/camel-k/eip/fruits-processor-kamelet.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: Kamelet
33
metadata:
44
name: fruits-processor
55
annotations:
6+
camel.apache.org/version: 1.11.0
67
camel.apache.org/kamelet.support.level: "Preview"
78
camel.apache.org/catalog.version: "main-SNAPSHOT"
89
camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCA1MDAgNTAwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA1MDAgNTAwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8ZyBpZD0iWE1MSURfMV8iPg0KCTxwYXRoIGlkPSJYTUxJRF85XyIgZD0iTTMxNC44LDI2OS43Yy0xNC4yLDAtMjcsNi4zLTM1LjcsMTYuMkwyNTYuOCwyNzBjMi40LTYuNSwzLjctMTMuNiwzLjctMjAuOWMwLTcuMi0xLjMtMTQuMS0zLjYtMjAuNg0KCQlsMjIuMy0xNS43YzguNyw5LjksMjEuNCwxNi4xLDM1LjYsMTYuMWMyNi4yLDAsNDcuNi0yMS4zLDQ3LjYtNDcuNnMtMjEuMy00Ny42LTQ3LjYtNDcuNnMtNDcuNiwyMS4zLTQ3LjYsNDcuNg0KCQljMCw0LjcsMC43LDkuMiwyLDEzLjVsLTIyLjMsMTUuN2MtOS4zLTExLjYtMjIuOC0xOS42LTM4LjEtMjIuMXYtMjYuOWMyMS42LTQuNSwzNy44LTIzLjcsMzcuOC00Ni42YzAtMjYuMi0yMS4zLTQ3LjYtNDcuNi00Ny42DQoJCWMtMjYuMiwwLTQ3LjYsMjEuMy00Ny42LDQ3LjZjMCwyMi42LDE1LjgsNDEuNSwzNi45LDQ2LjN2MjcuM2MtMjguOCw1LjEtNTAuOCwzMC4yLTUwLjgsNjAuNWMwLDMwLjQsMjIuMiw1NS43LDUxLjIsNjAuNXYyOC44DQoJCWMtMjEuMyw0LjctMzcuNCwyMy43LTM3LjQsNDYuNGMwLDI2LjIsMjEuMyw0Ny42LDQ3LjYsNDcuNmMyNi4yLDAsNDcuNi0yMS4zLDQ3LjYtNDcuNmMwLTIyLjctMTYtNDEuOC0zNy40LTQ2LjR2LTI4LjgNCgkJYzE1LTIuNSwyOC4yLTEwLjQsMzcuNC0yMS44bDIyLjUsMTUuOWMtMS4yLDQuMy0xLjksOC43LTEuOSwxMy40YzAsMjYuMiwyMS4zLDQ3LjYsNDcuNiw0Ny42czQ3LjYtMjEuMyw0Ny42LTQ3LjYNCgkJQzM2Mi40LDI5MSwzNDEuMSwyNjkuNywzMTQuOCwyNjkuN3ogTTMxNC44LDE1OC40YzEyLjcsMCwyMy4xLDEwLjQsMjMuMSwyMy4xYzAsMTIuNy0xMC4zLDIzLjEtMjMuMSwyMy4xcy0yMy4xLTEwLjQtMjMuMS0yMy4xDQoJCUMyOTEuOCwxNjguOCwzMDIuMSwxNTguNCwzMTQuOCwxNTguNHogTTE3NiwxMTUuMWMwLTEyLjcsMTAuMy0yMy4xLDIzLjEtMjMuMWMxMi43LDAsMjMuMSwxMC40LDIzLjEsMjMuMQ0KCQljMCwxMi43LTEwLjMsMjMuMS0yMy4xLDIzLjFDMTg2LjMsMTM4LjIsMTc2LDEyNy44LDE3NiwxMTUuMXogTTIyMi4xLDM4NC45YzAsMTIuNy0xMC4zLDIzLjEtMjMuMSwyMy4xDQoJCWMtMTIuNywwLTIzLjEtMTAuNC0yMy4xLTIzLjFjMC0xMi43LDEwLjMtMjMuMSwyMy4xLTIzLjFDMjExLjgsMzYxLjgsMjIyLjEsMzcyLjIsMjIyLjEsMzg0Ljl6IE0xOTkuMSwyODEuMw0KCQljLTE3LjcsMC0zMi4yLTE0LjQtMzIuMi0zMi4yYzAtMTcuNywxNC40LTMyLjIsMzIuMi0zMi4yYzE3LjcsMCwzMi4yLDE0LjQsMzIuMiwzMi4yQzIzMS4yLDI2Ni45LDIxNi44LDI4MS4zLDE5OS4xLDI4MS4zeg0KCQkgTTMxNC44LDM0MC4zYy0xMi43LDAtMjMuMS0xMC40LTIzLjEtMjMuMWMwLTEyLjcsMTAuMy0yMy4xLDIzLjEtMjMuMXMyMy4xLDEwLjQsMjMuMSwyMy4xQzMzNy45LDMzMCwzMjcuNSwzNDAuMywzMTQuOCwzNDAuM3oiLz4NCjwvZz4NCjwvc3ZnPg0K"
@@ -29,13 +30,13 @@ spec:
2930
description: Comma separated list of Kafka Broker URLs
3031
type: string
3132
dependencies:
32-
- "github:apache.camel-kamelets:camel-kamelets-utils:main-SNAPSHOT"
33+
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:0.10.0"
3334
- "camel:kafka"
3435
- "camel:kamelet"
3536
- "camel:jackson"
3637
- "camel:core"
3738
- "camel:log"
38-
flow:
39+
template:
3940
from:
4041
uri: "kafka:fruits?brokers=my-cluster-kafka-bootstrap.kafka:9092"
4142
steps:

‎advanced/camel-k/eip/fruits-producer.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- set-header:
77
name: CamelHttpMethod
88
constant: GET
9-
- to: "https://www.fruityvice.com/api/fruit/all"
9+
- to: "https://fruityvice.com/api/fruit/all"
1010
- split:
1111
jsonpath: "$.[*]"
1212
- marshal:

‎apps/eventinghello/src/main/java/com/redhat/developers/LoggerResource.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.Map;
44
import java.util.logging.Logger;
5+
56
import javax.ws.rs.Consumes;
67
import javax.ws.rs.GET;
78
import javax.ws.rs.POST;
@@ -51,7 +52,7 @@ public Response eventingEndpoint(@Context HttpHeaders httpHeaders,
5152

5253
LOGGER.info("POST:" + cloudEventJSON);
5354

54-
return Response.status(Status.OK).entity("{\"hello\":\"world\"}")
55+
return Response.status(Status.OK)
5556
.build();
5657
}
5758

‎bin/install-configure-all-components.sh‎

Lines changed: 267 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,267 @@
1+
#!/bin/sh
2+
3+
SCRIPT_DIR="$( dirname -- "$0"; )"
4+
export TUTORIAL_HOME=$SCRIPT_DIR/../
5+
DNS_DOMAIN=nip.io
6+
KNATIVE_EVENTING_KAFKA_VERSION=v1.8.1
7+
KNATIVE_SERVING_VERSION=v1.8.3
8+
KNATIVE_EVENTING_VERSION=v1.8.5
9+
MINIKUBE_PROFILE=knativetutorial
10+
KOURIER_VERSION=v1.8.1
11+
STRIMZI_OP_VERSION=0.32.0
12+
13+
function confirm() {
14+
read -p "press enter to proceed or 'Ctrl+c' to cancel" -n 1 -r
15+
echo
16+
}
17+
18+
echo "
19+
=========================================
20+
This script assumes you have Minikube properly installed and will automatically install and configure:
21+
22+
* Knative (Serving and Eventing),
23+
* Kafka Cluster (using Strimzi Operator),
24+
* Kourier (Knative Serving) Ingress (a lightweight alternative for the Istio ingress),
25+
* Contour (Kubernetes) Ingress,
26+
* Nexus (Maven Repo Manager),
27+
* Camel-K Operator
28+
29+
on your local active cluster instance.
30+
=========================================
31+
"
32+
confirm
33+
34+
echo
35+
echo ">>> Check Minikube status"
36+
echo
37+
minikube -p $MINIKUBE_PROFILE status
38+
if [ $? -eq 0 ]; then
39+
echo "Ok!"
40+
else
41+
echo "Minikube profile $MINIKUBE_PROFILE not started."
42+
echo "Make sure to create and start it first!"
43+
exit 1
44+
fi
45+
46+
echo
47+
echo ">>> Install Knative Serving ($KNATIVE_SERVING_VERSION) and Eventing ($KNATIVE_EVENTING_VERSION) CRDs..."
48+
confirm
49+
kubectl apply \
50+
--filename https://github.com/knative/serving/releases/download/knative-$KNATIVE_SERVING_VERSION/serving-crds.yaml \
51+
--filename https://github.com/knative/eventing/releases/download/knative-$KNATIVE_EVENTING_VERSION/eventing-crds.yaml
52+
53+
echo
54+
echo "Serving CRDs"
55+
kubectl api-resources --api-group='serving.knative.dev'
56+
echo
57+
echo "Messaging CRDs"
58+
kubectl api-resources --api-group='messaging.knative.dev'
59+
echo
60+
echo "Eventing CRDs"
61+
kubectl api-resources --api-group='eventing.knative.dev'
62+
echo
63+
echo "Sources CRDs"
64+
kubectl api-resources --api-group='sources.knative.dev'
65+
66+
echo
67+
echo "----"
68+
echo ">>> Install Knative Serving ($KNATIVE_SERVING_VERSION)..."
69+
confirm
70+
kubectl apply \
71+
--filename https://github.com/knative/serving/releases/download/knative-$KNATIVE_SERVING_VERSION/serving-core.yaml
72+
73+
sleep 2
74+
75+
echo
76+
echo "Knative deploy status"
77+
kubectl rollout status deploy controller -n knative-serving
78+
kubectl rollout status deploy activator -n knative-serving
79+
kubectl rollout status deploy autoscaler -n knative-serving
80+
kubectl rollout status deploy webhook -n knative-serving
81+
echo
82+
kubectl get pods -n knative-serving
83+
84+
echo
85+
echo "----"
86+
echo ">>> Install Kourier Ingress Gateway ($KOURIER_VERSION)"
87+
confirm
88+
kubectl apply \
89+
--filename https://github.com/knative/net-kourier/releases/download/knative-$KOURIER_VERSION/kourier.yaml
90+
91+
sleep 5
92+
93+
echo
94+
echo "Kourier deployment status"
95+
kubectl rollout status deploy 3scale-kourier-gateway -n kourier-system
96+
kubectl rollout status deploy 3scale-kourier-control -n knative-serving
97+
echo
98+
kubectl get pods --all-namespaces -l 'app in(3scale-kourier-gateway,3scale-kourier-control)'
99+
100+
echo
101+
echo "configure Knative serving to use Kourier as the ingress by patching 'configmap/config-network'"
102+
kubectl patch configmap/config-network \
103+
-n knative-serving \
104+
--type merge \
105+
-p '{"data":{"ingress.class":"kourier.ingress.networking.knative.dev"}}'
106+
107+
echo
108+
echo "----"
109+
echo ">>> Install and Configure Contour Ingress Controller"
110+
confirm
111+
kubectl apply \
112+
--filename https://projectcontour.io/quickstart/contour.yaml
113+
114+
sleep 2
115+
echo
116+
kubectl get pods -n projectcontour
117+
118+
echo
119+
echo ">>> Create an Ingress to Kourier Ingress Gateway..."
120+
cat <<EOF | kubectl apply -n kourier-system -f -
121+
apiVersion: networking.k8s.io/v1
122+
kind: Ingress
123+
metadata:
124+
name: kourier-ingress
125+
namespace: kourier-system
126+
spec:
127+
rules:
128+
- http:
129+
paths:
130+
- path: /
131+
pathType: Prefix
132+
backend:
133+
service:
134+
name: kourier
135+
port:
136+
number: 80
137+
EOF
138+
139+
echo
140+
echo ">>> Configure Knative to use the kourier-ingress Gateway"
141+
ksvc_domain="\"data\":{\""$(minikube -p $MINIKUBE_PROFILE ip)".$DNS_DOMAIN\": \"\"}"
142+
kubectl patch configmap/config-domain \
143+
-n knative-serving \
144+
--type merge \
145+
-p "{$ksvc_domain}"
146+
147+
echo
148+
echo "----"
149+
echo ">>> Install Knative Eventing ($KNATIVE_EVENTING_VERSION) resources"
150+
confirm
151+
kubectl apply \
152+
--filename \
153+
https://github.com/knative/eventing/releases/download/knative-$KNATIVE_EVENTING_VERSION/eventing-core.yaml \
154+
--filename \
155+
https://github.com/knative/eventing/releases/download/knative-$KNATIVE_EVENTING_VERSION/in-memory-channel.yaml \
156+
--filename \
157+
https://github.com/knative/eventing/releases/download/knative-$KNATIVE_EVENTING_VERSION/mt-channel-broker.yaml
158+
159+
echo
160+
echo "Knative Eventing deploy status"
161+
kubectl rollout status deploy eventing-controller -n knative-eventing
162+
kubectl rollout status deploy eventing-webhook -n knative-eventing
163+
kubectl rollout status deploy imc-controller -n knative-eventing
164+
kubectl rollout status deploy imc-dispatcher -n knative-eventing
165+
kubectl rollout status deploy mt-broker-controller -n knative-eventing
166+
kubectl rollout status deploy mt-broker-filter -n knative-eventing
167+
kubectl rollout status deploy mt-broker-filter -n knative-eventing
168+
169+
echo
170+
kubectl get pods -n knative-eventing
171+
172+
sleep 3
173+
174+
echo
175+
echo "----"
176+
echo ">>> Create Tutorial Namespace"
177+
confirm
178+
kubectl create namespace knativetutorial
179+
echo
180+
kubens knativetutorial
181+
182+
echo "Minikube Docker env"
183+
eval $(minikube docker-env)
184+
185+
echo
186+
echo "----"
187+
echo ">>> Install Apache Camel K"
188+
confirm
189+
echo
190+
echo "Configure Maven Settings pointing to a local Nexus Instance to be used by the Camel-K Operator..."
191+
kubectl create configmap \
192+
-n knativetutorial my-camel-k-maven-settings \
193+
--from-file=settings.xml="$TUTORIAL_HOME/install/utils/camel-k-maven-settings.xml"
194+
195+
echo
196+
echo ">>> Enable image registry addon on Minikube"
197+
minikube -p $MINIKUBE_PROFILE addons enable registry
198+
199+
echo
200+
echo ">>> Install Camel-K Operator..."
201+
kamel install \
202+
--namespace knativetutorial \
203+
--olm=false \
204+
--maven-cli-option="-e" \
205+
--maven-cli-option="--no-transfer-progress" \
206+
--maven-cli-option="-Dstyle.color=never" \
207+
--maven-settings="configmap:my-camel-k-maven-settings/settings.xml" \
208+
--wait
209+
210+
echo
211+
echo "----"
212+
echo ">>> Deploy Nexus"
213+
confirm
214+
kubectl apply -n knativetutorial -f $TUTORIAL_HOME/install/utils/nexus.yaml
215+
216+
sleep 10
217+
echo
218+
kubectl get -n knativetutorial pods
219+
220+
echo
221+
echo "Get nexus Admin pwd"
222+
export NEXUS_POD=$(kubectl -n knativetutorial get pods \
223+
-lapp=nexus -ojsonpath='{.items[0].metadata.name}')
224+
kubectl exec $NEXUS_POD -- cat /nexus-data/admin.password
225+
minikube -p $MINIKUBE_PROFILE service -n knativetutorial nexus
226+
227+
echo
228+
echo "----"
229+
echo ">>> Deploy Kafka through Strimzi Operator ($STRIMZI_OP_VERSION)"
230+
confirm
231+
kubectl create namespace kafka
232+
233+
curl -L https://github.com/strimzi/strimzi-kafka-operator/releases/download/$STRIMZI_OP_VERSION/strimzi-cluster-operator-$STRIMZI_OP_VERSION.yaml \
234+
| sed 's/namespace:.*/namespace: kafka/' \
235+
| kubectl apply -n kafka -f -
236+
237+
echo
238+
kubectl api-resources --api-group='kafka.strimzi.io'
239+
240+
echo
241+
echo ">>> Create a Kafka Cluster"
242+
kubectl -n kafka apply -f $TUTORIAL_HOME/eventing/kafka-broker-my-cluster.yaml
243+
244+
echo
245+
kubectl get pods -n kafka
246+
247+
echo
248+
echo ">>> Deploy Knative Eventing KafkaSource ($KNATIVE_EVENTING_KAFKA_VERSION)"
249+
kubectl apply -f https://github.com/knative-sandbox/eventing-kafka/releases/download/knative-$KNATIVE_EVENTING_KAFKA_VERSION/source.yaml
250+
251+
echo
252+
echo ">>> Deploy a Knative Kafka Channel"
253+
curl -L "https://github.com/knative-sandbox/eventing-kafka/releases/download/knative-$KNATIVE_EVENTING_KAFKA_VERSION/channel-consolidated.yaml" \
254+
| sed 's/REPLACE_WITH_CLUSTER_URL/my-cluster-kafka-bootstrap.kafka:9092/' \
255+
| kubectl apply --filename -
256+
257+
echo
258+
kubectl get pods -n knative-eventing
259+
kn source list-types
260+
261+
echo
262+
echo "----"
263+
echo ">>> Using Kafka Channel as Default Knative Channel"
264+
kubectl apply -f $TUTORIAL_HOME/eventing/default-channel-config.yaml
265+
266+
echo
267+
echo "All set!"

‎dev-site.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runtime:
44
site:
55
title: Knative Tutorial
66
url: https://redhat-developer-demos.github.io/knative-tutorial
7-
start_page: index.adoc
7+
start_page: knative-tutorial::index.adoc
88

99
content:
1010
sources:
@@ -16,18 +16,18 @@ asciidoc:
1616
tutorial-namespace: knativetutorial
1717
branch: master
1818
workshop-domain: guru.devx.red
19-
minikube-version: v1.25.1
19+
minikube-version: v1.28.0
2020
openshift-version: v4.8
2121
kubernetes-version: v1.23.0
22-
knative-version: v1.1.0
23-
knative-serving-version: v1.1.0
24-
net-kourier-version: v1.1.0
25-
knative-eventing-version: v1.1.0
22+
knative-version: v1.8.1
23+
knative-serving-version: v1.8.3
24+
net-kourier-version: v1.8.1
25+
knative-eventing-version: v1.8.5
2626
knative-sources-version: v1.1.0
27-
kn-client-version: v1.1.0
27+
kn-client-version: v1.8.1
2828
camel-source-version: v0.24.0
29-
kafka-source-version: v1.1.0
30-
kamel-version: 1.8.0
29+
kafka-source-version: v1.8.1
30+
kamel-version: 1.11.0
3131
kubernetes-cli: kubectl
3232
release-version: master
3333
page-pagination: true

‎documentation/modules/advanced/pages/_attributes.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
:kamel-version: 1.8.0
77
:experimental:
88
:maven-version: 3.6.3+
9-
:strimzi-version: 0.26.1
9+
:strimzi-version: 0.32.0
1010
:camelk-repo: advanced/camel-k
1111
:eventing-repo: eventing
1212
:observability-repo: advanced/observability

0 commit comments

Comments
 (0)