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.

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

Fix Kafka connect config name for deletion #361

Merged
merged 15 commits into from
Sep 19, 2023
Merged

Fix Kafka connect config name for deletion #361

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d240b1f
Fix kafka connect config name for deletion
raminqaf Sep 15, 2023
31c0368
Fix clean and tests
raminqaf Sep 18, 2023
4d95e85
Update files
raminqaf Sep 18, 2023
d0663a0
Update files
raminqaf Sep 18, 2023
0821f9e
Update files
raminqaf Sep 18, 2023
67c93d0
Update files
raminqaf Sep 18, 2023
1224aca
self.full_name
raminqaf Sep 18, 2023
e2e197a
clean tests
raminqaf Sep 18, 2023
599f46c
clean properties
raminqaf Sep 18, 2023
fafc12d
change connector type
raminqaf Sep 18, 2023
795c974
add review
raminqaf Sep 18, 2023
cfb94e0
add review
raminqaf Sep 18, 2023
d2a16ee
Update files
raminqaf Sep 18, 2023
6469917
Update files
raminqaf Sep 18, 2023
a105241
Fix pydocs
raminqaf Sep 19, 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
27 changes: 9 additions & 18 deletions kpops/components/base_components/kafka_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def helm(self) -> Helm:
return helm

@property
def _connector_resetter_release_name(self) -> str:
def _resetter_release_name(self) -> str:
"""Get connector resetter's release name"""
suffix = "-clean"
clean_up_release_name = self.full_name + suffix
Expand All @@ -110,7 +110,7 @@ def _connector_resetter_release_name(self) -> str:

@property
def _resetter_helm_chart(self) -> str:
disrupted marked this conversation as resolved.
Show resolved Hide resolved
"""Get reseter Helm chart
"""Get resetter Helm chart

:return: returns the component resetter's helm chart
raminqaf marked this conversation as resolved.
Show resolved Hide resolved
"""
Expand All @@ -121,11 +121,6 @@ def dry_run_handler(self) -> DryRunHandler:
helm_diff = HelmDiff(self.config.helm_diff_config)
return DryRunHandler(self.helm, helm_diff, self.namespace)

@property
def _kafka_connect_resetter_chart(self) -> str:
"""Resetter chart for this component"""
return f"{self.repo_config.repository_name}/kafka-connect-resetter"

@property
def helm_flags(self) -> HelmFlags:
"""Return shared flags for Helm commands"""
Expand Down Expand Up @@ -193,9 +188,7 @@ def _run_connect_resetter(
f"Connector Cleanup: uninstalling cleanup job Helm release from previous runs for {self.full_name}"
)
)
self.__uninstall_connect_resetter(
self._connector_resetter_release_name, dry_run
)
self.__uninstall_connect_resetter(self._resetter_release_name, dry_run)

log.info(
magentaify(
Expand All @@ -207,14 +200,12 @@ def _run_connect_resetter(

if dry_run:
self.dry_run_handler.print_helm_diff(
stdout, self._connector_resetter_release_name, log
stdout, self._resetter_release_name, log
)

if not retain_clean_jobs:
log.info(magentaify("Connector Cleanup: uninstall Kafka Resetter."))
self.__uninstall_connect_resetter(
self._connector_resetter_release_name, dry_run
)
self.__uninstall_connect_resetter(self._resetter_release_name, dry_run)

def __install_connect_resetter(
self,
Expand All @@ -230,9 +221,9 @@ def __install_connect_resetter(
:return: The output of `helm upgrade --install`
"""
return self.helm.upgrade_install(
release_name=self._connector_resetter_release_name,
release_name=self._resetter_release_name,
namespace=self.namespace,
chart=self._kafka_connect_resetter_chart,
chart=self._resetter_helm_chart,
dry_run=dry_run,
flags=HelmUpgradeInstallFlags(
create_namespace=self.config.create_namespace,
Expand Down Expand Up @@ -305,7 +296,7 @@ def template(self) -> None:
offset_topic=self.offset_topic,
)
stdout = self.helm.template(
self._connector_resetter_release_name,
self._resetter_release_name,
self._resetter_helm_chart,
self.namespace,
values,
Expand Down Expand Up @@ -350,7 +341,7 @@ def add_input_topics(self, topics: list[str]) -> None:
def template(self) -> None:
values = self._get_kafka_connect_resetter_values()
stdout = self.helm.template(
self._connector_resetter_release_name,
self._resetter_release_name,
self._resetter_helm_chart,
self.namespace,
values,
Expand Down
4 changes: 1 addition & 3 deletions tests/components/test_kafka_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@

DEFAULTS_PATH = Path(__file__).parent / "resources"
CONNECTOR_NAME = "test-connector-with-long-name-0123456789abcdefghijklmnop"
CONNECTOR_FULL_NAME = (
"${pipeline_name}-test-connector-with-long-name-0123456789abcdefghijklmnop"
)
CONNECTOR_FULL_NAME = "${pipeline_name}-" + CONNECTOR_NAME
CONNECTOR_CLEAN_FULL_NAME = "${pipeline_name}-test-connector-with-long-name-clean"
CONNECTOR_CLASS = "com.bakdata.connect.TestConnector"

Expand Down