feat: support upstream scheme/retries/timeouts via ingress annotations #2614
Conversation
This file contains hidden or 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
There was a problem hiding this comment.
Pull Request Overview
This PR adds support for configuring upstream connection parameters (scheme, retries, and timeouts) via ingress annotations. Previously, these annotations were listed as unsupported; now they are fully implemented.
- Adds annotation parsing for
upstream-scheme,upstream-retries, and upstream timeout settings - Implements translator logic to apply these settings to upstream configurations
- Provides comprehensive test coverage for the new annotation functionality
Reviewed Changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
test/e2e/ingress/annotations.go |
Adds e2e tests verifying retries, scheme, and timeout annotations work correctly |
test/e2e/framework/manifests/nginx.yaml |
Adds /delay endpoint and additional HTTPS port for testing timeout behavior |
internal/webhook/v1/ingress_webhook.go |
Removes upstream-related annotations from unsupported list |
internal/adc/translator/ingress.go |
Integrates annotation parsing into ingress translation pipeline and applies settings to upstreams |
internal/adc/translator/annotations_test.go |
Adds unit tests for ingress annotation translation logic |
internal/adc/translator/annotations/upstream/upstream_test.go |
Adds unit tests for upstream annotation parser |
internal/adc/translator/annotations/upstream/upstream.go |
Implements parser for upstream-related annotations |
internal/adc/translator/annotations.go |
Updates annotation translation to use new IngressConfig structure |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
Co-authored-by: Copilot <[email protected]>
nic-6443
approved these changes
Oct 24, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Type of change:
What this PR does / why we need it:
Adds support for the following ingress-annotation keys for upstream configuration:
k8s.apisix.apache.org/upstream-scheme→ sets the upstream scheme (http / https / grpc / grpcs)k8s.apisix.apache.org/upstream-retries→ sets the number of retry attempts on upstream errorsk8s.apisix.apache.org/upstream-connect-timeout→ sets the connect timeout for upstream requestsk8s.apisix.apache.org/upstream-read-timeout→ sets the read timeout for upstream responsesk8s.apisix.apache.org/upstream-send-timeout→ sets the send/write timeout for upstream requestsPre-submission checklist: