1
0
mirror of https://github.com/rancher/rke.git synced 2025-08-11 19:53:02 +00:00

Merge pull request #2618 from superseb/kdm_20212307_2

update kdm
This commit is contained in:
Sebastiaan van Steenis 2021-07-24 20:46:07 +02:00 committed by GitHub
commit 8b86afefc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions

File diff suppressed because one or more lines are too long

View File

@ -8576,7 +8576,7 @@
"2.5.5": "v1.19.x", "2.5.5": "v1.19.x",
"2.5.6": "v1.20.x", "2.5.6": "v1.20.x",
"2.6": "v1.21.x", "2.6": "v1.21.x",
"default": "v1.20.x" "default": "v1.21.x"
}, },
"RKEDefaultK8sVersions": { "RKEDefaultK8sVersions": {
"0.3": "v1.16.3-rancher1-1", "0.3": "v1.16.3-rancher1-1",
@ -9221,12 +9221,12 @@
{ {
"maxChannelServerVersion": "v2.6.99", "maxChannelServerVersion": "v2.6.99",
"minChannelServerVersion": "v2.6.0-alpha1", "minChannelServerVersion": "v2.6.0-alpha1",
"version": "v1.19.12+rke2r1" "version": "v1.19.13+rke2r1"
}, },
{ {
"maxChannelServerVersion": "v2.6.99", "maxChannelServerVersion": "v2.6.99",
"minChannelServerVersion": "v2.6.0-alpha1", "minChannelServerVersion": "v2.6.0-alpha1",
"version": "v1.20.8+rke2r1" "version": "v1.20.9+rke2r1"
}, },
{ {
"agentArgs": { "agentArgs": {
@ -9249,6 +9249,9 @@
], ],
"type": "enum" "type": "enum"
}, },
"kube-proxy-arg": {
"type": "array"
},
"kubelet-arg": { "kubelet-arg": {
"type": "array" "type": "array"
}, },
@ -9361,6 +9364,9 @@
"kube-controller-manager-arg": { "kube-controller-manager-arg": {
"type": "array" "type": "array"
}, },
"kube-proxy-arg": {
"type": "array"
},
"kube-scheduler-arg": { "kube-scheduler-arg": {
"type": "array" "type": "array"
}, },
@ -9374,7 +9380,7 @@
"type": "array" "type": "array"
} }
}, },
"version": "v1.21.2+rke2r1" "version": "v1.21.3+rke2r1"
} }
] ]
} }