Merge branch '7.0.0-post' into 7.0.1-post

matt-mangia · Jan 21, 2022 · e0570d5 · e0570d5
2 parents 345a025 + ba53911
commit e0570d5
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 16 deletions.
diff --git a/ccloud/docs/config/backed-to-destination/docker-compose.yml b/ccloud/docs/config/backed-to-destination/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       CONNECT_BOOTSTRAP_SERVERS: $BOOTSTRAP_SERVERS_DESTINATION
       CONNECT_REST_ADVERTISED_HOST_NAME: connect-destination
       CONNECT_PRODUCER_CLIENT_ID: "demo-connect-destination-worker-producer"
-      CONNECT_REST_PORT: 8087
+      CONNECT_REST_ADVERTISED_PORT: 8087
       CONNECT_GROUP_ID: "connect-destination"
 
       CONNECT_CONFIG_STORAGE_TOPIC: demo-connect-destination-configs

diff --git a/ccloud/docs/config/backed-to-origin/docker-compose.yml b/ccloud/docs/config/backed-to-origin/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       CONNECT_BOOTSTRAP_SERVERS: $BOOTSTRAP_SERVERS_ORIGIN
       CONNECT_REST_ADVERTISED_HOST_NAME: connect-origin
       CONNECT_PRODUCER_CLIENT_ID: "demo-connect-origin-worker-producer"
-      CONNECT_REST_PORT: 8087
+      CONNECT_REST_ADVERTISED_PORT: 8087
       CONNECT_GROUP_ID: "connect-origin"
       CONNECT_CONNECTOR_CLIENT_CONFIG_OVERRIDE_POLICY: "All"
 

diff --git a/clickstream/docker-compose.yml b/clickstream/docker-compose.yml
@@ -79,7 +79,6 @@ services:
       # ksqlDB embedded Connect worker
       KSQL_CONNECT_BOOTSTRAP_SERVERS: kafka:29092
       KSQL_CONNECT_REST_ADVERTISED_HOST_NAME: ksqldb
-      KSQL_CONNECT_REST_PORT: 8083
       KSQL_CONNECT_GROUP_ID: ksqldb-kafka-connect-group-01
       KSQL_CONNECT_CONFIG_STORAGE_TOPIC: _ksqldb-kafka-connect-group-01-configs
       KSQL_CONNECT_OFFSET_STORAGE_TOPIC: _ksqldb-kafka-connect-group-01-offsets

diff --git a/clients/cloud/kafka-connect-datagen/docker-compose.yml b/clients/cloud/kafka-connect-datagen/docker-compose.yml
@@ -23,7 +23,6 @@ services:
       - "8083:8083"
     environment:
       CONNECT_BOOTSTRAP_SERVERS: $BOOTSTRAP_SERVERS
-      CONNECT_REST_PORT: 8083
       CONNECT_GROUP_ID: "connect"
       CONNECT_CONFIG_STORAGE_TOPIC: connect-configs
       CONNECT_OFFSET_STORAGE_TOPIC: connect-offsets

diff --git a/clients/cloud/ksql-datagen/docker-compose.yml b/clients/cloud/ksql-datagen/docker-compose.yml
@@ -52,7 +52,6 @@ services:
       - "8083:8083"
     environment:
       CONNECT_BOOTSTRAP_SERVERS: $BOOTSTRAP_SERVERS
-      CONNECT_REST_PORT: 8083
       CONNECT_GROUP_ID: "connect"
       CONNECT_CONFIG_STORAGE_TOPIC: connect-configs
       CONNECT_OFFSET_STORAGE_TOPIC: connect-offsets

diff --git a/microservices-orders/docker-compose.yml b/microservices-orders/docker-compose.yml
@@ -55,7 +55,6 @@ services:
       CONNECT_REST_ADVERTISED_HOST_NAME: connect
       CONNECT_GROUP_ID: "examples-microservices-orders"
       CONNECT_REST_ADVERTISED_HOST_NAME: connect
-      CONNECT_REST_PORT: 8083
 
       CONNECT_SECURITY_PROTOCOL: SASL_SSL
       CONNECT_SASL_JAAS_CONFIG: $SASL_JAAS_CONFIG

diff --git a/multi-datacenter/docker-compose.yml b/multi-datacenter/docker-compose.yml
@@ -119,7 +119,7 @@ services:
     environment:
       CONNECT_BOOTSTRAP_SERVERS: 'broker-dc2:29092'
       CONNECT_REST_ADVERTISED_HOST_NAME: connect-dc2
-      CONNECT_REST_PORT: 8382
+      CONNECT_LISTENERS: http://connect-dc2:8382
       CONNECT_GROUP_ID: "connect-dc2"
       CONNECT_PRODUCER_CLIENT_ID: "connect-worker-producer-dc2"
       CONNECT_CONFIG_STORAGE_TOPIC: connect-configs-dc2
@@ -158,7 +158,7 @@ services:
     environment:
       CONNECT_BOOTSTRAP_SERVERS: 'broker-dc1:29091'
       CONNECT_REST_ADVERTISED_HOST_NAME: connect-dc1
-      CONNECT_REST_PORT: 8381
+      CONNECT_LISTENERS: http://connect-dc1:8381
       CONNECT_GROUP_ID: "connect-dc1"
       CONNECT_PRODUCER_CLIENT_ID: "connect-worker-producer-dc1"
       CONNECT_CONFIG_STORAGE_TOPIC: connect-configs-dc1

diff --git a/multi-datacenter/start.sh b/multi-datacenter/start.sh
@@ -5,6 +5,8 @@ source ../utils/helper.sh
 
 check_jq || exit 1
 
+./stop.sh
+
 docker-compose up -d
 
 # Verify Kafka Connect workers have started

diff --git a/replicator-schema-translation/docker-compose.yml b/replicator-schema-translation/docker-compose.yml
@@ -87,7 +87,6 @@ services:
       - $PWD/scripts:/etc/kafka/scripts
     environment:
       CONNECT_BOOTSTRAP_SERVERS: "destKafka1:11091"
-      CONNECT_REST_PORT: 8083
       CONNECT_LISTENERS: "http://0.0.0.0:8083"
       CONNECT_CONFIG_STORAGE_TOPIC: connect-configs
       CONNECT_OFFSET_STORAGE_TOPIC: connect-offsets

diff --git a/replicator-security/dest_sasl_plain_auth/docker-compose.yml b/replicator-security/dest_sasl_plain_auth/docker-compose.yml
@@ -97,7 +97,6 @@ services:
       - mi3:/usr/share/replicator/kafka-connect-replicator/
     environment:
       CONNECT_BOOTSTRAP_SERVERS: "destKafka1:11091"
-      CONNECT_REST_PORT: 8083
       CONNECT_LISTENERS: "http://0.0.0.0:8083"
       CONNECT_CONFIG_STORAGE_TOPIC: connect-configs
       CONNECT_OFFSET_STORAGE_TOPIC: connect-offsets

diff --git a/replicator-security/dest_ssl_auth/docker-compose.yml b/replicator-security/dest_ssl_auth/docker-compose.yml
@@ -96,7 +96,6 @@ services:
       - $PWD/scripts/security:/etc/kafka/secrets
     environment:
       CONNECT_BOOTSTRAP_SERVERS: "destKafka1:11091"
-      CONNECT_REST_PORT: 8083
       CONNECT_LISTENERS: "http://0.0.0.0:8083"
       CONNECT_CONFIG_STORAGE_TOPIC: connect-configs
       CONNECT_OFFSET_STORAGE_TOPIC: connect-offsets

diff --git a/replicator-security/dest_ssl_encryption/docker-compose.yml b/replicator-security/dest_ssl_encryption/docker-compose.yml
@@ -95,7 +95,6 @@ services:
       - $PWD/scripts/security:/etc/kafka/secrets
     environment:
       CONNECT_BOOTSTRAP_SERVERS: "destKafka1:11091"
-      CONNECT_REST_PORT: 8083
       CONNECT_LISTENERS: "http://0.0.0.0:8083"
       CONNECT_CONFIG_STORAGE_TOPIC: connect-configs
       CONNECT_OFFSET_STORAGE_TOPIC: connect-offsets

diff --git a/replicator-security/source_sasl_plain_auth/docker-compose.yml b/replicator-security/source_sasl_plain_auth/docker-compose.yml
@@ -97,7 +97,6 @@ services:
       - mi3:/usr/share/replicator/kafka-connect-replicator/
     environment:
       CONNECT_BOOTSTRAP_SERVERS: "destKafka1:11091"
-      CONNECT_REST_PORT: 8083
       CONNECT_LISTENERS: "http://0.0.0.0:8083"
       CONNECT_CONFIG_STORAGE_TOPIC: connect-configs
       CONNECT_OFFSET_STORAGE_TOPIC: connect-offsets

diff --git a/replicator-security/source_ssl_auth/docker-compose.yml b/replicator-security/source_ssl_auth/docker-compose.yml
@@ -95,7 +95,6 @@ services:
       - $PWD/scripts/security:/etc/kafka/secrets
     environment:
       CONNECT_BOOTSTRAP_SERVERS: "destKafka1:11091"
-      CONNECT_REST_PORT: 8083
       CONNECT_LISTENERS: "http://0.0.0.0:8083"
       CONNECT_CONFIG_STORAGE_TOPIC: connect-configs
       CONNECT_OFFSET_STORAGE_TOPIC: connect-offsets

diff --git a/replicator-security/source_ssl_encryption/docker-compose.yml b/replicator-security/source_ssl_encryption/docker-compose.yml
@@ -94,7 +94,6 @@ services:
       - $PWD/scripts/security:/etc/kafka/secrets
     environment:
       CONNECT_BOOTSTRAP_SERVERS: "destKafka1:11091"
-      CONNECT_REST_PORT: 8083
       CONNECT_LISTENERS: "http://0.0.0.0:8083"
       CONNECT_CONFIG_STORAGE_TOPIC: connect-configs
       CONNECT_OFFSET_STORAGE_TOPIC: connect-offsets

diff --git a/replicator-security/unsecure/docker-compose.yml b/replicator-security/unsecure/docker-compose.yml
@@ -86,7 +86,6 @@ services:
       - mi3:/usr/share/replicator/kafka-connect-replicator/
     environment:
       CONNECT_BOOTSTRAP_SERVERS: "destKafka1:11091"
-      CONNECT_REST_PORT: 8083
       CONNECT_LISTENERS: "http://0.0.0.0:8083"
       CONNECT_CONFIG_STORAGE_TOPIC: connect-configs
       CONNECT_OFFSET_STORAGE_TOPIC: connect-offsets