Skip to content

Commit

Permalink
Helm charts updates for Kubernetes 1.30 (#212)
Browse files Browse the repository at this point in the history
* Helm charts updates (#206)

* 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>

* terraform-docs: automated action

---------

Co-authored-by: Olamide <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Oct 22, 2024
1 parent e598b29 commit 8b85174
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 12 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
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 8b85174

Please sign in to comment.