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

feat: Initial support for Gateway API #789

Merged
merged 36 commits into from
Dec 24, 2021

Conversation

tao12345666333
Copy link
Member

@tao12345666333 tao12345666333 commented Dec 8, 2021

Please answer these questions before submitting a pull request


New feature or improvement

  • Describe the details and related test reports.

    In this version, the initial Gateway API support has been added, and a switch has been added to control whether to enable this feature. So it can be safely merged.

    Changes in this PR:

       * Initial support for Gateway API
       * Update golang to v1.16
    

    Note: This feature is still under development, and the route has not yet been published to the Apache APISIX Gateway

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
@tao12345666333 tao12345666333 added this to In progress in v1.4 Planning via automation Dec 8, 2021
@tao12345666333 tao12345666333 added this to the 1.4.0 milestone Dec 8, 2021
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
@tao12345666333 tao12345666333 added changelog Issues with this label should be added to changelog when public a new release enhancement New feature or request labels Dec 8, 2021
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
@codecov-commenter
Copy link

codecov-commenter commented Dec 8, 2021

Codecov Report

Merging #789 (e647ee2) into master (7b62375) will decrease coverage by 0.56%.
The diff coverage is 1.52%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #789      +/-   ##
==========================================
- Coverage   33.14%   32.58%   -0.57%     
==========================================
  Files          67       69       +2     
  Lines        7142     7274     +132     
==========================================
+ Hits         2367     2370       +3     
- Misses       4505     4634     +129     
  Partials      270      270              
Impacted Files Coverage Δ
pkg/ingress/controller.go 0.98% <0.00%> (-0.03%) ⬇️
pkg/ingress/gateway.go 0.00% <0.00%> (ø)
pkg/ingress/status.go 0.00% <0.00%> (ø)
cmd/ingress/ingress.go 78.00% <100.00%> (+0.22%) ⬆️
pkg/config/config.go 66.01% <100.00%> (+0.33%) ⬆️
test/e2e/e2e.go 100.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7b62375...e647ee2. Read the comment docs.

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
cmd/ingress/ingress.go Outdated Show resolved Hide resolved
conf/config-default.yaml Outdated Show resolved Hide resolved
pkg/ingress/gateway.go Outdated Show resolved Hide resolved
@tao12345666333

This comment has been minimized.

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
go.mod Show resolved Hide resolved
}
}

func (c *gatewayController) sync(ctx context.Context, ev *types.Event) error {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can not see the logic for syncing to APISIX in sync method.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I wrote in the description of the PR.

Note: This feature is still under development, and the route has not yet been published to the Apache APISIX Gateway

Only initial support in this PR. Mainly to implement the synchronization of the Gateway resource status.
Once all features are submitted through a PR, then this PR will be huge. @gxthrj

@tao12345666333
Copy link
Member Author

ping @gxthrj @tokers for review, thanks!

pkg/ingress/gateway.go Outdated Show resolved Hide resolved
pkg/ingress/gateway.go Outdated Show resolved Hide resolved
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
v1.4 Planning automation moved this from In progress to Reviewer approved Dec 24, 2021
@gxthrj gxthrj merged commit 970df2b into apache:master Dec 24, 2021
v1.4 Planning automation moved this from Reviewer approved to Done Dec 24, 2021
@tao12345666333 tao12345666333 deleted the feat-gateway-api branch December 24, 2021 06:18
Sindweller pushed a commit to Sindweller/apisix-ingress-controller that referenced this pull request Dec 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog Issues with this label should be added to changelog when public a new release enhancement New feature or request
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants