Updated mode: http2 support #4004
Open
+7
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ilkinmammadzada
approved these changes
Jan 15, 2025
jfongatyelp
reviewed
Jan 15, 2025
| @@ -1371,7 +1371,7 @@ def get_liveness_probe( | |||
| timeout_seconds=timeout_seconds, | |||
| ) | |||
|
|
|||
| if mode == "http" or mode == "https": | |||
| if mode in ["http", "https", "http2"]: | |||
| path = self.get_healthcheck_uri(service_namespace_config) | |||
| probe.http_get = V1HTTPGetAction( | |||
| path=path, port=self.get_container_port(), scheme=mode.upper() | |||
There was a problem hiding this comment.
mode.upper() will lead to LivenessProbe w/ scheme=HTTP which isn't supported , so we need to do some conversion here
nemacysts
reviewed
Jan 16, 2025
| @@ -37,7 +37,7 @@ | |||
| ) | |||
|
|
|||
| # modes that depend on smartstack port cannot be tested via paasta proxies, so we exclude those | |||
| TESTABLE_SERVICE_MODES = {"http", "https"} | |||
| TESTABLE_SERVICE_MODES = {"http", "https", "http2"} | |||
There was a problem hiding this comment.
get_smartstack_endpoints() will probably need some special handling since that passes through the mode as the uri scheme - but the http2 scheme is still http
There was a problem hiding this comment.
and i think the same needs to happen in get_deployments_strings()?
| @@ -168,7 +168,7 @@ def run_healthcheck_on_container( | |||
| healthcheck_result = perform_cmd_healthcheck( | |||
| docker_client, container_id, healthcheck_data, timeout | |||
| ) | |||
| elif healthcheck_mode == "http" or healthcheck_mode == "https": | |||
| elif healthcheck_mode in ["http", "https", "http2"]: | |||
There was a problem hiding this comment.
non-blocking suggestion: might be nice to have a constant for HTTP_MODES = {"http", "https", "http2"} since we have this list in multiple places
| @@ -424,7 +424,7 @@ def get_healthcheck_for_instance( | |||
| mode = service_manifest.get_healthcheck_mode(smartstack_config) | |||
| hostname = socket.getfqdn() | |||
|
|
|||
| if mode == "http" or mode == "https": | |||
| if mode in ["http", "https", "http2"]: | |||
| path = service_manifest.get_healthcheck_uri(smartstack_config) | |||
| healthcheck_command = "%s://%s:%d%s" % (mode, hostname, random_port, path) | |||
There was a problem hiding this comment.
(same as above re: http2 having a uri scheme of http)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Support for HTTP2 mode & updated SmartStack schema.