Skip to content

Commit

Permalink
Helm update (#123)
Browse files Browse the repository at this point in the history
* Updating nginx

Signed-off-by: gar <[email protected]>

* Updating output

Signed-off-by: gar <[email protected]>

* Updating user input values file

Signed-off-by: gar <[email protected]>
  • Loading branch information
sekka1 authored Apr 23, 2021
1 parent e17425f commit 2c5d973
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 42 deletions.
3 changes: 2 additions & 1 deletion terraform-modules/aws/helm/argocd/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ resource "helm_release" "helm_chart" {
repository = "https://argoproj.github.io/argo-helm"

values = [
file("${path.module}/values.yaml")
file("${path.module}/values.yaml"),
var.helm_values,
]

}
16 changes: 6 additions & 10 deletions terraform-modules/aws/helm/argocd/outputs.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# output chart {
# value = helm_release.helm_chart.chart
# }
output chart {
value = helm_release.helm_chart.chart
}

# output revision {
# value = helm_release.helm_chart.revision
# }

# output status {
# value = helm_release.helm_chart.status
# }
output status {
value = helm_release.helm_chart.status
}
6 changes: 6 additions & 0 deletions terraform-modules/aws/helm/argocd/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,9 @@ variable chart_name {
default = "argocd"
description = "Name to set the helm deployment to"
}

variable helm_values {
type = string
default = ""
description = "Additional helm values to pass in. These values would override the default in this module."
}
16 changes: 6 additions & 10 deletions terraform-modules/aws/helm/helm_generic/outputs.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# output chart {
# value = helm_release.helm_chart.metadata.chart
# }
output chart {
value = helm_release.helm_chart.chart
}

# output revision {
# value = helm_release.helm_chart.metadata.revision
# }

# output status {
# value = helm_release.helm_chart.metadata.status
# }
output status {
value = helm_release.helm_chart.status
}
16 changes: 6 additions & 10 deletions terraform-modules/aws/helm/kube-prometheus-stack/outputs.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# output chart {
# value = helm_release.helm_chart.metadata.chart
# }
output chart {
value = helm_release.helm_chart.chart
}

# output revision {
# value = helm_release.helm_chart.metadata.revision
# }

# output status {
# value = helm_release.helm_chart.metadata.status
# }
output status {
value = helm_release.helm_chart.status
}
3 changes: 2 additions & 1 deletion terraform-modules/aws/helm/nginx-ingress/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ resource "helm_release" "helm_chart" {
repository = "https://kubernetes.github.io/ingress-nginx"

values = [
file("${path.module}/values.yaml")
file("${path.module}/values.yaml"),
var.helm_values,
]

}
16 changes: 6 additions & 10 deletions terraform-modules/aws/helm/nginx-ingress/outputs.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# output chart {
# value = helm_release.helm_chart.metadata.chart
# }
output chart {
value = helm_release.helm_chart.chart
}

# output revision {
# value = helm_release.helm_chart.metadata.revision
# }

# output status {
# value = helm_release.helm_chart.metadata.status
# }
output status {
value = helm_release.helm_chart.status
}
6 changes: 6 additions & 0 deletions terraform-modules/aws/helm/nginx-ingress/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,9 @@ variable chart_name {
default = "nginx-ingress"
description = "Name to set the helm deployment to"
}

variable helm_values {
type = string
default = ""
description = "Additional helm values to pass in. These values would override the default in this module."
}

0 comments on commit 2c5d973

Please sign in to comment.