Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions internal/configs/configmaps.go
Original file line number Diff line number Diff line change
Expand Up @@ -359,10 +359,14 @@ func ParseConfigMap(ctx context.Context, cfgm *v1.ConfigMap, nginxPlus bool, has

if virtualServerTemplate, exists := cfgm.Data["virtualserver-template"]; exists {
cfgParams.VirtualServerTemplate = &virtualServerTemplate
} else {
cfgParams.VirtualServerTemplate = nil
}

if transportServerTemplate, exists := cfgm.Data["transportserver-template"]; exists {
cfgParams.TransportServerTemplate = &transportServerTemplate
} else {
cfgParams.TransportServerTemplate = nil
}

if mainStreamSnippets, exists := GetMapKeyAsStringSlice(cfgm.Data, "stream-snippets", cfgm, "\n"); exists {
Expand Down
11 changes: 10 additions & 1 deletion internal/configs/configurator.go
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,7 @@ func (cnf *Configurator) UpdateConfig(cfgParams *ConfigParams, resources Extende
return allWarnings, fmt.Errorf("error when parsing the main template: %w", err)
}
} else {
// Reverse to default main template parsed at NIC startup.
// Reverse to default Main template parsed at NIC startup.
cnf.templateExecutor.UseOriginalMainTemplate()
}

Expand All @@ -1327,20 +1327,29 @@ func (cnf *Configurator) UpdateConfig(cfgParams *ConfigParams, resources Extende
if err != nil {
return allWarnings, fmt.Errorf("error when parsing the ingress template: %w", err)
}
} else {
// Reverse to default Ingress template parsed at NIC startup.
cnf.templateExecutor.UseOriginalIngressTemplate()
}

if cfgParams.VirtualServerTemplate != nil {
err := cnf.templateExecutorV2.UpdateVirtualServerTemplate(cfgParams.VirtualServerTemplate)
if err != nil {
return allWarnings, fmt.Errorf("error when parsing the VirtualServer template: %w", err)
}
} else {
// Reverse to default TransportServer template parsed at NIC startup.
cnf.templateExecutorV2.UseOriginalVStemplate()
}

if cfgParams.TransportServerTemplate != nil {
err := cnf.templateExecutorV2.UpdateTransportServerTemplate(cfgParams.TransportServerTemplate)
if err != nil {
return allWarnings, fmt.Errorf("error when parsing the TransportServer template: %w", err)
}
} else {
// Reverse to default TransportServer template parsed at NIC startup.
cnf.templateExecutorV2.UseOriginalTStemplate()
}

mainCfg := GenerateNginxMainConfig(cnf.staticCfgParams, cfgParams)
Expand Down
Loading