fix: stop being clever with template variables (#128)

Also remove some kernelCmdline args I accidentally added back somehow. Oops.
liquidmetal-dev · Feb 2, 2022 · ae940cf · ae940cf
1 parent c20ee30
commit ae940cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/templates/cluster-template-cilium.yaml b/templates/cluster-template-cilium.yaml
@@ -74,7 +74,7 @@ spec:
       memoryMb: 2048
       rootVolume:
         id: root
-        image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks/capmvm-kubernetes:${KUBERNETES_VERSION#v}}"
+        image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks/capmvm-kubernetes:1.21.8}"
         mountPoint: "/"
       kernel:
         filename: "boot/vmlinux"
@@ -118,7 +118,7 @@ spec:
       memoryMb: 2048
       rootVolume:
         id: root
-        image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks/capmvm-kubernetes:${KUBERNETES_VERSION#v}}"
+        image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks/capmvm-kubernetes:1.21.8}"
         mountPoint: "/"
       kernel:
         filename: "boot/vmlinux"

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -70,7 +70,7 @@ spec:
       memoryMb: 2048
       rootVolume:
         id: root
-        image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks/capmvm-kubernetes:${KUBERNETES_VERSION#v}}"
+        image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks/capmvm-kubernetes:1.21.8}"
         mountPoint: "/"
       kernel:
         filename: "boot/vmlinux"
@@ -114,12 +114,12 @@ spec:
       memoryMb: 2048
       rootVolume:
         id: root
-        image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks/capmvm-kubernetes:${KUBERNETES_VERSION#v}}"
+        image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks/capmvm-kubernetes:1.21.8}"
         mountPoint: "/"
       kernel:
         filename: "boot/vmlinux"
         image: "${MVM_KERNEL_IMAGE:=ghcr.io/weaveworks/flintlock-kernel:5.10.77}"
-      kernelCmdline: console=ttyS0 reboot=k panic=1 pci=off i8042.noaux i8042.nomux i8042.nopnp i8042.dumbkbd ds=nocloud-net;s=http://169.254.169.254/latest/
+      kernelCmdline: {}
       networkInterfaces:
       - guestDeviceName: "eth1"
         type: "macvtap"