Skip to content

Commit ef2d77c

Browse files
authored
Revert to original main-template without pod downtime (#6661)
1 parent 55b123d commit ef2d77c

File tree

5 files changed

+1508
-10
lines changed

5 files changed

+1508
-10
lines changed

internal/configs/configmaps.go

+4
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,14 @@ func ParseConfigMap(ctx context.Context, cfgm *v1.ConfigMap, nginxPlus bool, has
347347

348348
if mainTemplate, exists := cfgm.Data["main-template"]; exists {
349349
cfgParams.MainTemplate = &mainTemplate
350+
} else {
351+
cfgParams.MainTemplate = nil
350352
}
351353

352354
if ingressTemplate, exists := cfgm.Data["ingress-template"]; exists {
353355
cfgParams.IngressTemplate = &ingressTemplate
356+
} else {
357+
cfgParams.IngressTemplate = nil
354358
}
355359

356360
if virtualServerTemplate, exists := cfgm.Data["virtualserver-template"]; exists {

internal/configs/configurator.go

+4
Original file line numberDiff line numberDiff line change
@@ -1310,11 +1310,15 @@ func (cnf *Configurator) UpdateConfig(cfgParams *ConfigParams, resources Extende
13101310
cfgParams.MainServerSSLDHParam = fileName
13111311
}
13121312

1313+
// Apply custom main-template defined in ConfigMap obj
13131314
if cfgParams.MainTemplate != nil {
13141315
err := cnf.templateExecutor.UpdateMainTemplate(cfgParams.MainTemplate)
13151316
if err != nil {
13161317
return allWarnings, fmt.Errorf("error when parsing the main template: %w", err)
13171318
}
1319+
} else {
1320+
// Reverse to default main template parsed at NIC startup.
1321+
cnf.templateExecutor.UseOriginalMainTemplate()
13181322
}
13191323

13201324
if cfgParams.IngressTemplate != nil {

0 commit comments

Comments
 (0)