Merge pull request #883 from jiaqiluo/add-appDefaults

rancher · Apr 12, 2022 · 20c3406 · 20c3406
2 parents df3443c + d5b24c8
commit 20c3406
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/channels-rke2.yaml b/channels-rke2.yaml
@@ -1,6 +1,11 @@
 channels:
   - name: default
     latest: v1.22.8+rke2r1
+appDefaults:
+  - appName: rancher
+    defaults:
+      - appVersion: '> 2.6.0-0 < 2.6.99-0'
+        defaultVersion: '1.22.x'
 releases:
   - version: v1.19.16+rke2r1
     minChannelServerVersion: v2.6.0-alpha1

diff --git a/channels.yaml b/channels.yaml
@@ -1,6 +1,11 @@
 channels:
   - name: default
     latest: v1.22.8+k3s1
+appDefaults:
+  - appName: rancher
+    defaults:
+      - appVersion: '> 2.6.0-0 < 2.6.99-0'
+        defaultVersion: '1.22.x'
 releases:
   - version: v1.18.20+k3s1
     minChannelServerVersion: v2.6.0-alpha1

diff --git a/data/data.json b/data/data.json
@@ -11536,6 +11536,17 @@
   }
  },
  "k3s": {
+  "appDefaults": [
+   {
+    "appName": "rancher",
+    "defaults": [
+     {
+      "appVersion": "\u003e 2.6.0-0 \u003c 2.6.99-0",
+      "defaultVersion": "1.22.x"
+     }
+    ]
+   }
+  ],
   "channels": [
    {
     "latest": "v1.22.8+k3s1",
@@ -13909,6 +13920,17 @@
   ]
  },
  "rke2": {
+  "appDefaults": [
+   {
+    "appName": "rancher",
+    "defaults": [
+     {
+      "appVersion": "\u003e 2.6.0-0 \u003c 2.6.99-0",
+      "defaultVersion": "1.22.x"
+     }
+    ]
+   }
+  ],
   "channels": [
    {
     "latest": "v1.22.8+rke2r1",