From 7d1c40800aed57852587a837da9c924f9813e5f3 Mon Sep 17 00:00:00 2001 From: az Date: Fri, 25 Nov 2022 16:14:28 +0100 Subject: [PATCH] fix missing reprovion in method provisionK3s --- .../provs/server/domain/k3s/K3sService.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sService.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sService.kt index bc5474c..96a0f86 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sService.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/domain/k3s/K3sService.kt @@ -15,10 +15,8 @@ fun Prov.provisionK3sCommand(cli: K3sCliCommand) = task { val k3sConfig: K3sConfig = getK3sConfig(cli.configFileName) DefaultApplicationFileRepository().assertExists(cli.applicationFileName) - if (cli.reprovision || k3sConfig.reprovision) { - deprovisionK3sInfra() - } - provisionK3s(k3sConfig, grafanaConfigResolved, cli.applicationFileName) + val k3sConfigReprovision = k3sConfig.copy(reprovision = cli.reprovision || k3sConfig.reprovision) + provisionK3s(k3sConfigReprovision, grafanaConfigResolved, cli.applicationFileName) } else { provisionGrafana(cli.onlyModules, grafanaConfigResolved) } @@ -32,6 +30,10 @@ fun Prov.provisionK3s( grafanaConfigResolved: GrafanaAgentConfigResolved? = null, applicationFileName: ApplicationFileName? = null) = task { + if (k3sConfig.reprovision) { + deprovisionK3sInfra() + } + provisionNetwork(k3sConfig) installK3s(k3sConfig)