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.

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

NAS-129400 / 24.10 / Remove kubernetes implementation #13841

Merged
merged 73 commits into from
Jun 6, 2024

Conversation

sonicaj
Copy link
Member

@sonicaj sonicaj commented Jun 4, 2024

This PR adds changes removing kubernetes integration and adding basic integration for new catalog management.
(Docker is not configurable with these changes atm and neither are we creating it's state atm (mounting apps dataset changes will be reflected in the next PR as well), those changes will be introduced in another PR)

@sonicaj sonicaj requested a review from a team June 4, 2024 20:35
@sonicaj sonicaj self-assigned this Jun 4, 2024
@sonicaj sonicaj added the jira label Jun 4, 2024
@bugclerk bugclerk changed the title Remove kubernetes implementation NAS-129400 / 24.10 / Remove kubernetes implementation Jun 4, 2024
@bugclerk
Copy link
Contributor

bugclerk commented Jun 4, 2024

src/middlewared/middlewared/plugins/catalog/app_version.py Outdated Show resolved Hide resolved
src/middlewared/middlewared/plugins/catalog/sync.py Outdated Show resolved Hide resolved
)
if not dataset:
test_path = os.path.join('/mnt', dataset_name)
if await self.middleware.run_in_thread(os.path.exists, test_path):
Copy link
Contributor

Choose a reason for hiding this comment

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

You're creating 2 threads everytime this method is called to perform a shutil.move which is unnecessary.

This is prone to TOCTOU issues as well so you can simply do shutil.move and catch FileNotFoundError since it'll fail if test_path doesn't exist.

src/middlewared/middlewared/plugins/docker/update.py Outdated Show resolved Hide resolved
@sonicaj sonicaj force-pushed the catalog-apps-integration branch from 994d7a2 to 7428fd8 Compare June 5, 2024 19:27
@sonicaj sonicaj requested a review from yocalebo June 5, 2024 19:34
Copy link
Contributor

@Qubad786 Qubad786 left a comment

Choose a reason for hiding this comment

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

LGTM!

@sonicaj sonicaj removed the pending QA label Jun 6, 2024
@sonicaj sonicaj merged commit 145c052 into master Jun 6, 2024
1 of 3 checks passed
@sonicaj sonicaj deleted the catalog-apps-integration branch June 6, 2024 00:37
@bugclerk
Copy link
Contributor

bugclerk commented Jun 6, 2024

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators Jun 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants