Merge pull request #962 from rancher/dev-v2.6

rancher · Aug 30, 2022 · 38f790e · 38f790e
2 parents b175bde + f2a9bda
commit 38f790e
Show file tree

Hide file tree

Showing 5 changed files with 1,927 additions and 383 deletions.
diff --git a/channels-rke2.yaml b/channels-rke2.yaml
@@ -1,6 +1,6 @@
 channels:
   - name: default
-    latest: v1.22.11+rke2r1
+    latest: v1.22.13+rke2r1
 appDefaults:
   - appName: rancher
     defaults:
@@ -595,6 +595,26 @@ releases:
         version: v3.8-build2021110403
     featureVersions: &featureVersions-v1-22-11-rke2r1
       <<: *featureVersions-v1-21-14-rke2r1
+  - version: v1.22.13+rke2r1
+    minChannelServerVersion: v2.6.3-alpha1
+    maxChannelServerVersion: v2.6.99
+    serverArgs: &serverArgs-v1
+      <<: *serverArgs-v1-22-11-rke2r1
+    agentArgs: &agentArgs-v1
+      <<: *agentArgs-v1-22-11-rke2r1
+    charts: &charts-v1
+      <<: *charts-v1-22-11-rke2r1
+      rke2-cilium:
+        repo: rancher-rke2-charts
+        version: 1.12.001
+      rke2-ingress-nginx:
+        repo: rancher-rke2-charts
+        version: 4.1.004
+      harvester-cloud-provider:
+        repo: rancher-rke2-charts
+        version: 0.1.1300
+    featureVersions: &featureVersions-v1
+      <<: *featureVersions-v1-22-11-rke2r1
   - version: v1.23.4+rke2r2
     minChannelServerVersion: v2.6.4-alpha1
     maxChannelServerVersion: v2.6.99
@@ -710,6 +730,20 @@ releases:
         version: v3.8-build2021110403
     featureVersions: &featureVersions-v1-23-8-rke2r1
       <<: *featureVersions-v1-21-14-rke2r1
+  - version: v1.23.10+rke2r1
+    minChannelServerVersion: v2.6.4-alpha1
+    maxChannelServerVersion: v2.6.99
+    serverArgs: *serverArgs-v1
+    agentArgs: *agentArgs-v1
+    charts: &charts-v2
+      <<: *charts-v1
+      rke2-calico:
+        repo: rancher-rke2-charts
+        version: v3.23.103
+      rke2-calico-crd:
+        repo: rancher-rke2-charts
+        version: v3.23.103
+    featureVersions: *featureVersions-v1
   - version: v1.24.2+rke2r1
     minChannelServerVersion: v2.6.7-alpha1
     maxChannelServerVersion: v2.6.99
@@ -721,3 +755,10 @@ releases:
       <<: *charts-v1-23-8-rke2r1
     featureVersions: &featureVersions-v1-24-2-rke2r1
       <<: *featureVersions-v1-23-8-rke2r1
+  - version: v1.24.4+rke2r1
+    minChannelServerVersion: v2.6.7-alpha1
+    maxChannelServerVersion: v2.6.99
+    serverArgs: *serverArgs-v1
+    agentArgs: *agentArgs-v1
+    charts: *charts-v2
+    featureVersions: *featureVersions-v1
diff --git a/channels.yaml b/channels.yaml
@@ -221,6 +221,12 @@ releases:
     serverArgs: *serverArgs-v3
     agentArgs: *agentArgs-v2
     featureVersions: *featureVersions-v1
+  - version: v1.22.13+k3s1
+    minChannelServerVersion: v2.6.3-alpha1
+    maxChannelServerVersion: v2.6.99
+    serverArgs: *serverArgs-v3
+    agentArgs: *agentArgs-v2
+    featureVersions: *featureVersions-v1
   - version: v1.23.4+k3s1
     minChannelServerVersion: v2.6.4-alpha1
     maxChannelServerVersion: v2.6.99
@@ -244,9 +250,21 @@ releases:
     serverArgs: *serverArgs-v3
     agentArgs: *agentArgs-v2
     featureVersions: *featureVersions-v1
+  - version: v1.23.10+k3s1
+    minChannelServerVersion: v2.6.4-alpha1
+    maxChannelServerVersion: v2.6.99
+    serverArgs: *serverArgs-v3
+    agentArgs: *agentArgs-v2
+    featureVersions: *featureVersions-v1
   - version: v1.24.2+k3s2
     minChannelServerVersion: v2.6.7-alpha1
     maxChannelServerVersion: v2.6.99
     serverArgs: *serverArgs-v3
     agentArgs: *agentArgs-v2
     featureVersions: *featureVersions-v1
+  - version: v1.24.4+k3s1
+    minChannelServerVersion: v2.6.7-alpha1
+    maxChannelServerVersion: v2.6.99
+    serverArgs: *serverArgs-v3
+    agentArgs: *agentArgs-v2
+    featureVersions: *featureVersions-v1