From 7c52ecfe24fabf47173f697b9506e447fb6dfd50 Mon Sep 17 00:00:00 2001 From: Kevin Coleman <kcaws@amazon.com> Date: Sat, 13 Nov 2021 14:59:59 -0800 Subject: [PATCH] Formatting files --- kubernetes-addons/agones/locals.tf | 8 +- kubernetes-addons/argocd/locals.tf | 20 ++--- kubernetes-addons/aws-for-fluentbit/locals.tf | 68 +++++++-------- .../aws-load-balancer-controller/locals.tf | 82 +++++++++---------- .../aws-opentelemetry-eks/locals.tf | 4 +- kubernetes-addons/cert-manager/locals.tf | 20 ++--- .../cluster-autoscaler/locals.tf | 10 +-- kubernetes-addons/metrics-server/locals.tf | 74 ++++++++--------- kubernetes-addons/nginx-ingress/locals.tf | 72 ++++++++-------- kubernetes-addons/prometheus/README.md | 2 - kubernetes-addons/prometheus/locals.tf | 22 ++--- .../spark-k8s-operator/locals.tf | 70 ++++++++-------- kubernetes-addons/traefik-ingress/locals.tf | 70 ++++++++-------- .../windows-vpc-controllers/locals.tf | 72 ++++++++-------- 14 files changed, 296 insertions(+), 298 deletions(-) diff --git a/kubernetes-addons/agones/locals.tf b/kubernetes-addons/agones/locals.tf index b0200f0c..7a8f5e7e 100644 --- a/kubernetes-addons/agones/locals.tf +++ b/kubernetes-addons/agones/locals.tf @@ -1,9 +1,9 @@ data "aws_region" "current" {} locals { - default_helm_values = [templatefile("${path.module}/values.yaml", {})] + default_helm_values = [templatefile("${path.module}/values.yaml", {})] - default_agones_helm_chart = { + default_agones_helm_app = { name = "agones" chart = "agones" repository = "https://agones.dev/chart/stable" @@ -42,9 +42,9 @@ locals { gameserver_minport = 7000 gameserver_maxport = 8000 } - + agones_helm_app = merge( - local.default_agones_helm_chart, + local.default_agones_helm_app, var.agones_helm_chart ) } diff --git a/kubernetes-addons/argocd/locals.tf b/kubernetes-addons/argocd/locals.tf index 91f4cbf2..cceca1b7 100644 --- a/kubernetes-addons/argocd/locals.tf +++ b/kubernetes-addons/argocd/locals.tf @@ -3,16 +3,16 @@ locals { default_helm_values = [templatefile("${path.module}/values.yaml", {})] default_argocd_helm_app = { - name = "argo-cd" - chart = "argo-cd" - repository = "https://argoproj.github.io/argo-helm" - version = "3.26.8" - namespace = "argocd" - timeout = "1200" - create_namespace = true - values = local.default_helm_values - set = [] - set_sensitive = null + name = "argo-cd" + chart = "argo-cd" + repository = "https://argoproj.github.io/argo-helm" + version = "3.26.8" + namespace = "argocd" + timeout = "1200" + create_namespace = true + values = local.default_helm_values + set = [] + set_sensitive = null lint = false verify = false keyring = "" diff --git a/kubernetes-addons/aws-for-fluentbit/locals.tf b/kubernetes-addons/aws-for-fluentbit/locals.tf index aa046e9e..d9aedc54 100644 --- a/kubernetes-addons/aws-for-fluentbit/locals.tf +++ b/kubernetes-addons/aws-for-fluentbit/locals.tf @@ -2,10 +2,10 @@ locals { log_group_name = "/${var.eks_cluster_id}/worker-fluentbit-logs" - default_helm_values = [templatefile("${path.module}/values.yaml", { - aws_region = data.aws_region.current.name, - log_group_name = local.log_group_name - })] + default_helm_values = [templatefile("${path.module}/values.yaml", { + aws_region = data.aws_region.current.name, + log_group_name = local.log_group_name + })] default_aws_for_fluentbit_helm_app = { name = "aws-for-fluent-bit" @@ -17,38 +17,38 @@ locals { create_namespace = true aws_for_fluent_bit_cw_log_group = local.log_group_name aws_for_fluentbit_cwlog_retention_in_days = 90 - values = local.default_helm_values - set = [] - set_sensitive = null - lint = true - wait = true - wait_for_jobs = false - description = "aws-for-fluentbit Helm Chart deployment configuration" - verify = false - keyring = "" - repository_key_file = "" - repository_cert_file = "" - repository_ca_file = "" - repository_username = "" - repository_password = "" - disable_webhooks = false - reuse_values = false - reset_values = false - force_update = false - recreate_pods = false - cleanup_on_fail = false - max_history = 0 - atomic = false - skip_crds = false - render_subchart_notes = true - disable_openapi_validation = false - dependency_update = false - replace = false - postrender = "" + values = local.default_helm_values + set = [] + set_sensitive = null + lint = true + wait = true + wait_for_jobs = false + description = "aws-for-fluentbit Helm Chart deployment configuration" + verify = false + keyring = "" + repository_key_file = "" + repository_cert_file = "" + repository_ca_file = "" + repository_username = "" + repository_password = "" + disable_webhooks = false + reuse_values = false + reset_values = false + force_update = false + recreate_pods = false + cleanup_on_fail = false + max_history = 0 + atomic = false + skip_crds = false + render_subchart_notes = true + disable_openapi_validation = false + dependency_update = false + replace = false + postrender = "" } aws_for_fluentbit_helm_app = merge( local.default_aws_for_fluentbit_helm_app, - var.aws_for_fluentbit_helm_chart - ) + var.aws_for_fluentbit_helm_chart + ) } diff --git a/kubernetes-addons/aws-load-balancer-controller/locals.tf b/kubernetes-addons/aws-load-balancer-controller/locals.tf index 6b98c768..350bbc62 100644 --- a/kubernetes-addons/aws-load-balancer-controller/locals.tf +++ b/kubernetes-addons/aws-load-balancer-controller/locals.tf @@ -1,54 +1,54 @@ data "aws_region" "current" {} locals { - aws_load_balancer_controller_sa = "aws-load-balancer-controller-sa" + aws_load_balancer_controller_sa = "aws-load-balancer-controller-sa" default_helm_values = [templatefile("${path.module}/values.yaml", { - aws_region = data.aws_region.current.name, - cluster_name = var.eks_cluster_id, - service_account_name = local.aws_load_balancer_controller_sa + aws_region = data.aws_region.current.name, + cluster_name = var.eks_cluster_id, + service_account_name = local.aws_load_balancer_controller_sa })] default_lb_ingress_controller_helm_app = { - name = "aws-load-balancer-controller" - chart = "aws-load-balancer-controller" - repository = "https://aws.github.io/eks-charts" - version = "1.3.1" - namespace = "kube-system" - timeout = "1200" - create_namespace = false - values = local.default_helm_values - set = [] - set_sensitive = null - lint = true - wait = true - wait_for_jobs = false - description = "aws-load-balancer-controller Helm Chart for ingress resources" - verify = false - keyring = "" - repository_key_file = "" - repository_cert_file = "" - repository_ca_file = "" - repository_username = "" - repository_password = "" - disable_webhooks = false - reuse_values = false - reset_values = false - force_update = false - recreate_pods = false - cleanup_on_fail = false - max_history = 0 - atomic = false - skip_crds = false - render_subchart_notes = true - disable_openapi_validation = false - dependency_update = false - replace = false - postrender = "" + name = "aws-load-balancer-controller" + chart = "aws-load-balancer-controller" + repository = "https://aws.github.io/eks-charts" + version = "1.3.1" + namespace = "kube-system" + timeout = "1200" + create_namespace = false + values = local.default_helm_values + set = [] + set_sensitive = null + lint = true + wait = true + wait_for_jobs = false + description = "aws-load-balancer-controller Helm Chart for ingress resources" + verify = false + keyring = "" + repository_key_file = "" + repository_cert_file = "" + repository_ca_file = "" + repository_username = "" + repository_password = "" + disable_webhooks = false + reuse_values = false + reset_values = false + force_update = false + recreate_pods = false + cleanup_on_fail = false + max_history = 0 + atomic = false + skip_crds = false + render_subchart_notes = true + disable_openapi_validation = false + dependency_update = false + replace = false + postrender = "" } lb_ingress_controller_helm_app = merge( local.default_lb_ingress_controller_helm_app, - var.lb_ingress_controller_helm_app - ) + var.lb_ingress_controller_helm_app + ) } diff --git a/kubernetes-addons/aws-opentelemetry-eks/locals.tf b/kubernetes-addons/aws-opentelemetry-eks/locals.tf index 53dc4b38..87991631 100644 --- a/kubernetes-addons/aws-opentelemetry-eks/locals.tf +++ b/kubernetes-addons/aws-opentelemetry-eks/locals.tf @@ -12,9 +12,9 @@ locals { aws_open_telemetry_mg_node_iam_role_arns = [] aws_open_telemetry_self_mg_node_iam_role_arns = [] } - + aws_open_telemetry_app = merge( local.default_aws_open_telemetry_helm_app, var.aws_open_telemetry_addon - ) + ) } diff --git a/kubernetes-addons/cert-manager/locals.tf b/kubernetes-addons/cert-manager/locals.tf index bf687469..ef901f9c 100644 --- a/kubernetes-addons/cert-manager/locals.tf +++ b/kubernetes-addons/cert-manager/locals.tf @@ -1,16 +1,16 @@ locals { - default_helm_values = [templatefile("${path.module}/values.yaml", {})] + default_helm_values = [templatefile("${path.module}/values.yaml", {})] default_cert_manager_helm_app = { - name = "cert-manager" - chart = "cert-manager" - repository = "https://charts.jetstack.io" - version = "v1.6.1" - namespace = "kube-system" - timeout = "600" - create_namespace = false - set = [] + name = "cert-manager" + chart = "cert-manager" + repository = "https://charts.jetstack.io" + version = "v1.6.1" + namespace = "kube-system" + timeout = "600" + create_namespace = false + set = [] set_sensitive = null lint = false values = local.default_helm_values @@ -42,7 +42,7 @@ locals { # See ./cert-manager-ca/templates/ca.yaml install_default_ca = true } - + cert_manager_helm_app = merge( local.default_cert_manager_helm_app, var.cert_manager_helm_chart diff --git a/kubernetes-addons/cluster-autoscaler/locals.tf b/kubernetes-addons/cluster-autoscaler/locals.tf index 07ab0ab3..7b0224b3 100644 --- a/kubernetes-addons/cluster-autoscaler/locals.tf +++ b/kubernetes-addons/cluster-autoscaler/locals.tf @@ -2,9 +2,9 @@ data "aws_region" "current" {} locals { default_helm_values = [templatefile("${path.module}/values.yaml", { - aws_region = data.aws_region.current.name, - cluster_name = var.eks_cluster_id - })] + aws_region = data.aws_region.current.name, + cluster_name = var.eks_cluster_id + })] default_cluster_autoscaler_helm_app = { name = "cluster-autoscaler" @@ -40,8 +40,8 @@ locals { replace = false description = "Cluster AutoScaler helm Chart deployment configuration" postrender = "" - set = [] - set_sensitive = null + set = [] + set_sensitive = null } cluster_autoscaler_helm_app = merge( diff --git a/kubernetes-addons/metrics-server/locals.tf b/kubernetes-addons/metrics-server/locals.tf index 812134ef..fe67d2a4 100644 --- a/kubernetes-addons/metrics-server/locals.tf +++ b/kubernetes-addons/metrics-server/locals.tf @@ -1,45 +1,45 @@ locals { default_metric_server_helm_app = { - name = "metrics-server" - chart = "metrics-server" - repository = "https://kubernetes-sigs.github.io/metrics-server/" - version = "3.5.0" - namespace = "kube-system" - timeout = "1200" - create_namespace = false - set = [] - set_sensitive = null - lint = false - values = null - wait = true - wait_for_jobs = false - description = "Metric server helm Chart deployment configuration" - verify = false - keyring = "" - repository_key_file = "" - repository_cert_file = "" - repository_ca_file = "" - repository_username = "" - repository_password = "" - disable_webhooks = false - reuse_values = false - reset_values = false - force_update = false - recreate_pods = false - cleanup_on_fail = false - max_history = 0 - atomic = false - skip_crds = false - render_subchart_notes = true - disable_openapi_validation = false - dependency_update = false - replace = false - postrender = "" + name = "metrics-server" + chart = "metrics-server" + repository = "https://kubernetes-sigs.github.io/metrics-server/" + version = "3.5.0" + namespace = "kube-system" + timeout = "1200" + create_namespace = false + set = [] + set_sensitive = null + lint = false + values = null + wait = true + wait_for_jobs = false + description = "Metric server helm Chart deployment configuration" + verify = false + keyring = "" + repository_key_file = "" + repository_cert_file = "" + repository_ca_file = "" + repository_username = "" + repository_password = "" + disable_webhooks = false + reuse_values = false + reset_values = false + force_update = false + recreate_pods = false + cleanup_on_fail = false + max_history = 0 + atomic = false + skip_crds = false + render_subchart_notes = true + disable_openapi_validation = false + dependency_update = false + replace = false + postrender = "" } - + metric_server_helm_app = merge( local.default_metric_server_helm_app, var.metrics_server_helm_chart - ) + ) } diff --git a/kubernetes-addons/nginx-ingress/locals.tf b/kubernetes-addons/nginx-ingress/locals.tf index a006949a..084bf2cd 100644 --- a/kubernetes-addons/nginx-ingress/locals.tf +++ b/kubernetes-addons/nginx-ingress/locals.tf @@ -1,43 +1,43 @@ locals { - default_helm_values = [templatefile("${path.module}/values.yaml", {})] + default_helm_values = [templatefile("${path.module}/values.yaml", {})] default_nginx_helm_app = { - name = "ingress-nginx" - chart = "ingress-nginx" - repository = "https://kubernetes.github.io/ingress-nginx" - version = "4.0.6" - namespace = "kube-system" - timeout = "1200" - create_namespace = false - values = local.default_helm_values - set = [] - set_sensitive = null - lint = false - verify = false - keyring = "" - repository_key_file = "" - repository_cert_file = "" - repository_ca_file = "" - repository_username = "" - repository_password = "" - disable_webhooks = false - reuse_values = false - reset_values = false - force_update = false - recreate_pods = false - cleanup_on_fail = false - max_history = 0 - atomic = false - skip_crds = false - render_subchart_notes = true - disable_openapi_validation = false - wait = true - wait_for_jobs = false - dependency_update = false - replace = false - description = "The NGINX HelmChart Ingress Controller deployment configuration" - postrender = "" + name = "ingress-nginx" + chart = "ingress-nginx" + repository = "https://kubernetes.github.io/ingress-nginx" + version = "4.0.6" + namespace = "kube-system" + timeout = "1200" + create_namespace = false + values = local.default_helm_values + set = [] + set_sensitive = null + lint = false + verify = false + keyring = "" + repository_key_file = "" + repository_cert_file = "" + repository_ca_file = "" + repository_username = "" + repository_password = "" + disable_webhooks = false + reuse_values = false + reset_values = false + force_update = false + recreate_pods = false + cleanup_on_fail = false + max_history = 0 + atomic = false + skip_crds = false + render_subchart_notes = true + disable_openapi_validation = false + wait = true + wait_for_jobs = false + dependency_update = false + replace = false + description = "The NGINX HelmChart Ingress Controller deployment configuration" + postrender = "" } nginx_helm_app = merge( diff --git a/kubernetes-addons/prometheus/README.md b/kubernetes-addons/prometheus/README.md index 947d5cfc..85f009b7 100644 --- a/kubernetes-addons/prometheus/README.md +++ b/kubernetes-addons/prometheus/README.md @@ -1,7 +1,5 @@ # Prometheus Helm Chart -https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-onboard-ingest-metrics-new-Prometheus.html - ###### Instructions to upload Prometheus Docker image to AWS ECR Step1: Get the latest docker image from this link diff --git a/kubernetes-addons/prometheus/locals.tf b/kubernetes-addons/prometheus/locals.tf index 94ca1553..bc365ccd 100644 --- a/kubernetes-addons/prometheus/locals.tf +++ b/kubernetes-addons/prometheus/locals.tf @@ -1,14 +1,14 @@ data "aws_region" "current" {} locals { - amp_workspace_url = "https://aps-workspaces.${data.aws_region.current.id}.amazonaws.com/workspaces/${var.amp_workspace_id}/api/v1/remote_write" + amp_workspace_url = "https://aps-workspaces.${data.aws_region.current.id}.amazonaws.com/workspaces/${var.amp_workspace_id}/api/v1/remote_write" - default_helm_values = [templatefile("${path.module}/values.yaml", { - aws_region = data.aws_region.current.name, - ingest_role_arn = var.amp_ingest_role_arn - service_account_name = var.service_account_amp_ingest_name - amp_workspace_url = local.amp_workspace_url - })] + default_helm_values = [templatefile("${path.module}/values.yaml", { + aws_region = data.aws_region.current.name, + ingest_role_arn = var.amp_ingest_role_arn + service_account_name = var.service_account_amp_ingest_name + amp_workspace_url = local.amp_workspace_url + })] default_prometheus_helm_app = { name = "prometheus" @@ -24,7 +24,7 @@ locals { wait = true wait_for_jobs = false verify = false - set = [] + set = [] set_sensitive = null keyring = "" repository_key_file = "" @@ -46,10 +46,10 @@ locals { dependency_update = false replace = false postrender = "" - } + prometheus_helm_app = merge( local.default_prometheus_helm_app, - var.prometheus_helm_chart - ) + var.prometheus_helm_chart + ) } diff --git a/kubernetes-addons/spark-k8s-operator/locals.tf b/kubernetes-addons/spark-k8s-operator/locals.tf index 6a5debf4..47666de7 100644 --- a/kubernetes-addons/spark-k8s-operator/locals.tf +++ b/kubernetes-addons/spark-k8s-operator/locals.tf @@ -1,41 +1,41 @@ locals { default_spark_k8s_operator_helm_app = { - name = "spark-operator" - chart = "spark-operator" - repository = "https://googlecloudplatform.github.io/spark-on-k8s-operator" - version = "1.1.6" - namespace = "spark-k8s-operator" - timeout = "1200" - create_namespace = true - values = null - set = [] - set_sensitive = null - lint = false - verify = false - keyring = "" - repository_key_file = "" - repository_cert_file = "" - repository_ca_file = "" - repository_username = "" - repository_password = "" - disable_webhooks = false - reuse_values = false - reset_values = false - force_update = false - recreate_pods = false - cleanup_on_fail = false - max_history = 0 - atomic = false - skip_crds = false - render_subchart_notes = true - disable_openapi_validation = false - wait = true - wait_for_jobs = false - dependency_update = false - replace = false - description = "The spark_k8s_operator HelmChart Ingress Controller deployment configuration" - postrender = "" + name = "spark-operator" + chart = "spark-operator" + repository = "https://googlecloudplatform.github.io/spark-on-k8s-operator" + version = "1.1.6" + namespace = "spark-k8s-operator" + timeout = "1200" + create_namespace = true + values = null + set = [] + set_sensitive = null + lint = false + verify = false + keyring = "" + repository_key_file = "" + repository_cert_file = "" + repository_ca_file = "" + repository_username = "" + repository_password = "" + disable_webhooks = false + reuse_values = false + reset_values = false + force_update = false + recreate_pods = false + cleanup_on_fail = false + max_history = 0 + atomic = false + skip_crds = false + render_subchart_notes = true + disable_openapi_validation = false + wait = true + wait_for_jobs = false + dependency_update = false + replace = false + description = "The spark_k8s_operator HelmChart Ingress Controller deployment configuration" + postrender = "" } spark_k8s_operator_helm_app = merge( diff --git a/kubernetes-addons/traefik-ingress/locals.tf b/kubernetes-addons/traefik-ingress/locals.tf index a3c30377..0d70f743 100644 --- a/kubernetes-addons/traefik-ingress/locals.tf +++ b/kubernetes-addons/traefik-ingress/locals.tf @@ -1,41 +1,41 @@ locals { default_traefik_helm_app = { - name = "traefik" - chart = "traefik" - repository = "https://helm.traefik.io/traefik" - version = "10.0.0" - namespace = "kube-system" - timeout = "1200" - create_namespace = false - values = null - set = [] - set_sensitive = null - lint = false - verify = false - keyring = "" - repository_key_file = "" - repository_cert_file = "" - repository_ca_file = "" - repository_username = "" - repository_password = "" - disable_webhooks = false - reuse_values = false - reset_values = false - force_update = false - recreate_pods = false - cleanup_on_fail = false - max_history = 0 - atomic = false - skip_crds = false - render_subchart_notes = true - disable_openapi_validation = false - wait = true - wait_for_jobs = false - dependency_update = false - replace = false - description = "The Traefik HelmChart is focused on Traefik deployment configuration" - postrender = "" + name = "traefik" + chart = "traefik" + repository = "https://helm.traefik.io/traefik" + version = "10.0.0" + namespace = "kube-system" + timeout = "1200" + create_namespace = false + values = null + set = [] + set_sensitive = null + lint = false + verify = false + keyring = "" + repository_key_file = "" + repository_cert_file = "" + repository_ca_file = "" + repository_username = "" + repository_password = "" + disable_webhooks = false + reuse_values = false + reset_values = false + force_update = false + recreate_pods = false + cleanup_on_fail = false + max_history = 0 + atomic = false + skip_crds = false + render_subchart_notes = true + disable_openapi_validation = false + wait = true + wait_for_jobs = false + dependency_update = false + replace = false + description = "The Traefik HelmChart is focused on Traefik deployment configuration" + postrender = "" } traefik_helm_app = merge( diff --git a/kubernetes-addons/windows-vpc-controllers/locals.tf b/kubernetes-addons/windows-vpc-controllers/locals.tf index 8080f2f6..8e93b71e 100644 --- a/kubernetes-addons/windows-vpc-controllers/locals.tf +++ b/kubernetes-addons/windows-vpc-controllers/locals.tf @@ -3,44 +3,44 @@ locals { default_helm_values = [templatefile("${path.module}/values.yaml", {})] default_windows_vpc_controllers_helm_app = { - name = "windows-vpc-controllers" - chart = "windows-vpc-controllers" - repository = "https://charts.jetstack.io" - version = "v1.5.4" - namespace = "kube-system" - timeout = "600" - create_namespace = false - set_sensitive = null - lint = false - values = local.default_helm_values - wait = true - wait_for_jobs = false - description = "Cert Manager Helm chart deployment configuration" - verify = false - keyring = "" - repository_key_file = "" - repository_cert_file = "" - repository_ca_file = "" - repository_username = "" - repository_password = "" - disable_webhooks = false - reuse_values = false - reset_values = false - force_update = false - recreate_pods = false - cleanup_on_fail = false - max_history = 0 - atomic = false - skip_crds = false - render_subchart_notes = true - disable_openapi_validation = false - dependency_update = false - replace = false - postrender = "" + name = "windows-vpc-controllers" + chart = "windows-vpc-controllers" + repository = "https://charts.jetstack.io" + version = "v1.5.4" + namespace = "kube-system" + timeout = "600" + create_namespace = false + set_sensitive = null + lint = false + values = local.default_helm_values + wait = true + wait_for_jobs = false + description = "Cert Manager Helm chart deployment configuration" + verify = false + keyring = "" + repository_key_file = "" + repository_cert_file = "" + repository_ca_file = "" + repository_username = "" + repository_password = "" + disable_webhooks = false + reuse_values = false + reset_values = false + force_update = false + recreate_pods = false + cleanup_on_fail = false + max_history = 0 + atomic = false + skip_crds = false + render_subchart_notes = true + disable_openapi_validation = false + dependency_update = false + replace = false + postrender = "" } windows_vpc_controllers_helm_app = merge( local.default_windows_vpc_controllers_helm_app, - var.windows_vpc_controllers_helm_chart - ) + var.windows_vpc_controllers_helm_chart + ) } -- GitLab