7.8.0 oauth fix v2 #173
7.8.0 oauth fix v2 #173
Conversation
Merge Conflict Resolution (from 7.8.x to 7.9.x)
Merge Conflict Resolution (from 7.9.x to master)
|
🎉 All Contributor License Agreements have been signed. Ready to merge. |
|
Potentially, a squash merge might be a good idea. |
| @@ -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 | |||
There was a problem hiding this comment.
this should be 7.8.0 since it's to be merged into 7.8.0-post branch
| @@ -2,7 +2,7 @@ | |||
| services: | |||
|
|
|||
| schema-registry: | |||
| image: confluentinc/cp-schema-registry:7.8.0 | |||
| image: confluentinc/cp-schema-registry:8.0.x-latest | |||
There was a problem hiding this comment.
there are a bunch of spots in this PR where 7.8.0 is changed to 8.0.x-latest that should be reverted back to 7.8.0 since this is going into 7.8.0-post. also post branches should also reference publicly available tags
|
|
||
| docker compose up -d | ||
|
|
||
| # # Start Keycloak and Broker instances |
There was a problem hiding this comment.
if all this needs is docker compose up -d, then remove rather than comment out all of the obsolete parts of this file - it can be confusing to have commented out code left behind
| @@ -228,9 +271,13 @@ services: | |||
| SCHEMA_REGISTRY_CONFLUENT_METADATA_OAUTHBEARER_LOGIN_CLIENT_SECRET: $SR_CLIENT_SECRET | |||
|
|
|||
| connect: | |||
| image: ${DOCKER_REGISTRY}confluentinc/cp-server-connect:${CONFLUENT_DOCKER_TAG:-latest} | |||
| #image: ${DOCKER_REGISTRY}confluentinc/cp-server-connect:${CONFLUENT_DOCKER_TAG:-latest} | |||
There was a problem hiding this comment.
this can be deleted rather than commented, right?
cp-all-in-one/docker-compose.yml
Outdated
| @@ -73,7 +73,7 @@ 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 | |||
There was a problem hiding this comment.
Sorry for the hassle. I will check the whole configuration again and fix the remaining settings.
github-actions-example/pom.xml
Outdated
| @@ -7,7 +7,7 @@ | |||
| <parent> | |||
| <groupId>io.confluent</groupId> | |||
| <artifactId>rest-utils-parent</artifactId> | |||
| <version>7.8.0</version> | |||
| <version>8.0.0-0</version> | |||
There was a problem hiding this comment.
revert changes in this file
Description
This pull requests utilizes init containers for setting up resources in the OAuth demo in order to reach a higher level of automation, remove some glitches that had been identified and improve the overall user experience of the demo by making it more robust.
Author Validation
The cp-all-in-one-security demo has been carefully checked by the requester. The reviewer should check the demo again, though.
Reviewer Tasks
Please check that all parts of the cp-all-in-one-security demo are working as expected.