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

minor fix

Browse source
This commit is contained in:
jem 2022-01-31 09:15:49 +01:00
parent c4d5f38f9d
commit 08e9dd1e1a
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,12 +6,13 @@ import org.domaindrivenarchitecture.provs.framework.core.repeatTaskUntilSuccess
import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.* import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.*
private const val k3sResourcePath = "org/domaindrivenarchitecture/provs/infrastructure/k3s/" private const val k3sResourcePath = "org/domaindrivenarchitecture/provs/infrastructure/k3s/"
private const val k3sManifestsDir = "/etc/rancher/k3s/manifests/" private const val k3sManualManifestsDir = "/etc/rancher/k3s/manifests/"
private const val k3sAutomatedManifestsDir = "/var/lib/rancher/k3s/server/manifests/"
private const val k3sConfig = "/etc/rancher/k3s/config.yaml" private const val k3sConfig = "/etc/rancher/k3s/config.yaml"
private const val k3sTraeficWorkaround = "/var/lib/rancher/k3s/server/manifests/traefik-workaround.yaml" private const val k3sTraeficWorkaround = "/var/lib/rancher/k3s/server/manifests/traefik-workaround.yaml"
private const val k3sApple = k3sManifestsDir + "apple.yaml" private const val k3sApple = k3sAutomatedManifestsDir + "apple.yaml"
private const val certManagerDeployment = k3sManifestsDir + "certmanager.yaml" private const val certManagerDeployment = k3sAutomatedManifestsDir + "certmanager.yaml"
private const val certManagerIssuer = k3sManifestsDir + "issuer.yaml" private const val certManagerIssuer = k3sManualManifestsDir + "issuer.yaml"
private const val k3sInstall = "/usr/local/bin/k3s-install.sh" private const val k3sInstall = "/usr/local/bin/k3s-install.sh"
enum class CertManagerEndPoint { enum class CertManagerEndPoint {
@ -39,7 +40,7 @@ fun Prov.provisionK3sInfra(tlsName: String, nodeIpv4: String, loopbackIpv4: Stri
nodeIpv6: String? = null) = task { nodeIpv6: String? = null) = task {
val isDualStack = nodeIpv6?.isNotEmpty() ?: false val isDualStack = nodeIpv6?.isNotEmpty() ?: false
if (!testConfigExists()) { if (!testConfigExists()) {
createDirs(k3sManifestsDir, sudo = true) createDirs(k3sAutomatedManifestsDir, 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)
@ -99,8 +100,6 @@ fun Prov.provisionK3sCertManager(endpoint: CertManagerEndPoint) = task {
"644", "644",
sudo = true sudo = true
) )
cmd("kubectl apply -f $certManagerDeployment", sudo = true)
repeatTaskUntilSuccess(10, 10) { repeatTaskUntilSuccess(10, 10) {
cmd("kubectl apply -f $certManagerIssuer", sudo = true) cmd("kubectl apply -f $certManagerIssuer", sudo = true)
} }
@ -115,9 +114,4 @@ fun Prov.provisionK3sApple(fqdn: String, endpoint: CertManagerEndPoint) = task {
"644", "644",
sudo = true sudo = true
) )
cmd("kubectl apply -f $k3sApple", sudo = true)
repeatTaskUntilSuccess(10, 10) {
cmd("kubectl apply -f $certManagerIssuer", sudo = true)
}
} }