microshift: fix for 4.16

karmab · Jun 30, 2024 · 9b56b0c · 9b56b0c
1 parent d5b8d08
commit 9b56b0c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/kvirt/cluster/microshift/scripts/03_microshift.sh b/kvirt/cluster/microshift/scripts/03_microshift.sh
@@ -5,9 +5,9 @@ if [ -d /root/manifests ] ; then
  cp /root/manifests/*y*ml /etc/microshift/manifests
 fi
 
-dnf -y install microshift {{ 'microshift-olm' if olm|default(False) else '' }}
+dnf -y install microshift {{ 'microshift-olm' if olm|default(False) else '' }} microshift-olm microshift-multus
 BASEDOMAIN={{ "$(hostname)" if sslip else cluster + '.' + domain }}
-sed -i "s@#baseDomain: .*@baseDomain: $BASEDOMAIN@" /etc/microshift/config.yaml.default
-sed -i "s@#subjectAltNames:.*@subjectAltNames: \[\"api.$BASEDOMAIN\"\]@" /etc/microshift/config.yaml.default
-mv /etc/microshift/config.yaml.default /etc/microshift/config.yaml
+
+microshift show-config > /etc/microshift/config.yaml
+python /root/scripts/config.py $BASEDOMAIN
 systemctl enable --now microshift
diff --git a/kvirt/cluster/microshift/scripts/config.py b/kvirt/cluster/microshift/scripts/config.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+
+import sys
+import yaml
+
+if len(sys.argv) != 2:
+    print("Usage config.py $domain")
+    sys.exit(1)
+
+domain = sys.argv[1]
+
+with open('/etc/microshift/config.yaml', 'rw') as f:
+    data = yaml.safe_load(f)
+    data['dns']['baseDomain'] = domain
+    data['apiServer']['subjectAltNames'] = [f'api.{domain}']
+    data['ingress']['listenAddress'] = ['eth0']
+    yaml.safe_dump(data, f)