Skip to content
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

Jump to bottom

Linkerd-Viz Fix #13

Closed
wants to merge 4 commits into from
Closed

Linkerd-Viz Fix #13

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
d7e40b0
Updated chart version
ggolub Mar 25, 2021
56d9f64
terraform-docs: automated action
ggolub Mar 25, 2021
0d4ceb5
Merge branch 'main' of github.com:Azure-Terraform/terraform-helm-link…
ggolub Mar 25, 2021
90db1e6
Merge branch 'develop' of github.com:Azure-Terraform/terraform-helm-l…
ggolub Mar 25, 2021
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
17 changes: 17 additions & 0 deletions .github/workflows/documentation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Generate terraform docs
on: [push, pull_request, workflow_dispatch]
jobs:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.ref }}

- name: Linkerd README Update
uses: Dirrk/[email protected]
with:
tf_docs_working_dir: .
tf_docs_output_file: README.md
tf_docs_output_method: inject
tf_docs_git_push: 'true'
35 changes: 34 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module "service_mesh" {
source = "https://github.com/Azure-Terraform/terraform-helm-linkerd"

# required values
chart_version = "2.9.2"
chart_version = "2.10.0"
ca_cert_expiration_hours = 8760 # 1 year
trust_anchor_validity_hours = 17520 # 2 years
issuer_validity_hours = 8760 # 1 year (must be shorter than the trusted anchor)
Expand Down Expand Up @@ -41,4 +41,37 @@ Notes:
```

<!--- BEGIN_TF_DOCS --->
## Requirements

| Name | Version |
|------|---------|
| terraform | >= 0.13.6 |
| helm | >= 1.2.4 |
| kubernetes | ~> 1.13.3 |
| local | ~> 2.0.0 |
| null | ~> 3.0.0 |
| tls | ~> 3.0.0 |

## Providers

| Name | Version |
|------|---------|
| helm | >= 1.2.4 |
| tls | ~> 3.0.0 |

## Inputs

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| additional\_yaml\_config | used for additional customization of the helm chart values | `string` | `""` | no |
| ca\_cert\_expiration\_hours | Number of hours added to installation time to calculate trust anchor certification expiration date | `number` | `8760` | no |
| chart\_repository | Helm chart repository | `string` | `"https://helm.linkerd.io/stable"` | no |
| chart\_version | Helm chart version | `string` | `"2.10.0"` | no |
| issuer\_validity\_hours | Number of hours for which the issuer certification is valid (must be shorter than the truste anchor) | `number` | `8760` | no |
| trust\_anchor\_validity\_hours | Number of hours for which the trust anchor certification is valid | `number` | `17520` | no |

## Outputs

No output.

<!--- END_TF_DOCS --->
2 changes: 1 addition & 1 deletion variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ variable "chart_repository" {
variable "chart_version" {
description = "Helm chart version"
type = string
default = "2.9.2"
default = "2.10.0"
}

variable "trust_anchor_validity_hours" {
Expand Down