Merge pull request #41 from projectsyn/fix/plan-rendering

Only try to fixup Plan `spec.upgrade.command` if it exists

Author: simu

component/main.jsonnet

@@ -215,12 +215,13 @@ local plans = [
     spec+: com.makeMergeable(p.spec),
   };
   local needsFG = !std.objectHas(sp.spec, 'channel') && !std.objectHas(sp.spec, 'version');
+  local hasCmd = std.objectHas(sp.spec, 'upgrade') && std.objectHas(sp.spec.upgrade, 'command');
 
   sp {
     spec+: {
       [if needsFG then 'channel']: suc.floodgate_channel(p.floodgate),
       upgrade+: {
-        command: fixup_command(super.command),
+        [if hasCmd then 'command']: fixup_command(super.command),
         [if std.objectHas(p, 'push_gateway') then 'args']+:
           [ p.push_gateway ],
       },

tests/defaults.yml

@@ -39,3 +39,20 @@ parameters:
           plan.upgrade.cattle.io/system-upgrade-bionic:
             operator: Exists
         tolerations: ${system_upgrade_controller:plan_tolerations}
+      k3s:
+        spec:
+          concurrency: 1
+          version: v1.20.12+k3s1
+          channel: null
+          serviceAccountName: system-upgrade
+          cordon: true
+          image: docker.io/rancher/k3s-upgrade
+        label_selectors:
+          k3s.io/hostname:
+            operator: Exists
+        tolerations:
+          node-role.kubernetes.io/controlplane:
+            operator: Exists
+          node-role.kubernetes.io/master:
+            operator: In
+            values: ["true"]

tests/golden/defaults/system-upgrade-controller/system-upgrade-controller/05_plans.yaml

@@ -1,5 +1,37 @@
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+  labels:
+    app.kubernetes.io/managed-by: syn
+    name: k3s
+  name: k3s
+  namespace: syn-system-upgrade-controller
+spec:
+  channel: null
+  concurrency: 1
+  cordon: true
+  drain:
+    force: true
+  image: docker.io/rancher/k3s-upgrade
+  nodeSelector:
+    matchExpressions:
+      - key: k3s.io/hostname
+        operator: Exists
+  serviceAccountName: system-upgrade
+  tolerations:
+    - key: node-role.kubernetes.io/controlplane
+      operator: Exists
+    - key: node-role.kubernetes.io/master
+      operator: In
+      values:
+        - 'true'
+  upgrade: {}
+  version: v1.20.12+k3s1
+---
+apiVersion: upgrade.cattle.io/v1
+kind: Plan
 metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true