Skip to content

Commit

Permalink
Remove drain_lib and all references, since this is not used for Kuber…
Browse files Browse the repository at this point in the history
…netes.
  • Loading branch information
EvanKrall committed May 18, 2024
1 parent 2700f45 commit cbe056b
Show file tree
Hide file tree
Showing 12 changed files with 0 additions and 849 deletions.
7 changes: 0 additions & 7 deletions docs/source/generated/paasta_tools.drain_lib.rst

This file was deleted.

1 change: 0 additions & 1 deletion docs/source/generated/paasta_tools.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ Submodules
paasta_tools.deployment_utils
paasta_tools.docker_wrapper
paasta_tools.docker_wrapper_imports
paasta_tools.drain_lib
paasta_tools.dump_locally_running_services
paasta_tools.eks_tools
paasta_tools.envoy_tools
Expand Down
2 changes: 0 additions & 2 deletions docs/source/installation/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,6 @@ Hacheck provides several behaviors that are useful for Paasta:

* It can preemptively return error codes for health checks, allowing us to remove a task from load balancers before
shutting it down.
(This is implemented in the
`HacheckDrainMethod <../generated/paasta_tools.drain_lib.html#paasta_tools.drain_lib.HacheckDrainMethod>`_.)

Sensu
-----
Expand Down
16 changes: 0 additions & 16 deletions docs/source/yelpsoa_configs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -368,14 +368,6 @@ instance MAY have:
This setting only affects the first time deployd processes an instance after a change --
instances that need to be reprocessed will be reenqueued normally.

* ``drain_method``: Controls the drain method; see `drain_lib
<generated/paasta_tools.drain_lib.html>`_. Defaults to ``noop`` for
instances that are not in Smartstack, or ``hacheck`` if they are.

* ``drain_method_params``: A dictionary of parameters for the specified
drain_method. Valid parameters are any of the kwargs defined for the
specified bounce_method in `drain_lib <generated/paasta_tools.drain_lib.html>`_.

* ``cmd``: The command that is executed. If a string, will be wrapped in ``/bin/sh -c``.
If a list, will be executed directly as is with no shell parsing.

Expand Down Expand Up @@ -621,14 +613,6 @@ instance MAY have:
This setting only affects the first time deployd processes an instance after a change --
instances that need to be reprocessed will be reenqueued normally.

* ``drain_method``: Controls the drain method; see `drain_lib
<generated/paasta_tools.drain_lib.html>`_. Defaults to ``noop`` for
instances that are not in Smartstack, or ``hacheck`` if they are.

* ``drain_method_params``: A dictionary of parameters for the specified
drain_method. Valid parameters are any of the kwargs defined for the
specified bounce_method in `drain_lib <generated/paasta_tools.drain_lib.html>`_.

* ``cmd``: The command that is executed. Can be used as an alternative to
args for containers without an `entrypoint
<https://docs.docker.com/reference/builder/#entrypoint>`_. This value is
Expand Down
104 changes: 0 additions & 104 deletions general_itests/steps/http_drain_method_steps.py

This file was deleted.

3 changes: 0 additions & 3 deletions mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ disallow_untyped_defs = True
[mypy-paasta_tools.generate_deployments_for_service]
disallow_untyped_defs = True

[mypy-paasta_tools.drain_lib]
disallow_untyped_defs = True

[mypy-paasta_tools.smartstack_tools]
disallow_untyped_defs = True

Expand Down
62 changes: 0 additions & 62 deletions paasta_tools/cli/schemas/kubernetes_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,56 +43,6 @@
]
}
]
},
{
"oneOf": [
{
"properties": {
"drain_method": {
"enum": [
"noop",
"hacheck",
"test"
]
}
}
},
{
"properties": {
"drain_method": {
"enum": [
"http"
]
},
"drain_method_params": {
"type": "object",
"properties": {
"drain": {
"type": "object"
},
"stop_draining": {
"type": "object"
},
"is_draining": {
"type": "object"
},
"is_safe_to_kill": {
"type": "object"
}
},
"required": [
"drain",
"stop_draining",
"is_draining",
"is_safe_to_kill"
]
}
},
"required": [
"drain_method_params"
]
}
]
}
],
"properties": {
Expand Down Expand Up @@ -205,18 +155,6 @@
"service_account_name": {
"type": "string"
},
"drain_method": {
"enum": [
"noop",
"hacheck",
"http",
"test"
],
"default": "noop"
},
"drain_method_params": {
"type": "object"
},
"constraints": {
"type": "array",
"items": {
Expand Down
Loading

0 comments on commit cbe056b

Please sign in to comment.