From 55e35d81670dfbc9a824a37ba7bd7c10274d2ea8 Mon Sep 17 00:00:00 2001 From: jem Date: Sat, 29 Jan 2022 20:47:53 +0100 Subject: [PATCH] renamed resource files --- .../provs/server/infrastructure/K3s.kt | 6 +++--- ...{config.yaml.template.dual => config.dual.template.yaml} | 0 ...{config.yaml.template.ipv4 => config.ipv4.template.yaml} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/{config.yaml.template.dual => config.dual.template.yaml} (100%) rename src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/{config.yaml.template.ipv4 => config.ipv4.template.yaml} (100%) diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt index 3d35469..28a7237 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/K3s.kt @@ -40,14 +40,14 @@ fun Prov.provisionK3sInfra(tlsName: String, nodeIpv4: String, loopbackIpv4: Stri val isDualStack = nodeIpv6?.isNotEmpty() ?: false if (!testConfigExists()) { createDirs(k3sManifestsDir, sudo = true) - var k3sConfigFileName = "config.yaml.template" + var k3sConfigFileName = "config" var k3sConfigMap: Map = mapOf("loopback_ipv4" to loopbackIpv4, "loopback_ipv6" to loopbackIpv6, "node_ipv4" to nodeIpv4, "tls_name" to tlsName) if (isDualStack) { - k3sConfigFileName += ".dual" + k3sConfigFileName += ".dual.template.yaml" k3sConfigMap = k3sConfigMap.plus("node_ipv6" to nodeIpv6!!) } else { - k3sConfigFileName += ".ipv4" + k3sConfigFileName += ".ipv4.template.yaml" } createFileFromResourceTemplate( k3sConfigFile, diff --git a/src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/config.yaml.template.dual b/src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/config.dual.template.yaml similarity index 100% rename from src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/config.yaml.template.dual rename to src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/config.dual.template.yaml diff --git a/src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/config.yaml.template.ipv4 b/src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/config.ipv4.template.yaml similarity index 100% rename from src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/config.yaml.template.ipv4 rename to src/main/resources/org/domaindrivenarchitecture/provs/infrastructure/k3s/config.ipv4.template.yaml