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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Aug 4, 2021
Merged

feat: support ingress v1beta1 https #596

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
239cbed
support ingress https
Jul 15, 2021
2341669
add ingress support https test
Jul 17, 2021
01e5288
change diffSSLes to diffSSL
Jul 19, 2021
f22197c
Correct spelling v1beta1
Jul 19, 2021
a5d074a
Modify ingress yaml
Jul 20, 2021
54d48ef
Solving e2e/test go mod dependency problem
Jul 20, 2021
98af216
Modify the ingress resource with tls test
Jul 21, 2021
ad2afaf
sort the imported packages
Jul 27, 2021
bd993f7
sort the imported packages
Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
change diffSSLes to diffSSL
  • Loading branch information
李闯 authored and 李闯 committed Jul 19, 2021
commit 01e5288aa03d67cbc91236dfa7fd53a4dc28a92b
4 changes: 2 additions & 2 deletions pkg/ingress/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

func diffSSLes(olds, news []*apisixv1.Ssl) (added, updated, deleted []*apisixv1.Ssl) {
func diffSSL(olds, news []*apisixv1.Ssl) (added, updated, deleted []*apisixv1.Ssl) {
if olds == nil {
return news, nil, nil
}
Expand Down Expand Up @@ -149,7 +149,7 @@ type manifest struct {

func (m *manifest) diff(om *manifest) (added, updated, deleted *manifest) {
// add diff ssl
sa, su, sd := diffSSLes(om.ssl, m.ssl)
sa, su, sd := diffSSL(om.ssl, m.ssl)
ar, ur, dr := diffRoutes(om.routes, m.routes)
au, uu, du := diffUpstreams(om.upstreams, m.upstreams)
asr, usr, dsr := diffStreamRoutes(om.streamRoutes, m.streamRoutes)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/ingress/ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ w174RSQoNMc+odHxn95mxtYdYVE5PKkzgrfxqymLa5Y0LMPCpKOq4XB0paZPtrOt
k1XbogS6EYyEdbkTDdXdUENvDrU7hzJXSVxJYADiqr44DGfWm6hK0bq9ZPc=
-----END RSA PRIVATE KEY-----
`
ginkgo.It("create a ingress support https", func() {
ginkgo.It("create an ingress resource with tls", func() {
// create secrets
err := s.NewSecret(serverCertSecret, serverCert, serverKey)
assert.Nil(ginkgo.GinkgoT(), err, "create server cert secret error")
Expand Down