Skip to content

Commit

Permalink
use k8s v1 resources
Browse files Browse the repository at this point in the history
  • Loading branch information
andyli committed Jun 2, 2024
1 parent 3b15514 commit 3a29e93
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions do-k8s-ingress.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
locals {
# do-ingress-ip = data.kubernetes_service.do-ingress-nginx.status[0].load_balancer[0].ingress[0].ip
# do-ingress-ip = data.kubernetes_service_v1.do-ingress-nginx.status[0].load_balancer[0].ingress[0].ip
# https://github.com/digitalocean/terraform-provider-digitalocean/issues/772
do-ingress-ip = data.digitalocean_loadbalancer.do-ingress-nginx.ip
}
Expand Down Expand Up @@ -58,7 +58,7 @@ resource "helm_release" "do-ingress-nginx" {
]
}

data "kubernetes_service" "do-ingress-nginx" {
data "kubernetes_service_v1" "do-ingress-nginx" {
provider = kubernetes.do

depends_on = [helm_release.do-ingress-nginx]
Expand All @@ -68,7 +68,7 @@ data "kubernetes_service" "do-ingress-nginx" {
}

data "digitalocean_loadbalancer" "do-ingress-nginx" {
id = data.kubernetes_service.do-ingress-nginx.metadata[0].annotations["kubernetes.digitalocean.com/load-balancer-id"]
id = data.kubernetes_service_v1.do-ingress-nginx.metadata[0].annotations["kubernetes.digitalocean.com/load-balancer-id"]
}

resource "aws_route53_record" "do-k8s-haxe-org" {
Expand Down
6 changes: 3 additions & 3 deletions do-k8s-kube-prometheus-stack.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ resource "kubernetes_secret_v1" "do-grafana-admin" {
provider = kubernetes.do
metadata {
name = "grafana-admin"
namespace = kubernetes_namespace.do-monitoring.metadata[0].name
namespace = kubernetes_namespace_v1.do-monitoring.metadata[0].name
}

data = {
Expand All @@ -37,7 +37,7 @@ data "kubernetes_secret_v1" "do-grafana-github-oauth-client-secret" {
provider = kubernetes.do
metadata {
name = "grafana-github-oauth-client-secret"
namespace = kubernetes_namespace.do-monitoring.metadata[0].name
namespace = kubernetes_namespace_v1.do-monitoring.metadata[0].name
}
}

Expand All @@ -55,7 +55,7 @@ resource "helm_release" "do-prometheus" {
name = "prometheus-stack"
repository = "https://prometheus-community.github.io/helm-charts"
chart = "kube-prometheus-stack"
namespace = kubernetes_namespace.do-monitoring.metadata[0].name
namespace = kubernetes_namespace_v1.do-monitoring.metadata[0].name
version = "45.3.0"
values = [
yamlencode({
Expand Down
6 changes: 3 additions & 3 deletions do-k8s-loki-stack.tf
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ resource "random_pet" "loki-pw" {
data "kubernetes_secret_v1" "loki-do-spaces" {
provider = kubernetes.do
metadata {
namespace = kubernetes_namespace.do-monitoring.metadata[0].name
namespace = kubernetes_namespace_v1.do-monitoring.metadata[0].name
name = "loki-do-spaces"
}
}

resource "kubernetes_secret_v1" "do-loki-basic-auth" {
provider = kubernetes.do
metadata {
namespace = kubernetes_namespace.do-monitoring.metadata[0].name
namespace = kubernetes_namespace_v1.do-monitoring.metadata[0].name
name = "loki-basic-auth-${random_pet.loki-pw.id}" # forces replacement
}

Expand All @@ -57,7 +57,7 @@ resource "kubernetes_secret_v1" "do-loki-basic-auth" {
resource "helm_release" "do-loki-stack" {
provider = helm.do

namespace = kubernetes_namespace.do-monitoring.metadata[0].name
namespace = kubernetes_namespace_v1.do-monitoring.metadata[0].name
name = "loki-stack"
repository = "https://grafana.github.io/helm-charts"
chart = "loki-stack"
Expand Down
2 changes: 1 addition & 1 deletion do-k8s-mysql-operator.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource "helm_release" "do-mysql-operator" {
provider = helm.do

name = "mysql-operator"
namespace = kubernetes_namespace.do-mysql-operator.metadata[0].name
namespace = kubernetes_namespace_v1.do-mysql-operator.metadata[0].name
chart = "./mysql-operator/helm/mysql-operator"
values = [
yamlencode({}),
Expand Down
4 changes: 2 additions & 2 deletions do-k8s.tf
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ provider "helm" {
}
}

resource "kubernetes_namespace" "do-monitoring" {
resource "kubernetes_namespace_v1" "do-monitoring" {
provider = kubernetes.do
metadata {
name = "monitoring"
}
}

resource "kubernetes_namespace" "do-mysql-operator" {
resource "kubernetes_namespace_v1" "do-mysql-operator" {
provider = kubernetes.do
metadata {
name = "mysql-operator"
Expand Down

0 comments on commit 3a29e93

Please sign in to comment.