Merge branch 'master' into local-sudoer-without-pw

build.gradle

@@ -18,7 +18,7 @@ apply plugin: "kotlinx-serialization"
 
 
 group = "org.domaindrivenarchitecture.provs"
-version = "0.17.1-SNAPSHOT"
+version = "0.18.1-SNAPSHOT"
 
 repositories {
     mavenCentral()

src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/DesktopConfigRepository.kt

@@ -11,8 +11,8 @@ import java.io.FileWriter
  * Returns DesktopConfig; data for config is read from specified file.
  * Throws exceptions FileNotFoundException, SerializationException if file is not found resp. cannot be parsed.
  */
-internal fun getConfig(filename: String = "desktop-config.yaml"): DesktopConfig = readFromFile(filename).yamlToType()
+fun getConfig(filename: String = "desktop-config.yaml"): DesktopConfig = readFromFile(filename).yamlToType()
 
 
 @Suppress("unused")
-internal fun writeConfig(config: DesktopConfig, fileName: String = "desktop-config.yaml") = FileWriter(fileName).use { it.write(config.toYaml()) }
+fun writeConfig(config: DesktopConfig, fileName: String = "desktop-config.yaml") = FileWriter(fileName).use { it.write(config.toYaml()) }

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

@@ -90,13 +90,17 @@ fun Prov.installK3s(k3sConfig: K3sConfig): ProvResult {
         cmd("INSTALL_K3S_VERSION=$K3S_VERSION k3s-install.sh")
 
         // metallb
-        applyK3sFileFromResource(File(k3sManualManifestsDir, "metallb-namespace.yaml"))
-        applyK3sFileFromResource(File(k3sManualManifestsDir, "metallb-0.10.2-manifest.yaml"))
-        applyK3sFileFromResourceTemplate(
-            File(k3sManualManifestsDir, "metallb-config.yaml"),
-            k3sConfigMap,
-            alternativeResourceName = File(metallbConfigResourceFileName)
-        )
+        applyK3sFileFromResource(File(k3sManualManifestsDir, "metallb-0.13.7-native-manifest.yaml"))
+
+        repeatTaskUntilSuccess(6, 10) {
+            applyK3sFileFromResourceTemplate(
+                File(k3sManualManifestsDir, "metallb-config.yaml"),
+                k3sConfigMap,
+                alternativeResourceName = File(metallbConfigResourceFileName)
+            )
+        }
+
+        applyK3sFileFromResource(File(k3sManualManifestsDir, "metallb-l2advertisement.yaml"))
 
         // traefik
         if (k3sConfig.isDualStack()) {

src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/metallb-config.dual.template.yaml

@@ -1,18 +1,19 @@
-apiVersion: v1
-kind: ConfigMap
+apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
 metadata:
+  name: public
   namespace: metallb-system
-  name: config
-data:
-  config: |
-    address-pools:
-    - name: public
-      protocol: layer2
-      addresses:
-      - ${node_ipv4}/32
-      - ${node_ipv6}/128
-    - name: private
-      protocol: layer2
-      addresses:
-      - ${loopback_ipv4}/32
-      - ${loopback_ipv6}/128
+spec:
+  addresses:
+  - ${node_ipv4}/32
+  - ${node_ipv6}/128
+---
+apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
+metadata:
+  name: private
+  namespace: metallb-system
+spec:
+  addresses:
+  - ${loopback_ipv4}/32
+  - ${loopback_ipv6}/128

src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/metallb-config.ipv4.template.yaml

@@ -1,16 +1,17 @@
-apiVersion: v1
-kind: ConfigMap
+apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
 metadata:
+  name: public
   namespace: metallb-system
-  name: config
-data:
-  config: |
-    address-pools:
-    - name: public
-      protocol: layer2
-      addresses:
-      - ${node_ipv4}/32
-    - name: private
-      protocol: layer2
-      addresses:
-      - ${loopback_ipv4}/32
+spec:
+  addresses:
+  - ${node_ipv4}/32
+---
+apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
+metadata:
+  name: private
+  namespace: metallb-system
+spec:
+  addresses:
+  - ${loopback_ipv4}/32

src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/metallb-l2advertisement.yaml

@@ -0,0 +1,9 @@
+apiVersion: metallb.io/v1beta1
+kind: L2Advertisement
+metadata:
+  name: layer2
+  namespace: metallb-system
+spec:
+  ipAddressPools:
+  - private
+  - public

src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/metallb-namespace.yaml

@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: metallb-system
-  labels:
-    app: metallb