diff --git a/modules/kubernetes/dbaas/main.tf b/modules/kubernetes/dbaas/main.tf index bec05f8c..dee4a62f 100644 --- a/modules/kubernetes/dbaas/main.tf +++ b/modules/kubernetes/dbaas/main.tf @@ -42,6 +42,7 @@ resource "helm_release" "mysql" { repository = "https://presslabs.github.io/charts" chart = "mysql-operator" + # version = "v0.5.0-rc.3" values = [templatefile("${path.module}/mysql_chart_values.yaml", { secretName = var.tls_secret_name })] atomic = true diff --git a/modules/kubernetes/descheduler/main.tf b/modules/kubernetes/descheduler/main.tf index e6b3393e..435aa074 100644 --- a/modules/kubernetes/descheduler/main.tf +++ b/modules/kubernetes/descheduler/main.tf @@ -106,7 +106,7 @@ resource "kubernetes_config_map" "policy" { } } -resource "kubernetes_cron_job" "descheduler" { +resource "kubernetes_cron_job_v1" "descheduler" { metadata { name = "descheduler" namespace = "descheduler" diff --git a/modules/kubernetes/mailserver/variables.tf b/modules/kubernetes/mailserver/variables.tf index a4e38206..076ce81f 100644 --- a/modules/kubernetes/mailserver/variables.tf +++ b/modules/kubernetes/mailserver/variables.tf @@ -53,7 +53,7 @@ disable_vrfy_command = yes # Postscreen settings to drop zombies/open relays/spam early postscreen_dnsbl_action = enforce -postscreen_dnsbl_sites = zen.spamhaus.org*3 +postscreen_dnsbl_sites = zen.spamhaus.org*2 bl.mailspike.net b.barracudacentral.org*2 bl.spameatingmonkey.net diff --git a/modules/kubernetes/metallb/main.tf b/modules/kubernetes/metallb/main.tf index 10b9079f..52d0b6e1 100644 --- a/modules/kubernetes/metallb/main.tf +++ b/modules/kubernetes/metallb/main.tf @@ -1,7 +1,7 @@ # Creates namespace and everythin needed module "metallb" { source = "colinwilson/metallb/kubernetes" - version = "0.1.5" + version = "0.1.7" } resource "kubernetes_config_map" "config" { diff --git a/modules/kubernetes/monitoring/main.tf b/modules/kubernetes/monitoring/main.tf index 48871fee..81c28442 100644 --- a/modules/kubernetes/monitoring/main.tf +++ b/modules/kubernetes/monitoring/main.tf @@ -154,7 +154,7 @@ resource "helm_release" "grafana" { values = [file("${path.module}/grafana_chart_values.yaml")] } -resource "kubernetes_cron_job" "monitor_prom" { +resource "kubernetes_cron_job_v1" "monitor_prom" { metadata { name = "monitor-prometheus" } diff --git a/terraform.tfstate b/terraform.tfstate index af6922d1..c6526e93 100644 Binary files a/terraform.tfstate and b/terraform.tfstate differ