diff --git a/bootstrap/cluster-resources/in-cluster/rke2-upgrade-plan.yaml b/bootstrap/cluster-resources/in-cluster/rke2-upgrade-plan.yaml index a9581c0..21e33e9 100644 --- a/bootstrap/cluster-resources/in-cluster/rke2-upgrade-plan.yaml +++ b/bootstrap/cluster-resources/in-cluster/rke2-upgrade-plan.yaml @@ -10,20 +10,24 @@ spec: concurrency: 1 nodeSelector: matchExpressions: - # When using k8s version 1.19 or older, swap control-plane with master - - {key: node-role.kubernetes.io/control-plane, operator: In, values: ["true"]} + # When using k8s version 1.19 or older, swap control-plane with master + - { + key: node-role.kubernetes.io/control-plane, + operator: In, + values: ["true"], + } tolerations: - - key: "CriticalAddonsOnly" - operator: "Equal" - value: "true" - effect: "NoExecute" + - key: "CriticalAddonsOnly" + operator: "Equal" + value: "true" + effect: "NoExecute" serviceAccountName: system-upgrade cordon: true -# drain: -# force: true + # drain: + # force: true upgrade: image: rancher/rke2-upgrade - version: v1.30.1-rke2r1 + version: v1.30.7-rke2r1 --- # Agent plan apiVersion: upgrade.cattle.io/v1 @@ -37,15 +41,19 @@ spec: concurrency: 2 nodeSelector: matchExpressions: - - {key: beta.kubernetes.io/os, operator: In, values: ["linux"]} - - {key: rke2-upgrade, operator: Exists} - - {key: rke2-upgrade, operator: NotIn, values: ["disabled", "false"]} + - { key: beta.kubernetes.io/os, operator: In, values: ["linux"] } + - { key: rke2-upgrade, operator: Exists } + - { key: rke2-upgrade, operator: NotIn, values: ["disabled", "false"] } # When using k8s version 1.19 or older, swap control-plane with master - - {key: node-role.kubernetes.io/control-plane, operator: NotIn, values: ["true"]} + - { + key: node-role.kubernetes.io/control-plane, + operator: NotIn, + values: ["true"], + } prepare: args: - - prepare - - server-plan + - prepare + - server-plan image: rancher/rke2-upgrade serviceAccountName: system-upgrade cordon: true @@ -53,5 +61,4 @@ spec: force: true upgrade: image: rancher/rke2-upgrade - version: v1.30.1-rke2r1 - + version: v1.30.7-rke2r1