Skip to content

Bug/terragrunt deploy cluster issuer #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 3, 2023
Merged

Bug/terragrunt deploy cluster issuer #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fd2900
change paht helm chart
vitaliimd Apr 20, 2023
35a56a5
update terraform docs
vitaliimd Apr 20, 2023
c68368d
Merge branch 'main' into bug/terragrunt-deploy-cluster-issuer
vitaliimd Apr 30, 2023
fbdd962
Merge branch 'main' into bug/terragrunt-deploy-cluster-issuer
vitaliimd May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
154 changes: 1 addition & 153 deletions terraform/layer2-k8s/README.md
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions terraform/layer2-k8s/eks-cert-manager.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ resource "helm_release" "cluster_issuer" {
count = local.cert_manager_cluster_issuer.enabled ? 1 : 0

name = local.cert_manager_cluster_issuer.name
chart = local.cert_manager_cluster_issuer.chart
chart = "${var.helm_charts_path}/${local.cert_manager_cluster_issuer.chart}"
repository = local.cert_manager_cluster_issuer.repository
version = local.cert_manager_cluster_issuer.chart_version
namespace = local.cert_manager_cluster_issuer.namespace
Expand All @@ -209,7 +209,7 @@ resource "helm_release" "certificate" {
count = local.cert_mananger_certificate.enabled ? 1 : 0

name = local.cert_mananger_certificate.name
chart = local.cert_mananger_certificate.chart
chart = "${var.helm_charts_path}/${local.cert_mananger_certificate.chart}"
repository = local.cert_mananger_certificate.repository
version = local.cert_mananger_certificate.chart_version
namespace = local.cert_mananger_certificate.namespace
Expand Down
2 changes: 1 addition & 1 deletion terraform/layer2-k8s/eks-elk.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ resource "helm_release" "elk" {
count = local.elk.enabled ? 1 : 0

name = local.elk.name
chart = local.elk.chart
chart = "${var.helm_charts_path}/${local.elk.chart}"
repository = local.elk.repository
version = local.elk.chart_version
namespace = module.elk_namespace[count.index].name
Expand Down
6 changes: 3 additions & 3 deletions terraform/layer2-k8s/helm-releases.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ releases:
namespace: certmanager
- id: cert-mananger-certificate
enabled: false
chart: ../../helm-charts/certificate
chart: certificate
repository:
chart_version:
namespace: ingress-nginx
- id: cert-manager-cluster-issuer
enabled: false
chart: ../../helm-charts/cluster-issuer
chart: cluster-issuer
repository:
chart_version:
namespace: certmanager
Expand All @@ -37,7 +37,7 @@ releases:
namespace: cluster-autoscaler
- id: elk
enabled: false
chart: ../../helm-charts/elk
chart: elk
repository:
chart_version:
namespace: elk
Expand Down
7 changes: 7 additions & 0 deletions terraform/layer2-k8s/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,10 @@ variable "cluster_autoscaler_version" {
description = "Version of cluster autoscaler"
default = "v1.25.0"
}


variable "helm_charts_path" {
type = string
description = "where to find the helm charts"
default = "../../helm-charts/"
}
1 change: 1 addition & 0 deletions terragrunt/demo/us-east-1/k8s-addons/terragrunt.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ inputs = {
eks_cluster_id = dependency.aws-base.outputs.eks_cluster_id
eks_oidc_provider_arn = dependency.aws-base.outputs.eks_oidc_provider_arn
ssl_certificate_arn = dependency.aws-base.outputs.ssl_certificate_arn
helm_charts_path = "${get_terragrunt_dir()}/../../../../helm-charts"
}