[dev-v2.9] rke fix nginx template range for oct patches (rancher#1547)

* fix nginx template range for rke oct patches
noironetworks · Nov 8, 2024 · 25f546d · 25f546d
1 parent 69de41a
commit 25f546d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/data/data.json b/data/data.json
@@ -14567,11 +14567,13 @@
    "\u003e=1.27.0-rancher1-1 \u003c1.27.8-rancher2-1": "nginxingress-v1.8.1-rancher1",
    "\u003e=1.27.8-rancher2-1 \u003c1.28.6-rancher1-1": "nginxingress-v1.9.4-rancher1",
    "\u003e=1.28.13-rancher1-1 \u003c1.28.14-rancher1-1": "nginxingress-v1.11.2-rancher1",
-   "\u003e=1.28.14-rancher1-1 \u003c1.29.0-rancher1-1": "nginxingress-v1.11.2-rancher2",
+   "\u003e=1.28.14-rancher1-1 \u003c1.28.15-rancher1-1": "nginxingress-v1.11.2-rancher2",
+   "\u003e=1.28.15-rancher1-1 \u003c1.29.0-rancher1-1": "nginxingress-v1.11.3-rancher1",
    "\u003e=1.28.6-rancher1-1 \u003c1.28.13-rancher1-1": "nginxingress-v1.9.6-rancher1",
    "\u003e=1.29.0-rancher1-1 \u003c1.29.8-rancher1-1": "nginxingress-v1.9.6-rancher1",
+   "\u003e=1.29.10-rancher1-1 \u003c1.30.0-rancher1-1": "nginxingress-v1.11.3-rancher1",
    "\u003e=1.29.8-rancher1-1 \u003c1.29.9-rancher1-1": "nginxingress-v1.11.2-rancher1",
-   "\u003e=1.29.9-rancher1-1 \u003c1.30.0-rancher1-1": "nginxingress-v1.11.2-rancher2",
+   "\u003e=1.29.9-rancher1-1 \u003c1.29.10-rancher1-1": "nginxingress-v1.11.2-rancher2",
    "\u003e=1.30.0-rancher1-1 \u003c1.30.4-rancher1-1": "nginxingress-v1.10.1-rancher1",
    "\u003e=1.30.4-rancher1-1 \u003c1.30.5-rancher1-1": "nginxingress-v1.11.2-rancher1",
    "\u003e=1.30.5-rancher1-1 \u003c1.30.6-rancher1-1": "nginxingress-v1.11.2-rancher2",

diff --git a/pkg/rke/templates/templates.go b/pkg/rke/templates/templates.go
@@ -361,10 +361,12 @@ func LoadK8sVersionedTemplates() map[string]map[string]string {
 			">=1.27.8-rancher2-1 <1.28.6-rancher1-1":   nginxIngressv194Rancher1,
 			">=1.28.6-rancher1-1 <1.28.13-rancher1-1":  nginxIngressv196Rancher1,
 			">=1.28.13-rancher1-1 <1.28.14-rancher1-1": nginxIngressv1112Rancher1,
-			">=1.28.14-rancher1-1 <1.29.0-rancher1-1":  nginxIngressv1112Rancher2,
+			">=1.28.14-rancher1-1 <1.28.15-rancher1-1": nginxIngressv1112Rancher2,
+			">=1.28.15-rancher1-1 <1.29.0-rancher1-1":  nginxIngressv1113Rancher1,
 			">=1.29.0-rancher1-1 <1.29.8-rancher1-1":   nginxIngressv196Rancher1,
 			">=1.29.8-rancher1-1 <1.29.9-rancher1-1":   nginxIngressv1112Rancher1,
-			">=1.29.9-rancher1-1 <1.30.0-rancher1-1":   nginxIngressv1112Rancher2,
+			">=1.29.9-rancher1-1 <1.29.10-rancher1-1":  nginxIngressv1112Rancher2,
+			">=1.29.10-rancher1-1 <1.30.0-rancher1-1":  nginxIngressv1113Rancher1,
 			">=1.30.0-rancher1-1 <1.30.4-rancher1-1":   nginxIngressv1101Rancher1,
 			">=1.30.4-rancher1-1 <1.30.5-rancher1-1":   nginxIngressv1112Rancher1,
 			">=1.30.5-rancher1-1 <1.30.6-rancher1-1":   nginxIngressv1112Rancher2,