meissa/provs
7
1
Fork 0
Code Issues Pull requests Projects Releases 12 Packages Wiki Activity

fix k3s options for options=null

Browse source
This commit is contained in:
ansgarz 2022-01-23 19:19:48 +01:00
parent ee658622b7
commit c2fc62e13a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt
View file

@ -13,10 +13,10 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInsta
fun Prov.provisionK3sInfra(docker: Boolean = false, tlsHost: String? = null, options: String? = null) = task { fun Prov.provisionK3sInfra(docker: Boolean = false, tlsHost: String? = null, options: String? = null) = task {
val tlsSanOption = tlsHost?.let { "--tls-san ${it}" } ?: "" val tlsSanOption = tlsHost?.let { "--tls-san ${it}" } ?: ""
val k3sOptions = if (tlsHost == null && options == null) val k3sAllOptions = if (tlsHost == null && options == null)
"" ""
else else
"INSTALL_K3S_EXEC=\"$options $tlsSanOption\"" "INSTALL_K3S_EXEC=\"$tlsSanOption ${options ?: ""}\""
aptInstall("curl") aptInstall("curl")
if (!chk("k3s -version")) { if (!chk("k3s -version")) {
@ -24,10 +24,10 @@ fun Prov.provisionK3sInfra(docker: Boolean = false, tlsHost: String? = null, opt
// might not work if docker already installed // might not work if docker already installed
sh(""" sh("""
curl https://releases.rancher.com/install-docker/19.03.sh | sh curl https://releases.rancher.com/install-docker/19.03.sh | sh
curl -sfL https://get.k3s.io | $k3sOptions sh -s - --docker curl -sfL https://get.k3s.io | $k3sAllOptions sh -s - --docker
""".trimIndent()) """.trimIndent())
} else { } else {
cmd("curl -sfL https://get.k3s.io | $k3sOptions sh -") cmd("curl -sfL https://get.k3s.io | $k3sAllOptions sh -")
} }
} else { } else {
ProvResult(true) ProvResult(true)
@ -35,6 +35,7 @@ fun Prov.provisionK3sInfra(docker: Boolean = false, tlsHost: String? = null, opt
} }
@Suppress("unused")
fun Prov.uninstallK3sServer() = task { fun Prov.uninstallK3sServer() = task {
cmd("sudo /usr/local/bin/k3s-uninstall.sh") cmd("sudo /usr/local/bin/k3s-uninstall.sh")
} }