sync with latest source

cluster/config/cluster-upgrade/cluster-upgrade.yml

@@ -5,7 +5,6 @@ metadata:
   name: server-plan
   namespace: system-upgrade
 spec:
-  channel: https://update.k3s.io/v1-release/channels/stable
   concurrency: 1
   cordon: true
   nodeSelector:
@@ -17,6 +16,7 @@ spec:
   serviceAccountName: system-upgrade
   upgrade:
     image: rancher/k3s-upgrade
+  channel: https://update.k3s.io/v1-release/channels/stable
 ---
 # Agent plan
 apiVersion: upgrade.cattle.io/v1
@@ -25,7 +25,6 @@ metadata:
   name: agent-plan
   namespace: system-upgrade
 spec:
-  channel: https://update.k3s.io/v1-release/channels/stable
   concurrency: 1
   cordon: true
   nodeSelector:
@@ -40,3 +39,4 @@ spec:
   serviceAccountName: system-upgrade
   upgrade:
     image: rancher/k3s-upgrade
+  channel: https://update.k3s.io/v1-release/channels/stable

cluster/config/cluster-upgrade/system-upgrade-controller.yaml

@@ -264,7 +264,7 @@ spec:
         envFrom:
         - configMapRef:
             name: default-controller-env
-        image: rancher/system-upgrade-controller:v0.15.2
+        image: rancher/system-upgrade-controller:v0.16.3
         imagePullPolicy: IfNotPresent
         name: system-upgrade-controller
         securityContext: