-
Notifications
You must be signed in to change notification settings - Fork 405
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
[ANSIENG-4230] | listener changes (#71) #1802
Open
rrbadiani
wants to merge
1
commit into
7.8.x
Choose a base branch
from
listeners-change-ANSIENG-4230
base: 7.8.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+29
−10
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -437,6 +437,7 @@ kafka_controller_listeners: "{ | |
'port': {{kafka_controller_port}}, | ||
'ssl_enabled': {{kafka_controller_ssl_enabled|string|lower}}, | ||
'ssl_mutual_auth_enabled': {{kafka_controller_ssl_mutual_auth_enabled|string|lower}}, | ||
'ssl_client_authentication': '{{kafka_controller_ssl_client_authentication|string|lower}}', | ||
'sasl_protocol': '{{kafka_controller_sasl_protocol}}' | ||
} | ||
}" | ||
|
@@ -566,20 +567,32 @@ kafka_broker_default_listeners: "{ | |
'port': 9092, | ||
'ssl_enabled': {% if ccloud_kafka_enabled|bool %}true{% else %}{{ssl_enabled|string|lower}}{% endif %}, | ||
'ssl_mutual_auth_enabled': {% if ccloud_kafka_enabled|bool %}false{% else %}{{ssl_mutual_auth_enabled|string|lower}}{% endif %}, | ||
'sasl_protocol': '{% if rbac_enabled|bool or oauth_enabled|bool %}OAUTH{% elif ccloud_kafka_enabled|bool %}PLAIN{% else %}{{sasl_protocol}}{% endif %}' | ||
}{% if kafka_broker_configure_multiple_listeners|bool %}, | ||
'ssl_client_authentication': '{% if ccloud_kafka_enabled|bool %}none{% else %}{{ssl_client_authentication|string|lower}}{% endif %}', | ||
'sasl_protocol': '{% if auth_mode in [\"ldap\", \"ldap_with_oauth\", \"oauth\"] %}OAUTH{% elif ccloud_kafka_enabled|bool %}PLAIN{% else %}{{sasl_protocol}}{% endif %}' | ||
}{% if auth_mode == 'mtls' %}, | ||
'internal_token': { | ||
'name': 'INTERNAL_TOKEN', | ||
'port': 9088, | ||
'ssl_enabled': true, | ||
'ssl_mutual_auth_enabled': true, | ||
'ssl_client_authentication': '{{ssl_client_authentication|string|lower}}', | ||
'sasl_protocol': 'OAUTH' | ||
}{% endif %} | ||
{% if kafka_broker_configure_multiple_listeners|bool %}, | ||
'broker': { | ||
'name': 'BROKER', | ||
'port': 9091, | ||
'ssl_enabled': {{ssl_enabled|string|lower}}, | ||
'ssl_mutual_auth_enabled': {{ssl_mutual_auth_enabled|string|lower}}, | ||
'ssl_client_authentication': '{{ssl_client_authentication|string|lower}}', | ||
'sasl_protocol': '{{sasl_protocol}}' | ||
}{% if kafka_broker_configure_control_plane_listener|bool and not kraft_enabled|bool %}, | ||
'controller': { | ||
'name': 'CONTROLLER', | ||
'port': 9089, | ||
'ssl_enabled': {{ssl_enabled|string|lower}}, | ||
'ssl_mutual_auth_enabled': {{ssl_mutual_auth_enabled|string|lower}}, | ||
'ssl_client_authentication': '{{ssl_client_authentication|string|lower}}', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Test version upgrades to ensure that adding new fields in listeners dict doesnt cause trouble in upgades |
||
'sasl_protocol': '{{sasl_protocol}}' | ||
}{% endif %}{% endif %} | ||
}" | ||
|
@@ -703,7 +716,14 @@ kafka_broker_rest_proxy_enabled: "{{confluent_server_enabled and not ccloud_kafk | |
### Authentication type to add to Kafka's embedded rest proxy or Admin API. Do not set when RBAC is enabled. Options: [basic, none] | ||
kafka_broker_rest_proxy_authentication_type: none | ||
|
||
kafka_broker_rest_proxy_listener_name: "{{ 'internal' if rbac_enabled else kafka_broker_inter_broker_listener_name }}" | ||
kafka_broker_rest_proxy_listener_name: >- | ||
{%- if not rbac_enabled|bool -%} | ||
{{ kafka_broker_inter_broker_listener_name }} | ||
{%- elif rbac_enabled|bool and auth_mode == 'mtls' -%} | ||
internal_token | ||
{%- else -%} | ||
internal | ||
{%- endif -%} | ||
|
||
### Use to register and identify your Kafka cluster in the MDS. | ||
kafka_broker_cluster_name: "" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add config validation to only define auth_mode in case rbac_enabled is true