Skip to content

Fix tls ports for FunctionWorkers and Zookeeper #110

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.

Sign up for GitHub

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

Open
dave2wave wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix tls ports for FunctionWorkers and Zookeeper #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f601221
Fix FNW tls port
dave2wave Jul 28, 2023
6b30be7
Fix zookeeper tls port
dave2wave Jul 28, 2023
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: 1 addition & 1 deletion ...main/java/com/datastax/oss/kaap/controllers/function/FunctionsWorkerResourcesFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ public void patchConfigMap() {
"pulsarRootDir", "/pulsar",
"submittingInsidePod", true,
"pulsarServiceUrl", brokerServiceUrl,
"pulsarAdminUrl", "https://%s.%s:6750/"
"pulsarAdminUrl", "https://%s.%s:6751/"
Copy link
Member

@michaeljmarshall michaeljmarshall Jul 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that line 301 has brokerServiceUrl, I think we might need to dynamically compute this value.

Copy link
Author

@dave2wave dave2wave Jul 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to me that are a lot of little things to do in this class like making use of constants for the ports provided as ints at the top, but likely better as strings.

Copy link
Contributor

@nicoloboschi nicoloboschi Jul 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it has to be computed based on tls configuration

.formatted(resourceName, getServiceDnsSuffix()),
"percentMemoryPadding", 10)
);
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/datastax/oss/kaap/controllers/zookeeper/ZooKeeperResourcesFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public class ZooKeeperResourcesFactory extends BaseResourcesFactory<ZooKeeperSpe
public static final int DEFAULT_SERVER_PORT = 2888;
public static final int DEFAULT_LEADER_ELECTION_PORT = 3888;
public static final int DEFAULT_CLIENT_PORT = 2181;
public static final int DEFAULT_CLIENT_TLS_PORT = 2281;
public static final int DEFAULT_CLIENT_TLS_PORT = 2282;
public static final String ENV_ZOOKEEPER_SERVERS = "ZOOKEEPER_SERVERS";
public static final List<String> DEFAULT_ENV = List.of("ZOOKEEPER_SERVERS");

Expand Down