Skip to content

Commit

Permalink
Helm charts updates (#206)
Browse files Browse the repository at this point in the history
* Updating helm charts
* Updating modules
* Pass in vpc id and region to aws load balancer module
* Update github workflow runner version
---------
Co-authored-by: William <[email protected]>
Co-authored-by: Olamide <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
OlamideOl1 authored and emilford committed Oct 22, 2024
1 parent e598b29 commit 819c63a
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 16 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
jobs:
checkfmt:
name: Format
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -18,7 +18,7 @@ jobs:

validate:
name: Validate
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -31,7 +31,7 @@ jobs:

docs:
name: Docs
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -56,7 +56,7 @@ jobs:

lint:
name: Lint
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion aws/cluster/modules/k8s-oidc-provider/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_cluster"></a> [cluster](#input\_cluster) | Cluster providing an OpenID connect issuer | <pre>object({<br> identity = list(object({ oidc = list(object({ issuer = string })) }))<br> })</pre> | n/a | yes |
| <a name="input_cluster"></a> [cluster](#input\_cluster) | Cluster providing an OpenID connect issuer | <pre>object({<br/> identity = list(object({ oidc = list(object({ issuer = string })) }))<br/> })</pre> | n/a | yes |

## Outputs

Expand Down
4 changes: 2 additions & 2 deletions aws/network-data/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_private_tags"></a> [private\_tags](#input\_private\_tags) | Tags to identify private subnets | `map(string)` | <pre>{<br> "kubernetes.io/role/internal-elb": "1"<br>}</pre> | no |
| <a name="input_public_tags"></a> [public\_tags](#input\_public\_tags) | Tags to identify public subnets | `map(string)` | <pre>{<br> "kubernetes.io/role/elb": "1"<br>}</pre> | no |
| <a name="input_private_tags"></a> [private\_tags](#input\_private\_tags) | Tags to identify private subnets | `map(string)` | <pre>{<br/> "kubernetes.io/role/internal-elb": "1"<br/>}</pre> | no |
| <a name="input_public_tags"></a> [public\_tags](#input\_public\_tags) | Tags to identify public subnets | `map(string)` | <pre>{<br/> "kubernetes.io/role/elb": "1"<br/>}</pre> | no |
| <a name="input_tags"></a> [tags](#input\_tags) | Tags to identify all resources | `map(string)` | `{}` | no |
| <a name="input_vpc_tags"></a> [vpc\_tags](#input\_vpc\_tags) | Tags to identify the VPC | `map(string)` | `{}` | no |

Expand Down
2 changes: 1 addition & 1 deletion aws/platform/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ You can then use it to manually edit the aws-auth ConfigMap:
| <a name="input_opsgenie_parameter"></a> [opsgenie\_parameter](#input\_opsgenie\_parameter) | SSM parameter containing the OpsGenie api key | `string` | `null` | no |
| <a name="input_pagerduty_parameter"></a> [pagerduty\_parameter](#input\_pagerduty\_parameter) | SSM parameter containing the Pagerduty routing key | `string` | `null` | no |
| <a name="input_prometheus_adapter_values"></a> [prometheus\_adapter\_values](#input\_prometheus\_adapter\_values) | Overrides to pass to the Helm chart | `list(string)` | `[]` | no |
| <a name="input_prometheus_data_source"></a> [prometheus\_data\_source](#input\_prometheus\_data\_source) | Prometheus datasource object with necessary details required to connect to the Prometheus workspace for centralized ingestion | <pre>object({<br> # The name of the Prometheus workspace for centralized injestion<br> name = string<br><br> # The Prometheus workspace host. <br> # A sample value for AWs managed Prometheus will be `aps-workspaces.us-east-1.amazonaws.com`<br> host = string<br><br> # The Prometheus workspace query path. <br> # A sample value for AWs managed Prometheus will be `workspaces/ws-xxxxx-xxx-xxx-xxx-xxxxxxx/api/v1/query`<br> query_path = string<br><br> # The region for the Prometheus workspace created for centralized injestion path.<br> region = string<br><br> # The ARN of the AWS IAM role enabling this cluster to use the Prometheus workspace for centralized ingestion <br> role_arn = string<br><br> # The write path for the Prometheus workspace. <br> # A sample value for AWs managed Prometheus will be `workspaces/ws-xxxxx-xxx-xxx-xxx-xxxxxxx/api/v1/remote_write`<br> write_path = string<br><br> # The url for the Prometheus workspace. <br> # A sample value for AWs managed Prometheus will be `https://aps-workspaces.us-east-1.amazonaws.com/workspaces/ws-xxxxx-xxx-xxx-xxx-xxxxxxx`<br> url = string<br> })</pre> | <pre>{<br> "host": null,<br> "name": null,<br> "query_path": null,<br> "region": null,<br> "role_arn": null,<br> "url": null,<br> "write_path": null<br>}</pre> | no |
| <a name="input_prometheus_data_source"></a> [prometheus\_data\_source](#input\_prometheus\_data\_source) | Prometheus datasource object with necessary details required to connect to the Prometheus workspace for centralized ingestion | <pre>object({<br/> # The name of the Prometheus workspace for centralized injestion<br/> name = string<br/><br/> # The Prometheus workspace host. <br/> # A sample value for AWs managed Prometheus will be `aps-workspaces.us-east-1.amazonaws.com`<br/> host = string<br/><br/> # The Prometheus workspace query path. <br/> # A sample value for AWs managed Prometheus will be `workspaces/ws-xxxxx-xxx-xxx-xxx-xxxxxxx/api/v1/query`<br/> query_path = string<br/><br/> # The region for the Prometheus workspace created for centralized injestion path.<br/> region = string<br/><br/> # The ARN of the AWS IAM role enabling this cluster to use the Prometheus workspace for centralized ingestion <br/> role_arn = string<br/><br/> # The write path for the Prometheus workspace. <br/> # A sample value for AWs managed Prometheus will be `workspaces/ws-xxxxx-xxx-xxx-xxx-xxxxxxx/api/v1/remote_write`<br/> write_path = string<br/><br/> # The url for the Prometheus workspace. <br/> # A sample value for AWs managed Prometheus will be `https://aps-workspaces.us-east-1.amazonaws.com/workspaces/ws-xxxxx-xxx-xxx-xxx-xxxxxxx`<br/> url = string<br/> })</pre> | <pre>{<br/> "host": null,<br/> "name": null,<br/> "query_path": null,<br/> "region": null,<br/> "role_arn": null,<br/> "url": null,<br/> "write_path": null<br/>}</pre> | no |
| <a name="input_prometheus_operator_values"></a> [prometheus\_operator\_values](#input\_prometheus\_operator\_values) | Overrides to pass to the Helm chart | `list(string)` | `[]` | no |
| <a name="input_reloader_values"></a> [reloader\_values](#input\_reloader\_values) | Overrides to pass to the Helm chart | `list(string)` | `[]` | no |
| <a name="input_reloader_version"></a> [reloader\_version](#input\_reloader\_version) | Version of external-dns to install | `string` | `null` | no |
Expand Down
1 change: 1 addition & 0 deletions aws/platform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ module "aws_load_balancer_controller" {
k8s_namespace = var.k8s_namespace
oidc_issuer = data.aws_ssm_parameter.oidc_issuer.value
vpc_cidr_block = module.network.vpc.cidr_block
vpc_id = module.network.vpc.id

depends_on = [module.common_platform]
}
Expand Down
2 changes: 2 additions & 0 deletions aws/platform/modules/load-balancer-controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ target group bound to the Istio ingress gateway service.
| [helm_release.ingress_config](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
| [helm_release.this](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
| [aws_lb_target_group.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/lb_target_group) | data source |
| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |

## Inputs

Expand All @@ -53,4 +54,5 @@ target group bound to the Istio ingress gateway service.
| <a name="input_oidc_issuer"></a> [oidc\_issuer](#input\_oidc\_issuer) | OIDC issuer of the Kubernetes cluster | `string` | n/a | yes |
| <a name="input_target_group_name"></a> [target\_group\_name](#input\_target\_group\_name) | Override the name of the target group for this cluster | `string` | `null` | no |
| <a name="input_vpc_cidr_block"></a> [vpc\_cidr\_block](#input\_vpc\_cidr\_block) | CIDR block for the AWS VPC in which the load balancer runs | `string` | n/a | yes |
| <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | The VPC ID for the Kubernetes cluster. | `string` | n/a | yes |
<!-- END_TF_DOCS -->
4 changes: 4 additions & 0 deletions aws/platform/modules/load-balancer-controller/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ resource "aws_iam_role_policy_attachment" "this" {
policy_arn = aws_iam_policy.this.arn
}

data "aws_region" "current" {}

locals {
chart_defaults = jsondecode(file("${path.module}/chart.json"))

Expand All @@ -90,6 +92,8 @@ locals {
"eks.amazonaws.com/role-arn" = module.service_account_role.arn
}
}
region = data.aws_region.current.name
vpcId = var.vpc_id
})
]
}
5 changes: 5 additions & 0 deletions aws/platform/modules/load-balancer-controller/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,8 @@ variable "vpc_cidr_block" {
type = string
description = "CIDR block for the AWS VPC in which the load balancer runs"
}

variable "vpc_id" {
type = string
description = "The VPC ID for the Kubernetes cluster."
}
8 changes: 4 additions & 4 deletions charts.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"cert-manager": {
"chart": "cert-manager",
"repository": "https://charts.jetstack.io",
"version": "v1.10.1"
"version": "v1.12.13"
},
"cluster-autoscaler": {
"chart": "cluster-autoscaler",
Expand All @@ -27,17 +27,17 @@
"istio-base": {
"chart": "base",
"repository": "https://istio-release.storage.googleapis.com/charts",
"version": "1.16.1"
"version": "1.23.0"
},
"istiod": {
"chart": "istiod",
"repository": "https://istio-release.storage.googleapis.com/charts",
"version": "1.16.1"
"version": "1.23.0"
},
"istio-ingress": {
"chart": "gateway",
"repository": "https://istio-release.storage.googleapis.com/charts",
"version": "1.16.1"
"version": "1.23.0"
},
"load-balancer-controller": {
"chart": "aws-load-balancer-controller",
Expand Down
2 changes: 1 addition & 1 deletion platform/modules/cert-manager/chart.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"chart": "cert-manager",
"repository": "https://charts.jetstack.io",
"version": "v1.10.1"
"version": "v1.12.13"
}
2 changes: 1 addition & 1 deletion platform/modules/istio-base/chart.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"chart": "base",
"repository": "https://istio-release.storage.googleapis.com/charts",
"version": "1.16.1"
"version": "1.23.0"
}
2 changes: 1 addition & 1 deletion platform/modules/istio-ingress/chart.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"chart": "gateway",
"repository": "https://istio-release.storage.googleapis.com/charts",
"version": "1.16.1"
"version": "1.23.0"
}
2 changes: 1 addition & 1 deletion platform/modules/istiod/chart.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"chart": "istiod",
"repository": "https://istio-release.storage.googleapis.com/charts",
"version": "1.16.1"
"version": "1.23.0"
}

0 comments on commit 819c63a

Please sign in to comment.