Skip to content

Commit

Permalink
Merge pull request #3 from sparkfabrik/task/fix-values
Browse files Browse the repository at this point in the history
move values.yaml into files directory, remove annotation prefix
  • Loading branch information
Monska85 authored Dec 5, 2023
2 parents 22ec680 + 4fb660b commit 9742e5f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

---

## [0.2.0] - 2023-12-05

### Changed

- `annotations-prefix` removed from values file.
- `values.yaml` moved into `files` directory.

## [0.1.0] - 2023-12-04

- First release.
13 changes: 6 additions & 7 deletions examples/main.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
module "ingress_nginx" {
source = "../"
chart_version = "4.8.3"
namespace = "ingress-nginx"
host = "https://test"
cluster_ca_certificate = base64decode("certificate")
token = "token"
namespace_lifecycle_ignore_changes = ["test"]
source = "../"
chart_version = "4.8.3"
namespace = "ingress-nginx"
host = "https://test"
cluster_ca_certificate = base64decode("certificate")
token = "token"
}
2 changes: 0 additions & 2 deletions values.yaml → files/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ controller:
maxReplicas: 3
targetCPUUtilizationPercentage: 80
targetMemoryUtilizationPercentage: 80
extraArgs:
annotations-prefix: ingress.kubernetes.io
config:
body-size: "0"
hsts-include-subdomains: "true"
Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ resource "helm_release" "this" {
namespace = var.create_namespace ? kubernetes_namespace_v1.this[0].metadata[0].name : data.kubernetes_namespace_v1.this[0].metadata[0].name

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

0 comments on commit 9742e5f

Please sign in to comment.