diff --git a/channels-rke2.yaml b/channels-rke2.yaml index b9cf7d9a7..faa144c6d 100644 --- a/channels-rke2.yaml +++ b/channels-rke2.yaml @@ -1375,7 +1375,7 @@ releases: featureVersions: *featureVersions-v1 - version: v1.25.13+rke2r1 minChannelServerVersion: v2.7.2-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: &serverArgs-v1-25-13-rke2r1 <<: *serverArgs-v1-24-2-rke2r1 tls-san-security: @@ -1398,7 +1398,7 @@ releases: featureVersions: *featureVersions-v1 - version: v1.25.15+rke2r2 minChannelServerVersion: v2.7.2-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: &serverArgs-v1-25-15-rke2r2 <<: *serverArgs-v1-25-13-rke2r1 kube-cloud-controller-manager-arg: @@ -1437,7 +1437,7 @@ releases: featureVersions: *featureVersions-v1 - version: v1.25.16+rke2r1 minChannelServerVersion: v2.7.2-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: *serverArgs-v1-25-15-rke2r2 agentArgs: *agentArgs-v1-25-15-rke2r2 charts: &charts-v1-25-16-rke2r1 @@ -1529,7 +1529,7 @@ releases: featureVersions: *featureVersions-v1 - version: v1.26.8+rke2r1 minChannelServerVersion: v2.7.5-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: &serverArgs-v1-26-8-rke2r1 <<: *serverArgs-v1-24-2-rke2r1 tls-san-security: @@ -1552,7 +1552,7 @@ releases: featureVersions: *featureVersions-v1 - version: v1.26.10+rke2r2 minChannelServerVersion: v2.7.5-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: &serverArgs-v1-26-10-rke2r2 <<: *serverArgs-v1-26-8-rke2r1 kube-cloud-controller-manager-arg: @@ -1584,7 +1584,7 @@ releases: featureVersions: *featureVersions-v1 - version: v1.26.11+rke2r1 minChannelServerVersion: v2.7.5-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: *serverArgs-v1-26-10-rke2r2 agentArgs: *agentArgs-v1-25-15-rke2r2 charts: &charts-v1-26-11-rke2r1 @@ -1604,7 +1604,7 @@ releases: featureVersions: *featureVersions-v1 - version: v1.26.13+rke2r1 minChannelServerVersion: v2.7.5-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: *serverArgs-v1-26-10-rke2r2 agentArgs: *agentArgs-v1-25-15-rke2r2 charts: &charts-v1-26-13-rke2r1 @@ -1621,7 +1621,7 @@ releases: featureVersions: *featureVersions-v1 - version: v1.26.14+rke2r1 minChannelServerVersion: v2.7.5-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: &serverArgs-v1-26-14-rke2r1 <<: *serverArgs-v1-26-10-rke2r2 cni: @@ -1668,7 +1668,7 @@ releases: featureVersions: *featureVersions-v1 - version: v1.26.15+rke2r1 minChannelServerVersion: v2.7.5-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: *serverArgs-v1-26-14-rke2r1 agentArgs: *agentArgs-v1-25-15-rke2r2 charts: &charts-v1-26-15-rke2r1 diff --git a/channels.yaml b/channels.yaml index e7033e9dd..66192e008 100644 --- a/channels.yaml +++ b/channels.yaml @@ -445,19 +445,19 @@ releases: featureVersions: *featureVersions-v1 - version: v1.25.13+k3s1 minChannelServerVersion: v2.7.2-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: *serverArgs-v6 agentArgs: *agentArgs-v3 featureVersions: *featureVersions-v1 - version: v1.25.15+k3s2 minChannelServerVersion: v2.7.2-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: *serverArgs-v6 agentArgs: *agentArgs-v3 featureVersions: *featureVersions-v1 - version: v1.25.16+k3s4 minChannelServerVersion: v2.7.2-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: *serverArgs-v6 agentArgs: &agentArgs-v4 <<: *agentArgs-v3 @@ -484,25 +484,25 @@ releases: featureVersions: *featureVersions-v1 - version: v1.26.8+k3s1 minChannelServerVersion: v2.7.5-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: *serverArgs-v6 agentArgs: *agentArgs-v3 featureVersions: *featureVersions-v1 - version: v1.26.10+k3s2 minChannelServerVersion: v2.7.5-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: *serverArgs-v6 agentArgs: *agentArgs-v3 featureVersions: *featureVersions-v1 - version: v1.26.11+k3s2 minChannelServerVersion: v2.7.5-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: *serverArgs-v6 agentArgs: *agentArgs-v4 featureVersions: *featureVersions-v1 - version: v1.26.13+k3s2 minChannelServerVersion: v2.7.5-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: &serverArgs-v7 <<: *serverArgs-v6 embedded-registry: @@ -516,13 +516,13 @@ releases: featureVersions: *featureVersions-v1 - version: v1.26.14+k3s1 minChannelServerVersion: v2.7.5-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: *serverArgs-v7 agentArgs: *agentArgs-v5 featureVersions: *featureVersions-v1 - version: v1.26.15+k3s1 minChannelServerVersion: v2.7.5-alpha1 - maxChannelServerVersion: v2.9.99 + maxChannelServerVersion: v2.8.99 serverArgs: *serverArgs-v7 agentArgs: *agentArgs-v5 featureVersions: *featureVersions-v1 diff --git a/data/data.json b/data/data.json index 036d65cc9..47cd89cb5 100644 --- a/data/data.json +++ b/data/data.json @@ -14570,11 +14570,15 @@ }, "v1.25": { "minRKEVersion": "1.4.0-rc0", - "minRancherVersion": "2.7.2-patch0" + "maxRKEVersion": "1.5.99", + "minRancherVersion": "2.7.2-patch0", + "maxRancherVersion": "2.8.99" }, "v1.26": { "minRKEVersion": "1.4.0-rc0", - "minRancherVersion": "2.7.5-patch0" + "maxRKEVersion": "1.5.99", + "minRancherVersion": "2.7.5-patch0", + "maxRancherVersion": "2.8.99" }, "v1.27": { "minRKEVersion": "1.5.0-rc0", @@ -23291,7 +23295,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.2-alpha1", "serverArgs": { "cluster-cidr": { @@ -23459,7 +23463,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.2-alpha1", "serverArgs": { "cluster-cidr": { @@ -23630,7 +23634,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.2-alpha1", "serverArgs": { "cluster-cidr": { @@ -24281,7 +24285,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.5-alpha1", "serverArgs": { "cluster-cidr": { @@ -24449,7 +24453,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.5-alpha1", "serverArgs": { "cluster-cidr": { @@ -24620,7 +24624,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.5-alpha1", "serverArgs": { "cluster-cidr": { @@ -24797,7 +24801,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.5-alpha1", "serverArgs": { "cluster-cidr": { @@ -24977,7 +24981,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.5-alpha1", "serverArgs": { "cluster-cidr": { @@ -25157,7 +25161,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.5-alpha1", "serverArgs": { "cluster-cidr": { @@ -41081,7 +41085,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.2-alpha1", "serverArgs": { "audit-policy-file": { @@ -41346,7 +41350,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.2-alpha1", "serverArgs": { "audit-policy-file": { @@ -41614,7 +41618,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.2-alpha1", "serverArgs": { "audit-policy-file": { @@ -42664,7 +42668,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.5-alpha1", "serverArgs": { "audit-policy-file": { @@ -42929,7 +42933,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.5-alpha1", "serverArgs": { "audit-policy-file": { @@ -43197,7 +43201,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.5-alpha1", "serverArgs": { "audit-policy-file": { @@ -43465,7 +43469,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.5-alpha1", "serverArgs": { "audit-policy-file": { @@ -43733,7 +43737,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.5-alpha1", "serverArgs": { "audit-policy-file": { @@ -44002,7 +44006,7 @@ "featureVersions": { "encryption-key-rotation": "2.0.0" }, - "maxChannelServerVersion": "v2.9.99", + "maxChannelServerVersion": "v2.8.99", "minChannelServerVersion": "v2.7.5-alpha1", "serverArgs": { "audit-policy-file": { diff --git a/pkg/rke/k8s_version_info.go b/pkg/rke/k8s_version_info.go index a54e28ada..601a53e48 100644 --- a/pkg/rke/k8s_version_info.go +++ b/pkg/rke/k8s_version_info.go @@ -666,10 +666,14 @@ func loadK8sVersionInfo() map[string]v3.K8sVersionInfo { "v1.25": { MinRancherVersion: "2.7.2-patch0", MinRKEVersion: "1.4.0-rc0", + MaxRancherVersion: "2.8.99", + MaxRKEVersion: "1.5.99", }, "v1.26": { MinRancherVersion: "2.7.5-patch0", MinRKEVersion: "1.4.0-rc0", + MaxRancherVersion: "2.8.99", + MaxRKEVersion: "1.5.99", }, "v1.27": { MinRancherVersion: "2.8.0-patch0",