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

Added PDB parameter for maxUnavailable #237

Merged
merged 4 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
6 changes: 6 additions & 0 deletions fiaas_deploy_daemon/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,12 @@ def _parse_args(self, args):
"--include-status-in-app", help="Include status subresource in application CRD", default=False,
action="store_true"
)
parser.add_argument(
portega-adv marked this conversation as resolved.
Show resolved Hide resolved
"--pdb-max-unavailable",
help="The maximum number of pods that can be unavailable after an eviction",
default="1",
type=_int_or_unicode
)
usage_reporting_parser = parser.add_argument_group("Usage Reporting", USAGE_REPORTING_LONG_HELP)
usage_reporting_parser.add_argument(
"--usage-reporting-cluster-name", help="Name of the cluster where the fiaas-deploy-daemon instance resides"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@


class PodDisruptionBudgetDeployer(object):
def __init__(self, owner_references, extension_hook):
def __init__(self, owner_references, extension_hook, config):
self._owner_references = owner_references
self._extension_hook = extension_hook
self.max_unavailable = config.pdb_max_unavailable

@retry_on_upsert_conflict
def deploy(self, app_spec: AppSpec, selector: dict[str, any], labels: dict[str, any]):
Expand All @@ -52,7 +53,7 @@ def deploy(self, app_spec: AppSpec, selector: dict[str, any], labels: dict[str,

# Conservative default to ensure that we don't block evictions.
# See https://github.com/fiaas/fiaas-deploy-daemon/issues/220 for discussion.
max_unavailable = 1
max_unavailable = self.max_unavailable
spec = PodDisruptionBudgetSpec(
selector=LabelSelector(matchLabels=selector),
maxUnavailable=max_unavailable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from utils import TypeMatcher

from fiaas_deploy_daemon import ExtensionHookCaller
from fiaas_deploy_daemon.config import Configuration
from fiaas_deploy_daemon.deployer.kubernetes.pod_disruption_budget import PodDisruptionBudgetDeployer
from fiaas_deploy_daemon.specs.models import (
AutoscalerSpec,
Expand All @@ -37,8 +38,14 @@ def extension_hook(self):
return create_autospec(ExtensionHookCaller, spec_set=True, instance=True)

@pytest.fixture
def deployer(self, owner_references, extension_hook):
return PodDisruptionBudgetDeployer(owner_references, extension_hook)
def deployer(self, owner_references, extension_hook, config):
return PodDisruptionBudgetDeployer(owner_references, extension_hook, config)

@pytest.fixture
def config(self):
portega-adv marked this conversation as resolved.
Show resolved Hide resolved
config = create_autospec(Configuration([]), spec_set=True)
config.pdb_max_unavailable = 1
return config

@pytest.mark.usefixtures("get")
def test_new_pdb(self, deployer, post, app_spec, owner_references, extension_hook):
Expand Down