Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert 1.25 and 1.26 support removal #1424

Closed
wants to merge 2 commits into from
Closed

Revert 1.25 and 1.26 support removal #1424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7296b6b
Revert "updated max version constraints for k8s 1.25 and 1.26"
vardhaman22 Jun 25, 2024
eaafa9c
Revert "go generate"
vardhaman22 Jun 25, 2024
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
18 changes: 9 additions & 9 deletions channels-rke2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1375,7 +1375,7 @@ releases:
featureVersions: *featureVersions-v1
- version: v1.25.13+rke2r1
minChannelServerVersion: v2.7.2-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: &serverArgs-v1-25-13-rke2r1
<<: *serverArgs-v1-24-2-rke2r1
tls-san-security:
Expand All @@ -1398,7 +1398,7 @@ releases:
featureVersions: *featureVersions-v1
- version: v1.25.15+rke2r2
minChannelServerVersion: v2.7.2-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: &serverArgs-v1-25-15-rke2r2
<<: *serverArgs-v1-25-13-rke2r1
kube-cloud-controller-manager-arg:
Expand Down Expand Up @@ -1437,7 +1437,7 @@ releases:
featureVersions: *featureVersions-v1
- version: v1.25.16+rke2r1
minChannelServerVersion: v2.7.2-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: *serverArgs-v1-25-15-rke2r2
agentArgs: *agentArgs-v1-25-15-rke2r2
charts: &charts-v1-25-16-rke2r1
Expand Down Expand Up @@ -1529,7 +1529,7 @@ releases:
featureVersions: *featureVersions-v1
- version: v1.26.8+rke2r1
minChannelServerVersion: v2.7.5-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: &serverArgs-v1-26-8-rke2r1
<<: *serverArgs-v1-24-2-rke2r1
tls-san-security:
Expand All @@ -1552,7 +1552,7 @@ releases:
featureVersions: *featureVersions-v1
- version: v1.26.10+rke2r2
minChannelServerVersion: v2.7.5-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: &serverArgs-v1-26-10-rke2r2
<<: *serverArgs-v1-26-8-rke2r1
kube-cloud-controller-manager-arg:
Expand Down Expand Up @@ -1584,7 +1584,7 @@ releases:
featureVersions: *featureVersions-v1
- version: v1.26.11+rke2r1
minChannelServerVersion: v2.7.5-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: *serverArgs-v1-26-10-rke2r2
agentArgs: *agentArgs-v1-25-15-rke2r2
charts: &charts-v1-26-11-rke2r1
Expand All @@ -1604,7 +1604,7 @@ releases:
featureVersions: *featureVersions-v1
- version: v1.26.13+rke2r1
minChannelServerVersion: v2.7.5-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: *serverArgs-v1-26-10-rke2r2
agentArgs: *agentArgs-v1-25-15-rke2r2
charts: &charts-v1-26-13-rke2r1
Expand All @@ -1621,7 +1621,7 @@ releases:
featureVersions: *featureVersions-v1
- version: v1.26.14+rke2r1
minChannelServerVersion: v2.7.5-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: &serverArgs-v1-26-14-rke2r1
<<: *serverArgs-v1-26-10-rke2r2
cni:
Expand Down Expand Up @@ -1668,7 +1668,7 @@ releases:
featureVersions: *featureVersions-v1
- version: v1.26.15+rke2r1
minChannelServerVersion: v2.7.5-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: *serverArgs-v1-26-14-rke2r1
agentArgs: *agentArgs-v1-25-15-rke2r2
charts: &charts-v1-26-15-rke2r1
Expand Down
18 changes: 9 additions & 9 deletions channels.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,19 +445,19 @@ releases:
featureVersions: *featureVersions-v1
- version: v1.25.13+k3s1
minChannelServerVersion: v2.7.2-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: *serverArgs-v6
agentArgs: *agentArgs-v3
featureVersions: *featureVersions-v1
- version: v1.25.15+k3s2
minChannelServerVersion: v2.7.2-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: *serverArgs-v6
agentArgs: *agentArgs-v3
featureVersions: *featureVersions-v1
- version: v1.25.16+k3s4
minChannelServerVersion: v2.7.2-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: *serverArgs-v6
agentArgs: &agentArgs-v4
<<: *agentArgs-v3
Expand All @@ -484,25 +484,25 @@ releases:
featureVersions: *featureVersions-v1
- version: v1.26.8+k3s1
minChannelServerVersion: v2.7.5-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: *serverArgs-v6
agentArgs: *agentArgs-v3
featureVersions: *featureVersions-v1
- version: v1.26.10+k3s2
minChannelServerVersion: v2.7.5-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: *serverArgs-v6
agentArgs: *agentArgs-v3
featureVersions: *featureVersions-v1
- version: v1.26.11+k3s2
minChannelServerVersion: v2.7.5-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: *serverArgs-v6
agentArgs: *agentArgs-v4
featureVersions: *featureVersions-v1
- version: v1.26.13+k3s2
minChannelServerVersion: v2.7.5-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: &serverArgs-v7
<<: *serverArgs-v6
embedded-registry:
Expand All @@ -516,13 +516,13 @@ releases:
featureVersions: *featureVersions-v1
- version: v1.26.14+k3s1
minChannelServerVersion: v2.7.5-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: *serverArgs-v7
agentArgs: *agentArgs-v5
featureVersions: *featureVersions-v1
- version: v1.26.15+k3s1
minChannelServerVersion: v2.7.5-alpha1
maxChannelServerVersion: v2.8.99
maxChannelServerVersion: v2.9.99
serverArgs: *serverArgs-v7
agentArgs: *agentArgs-v5
featureVersions: *featureVersions-v1
Expand Down
44 changes: 20 additions & 24 deletions data/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14570,15 +14570,11 @@
},
"v1.25": {
"minRKEVersion": "1.4.0-rc0",
"maxRKEVersion": "1.5.99",
"minRancherVersion": "2.7.2-patch0",
"maxRancherVersion": "2.8.99"
"minRancherVersion": "2.7.2-patch0"
},
"v1.26": {
"minRKEVersion": "1.4.0-rc0",
"maxRKEVersion": "1.5.99",
"minRancherVersion": "2.7.5-patch0",
"maxRancherVersion": "2.8.99"
"minRancherVersion": "2.7.5-patch0"
},
"v1.27": {
"minRKEVersion": "1.5.0-rc0",
Expand Down Expand Up @@ -23295,7 +23291,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.2-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -23463,7 +23459,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.2-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -23634,7 +23630,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.2-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -24285,7 +24281,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -24453,7 +24449,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -24624,7 +24620,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -24801,7 +24797,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -24981,7 +24977,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -25161,7 +25157,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"cluster-cidr": {
Expand Down Expand Up @@ -41085,7 +41081,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.2-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -41350,7 +41346,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.2-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -41618,7 +41614,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.2-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -42668,7 +42664,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -42933,7 +42929,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -43201,7 +43197,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -43469,7 +43465,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -43737,7 +43733,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down Expand Up @@ -44006,7 +44002,7 @@
"featureVersions": {
"encryption-key-rotation": "2.0.0"
},
"maxChannelServerVersion": "v2.8.99",
"maxChannelServerVersion": "v2.9.99",
"minChannelServerVersion": "v2.7.5-alpha1",
"serverArgs": {
"audit-policy-file": {
Expand Down
4 changes: 0 additions & 4 deletions pkg/rke/k8s_version_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,14 +666,10 @@ 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",
Expand Down
Loading