nginx
diff --git a/‎internal/configs/configmaps.go‎
Lines changed: 4 additions & 0 deletions b/‎internal/configs/configmaps.go‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎internal/configs/configurator.go‎
Lines changed: 10 additions & 1 deletion b/‎internal/configs/configurator.go‎
Lines changed: 10 additions & 1 deletion
@@ -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 {
 
@@ -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()
 	}
 
@@ -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)
Original file line number	Diff line number	Diff line change
`@@ -359,10 +359,14 @@ func ParseConfigMap(ctx context.Context, cfgm *v1.ConfigMap, nginxPlus bool, has`
`359`	`359`
`360`	`360`	`if virtualServerTemplate, exists := cfgm.Data["virtualserver-template"]; exists {`
`361`	`361`	`cfgParams.VirtualServerTemplate = &virtualServerTemplate`
	`362`	`+ } else {`
	`363`	`+ cfgParams.VirtualServerTemplate = nil`
`362`	`364`	`}`
`363`	`365`
`364`	`366`	`if transportServerTemplate, exists := cfgm.Data["transportserver-template"]; exists {`
`365`	`367`	`cfgParams.TransportServerTemplate = &transportServerTemplate`
	`368`	`+ } else {`
	`369`	`+ cfgParams.TransportServerTemplate = nil`
`366`	`370`	`}`
`367`	`371`
`368`	`372`	`if mainStreamSnippets, exists := GetMapKeyAsStringSlice(cfgm.Data, "stream-snippets", cfgm, "\n"); exists {`
Original file line number	Diff line number	Diff line change
`@@ -1318,7 +1318,7 @@ func (cnf Configurator) UpdateConfig(cfgParams ConfigParams, resources Extende`
`1318`	`1318`	`return allWarnings, fmt.Errorf("error when parsing the main template: %w", err)`
`1319`	`1319`	`}`
`1320`	`1320`	`} else {`
`1321`		`- // Reverse to default main template parsed at NIC startup.`
	`1321`	`+ // Reverse to default Main template parsed at NIC startup.`
`1322`	`1322`	`cnf.templateExecutor.UseOriginalMainTemplate()`
`1323`	`1323`	`}`
`1324`	`1324`
`@@ -1327,20 +1327,29 @@ func (cnf Configurator) UpdateConfig(cfgParams ConfigParams, resources Extende`
`1327`	`1327`	`if err != nil {`
`1328`	`1328`	`return allWarnings, fmt.Errorf("error when parsing the ingress template: %w", err)`
`1329`	`1329`	`}`
	`1330`	`+ } else {`
	`1331`	`+ // Reverse to default Ingress template parsed at NIC startup.`
	`1332`	`+ cnf.templateExecutor.UseOriginalIngressTemplate()`
`1330`	`1333`	`}`
`1331`	`1334`
`1332`	`1335`	`if cfgParams.VirtualServerTemplate != nil {`
`1333`	`1336`	`err := cnf.templateExecutorV2.UpdateVirtualServerTemplate(cfgParams.VirtualServerTemplate)`
`1334`	`1337`	`if err != nil {`
`1335`	`1338`	`return allWarnings, fmt.Errorf("error when parsing the VirtualServer template: %w", err)`
`1336`	`1339`	`}`
	`1340`	`+ } else {`
	`1341`	`+ // Reverse to default TransportServer template parsed at NIC startup.`
	`1342`	`+ cnf.templateExecutorV2.UseOriginalVStemplate()`
`1337`	`1343`	`}`
`1338`	`1344`
`1339`	`1345`	`if cfgParams.TransportServerTemplate != nil {`
`1340`	`1346`	`err := cnf.templateExecutorV2.UpdateTransportServerTemplate(cfgParams.TransportServerTemplate)`
`1341`	`1347`	`if err != nil {`
`1342`	`1348`	`return allWarnings, fmt.Errorf("error when parsing the TransportServer template: %w", err)`
`1343`	`1349`	`}`
	`1350`	`+ } else {`
	`1351`	`+ // Reverse to default TransportServer template parsed at NIC startup.`
	`1352`	`+ cnf.templateExecutorV2.UseOriginalTStemplate()`
`1344`	`1353`	`}`
`1345`	`1354`
`1346`	`1355`	`mainCfg := GenerateNginxMainConfig(cnf.staticCfgParams, cfgParams)`