Remove broken RKE2 releases (#1001)

* removing v1.24.6+rke2r1 Signed-off-by: matttrach <[email protected]> * removing v1.23.12+rke2r1 Signed-off-by: matttrach <[email protected]> * commenting out v1.22.14+rke2r1 and removing pointers to its anchors Signed-off-by: matttrach <[email protected]> * removing v1.22.15+rke2r1 Signed-off-by: matttrach <[email protected]> * removing reference to v1-22-15-rke2r1 Signed-off-by: matttrach <[email protected]> * go generate Signed-off-by: matttrach <[email protected]> Signed-off-by: matttrach <[email protected]>
rancher · Nov 7, 2022 · 067672c · 067672c
1 parent e127862
commit 067672c
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 870 deletions.
diff --git a/channels-rke2.yaml b/channels-rke2.yaml
@@ -615,28 +615,16 @@ releases:
         version: 0.1.1300
     featureVersions: &featureVersions-v1
       <<: *featureVersions-v1-22-11-rke2r1
-  - version: v1.22.15+rke2r1
+  - version: v1.22.15+rke2r2
     minChannelServerVersion: v2.6.3-alpha1
     maxChannelServerVersion: v2.6.99
     serverArgs: *serverArgs-v1-22-11-rke2r1
     agentArgs: *agentArgs-v1-22-11-rke2r1
-    charts: &charts-v1-22-15-rke2r1
+    charts: &charts-v1-22-15-rke2r2
       <<: *charts-v1
       rke2-cilium:
         repo: rancher-rke2-charts
         version: 1.12.102
-      rke2-canal:
-        repo: rancher-rke2-charts
-        version: v3.23.3-build2022081001
-    featureVersions: &featureVersions-v1
-      <<: *featureVersions-v1-22-11-rke2r1
-  - version: v1.22.15+rke2r2
-    minChannelServerVersion: v2.6.3-alpha1
-    maxChannelServerVersion: v2.6.99
-    serverArgs: *serverArgs-v1-22-11-rke2r1
-    agentArgs: *agentArgs-v1-22-11-rke2r1
-    charts: &charts-v1-22-15-rke2r2
-      <<: *charts-v1-22-15-rke2r1
       rke2-canal:
         repo: rancher-rke2-charts
         version: v3.24.1-build2022101102
@@ -771,27 +759,16 @@ releases:
         repo: rancher-rke2-charts
         version: v3.23.103
     featureVersions: *featureVersions-v1
-  - version: v1.23.12+rke2r1
-    minChannelServerVersion: v2.6.4-alpha1
-    maxChannelServerVersion: v2.7.99
-    serverArgs: *serverArgs-v1-23-8-rke2r1
-    agentArgs: *agentArgs-v1-23-8-rke2r1
-    charts: &charts-v1-23-12-rke2r1
-      <<: *charts-v1-22-15-rke2r1
-      rke2-calico:
-        repo: rancher-rke2-charts
-        version: v3.24.102
-      rke2-calico-crd:
-        repo: rancher-rke2-charts
-        version: v3.24.102
-    featureVersions: *featureVersions-v1
   - version: v1.23.13+rke2r1
     minChannelServerVersion: v2.6.4-alpha1
     maxChannelServerVersion: v2.7.99
     serverArgs: *serverArgs-v1-23-8-rke2r1
     agentArgs: *agentArgs-v1-23-8-rke2r1
     charts: &charts-v1-23-13-rke2r1
-      <<: *charts-v1-22-15-rke2r1
+      <<: *charts-v1
+      rke2-cilium:
+        repo: rancher-rke2-charts
+        version: 1.12.102
       rke2-coredns:
         repo: rancher-rke2-charts
         version: 1.19.401
@@ -838,21 +815,16 @@ releases:
     agentArgs: *agentArgs-v1
     charts: *charts-v2
     featureVersions: *featureVersions-v1
-  - version: v1.24.6+rke2r1
-    minChannelServerVersion: v2.6.7-alpha1
-    maxChannelServerVersion: v2.7.99
-    serverArgs: *serverArgs-v1-24-2-rke2r1
-    agentArgs: *agentArgs-v1-24-2-rke2r1
-    charts: &charts-v1-24-6-rke2r1
-      <<: *charts-v1-23-12-rke2r1
-    featureVersions: *featureVersions-v1
   - version: v1.24.7+rke2r1
     minChannelServerVersion: v2.6.7-alpha1
     maxChannelServerVersion: v2.7.99
     serverArgs: *serverArgs-v1-24-2-rke2r1
     agentArgs: *agentArgs-v1-24-2-rke2r1
     charts: &charts-v1-24-7-rke2r1
-      <<: *charts-v1-23-12-rke2r1
+      <<: *charts-v1
+      rke2-cilium:
+        repo: rancher-rke2-charts
+        version: 1.12.102
       rke2-coredns:
         repo: rancher-rke2-charts
         version: 1.19.401