diff --git a/.gitmodules b/.gitmodules index 0fa106c8..d0acc81d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "lpp"] path = cluster/lpp - url = git@github.com:rancher/local-path-provisioner.git + url = https://github.com/rancher/local-path-provisioner.git diff --git a/cluster/local-path-provisioner.tf b/cluster/local-path-provisioner.tf index 1ed98a37..9acf469a 100644 --- a/cluster/local-path-provisioner.tf +++ b/cluster/local-path-provisioner.tf @@ -1,7 +1,7 @@ resource "helm_release" "local_path_provisioner" { - name = "local-path-storage" - repository = "./lpp" - chart = "local-path-storage" + name = "local-path-provisioner" + repository = "${path.module}/lpp/deploy/chart" + chart = "local-path-provisioner" create_namespace = true namespace = "local-path-storage" diff --git a/cluster/postgres.tf b/cluster/postgres.tf index 527b3231..97dae112 100644 --- a/cluster/postgres.tf +++ b/cluster/postgres.tf @@ -23,22 +23,6 @@ resource "kubernetes_secret" "postgres_auth_secret" { type = "Opaque" } -resource "kubernetes_persistent_volume_claim" "postgresql" { - metadata { - name = "prometheus-data" - namespace = "postgresql" - } - spec { - access_modes = [ "ReadWriteOnce" ] - resources { - requests = { - storage = "8Gi" - } - } - storage_class_name = "local-path" - } -} - resource "helm_release" "postgresql" { depends_on = [ kubernetes_namespace.postgres_namespace, @@ -55,8 +39,8 @@ resource "helm_release" "postgresql" { force_update = true set { - name = "persistence.existingClaim" - value = kubernetes_persistent_volume_claim.postgresql.metadata[0].name + name = "global.storageClass" + value = "local-path" } set { name = "global.postgresql.existingSecret"