-
Notifications
You must be signed in to change notification settings - Fork 350
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: support ingress v1beta1 https #596
Conversation
pkg/ingress/manifest.go
Outdated
} | ||
|
||
func (m *manifest) diff(om *manifest) (added, updated, deleted *manifest) { | ||
// TODO add diff ssl |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove the TODO
.
pkg/kube/translation/ingress.go
Outdated
@@ -93,7 +96,37 @@ func (t *translator) translateIngressV1beta1(ing *networkingv1beta1.Ingress) (*T | |||
upstreamMap: make(map[string]struct{}), | |||
} | |||
plugins := t.translateAnnotations(ing.Annotations) | |||
|
|||
// TODO add https |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ditto
BTW, we need to add some e2e test cases for TLS, |
pkg/ingress/ingress.go
Outdated
@@ -168,6 +170,7 @@ func (c *ingressController) sync(ctx context.Context, ev *types.Event) error { | |||
om := &manifest{ | |||
routes: oldCtx.Routes, | |||
upstreams: oldCtx.Upstreams, | |||
ssl: oldCtx.SSL, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Style.
@tianshimoyi Please check out the CI problems. |
@tianshimoyi Please format the code, then add UT and e2e test. |
Codecov Report
@@ Coverage Diff @@
## master #596 +/- ##
==========================================
- Coverage 34.40% 34.14% -0.26%
==========================================
Files 55 55
Lines 5468 5530 +62
==========================================
+ Hits 1881 1888 +7
- Misses 3362 3416 +54
- Partials 225 226 +1
Continue to review full report at Codecov.
|
Look good to me. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please check the lint error (format code)
The reason is that I didn't download the dependency under test / exe, which has been solved. |
[Fail] ApisixRoute Testing [It] create, update, remove k8s service, remove ApisixRoute What is the cause of this error? I did not modify this place. |
Just re-run it. |
re-run e2e jobs. |
thanks for your contributions, I will check it |
pkg/kube/translation/ingress.go
Outdated
@@ -15,19 +15,20 @@ | |||
package translation | |||
|
|||
import ( | |||
"go.uber.org/zap" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please classify the import packages.
This is a 3rd party packages, and it should be put with other 3rd party packages.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
Please answer these questions before submitting a pull request
Why submit this pull request?
New feature provided
Related issues
feat: add TLS support for Ingress resources #586
New feature or improvement