fix: remove gateway config items from the config file.#96
Merged
Conversation
Signed-off-by: ashing <axingfly@gmail.com>
ronething
changed the title
Signed-off-by: ashing <axingfly@gmail.com>
Signed-off-by: ashing <axingfly@gmail.com>
Signed-off-by: ashing <axingfly@gmail.com>
Signed-off-by: ashing <axingfly@gmail.com>
Signed-off-by: ashing <axingfly@gmail.com>
ronething
changed the title
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR removes legacy gateway configuration items from the config file and updates related tests and resource manifests to use a new GatewayProxy schema. Key changes include:
- Removal of the gatewayAddress field and associated config references.
- Replacement of legacy Ingress and Gateway configuration with new GatewayProxy YAML definitions.
- Updates across tests, docs, and config files to drop deprecated gateway configuration items.
Reviewed Changes
Copilot reviewed 20 out of 20 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| test/e2e/scaffold/scaffold.go | Removed gatewayAddress field from the Scaffold struct. |
| test/e2e/scaffold/ingress.go | Removed reference to gatewayAddress in the ingress deployment. |
| test/e2e/ingress/ingress.go | Updated Ingress tests to use new GatewayProxy YAML configuration. |
| test/e2e/gatewayapi/* | Updated multiple test files to use the new GatewayProxy resource. |
| internal/provider/controlplane/controlplane.go | Removed legacy gateway config usage when configuring the dashboard client. |
| internal/provider/adc/adc.go | Dropped default ADC configuration using gateway config values. |
| internal/controller/utils.go | Updated logging calls to use zap for consistency. |
| internal/controller/ingress_controller.go | Modified function signatures and error messages to work with new parameters. |
| internal/controller/gateway_controller.go | Updated gateway reconciliation to utilize the new GatewayProxy structure. |
| internal/controller/config/* and docs/config samples/chart files | Removed deprecated gateway config items from configuration and docs. |
|
|
||
| // 1. use the IngressStatusAddress in the config | ||
| statusAddresses := config.GetIngressStatusAddress() | ||
| statusAddresses := gatewayProxy.Spec.StatusAddress |
There was a problem hiding this comment.
The updateStatus function attempts to access gatewayProxy.Spec.StatusAddress, but the new GatewayProxy manifest no longer includes this field. Please update the logic to reflect the current GatewayProxy schema or provide an alternative field.
AlinsRan
reviewed
Apr 18, 2025
| # - ${ENDPOINT} # The endpoint of the control plane. | ||
| # tls_verify: false | ||
| # addresses: # record the status address of the gateway-api gateway | ||
| # - "172.18.0.4" # The LB IP of the gateway service. |
Contributor
Author
There was a problem hiding this comment.
will resolve it in the next PR.
AlinsRan
reviewed
Apr 18, 2025
| @@ -1,4 +1,4 @@ | |||
| log_level: "info" # The log level of the API7 Ingress Controller. | |||
| log_level: "debug" # The log level of the API7 Ingress Controller. | |||
AlinsRan
reviewed
Apr 18, 2025
| return nil | ||
| } | ||
|
|
||
| //nolint:unused |
AlinsRan
approved these changes
Apr 18, 2025
dspo
approved these changes
Apr 18, 2025
| - type: ExtensionRef | ||
| extensionRef: | ||
| group: gateway.api7.io | ||
| group: gateway.apisix.io |
Contributor
There was a problem hiding this comment.
Are all our resources grouped as gateway.apisix.io, or are some grouped as gateway.api7.io and some grouped as gateway.apisix.io?
Contributor
Author
There was a problem hiding this comment.
I have changed all "gateway.api7.io" in the code to "gateway.apisix.io".
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
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.
Uh oh!
There was an error while loading. Please reload this page.