jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-05-28 14:47:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fallbackForInvalidSecret to return original secret (#1245)

Browse Source
This commit is contained in:
Jun
2024-08-25 15:59:12 +08:00
committed by GitHub
parent a5a28aebf6
commit a2c2d1d521
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/ingress/kube/ingress/controller.go
View File

@@ -431,11 +431,14 @@ func (c *controller) ConvertGateway(convertOptions *common.ConvertOptions, wrapp
if err != nil { if err != nil {
if k8serrors.IsNotFound(err) { if k8serrors.IsNotFound(err) {
// If there is no matching secret, try to get it from configmap. // If there is no matching secret, try to get it from configmap.
secretName = httpsCredentialConfig.MatchSecretNameByDomain(rule.Host) matchSecretName := httpsCredentialConfig.MatchSecretNameByDomain(rule.Host)
if matchSecretName != "" {
namespace, secret := cert.ParseTLSSecret(matchSecretName)
if namespace == "" {
secretNamespace = c.options.SystemNamespace secretNamespace = c.options.SystemNamespace
namespace, secret := cert.ParseTLSSecret(secretName) } else {
if namespace != "" {
secretNamespace = namespace secretNamespace = namespace
}
secretName = secret secretName = secret
} }
} }

9
pkg/ingress/kube/ingressv1/controller.go
View File

@@ -417,11 +417,14 @@ func (c *controller) ConvertGateway(convertOptions *common.ConvertOptions, wrapp
if err != nil { if err != nil {
if k8serrors.IsNotFound(err) { if k8serrors.IsNotFound(err) {
// If there is no matching secret, try to get it from configmap. // If there is no matching secret, try to get it from configmap.
secretName = httpsCredentialConfig.MatchSecretNameByDomain(rule.Host) matchSecretName := httpsCredentialConfig.MatchSecretNameByDomain(rule.Host)
if matchSecretName != "" {
namespace, secret := cert.ParseTLSSecret(matchSecretName)
if namespace == "" {
secretNamespace = c.options.SystemNamespace secretNamespace = c.options.SystemNamespace
namespace, secret := cert.ParseTLSSecret(secretName) } else {
if namespace != "" {
secretNamespace = namespace secretNamespace = namespace
}
secretName = secret secretName = secret
} }
} }