diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/Install.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/Install.kt index 69dfa78..a831aea 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/Install.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/install/base/Install.kt @@ -13,6 +13,7 @@ private var aptInit = false * @param ignoreAlreadyInstalled if true, then for an already installed package no action will be taken, * if "ignoreAlreadyInstalled" is false, then installation is always attempted, which normally results in an upgrade if package wa already installed */ +@Suppress("UNUSED_PARAMETER") // ignoreAlreadyInstalled is added for external usage fun Prov.aptInstall(packages: String, ignoreAlreadyInstalled: Boolean = true): ProvResult = taskWithResult { val packageList = packages.split(" ") val allInstalled: Boolean = packageList.map { isPackageInstalled(it) }.fold(true, { a, b -> a && b }) @@ -41,6 +42,7 @@ fun Prov.aptInstall(packages: String, ignoreAlreadyInstalled: Boolean = true): P * * @param packages the packages to be installed, packages must be separated by space if there are more than one */ +@Suppress("unused") // api - for external usage fun Prov.snapInstall(packages: String, classic: Boolean = false): ProvResult = task { val packageList = packages.split(" ") for (pkg in packageList) { 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 92fff75..5f5b1c1 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 @@ -25,7 +25,7 @@ fun Prov.provisionK3s(cli: K3sCliCommand) = task { /** * Installs a k3s server. */ -fun Prov.provisionK3s(k3sConfig: K3sConfig, grafanaConfigResolved: GrafanaAgentConfigResolved?, applicationFileName: ApplicationFileName?) = task { +fun Prov.provisionK3s(k3sConfig: K3sConfig, grafanaConfigResolved: GrafanaAgentConfigResolved? = null, applicationFileName: ApplicationFileName? = null) = task { provisionNetwork(k3sConfig) if (k3sConfig.reprovision && testConfigExists()) { deprovisionK3sInfra() diff --git a/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/grafana/node-exporter-daemon-set.yaml b/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/grafana/node-exporter-daemon-set.yaml index 4ddbbf0..5cd3d9f 100644 --- a/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/grafana/node-exporter-daemon-set.yaml +++ b/src/main/resources/org/domaindrivenarchitecture/provs/server/infrastructure/grafana/node-exporter-daemon-set.yaml @@ -47,7 +47,7 @@ spec: - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/) - --collector.netclass.ignored-devices=^(veth.*)$ name: node-exporter - image: prom/node-exporter + image: prom/node-exporter:v1.3.1 ports: - containerPort: 9100 protocol: TCP