Skip to content

Commit 87161a5

Browse files
u-kainiclask25
authored and
niclask25
committed
fix default cert member index
1 parent 6c8b246 commit 87161a5

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pkg/ingress/model_builder.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,11 @@ func (t *defaultModelBuildTask) mergeListenPortConfigs(_ context.Context, listen
335335

336336
// Set the default cert as the first cert
337337
// This process allows the same certificate to be specified for both the default certificate and the SNI certificate.
338-
for _, cfg := range listenPortConfigs {
338+
var defaultCertMemberIndex int
339+
for i, cfg := range listenPortConfigs {
339340
if len(cfg.listenPortConfig.tlsCerts) > 0 {
340341
mergedTLSCerts = append(mergedTLSCerts, cfg.listenPortConfig.tlsCerts[0])
342+
defaultCertMemberIndex = i
341343
break
342344
}
343345
}
@@ -391,9 +393,8 @@ func (t *defaultModelBuildTask) mergeListenPortConfigs(_ context.Context, listen
391393
}
392394

393395
for j, cert := range cfg.listenPortConfig.tlsCerts {
394-
// Ignore the first cert as it is the default cert
395-
// Default cert is already added to the mergedTLSCerts
396-
if i == 0 && j == 0 {
396+
// The first certificate is ignored as it is the default certificate, which has already been added to the mergedTLSCerts.
397+
if i == defaultCertMemberIndex && j == 0 {
397398
continue
398399
}
399400
if mergedTLSCertsSet.Has(cert) {

0 commit comments

Comments
 (0)