Skip to content

Commit 3830101

Browse files
authored
fix: allow both default & wildcard secrets to be used at the same time (#6833)
1 parent 67af19e commit 3830101

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

internal/k8s/controller.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1778,15 +1778,14 @@ func (lbc *LoadBalancerController) validationTLSSpecialSecret(secret *api_v1.Sec
17781778
func (lbc *LoadBalancerController) handleSpecialSecretUpdate(secret *api_v1.Secret) {
17791779
var specialTLSSecretsToUpdate []string
17801780
secretNsName := secret.Namespace + "/" + secret.Name
1781-
switch secretNsName {
1782-
case lbc.specialSecrets.defaultServerSecret:
1781+
1782+
if secretNsName == lbc.specialSecrets.defaultServerSecret {
17831783
lbc.validationTLSSpecialSecret(secret, configs.DefaultServerSecretFileName, &specialTLSSecretsToUpdate)
1784-
case lbc.specialSecrets.wildcardTLSSecret:
1784+
}
1785+
if secretNsName == lbc.specialSecrets.wildcardTLSSecret {
17851786
lbc.validationTLSSpecialSecret(secret, configs.WildcardSecretFileName, &specialTLSSecretsToUpdate)
1786-
default:
1787-
nl.Warnf(lbc.Logger, "special secret not found")
1788-
return
17891787
}
1788+
17901789
err := lbc.configurator.AddOrUpdateSpecialTLSSecrets(secret, specialTLSSecretsToUpdate)
17911790
if err != nil {
17921791
nl.Errorf(lbc.Logger, "Error when updating the special Secret %v: %v", secretNsName, err)

0 commit comments

Comments
 (0)