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

minor fixes

Browse source
This commit is contained in:
jem 2022-02-02 18:21:45 +01:00
parent 1a8877d419
commit 2da49816a7
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -4,5 +4,5 @@
/.gradle/ /.gradle/
/.idea/ /.idea/
/MyIdeConfig.yaml /My*
/myServerConfig.yaml /my*

2
.run/provs-server.run.xml
View file

@ -2,7 +2,7 @@
<configuration default="false" name="provs-server statistics.dev" type="JetRunConfigurationType"> <configuration default="false" name="provs-server statistics.dev" type="JetRunConfigurationType">
<option name="MAIN_CLASS_NAME" value="org.domaindrivenarchitecture.provs.server.application.ApplicationKt" /> <option name="MAIN_CLASS_NAME" value="org.domaindrivenarchitecture.provs.server.application.ApplicationKt" />
<module name="provs.main" /> <module name="provs.main" />
<option name="PROGRAM_PARAMETERS" value="k3s -r statistics.test.meissa-gmbh.de -u root -k myServerKonfig.yaml" /> <option name="PROGRAM_PARAMETERS" value="k3s -r statistics.test.meissa-gmbh.de -u root -k myK3sServerConfig.yaml" />
<shortenClasspath name="NONE" /> <shortenClasspath name="NONE" />
<method v="2"> <method v="2">
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />

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

@ -41,6 +41,7 @@ fun Prov.provisionK3sInfra(tlsName: String, nodeIpv4: String, loopbackIpv4: Stri
val isDualStack = nodeIpv6?.isNotEmpty() ?: false val isDualStack = nodeIpv6?.isNotEmpty() ?: false
if (!testConfigExists()) { if (!testConfigExists()) {
createDirs(k3sAutomatedManifestsDir, sudo = true) createDirs(k3sAutomatedManifestsDir, sudo = true)
createDirs(k3sManualManifestsDir, sudo = true)
var k3sConfigFileName = "config" var k3sConfigFileName = "config"
var k3sConfigMap: Map<String, String> = mapOf("loopback_ipv4" to loopbackIpv4, "loopback_ipv6" to loopbackIpv6, var k3sConfigMap: Map<String, String> = mapOf("loopback_ipv4" to loopbackIpv4, "loopback_ipv6" to loopbackIpv6,
"node_ipv4" to nodeIpv4, "tls_name" to tlsName) "node_ipv4" to nodeIpv4, "tls_name" to tlsName)