Skip to content

Commit 330f3d3

Browse files
committed
Merge remote-tracking branch 'upstream/master' into v0.5.0
2 parents a492349 + 94a7b7c commit 330f3d3

3 files changed

Lines changed: 217 additions & 90 deletions

File tree

pkg/ingress/controller/secret.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ func (c *secretController) sync(ctx context.Context, ev *types.Event) error {
148148
sslMap := ssls.(*sync.Map)
149149
sslMap.Range(func(_, v interface{}) bool {
150150
ssl := v.(*apisixv1.Ssl)
151+
// sync ssl
152+
ssl.Cert = string(sec.Data["cert"])
153+
ssl.Key = string(sec.Data["key"])
151154
ssl.FullName = ssl.ID
152155
return state.SyncSsl(ssl, ev.Type.String()) == nil
153156
})

0 commit comments

Comments
 (0)