From 7da55f14ad84da622e3d5402853898d43c43f495 Mon Sep 17 00:00:00 2001 From: Ali Ok Date: Tue, 10 Nov 2020 17:54:43 +0300 Subject: [PATCH] Knative Kafka related fixes --- bin/clean-completed.sh | 5 ++++- bin/kafka-list-topics.sh | 2 +- .../advanced/pages/_partials/default-knative-channel.adoc | 4 ++-- .../modules/advanced/pages/deploy-apache-kafka.adoc | 2 ++ .../modules/advanced/pages/eventing-with-kafka.adoc | 2 +- eventing/mykafka-source.yaml | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bin/clean-completed.sh b/bin/clean-completed.sh index 3fa70ee1..9d8d9a2a 100755 --- a/bin/clean-completed.sh +++ b/bin/clean-completed.sh @@ -1,4 +1,7 @@ #!/bin/bash +echo "Deleting completed pods" kubectl delete pods --field-selector=status.phase=Succeeded -kubectl delete pods --field-selector=status.phase=Failed \ No newline at end of file + +echo "Deleting failed pods" +kubectl delete pods --field-selector=status.phase=Failed diff --git a/bin/kafka-list-topics.sh b/bin/kafka-list-topics.sh index 0cc5b3c3..c2497e0d 100755 --- a/bin/kafka-list-topics.sh +++ b/bin/kafka-list-topics.sh @@ -11,4 +11,4 @@ kubectl exec -it "$KAFKA_CLUSTER_NAME-kafka-0" \ -n $KAFKA_CLUSTER_NS \ -- ./bin/kafka-topics.sh \ --list \ - --zookeeper localhost:2181 + --bootstrap-server localhost:9092 diff --git a/documentation/modules/advanced/pages/_partials/default-knative-channel.adoc b/documentation/modules/advanced/pages/_partials/default-knative-channel.adoc index 7d09889f..4922b552 100644 --- a/documentation/modules/advanced/pages/_partials/default-knative-channel.adoc +++ b/documentation/modules/advanced/pages/_partials/default-knative-channel.adoc @@ -58,8 +58,8 @@ kn channel -n {tutorial-namespace} ls [.console-output] [source,bash] ---- -NAME TYPE URL AGE READY REASON -my-events-ch InMemoryChannel http://my-events-ch-kn-channel.knativetutorial.svc.cluster.local 10m True +NAME TYPE URL AGE READY REASON +my-events-ch KafkaChannel http://my-events-ch-kn-channel.knativetutorial.svc.cluster.local 2m55s True ---- -- {kubernetes-cli}:: diff --git a/documentation/modules/advanced/pages/deploy-apache-kafka.adoc b/documentation/modules/advanced/pages/deploy-apache-kafka.adoc index 9d9a7401..b051393c 100644 --- a/documentation/modules/advanced/pages/deploy-apache-kafka.adoc +++ b/documentation/modules/advanced/pages/deploy-apache-kafka.adoc @@ -105,6 +105,8 @@ NAME READY STATUS AGE my-cluster-entity-operator-7d677bdf7b-jpws7 3/3 Running 85s my-cluster-kafka-0 2/2 Running 110s my-cluster-zookeeper-0 2/2 Running 2m22s +my-cluster-zookeeper-1 2/2 Running 2m22s +my-cluster-zookeeper-2 2/2 Running 2m22s strimzi-cluster-operator-85f596bfc7-7dgds 1/1 Running 4m22s ---- diff --git a/documentation/modules/advanced/pages/eventing-with-kafka.adoc b/documentation/modules/advanced/pages/eventing-with-kafka.adoc index b0c1b38b..c44b5cd3 100644 --- a/documentation/modules/advanced/pages/eventing-with-kafka.adoc +++ b/documentation/modules/advanced/pages/eventing-with-kafka.adoc @@ -231,7 +231,7 @@ Create a `KafkaSource` for `my-topic` by connecting your Kafka topic `my-topic` [source,yaml] ---- -apiVersion: sources.knative.dev/v1alpha1 +apiVersion: sources.knative.dev/v1beta1 kind: KafkaSource metadata: name: mykafka-source diff --git a/eventing/mykafka-source.yaml b/eventing/mykafka-source.yaml index b1100bf4..21d4a896 100644 --- a/eventing/mykafka-source.yaml +++ b/eventing/mykafka-source.yaml @@ -1,4 +1,4 @@ -apiVersion: sources.knative.dev/v1alpha1 +apiVersion: sources.knative.dev/v1beta1 kind: KafkaSource metadata: name: mykafka-source