From be46f6d3dd1f535ef311436a8b48d0a5338929d6 Mon Sep 17 00:00:00 2001 From: sandeep-ctds Date: Thu, 10 Jul 2025 20:43:07 +0530 Subject: [PATCH] allow svc name for pulsar-proxy --- .../datastax/oss/kaap/migrationtool/InputClusterSpecs.java | 1 + .../kaap/migrationtool/specs/ProxySetSpecGenerator.java | 6 ++++-- .../oss/kaap/migrationtool/specs/ProxySpecGenerator.java | 7 ++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/migration-tool/src/main/java/com/datastax/oss/kaap/migrationtool/InputClusterSpecs.java b/migration-tool/src/main/java/com/datastax/oss/kaap/migrationtool/InputClusterSpecs.java index bf75a0cb..5a6d425c 100644 --- a/migration-tool/src/main/java/com/datastax/oss/kaap/migrationtool/InputClusterSpecs.java +++ b/migration-tool/src/main/java/com/datastax/oss/kaap/migrationtool/InputClusterSpecs.java @@ -115,6 +115,7 @@ public static class ProxySetSpecs { String overrideName; } String baseName = "proxy"; + String serviceName = ""; List proxySets = List.of(); } diff --git a/migration-tool/src/main/java/com/datastax/oss/kaap/migrationtool/specs/ProxySetSpecGenerator.java b/migration-tool/src/main/java/com/datastax/oss/kaap/migrationtool/specs/ProxySetSpecGenerator.java index f04803a3..c0a74291 100644 --- a/migration-tool/src/main/java/com/datastax/oss/kaap/migrationtool/specs/ProxySetSpecGenerator.java +++ b/migration-tool/src/main/java/com/datastax/oss/kaap/migrationtool/specs/ProxySetSpecGenerator.java @@ -42,6 +42,7 @@ public class ProxySetSpecGenerator extends BaseSpecGenerator { public static final String SPEC_NAME = "Proxy"; private final InputClusterSpecs.ProxySpecs.ProxySetSpecs proxyInputSpecs; private final String resourceName; + private final String resourceNameSvc; private ProxySetSpec generatedSpec; private PodDNSConfig podDNSConfig; private boolean isRestartOnConfigMapChange; @@ -50,12 +51,13 @@ public class ProxySetSpecGenerator extends BaseSpecGenerator { private TlsConfig.TlsEntryConfig tlsEntryConfig; public ProxySetSpecGenerator(InputClusterSpecs inputSpecs, InputClusterSpecs.ProxySpecs.ProxySetSpecs proxyInputSpecs, - KubernetesClient client) { + KubernetesClient client, String resourceNameSvc) { super(inputSpecs, client); this.proxyInputSpecs = proxyInputSpecs; final String clusterName = inputSpecs.getClusterName(); resourceName = ProxyResourcesFactory.getResourceName(clusterName, inputSpecs.getProxy().getBaseName(), proxyInputSpecs.getName(), proxyInputSpecs.getOverrideName()); + this.resourceNameSvc = resourceNameSvc.isEmpty() ? resourceName : resourceNameSvc; internalGenerateSpec(); } @@ -79,7 +81,7 @@ public void internalGenerateSpec() { final ConfigMap configMapWs = getConfigMap(resourceName + "-ws"); final Deployment deployment = requireDeployment(resourceName); final PodDisruptionBudget pdb = getPodDisruptionBudget(resourceName); - final Service service = requireService(resourceName); + final Service service = requireService(resourceNameSvc); if (configMapWs != null) { assertConfigMapsCompatible(configMap.getData(), configMapWs.getData()); } diff --git a/migration-tool/src/main/java/com/datastax/oss/kaap/migrationtool/specs/ProxySpecGenerator.java b/migration-tool/src/main/java/com/datastax/oss/kaap/migrationtool/specs/ProxySpecGenerator.java index 3be2c730..69106317 100644 --- a/migration-tool/src/main/java/com/datastax/oss/kaap/migrationtool/specs/ProxySpecGenerator.java +++ b/migration-tool/src/main/java/com/datastax/oss/kaap/migrationtool/specs/ProxySpecGenerator.java @@ -53,14 +53,15 @@ private void internalGenerateSpec(InputClusterSpecs inputSpecs, KubernetesClient final ProxySetSpecGenerator proxySetSpecGenerator = new ProxySetSpecGenerator( inputSpecs, new InputClusterSpecs.ProxySpecs.ProxySetSpecs(ProxyResourcesFactory.PROXY_DEFAULT_SET, null), - client - ); + client, + inputSpecs.getProxy().getServiceName()); generators.put(ProxyResourcesFactory.PROXY_DEFAULT_SET, proxySetSpecGenerator); generatedSpec = SerializationUtil.convertValue(proxySetSpecGenerator.generateSpec(), ProxySpec.class); } else { LinkedHashMap sets = new LinkedHashMap<>(); proxySets.stream().map( - setConfig -> Pair.of(setConfig.getName(), new ProxySetSpecGenerator(inputSpecs, setConfig, client)) + setConfig -> Pair.of(setConfig.getName(), new ProxySetSpecGenerator(inputSpecs, setConfig, client, + inputSpecs.getProxy().getServiceName())) ).forEach(pair -> { generators.put(pair.getLeft(), pair.getRight()); sets.put(pair.getLeft(), pair.getRight().generateSpec());