Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@badra001
badra001 committed Sep 16, 2022
1 parent 968bd7a commit 8922a7d
Show file tree
Hide file tree
Showing 4 changed files with 368 additions and 41 deletions.
41 changes: 41 additions & 0 deletions examples/efk/images.tf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module "images" {
source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git"

profile = var.profile
application_list = []
application_name = format("eks/%v", var.cluster_name)
image_config = var.image_config
Expand All @@ -16,3 +17,43 @@ module "images" {
## source_password = ""
## source_username = ""
}


## image_info = {
## "elastic/elasticsearch#7.14.0" = {
## "dest_full_path" = "817869416306.dkr.ecr.us-gov-east-1.amazonaws.com/eks/test-cluster-name/elastic/elasticsearch:7.14.0"
## "dest_registry" = "817869416306.dkr.ecr.us-gov-east-1.amazonaws.com"
## "dest_repository" = "eks/test-cluster-name/elastic/elasticsearch"
## "enabled" = true
## "key" = "elastic/elasticsearch#7.14.0"
## "name" = "elastic/elasticsearch"
## "source_full_path" = "docker.elastic.co/elasticsearch/elasticsearch:7.14.0"
## "source_image" = "elasticsearch/elasticsearch"
## "source_registry" = "docker.elastic.co"
## "tag" = "7.14.0"
## }
## "elastic/kibana#7.14.0" = {
## "dest_full_path" = "817869416306.dkr.ecr.us-gov-east-1.amazonaws.com/eks/test-cluster-name/elastic/kibana:7.14.0"
## "dest_registry" = "817869416306.dkr.ecr.us-gov-east-1.amazonaws.com"
## "dest_repository" = "eks/test-cluster-name/elastic/kibana"
## "enabled" = true
## "key" = "elastic/kibana#7.14.0"
## "name" = "elastic/kibana"
## "source_full_path" = "docker.elastic.co/kibana/kibana:7.14.0"
## "source_image" = "kibana/kibana"
## "source_registry" = "docker.elastic.co"
## "tag" = "7.14.0"
## }
## "fluent/fluentd-kubernetes-daemonset#v1.13.3-debian-elasticsearch7-1.2" = {
## "dest_full_path" = "817869416306.dkr.ecr.us-gov-east-1.amazonaws.com/eks/test-cluster-name/fluent/fluentd-kubernetes-daemonset:v1.13.3-debian-elasticsearch7-1.2"
## "dest_registry" = "817869416306.dkr.ecr.us-gov-east-1.amazonaws.com"
## "dest_repository" = "eks/test-cluster-name/fluent/fluentd-kubernetes-daemonset"
## "enabled" = true
## "key" = "fluent/fluentd-kubernetes-daemonset#v1.13.3-debian-elasticsearch7-1.2"
## "name" = "fluent/fluentd-kubernetes-daemonset"
## "source_full_path" = "docker.io/fluent/fluentd-kubernetes-daemonset:v1.13.3-debian-elasticsearch7-1.2"
## "source_image" = "fluent/fluentd-kubernetes-daemonset"
## "source_registry" = "docker.io"
## "tag" = "v1.13.3-debian-elasticsearch7-1.2"
## }
## }
125 changes: 85 additions & 40 deletions examples/efk/main.tf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
resource "kubernetes_namespace" "logging" {
depends_on = [null_resource.copy_images]
# depends_on = [null_resource.copy_images]
depends_on = [module.images]

metadata {
name = "logging"
Expand All @@ -9,20 +10,64 @@ resource "kubernetes_namespace" "logging" {
}
}

## image_info = {
## "elastic/elasticsearch#7.14.0" = {
## "dest_full_path" = "817869416306.dkr.ecr.us-gov-east-1.amazonaws.com/eks/test-cluster-name/elastic/elasticsearch:7.14.0"
## "dest_registry" = "817869416306.dkr.ecr.us-gov-east-1.amazonaws.com"
## "dest_repository" = "eks/test-cluster-name/elastic/elasticsearch"
## "enabled" = true
## "key" = "elastic/elasticsearch#7.14.0"
## "name" = "elastic/elasticsearch"
## "source_full_path" = "docker.elastic.co/elasticsearch/elasticsearch:7.14.0"
## "source_image" = "elasticsearch/elasticsearch"
## "source_registry" = "docker.elastic.co"
## "tag" = "7.14.0"
## }
##
## image_config
## {
## enabled = true
## dest_path = null
## name = "fluent/fluentd-kubernetes-daemonset"
## source_image = "fluent/fluentd-kubernetes-daemonset"
## source_registry = "docker.io"
## source_tag = null
## tag = "v1.13.3-debian-elasticsearch7-1.2"
## },
## ]
##
## chart_config = [
## {
## name = "elasticsearch"
## chart_name = "elasticsearch"
## chart_version = "7.14.0"
## source_repository = "https://helm.elastic.co"
## image_reference = "elastic/elasticsearch"
## image_tag = "7.14.0"
## enabled = true
## },

locals {
charts = { for c in var.chart_config : c.name => merge(c, { image_key = format("%v#%v", c.image_reference, c.image_tag) }) }
}

resource "helm_release" "elasticsearch" {
chart = "elasticsearch"
version = var.elasticsearch_chart_version
name = "elasticsearch"
depends_on = [module.images]
for_each = { "elasticsearch" = local.charts["elasticsearch"] }
chart = each.key
version = each.value.chart_version
name = each.value.chart_name
namespace = kubernetes_namespace.logging.metadata[0].name
repository = "https://helm.elastic.co"
repository = each.value.source_repository

set {
name = "image"
value = local.image_repos["elastic/elasticsearch"]
name = "image"
# value = local.image_repos["elastic/elasticsearch"]
value = format("%v/%v", module.images.images[each.value.image_key].dest_registry, module.images.images[each.value.image_key].dest_registry)
}
set {
name = "imageTag"
value = var.elasticsearch_tag
value = each.value.image_tag
}

# set {
Expand Down Expand Up @@ -54,21 +99,22 @@ resource "helm_release" "elasticsearch" {
}

resource "helm_release" "kibana" {
chart = "kibana"
version = var.kibana_chart_version
name = "kibana"
depends_on = [module.images, helm_release.elasticsearch]
for_each = { "kibana" = local.charts["kibana"] }
chart = each.key
version = each.value.chart_version
name = each.value.chart_name
namespace = kubernetes_namespace.logging.metadata[0].name
repository = "https://helm.elastic.co"

depends_on = [helm_release.elasticsearch]
repository = each.value.source_repository

set {
name = "image"
value = local.image_repos["elastic/kibana"]
name = "image"
# value = local.image_repos["elastic/kibana"]
value = format("%v/%v", module.images.images[each.value.image_key].dest_registry, module.images.images[each.value.image_key].dest_registry)
}
set {
name = "imageTag"
value = var.kibana_tag
value = each.value.image_tag
}

set {
Expand Down Expand Up @@ -109,6 +155,28 @@ resource "helm_release" "kibana" {
timeout = 180
}

resource "helm_release" "fluentd" {
depends_on = [module.images, helm_release.elasticsearch]
for_each = { "fluentd" = local.charts["fluentd"] }
chart = each.key
version = each.value.chart_version
name = each.value.chart_name
namespace = kubernetes_namespace.logging.metadata[0].name
repository = each.value.source_repository

set {
name = "image.repository"
value = format("%v/%v", module.images.images[each.value.image_key].dest_registry, module.images.images[each.value.image_key].dest_registry)
}
set {
name = "image.tag"
value = each.value.image_tag
}

timeout = 180
}


resource "kubernetes_config_map" "elasticsearch-output" {
metadata {
name = "elasticsearch-output"
Expand Down Expand Up @@ -216,26 +284,3 @@ resource "kubernetes_config_map" "apache-log-parser" {
EOF
}
}

resource "helm_release" "fluentd" {
chart = "fluentd"
version = var.fluentd_chart_version
name = "fluentd"
namespace = kubernetes_namespace.logging.metadata[0].name
repository = "https://fluent.github.io/helm-charts"

depends_on = [helm_release.elasticsearch]

set {
name = "image.repository"
value = local.image_repos["fluent/fluentd-kubernetes-daemonset"]
}
set {
name = "image.tag"
value = var.fluentd_tag
}

timeout = 180
}


0 comments on commit 8922a7d

Please sign in to comment.