Skip to content

Commit e7f4186

Browse files
committed
Use default VS and TS templates when CfgMap obj is deleted
1 parent 4257ca6 commit e7f4186

File tree

5 files changed

+1837
-18
lines changed

5 files changed

+1837
-18
lines changed

internal/configs/configmaps.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,14 @@ func ParseConfigMap(ctx context.Context, cfgm *v1.ConfigMap, nginxPlus bool, has
359359

360360
if virtualServerTemplate, exists := cfgm.Data["virtualserver-template"]; exists {
361361
cfgParams.VirtualServerTemplate = &virtualServerTemplate
362+
} else {
363+
cfgParams.VirtualServerTemplate = nil
362364
}
363365

364366
if transportServerTemplate, exists := cfgm.Data["transportserver-template"]; exists {
365367
cfgParams.TransportServerTemplate = &transportServerTemplate
368+
} else {
369+
cfgParams.TransportServerTemplate = nil
366370
}
367371

368372
if mainStreamSnippets, exists := GetMapKeyAsStringSlice(cfgm.Data, "stream-snippets", cfgm, "\n"); exists {

internal/configs/configurator.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,20 +1327,29 @@ func (cnf *Configurator) UpdateConfig(cfgParams *ConfigParams, resources Extende
13271327
if err != nil {
13281328
return allWarnings, fmt.Errorf("error when parsing the ingress template: %w", err)
13291329
}
1330+
} else {
1331+
// reverse to default ingress template parsed at NIC startup.
1332+
cnf.templateExecutor.UseOriginalIngressTemplate()
13301333
}
13311334

13321335
if cfgParams.VirtualServerTemplate != nil {
13331336
err := cnf.templateExecutorV2.UpdateVirtualServerTemplate(cfgParams.VirtualServerTemplate)
13341337
if err != nil {
13351338
return allWarnings, fmt.Errorf("error when parsing the VirtualServer template: %w", err)
13361339
}
1340+
} else {
1341+
// Reverse to default TransportServer template
1342+
cnf.templateExecutorV2.UseOriginalVStemplate()
13371343
}
13381344

13391345
if cfgParams.TransportServerTemplate != nil {
13401346
err := cnf.templateExecutorV2.UpdateTransportServerTemplate(cfgParams.TransportServerTemplate)
13411347
if err != nil {
13421348
return allWarnings, fmt.Errorf("error when parsing the TransportServer template: %w", err)
13431349
}
1350+
} else {
1351+
// Reverse to defualt TransportServer template
1352+
cnf.templateExecutorV2.UseOriginalTStemplate()
13441353
}
13451354

13461355
mainCfg := GenerateNginxMainConfig(cnf.staticCfgParams, cfgParams)

0 commit comments

Comments
 (0)