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

Move reprovision cmd line option to new branch

Browse source
This commit is contained in:
erik 2022-08-24 13:21:43 +02:00
parent 411003f04a
commit 17a814a11a
3 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/kotlin/org/domaindrivenarchitecture/provs/server/application/CliArgumentsParser.kt
View file

@ -34,8 +34,7 @@ class CliArgumentsParser(name: String) : CliTargetParser(name) {
),
module.configFileName,
module.applicationFileName,
module.submodules,
module.reprovision
module.submodules
)
else -> return ServerCliCommand(
ServerType.valueOf(module.name.uppercase()),
@ -53,7 +52,6 @@ class CliArgumentsParser(name: String) : CliTargetParser(name) {
var configFileName: ConfigFileName? = null
var applicationFileName: ApplicationFileName? = null
var submodules: List<String>? = null
var reprovision: Boolean = false
}
class K3s : ServerSubcommand("k3s", "the k3s module") {
@ -75,17 +73,11 @@ class CliArgumentsParser(name: String) : CliTargetParser(name) {
"o",
"provisions only parts ",
)
val cliReprovision by option(
ArgType.Boolean,
"reprovision",
"r",
"redo provisioning, deletes old config first"
)
override fun execute() {
super.configFileName = cliConfigFileName?.let { ConfigFileName(it) }
super.applicationFileName = cliApplicationFileName?.let { ApplicationFileName(it) }
super.submodules = if (only != null) listOf(only!!.name.lowercase()) else null
super.reprovision = cliReprovision == true
super.parsed = true
}
}

3
src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sCliCommand.kt
View file

@ -10,8 +10,7 @@ class K3sCliCommand(
target: TargetCliCommand,
configFileName: ConfigFileName?,
val applicationFileName: ApplicationFileName?,
val submodules: List<String>? = null,
val reprovision: Reprovision = false
val submodules: List<String>? = null
) :
ServerCliCommand(
serverType, target, configFileName

10
src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sService.kt
View file

@ -11,17 +11,11 @@ fun Prov.provisionK3s(cli: K3sCliCommand) = task {
val grafanaConfigResolved: GrafanaAgentConfigResolved? = findK8sGrafanaConfig(cli.configFileName)?.resolveSecret()
if (cli.submodules == null && !cli.reprovision) {
if (cli.submodules == null) {
// full k3s
val k3sConfig: K3sConfig = getK3sConfig(cli.configFileName)
provisionK3sWorker(k3sConfig, grafanaConfigResolved, cli.applicationFileName)
}
else if (cli.reprovision) {
deprovisionK3sInfra()
val k3sConfig: K3sConfig = getK3sConfig(cli.configFileName)
provisionK3sWorker(k3sConfig, grafanaConfigResolved, cli.applicationFileName)
}
else {
} else {
// submodules only
provisionGrafanaSanitized(cli.submodules, grafanaConfigResolved)
}