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.

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

7.8.0 oauth fix v2 #173

Merged
merged 55 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
593ee09
Merge branch '7.8.x' into master (using strategy ours)
ConfluentSemaphore Sep 3, 2024
9dd7cea
Bump Confluent to 7.9.0-0, Kafka to 7.9.0-0
ConfluentSemaphore Sep 3, 2024
6edffa2
Merge branch '7.8.x' into master by kc596
ConfluentSemaphore Sep 15, 2024
0b33458
Merge branch '7.8.x' into master (using strategy ours)
ConfluentSemaphore Sep 17, 2024
97853b8
Merge branch '7.8.x' into master (using strategy ours)
ConfluentSemaphore Sep 17, 2024
c6d8258
Merge branch '7.8.x' into master (using strategy ours)
ConfluentSemaphore Sep 17, 2024
cb72dc4
Merge branch '7.8.x' into master (using strategy ours)
ConfluentSemaphore Sep 17, 2024
3db9566
Merge branch '7.8.x' into master (using strategy ours)
ConfluentSemaphore Sep 17, 2024
230c0a0
Merge branch '7.8.x' into master (using strategy ours)
ConfluentSemaphore Sep 17, 2024
050c835
Merge branch '7.8.x' into master (using strategy ours)
ConfluentSemaphore Sep 17, 2024
3c6596f
Merge branch '7.8.x' into master (using strategy ours)
ConfluentSemaphore Sep 17, 2024
09d502b
Merge branch '7.8.x' into master by davetroiano
ConfluentSemaphore Nov 5, 2024
d1a5166
Bump Confluent to 7.9.0-0, Kafka to 7.9.0-0
ConfluentSemaphore Nov 13, 2024
e06c2ac
Merge branch '7.9.x' into master (using strategy ours)
ConfluentSemaphore Nov 13, 2024
da04c2b
Bump Confluent to 8.0.0-0, Kafka to 8.0.0-0
ConfluentSemaphore Nov 13, 2024
05e3448
Improved startup procedure
ethaden Nov 25, 2024
7103f72
Merge remote-tracking branch 'origin/7.9.x' into pr_merge_from_7_8_x_…
davetroiano Nov 26, 2024
e634212
update dependency version
davetroiano Nov 26, 2024
9f3cd69
Merge pull request #169 from confluentinc/pr_merge_from_7_8_x_to_7_9_x
davetroiano Nov 26, 2024
c062647
Merge remote-tracking branch 'origin/master' into pr_merge_from_7_9_x…
davetroiano Nov 26, 2024
9e46ea5
Merge pull request #170 from confluentinc/pr_merge_from_7_9_x_to_master
davetroiano Nov 26, 2024
c8e66b9
Merge branch '7.8.x' into 7.9.x (using strategy ours)
ConfluentSemaphore Nov 29, 2024
523c439
Merge branch '7.9.x' into master (using strategy ours)
ConfluentSemaphore Nov 29, 2024
52b6342
Merge branch '7.8.x' into 7.9.x (using strategy ours)
ConfluentSemaphore Nov 29, 2024
c088fdb
Merge branch '7.9.x' into master (using strategy ours)
ConfluentSemaphore Nov 29, 2024
73c6e24
Merge branch '7.8.x' into 7.9.x (using strategy ours)
ConfluentSemaphore Nov 29, 2024
3704bc4
Merge branch '7.9.x' into master (using strategy ours)
ConfluentSemaphore Nov 29, 2024
5debdb5
Merge branch '7.8.x' into 7.9.x (using strategy ours)
ConfluentSemaphore Nov 29, 2024
12bf037
Merge branch '7.9.x' into master (using strategy ours)
ConfluentSemaphore Nov 29, 2024
cf8cdca
Merge branch '7.8.x' into 7.9.x (using strategy ours)
ConfluentSemaphore Nov 29, 2024
7be8bc2
Merge branch '7.9.x' into master (using strategy ours)
ConfluentSemaphore Nov 29, 2024
7dc8d35
Merge branch '7.8.x' into 7.9.x (using strategy ours)
ConfluentSemaphore Nov 29, 2024
b130bf6
Merge branch '7.9.x' into master (using strategy ours)
ConfluentSemaphore Nov 29, 2024
53f64fb
Merge branch '7.8.x' into 7.9.x (using strategy ours)
ConfluentSemaphore Nov 29, 2024
a76335c
Merge branch '7.9.x' into master (using strategy ours)
ConfluentSemaphore Nov 29, 2024
8a287f2
Merge branch '7.8.0-post' into 7.8.x (using strategy ours)
ConfluentSemaphore Dec 2, 2024
0021a2f
Merge branch '7.8.x' into 7.9.x (using strategy ours)
ConfluentSemaphore Dec 2, 2024
68c1e9b
Merge branch '7.9.x' into master (using strategy ours)
ConfluentSemaphore Dec 2, 2024
63aac04
Made sure the keypair folder exists
ethaden Dec 6, 2024
323be99
Merged v7.7.2
ethaden Dec 6, 2024
0f56410
Upgraded to CP 7.8. Added stop script
ethaden Dec 6, 2024
68dcd2a
Merge branch '7.8.0-post' into 7.8.x by davetroiano
ConfluentSemaphore Dec 17, 2024
c95e299
Merge branch '7.8.x' into 7.9.x by davetroiano
ConfluentSemaphore Dec 17, 2024
532e6c9
Merge branch '7.9.x' into master by davetroiano
ConfluentSemaphore Dec 17, 2024
917c104
Fixed permissions
ethaden Jan 6, 2025
09bc5f8
Using CP 7.8.0
ethaden Jan 6, 2025
c6784a8
Use special image for generating certificates
ethaden Jan 6, 2025
b958020
Merge remote-tracking branch 'origin/master' into 7.7.1-oauth-fix
ethaden Jan 6, 2025
f52f52d
Let ksqldb wait for permissions to be set up
ethaden Jan 6, 2025
721f9b7
Improved documentation
ethaden Jan 13, 2025
ff1a78b
Fixed ksqldb
ethaden Jan 13, 2025
6671477
Using 7.8.0 everywhere
ethaden Jan 13, 2025
e67fd01
Removed unused code from shell scripts. Added helper script
ethaden Jan 13, 2025
c166d82
Removed commented image source line
ethaden Jan 13, 2025
a21f7db
Reverted versions
ethaden Jan 16, 2025
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ img_data
**/ccloud_library.sh
*.tar.gz
log.*
.env
keypair
2 changes: 1 addition & 1 deletion cp-all-in-one-cloud/docker-compose.connect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
CONNECT_LOG4J_ROOT_LOGLEVEL: INFO
# CLASSPATH required due to CC-2422
CLASSPATH: /usr/share/java/monitoring-interceptors/monitoring-interceptors-7.7.1.jar
CLASSPATH: /usr/share/java/monitoring-interceptors/monitoring-interceptors-8.0.0-0.jar
davetroiano marked this conversation as resolved.
Show resolved Hide resolved
# Connect worker
CONNECT_SECURITY_PROTOCOL: SASL_SSL
CONNECT_SASL_JAAS_CONFIG: $SASL_JAAS_CONFIG
Expand Down
12 changes: 6 additions & 6 deletions cp-all-in-one-cloud/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
services:

schema-registry:
image: confluentinc/cp-schema-registry:7.8.0
image: confluentinc/cp-schema-registry:8.0.x-latest
davetroiano marked this conversation as resolved.
Show resolved Hide resolved
hostname: schema-registry
container_name: schema-registry
ports:
Expand All @@ -16,7 +16,7 @@ services:
SCHEMA_REGISTRY_KAFKASTORE_SASL_MECHANISM: "PLAIN"

ksqldb-server:
image: confluentinc/cp-ksqldb-server:7.8.0
image: confluentinc/cp-ksqldb-server:8.0.x-latest
hostname: ksqldb-server
container_name: ksqldb-server
ports:
Expand Down Expand Up @@ -58,13 +58,13 @@ services:
KSQL_KSQL_CONNECT_URL: "http://connect:8083"

ksqldb-cli:
image: confluentinc/cp-ksqldb-cli:7.8.0
image: confluentinc/cp-ksqldb-cli:8.0.x-latest
container_name: ksqldb-cli
entrypoint: /bin/sh
tty: true

control-center:
image: confluentinc/cp-enterprise-control-center:7.8.0
image: confluentinc/cp-enterprise-control-center:8.0.x-latest
hostname: control-center
container_name: control-center
ports:
Expand Down Expand Up @@ -119,7 +119,7 @@ services:
CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
CONNECT_LOG4J_ROOT_LOGLEVEL: INFO
# CLASSPATH required due to CC-2422
CLASSPATH: /usr/share/java/monitoring-interceptors/monitoring-interceptors-7.8.0.jar
CLASSPATH: /usr/share/java/monitoring-interceptors/monitoring-interceptors-8.0.0-0.jar
# Connect worker
CONNECT_SECURITY_PROTOCOL: SASL_SSL
CONNECT_SASL_JAAS_CONFIG: $SASL_JAAS_CONFIG
Expand All @@ -142,7 +142,7 @@ services:
CONNECT_CONSUMER_CONFLUENT_MONITORING_INTERCEPTOR_SASL_MECHANISM: PLAIN

rest-proxy:
image: confluentinc/cp-kafka-rest:7.8.0
image: confluentinc/cp-kafka-rest:8.0.x-latest
ports:
- 8082:8082
hostname: rest-proxy
Expand Down
12 changes: 6 additions & 6 deletions cp-all-in-one-community/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
services:

broker:
image: confluentinc/cp-kafka:7.8.0
image: confluentinc/cp-kafka:8.0.x-latest
hostname: broker
container_name: broker
ports:
Expand All @@ -29,7 +29,7 @@ services:
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'

schema-registry:
image: confluentinc/cp-schema-registry:7.8.0
image: confluentinc/cp-schema-registry:8.0.x-latest
hostname: schema-registry
container_name: schema-registry
depends_on:
Expand Down Expand Up @@ -67,7 +67,7 @@ services:
CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"

ksqldb-server:
image: confluentinc/cp-ksqldb-server:7.8.0
image: confluentinc/cp-ksqldb-server:8.0.x-latest
hostname: ksqldb-server
container_name: ksqldb-server
depends_on:
Expand All @@ -88,7 +88,7 @@ services:
KSQL_KSQL_LOGGING_PROCESSING_STREAM_AUTO_CREATE: 'true'

ksqldb-cli:
image: confluentinc/cp-ksqldb-cli:7.8.0
image: confluentinc/cp-ksqldb-cli:8.0.x-latest
container_name: ksqldb-cli
depends_on:
- broker
Expand All @@ -98,7 +98,7 @@ services:
tty: true

ksql-datagen:
image: confluentinc/ksqldb-examples:7.8.0
image: confluentinc/ksqldb-examples:8.0.x-latest
hostname: ksql-datagen
container_name: ksql-datagen
depends_on:
Expand All @@ -120,7 +120,7 @@ services:
STREAMS_SCHEMA_REGISTRY_PORT: 8081

rest-proxy:
image: confluentinc/cp-kafka-rest:7.8.0
image: confluentinc/cp-kafka-rest:8.0.x-latest
depends_on:
- broker
- schema-registry
Expand Down
16 changes: 8 additions & 8 deletions cp-all-in-one-kraft/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
services:

broker:
image: confluentinc/cp-kafka:7.8.0
image: confluentinc/cp-kafka:8.0.x-latest
hostname: broker
container_name: broker
ports:
Expand All @@ -29,7 +29,7 @@ services:
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'

schema-registry:
image: confluentinc/cp-schema-registry:7.8.0
image: confluentinc/cp-schema-registry:8.0.x-latest
hostname: schema-registry
container_name: schema-registry
depends_on:
Expand Down Expand Up @@ -65,13 +65,13 @@ services:
CONNECT_VALUE_CONVERTER: io.confluent.connect.avro.AvroConverter
CONNECT_VALUE_CONVERTER_SCHEMA_REGISTRY_URL: http://schema-registry:8081
# CLASSPATH required due to CC-2422
CLASSPATH: /usr/share/java/monitoring-interceptors/monitoring-interceptors-7.8.0.jar
CLASSPATH: /usr/share/java/monitoring-interceptors/monitoring-interceptors-8.0.0-0.jar
CONNECT_PRODUCER_INTERCEPTOR_CLASSES: "io.confluent.monitoring.clients.interceptor.MonitoringProducerInterceptor"
CONNECT_CONSUMER_INTERCEPTOR_CLASSES: "io.confluent.monitoring.clients.interceptor.MonitoringConsumerInterceptor"
CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"

control-center:
image: confluentinc/cp-enterprise-control-center:7.8.0
image: confluentinc/cp-enterprise-control-center:8.0.x-latest
hostname: control-center
container_name: control-center
depends_on:
Expand All @@ -95,7 +95,7 @@ services:
PORT: 9021

ksqldb-server:
image: confluentinc/cp-ksqldb-server:7.8.0
image: confluentinc/cp-ksqldb-server:8.0.x-latest
hostname: ksqldb-server
container_name: ksqldb-server
depends_on:
Expand All @@ -118,7 +118,7 @@ services:
KSQL_KSQL_LOGGING_PROCESSING_STREAM_AUTO_CREATE: 'true'

ksqldb-cli:
image: confluentinc/cp-ksqldb-cli:7.8.0
image: confluentinc/cp-ksqldb-cli:8.0.x-latest
container_name: ksqldb-cli
depends_on:
- broker
Expand All @@ -128,7 +128,7 @@ services:
tty: true

ksql-datagen:
image: confluentinc/ksqldb-examples:7.8.0
image: confluentinc/ksqldb-examples:8.0.x-latest
hostname: ksql-datagen
container_name: ksql-datagen
depends_on:
Expand All @@ -150,7 +150,7 @@ services:
STREAMS_SCHEMA_REGISTRY_PORT: 8081

rest-proxy:
image: confluentinc/cp-kafka-rest:7.8.0
image: confluentinc/cp-kafka-rest:8.0.x-latest
depends_on:
- broker
- schema-registry
Expand Down
5 changes: 5 additions & 0 deletions cp-all-in-one-security/oauth/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ARG CONFLUENT_DOCKER_TAG
FROM confluentinc/cp-server-connect-base:$CONFLUENT_DOCKER_TAG

RUN confluent-hub install --no-prompt confluentinc/kafka-connect-datagen:0.6.5 \
&& confluent-hub install --no-prompt confluentinc/kafka-connect-avro-converter:7.6.0
Loading