Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

Commit

Permalink
Merge pull request #17 from xoap-io/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ssokolic authored Aug 17, 2022
2 parents edd897c + 94f7a51 commit 41df7cf
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/commit-message-validator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: wagoid/commitlint-github-action@v4
- uses: wagoid/commitlint-github-action@v5
2 changes: 1 addition & 1 deletion .github/workflows/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: Dependabot metadata
id: dependabot-metadata
uses: dependabot/[email protected].1
uses: dependabot/[email protected].3
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Approve a PR
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/megalinter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fetch-depth: 0
- name: MegaLinter
id: ml
uses: megalinter/megalinter/flavors/terraform@v5
uses: megalinter/megalinter/flavors/terraform@v6.5.0
env:
VALIDATE_ALL_CODEBASE: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ No modules.
| <a name="input_namespace"></a> [namespace](#input\_namespace) | Kubernetes namespace where resources must be created. | `string` | n/a | yes |
| <a name="input_paths"></a> [paths](#input\_paths) | Object mapping local paths to container paths | `map(any)` | `{}` | no |
| <a name="input_resource_config"></a> [resource\_config](#input\_resource\_config) | Object with resource limits and requests. | <pre>object({<br> limits = object({<br> cpu = string<br> memory = string<br> })<br><br> requests = object({<br> cpu = string<br> memory = string<br> })<br> })</pre> | <pre>{<br> "limits": {<br> "cpu": "0.5",<br> "memory": "512Mi"<br> },<br> "requests": {<br> "cpu": "250m",<br> "memory": "50Mi"<br> }<br>}</pre> | no |
| <a name="input_service_account_annotations"></a> [service\_account\_annotations](#input\_service\_account\_annotations) | Annotations to be added to the service account resource. | `map(string)` | n/a | yes |
| <a name="input_service_port"></a> [service\_port](#input\_service\_port) | Port configured on the service side to receive requests (routed to the container port). | `string` | n/a | yes |

## Outputs
Expand Down
1 change: 1 addition & 0 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ resource "kubernetes_service_account" "this" {
k8s-app = var.name
})
}
annotations = var.service_account_annotations
automount_service_account_token = true
}
resource "kubernetes_deployment" "this" {
Expand Down
4 changes: 4 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ variable "ingress_annotations" {
type = map(string)
description = "Annotations to be added to the ingress resource."
}
variable "service_account_annotations" {
type = map(string)
description = "Annotations to be added to the service account resource."
}
variable "health_check" {
type = object({
path = string
Expand Down

0 comments on commit 41df7cf

Please sign in to comment.