Merge pull request #459 from dweomer/bump/system-upgrade-controller/v…

…0.5.0

upgrade: bump system-upgrade-controller to v0.5.0

overlay/share/rancher/k3s/server/manifests/system-upgrade-controller.yaml

@@ -61,7 +61,7 @@ spec:
       serviceAccountName: k3os-upgrade
       containers:
         - name: system-upgrade-controller
-          image: rancher/system-upgrade-controller:v0.4.0
+          image: rancher/system-upgrade-controller:v0.5.0
           imagePullPolicy: IfNotPresent
           envFrom:
             - configMapRef:

overlay/share/rancher/k3s/server/manifests/system-upgrade-plans/k3os-latest.yaml

@@ -34,12 +34,21 @@ spec:
   # See https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
   serviceAccountName: k3os-upgrade
 
+  # Specify which node taints should be tolerated by pods applying the upgrade.
+  # Anything specified here is appended to the default of:
+  # - {key: node.kubernetes.io/unschedulable, effect: NoSchedule, operator: Exists}
+  tolerations:
+    - {key: kubernetes.io/arch, effect: NoSchedule, operator: Equal, value: amd64}
+    - {key: kubernetes.io/arch, effect: NoSchedule, operator: Equal, value: arm64}
+    - {key: kubernetes.io/arch, effect: NoSchedule, operator: Equal, value: arm}
+
   # The prepare init container is run before cordon/drain which is run before the upgrade container.
-  # Shares the same format as the `upgrade` container
-  # prepare:
-  #   image: alpine:3.11
-  #   command: [sh, -c]
-  #   args: [" echo '### ENV ###'; env | sort; echo '### RUN ###'; find /run/system-upgrade | sort"]
+  # Shares the same format as the `upgrade` container.
+  # This formulation will incur the rancher/k3os image download prior to the drain, minimizing unavailability.
+  prepare:
+    image: rancher/k3os
+    command: [k3os, --version]
+    args: []
 
   # See https://kubernetes.io/docs/tasks/administer-cluster/safely-drain-node/#use-kubectl-drain-to-remove-a-node-from-service
   drain: