Skip to content

Commit

Permalink
style: apply terraform fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
etienne-napoleone committed May 13, 2019
1 parent e7b850e commit 28346ec
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 42 deletions.
14 changes: 7 additions & 7 deletions terraform/devnet/main.tf
Expand Up @@ -11,18 +11,18 @@ provider "kubernetes" {
}

provider "helm" {
kubernetes {
host = "${module.kubernetes.endpoint}"
kubernetes {
host = "${module.kubernetes.endpoint}"

client_certificate = "${module.kubernetes.client_certificate}"
client_key = "${module.kubernetes.client_key}"
cluster_ca_certificate = "${module.kubernetes.cluster_ca_certificate}"
}
client_certificate = "${module.kubernetes.client_certificate}"
client_key = "${module.kubernetes.client_key}"
cluster_ca_certificate = "${module.kubernetes.cluster_ca_certificate}"
}
}

module "kubernetes" {
source = "../modules/providers/digitalocean/kubernetes"

name = "devnet"
}

Expand Down
2 changes: 2 additions & 0 deletions terraform/devnet/output.tf
Expand Up @@ -6,6 +6,8 @@ output "tomoscan_ip" {
# value = "${module.tomomaster.loadbalancer_ip}"
# }


# output "netdata_ip" {
# value = "${module.netdata.loadbalancer_ip}"
# }

2 changes: 1 addition & 1 deletion terraform/devnet/variables.tf
@@ -1 +1 @@
variable "do_token" {}
variable "do_token" {}
40 changes: 20 additions & 20 deletions terraform/modules/netdata/helmrelease.tf
@@ -1,26 +1,26 @@
resource "helm_release" "netdata" {
name = "netdata"
chart = "${path.module}/charts/netdata"
name = "netdata"
chart = "${path.module}/charts/netdata"

set {
name = "service.type"
value = "LoadBalancer"
}
set {
name = "service.type"
value = "LoadBalancer"
}

set {
name = "master.database.storageclass"
value = "do-block-storage"
}
set {
name = "master.database.storageclass"
value = "do-block-storage"
}

set {
name = "master.alarms.storageclass"
value = "do-block-storage"
}
set {
name = "master.alarms.storageclass"
value = "do-block-storage"
}

set {
name = "master.alarms.volumesize"
value = "1Gi"
}
set {
name = "master.alarms.volumesize"
value = "1Gi"
}

depends_on = [ "kubernetes_service_account.helm" ]
}
depends_on = ["kubernetes_service_account.helm"]
}
@@ -1,15 +1,17 @@
resource "kubernetes_cluster_role_binding" "admin" {
metadata {
name = "admin"
}
role_ref {
api_group = "rbac.authorization.k8s.io"
kind = "ClusterRole"
name = "cluster-admin"
}
subject {
kind = "ServiceAccount"
name = "admin"
namespace = "kube-system"
}
metadata {
name = "admin"
}

role_ref {
api_group = "rbac.authorization.k8s.io"
kind = "ClusterRole"
name = "cluster-admin"
}

subject {
kind = "ServiceAccount"
name = "admin"
namespace = "kube-system"
}
}
@@ -1,12 +1,15 @@
output "endpoint" {
value = "${digitalocean_kubernetes_cluster.cluster.endpoint}"
}

output "client_certificate" {
value = "${base64decode(digitalocean_kubernetes_cluster.cluster.kube_config.0.client_certificate)}"
}

output "client_key" {
value = "${base64decode(digitalocean_kubernetes_cluster.cluster.kube_config.0.client_key)}"
}

output "cluster_ca_certificate" {
value = "${base64decode(digitalocean_kubernetes_cluster.cluster.kube_config.0.cluster_ca_certificate)}"
}
@@ -1,6 +1,6 @@
resource "kubernetes_service_account" "admin" {
metadata {
name = "admin"
name = "admin"
namespace = "kube-system"
}
}

0 comments on commit 28346ec

Please sign in to comment.