Skip to content

Commit

Permalink
Update terraform provider versions, uprev tests to use kubernetes 1.28 (
Browse files Browse the repository at this point in the history 
#37)
  • Loading branch information
@lumberbaron
lumberbaron committed Mar 1, 2024
1 parent 10504de commit fc59e8c
Show file tree
Hide file tree
Showing 36 changed files with 185 additions and 155 deletions.
14 changes: 7 additions & 7 deletions aks/terraform/modules/bastion/README.md
View file
Expand Up @@ -4,13 +4,13 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 3.81.0 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 3.94.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.81.0 |
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.94.0 |

## Modules

Expand All @@ -20,11 +20,11 @@ No modules.

| Name | Type |
|------|------|
| [azurerm_network_interface.bastion](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/network_interface) | resource |
| [azurerm_network_interface_security_group_association.bastion](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/network_interface_security_group_association) | resource |
| [azurerm_network_security_group.bastion](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/network_security_group) | resource |
| [azurerm_public_ip.bastion](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/public_ip) | resource |
| [azurerm_virtual_machine.bastion](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/virtual_machine) | resource |
| [azurerm_network_interface.bastion](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/network_interface) | resource |
| [azurerm_network_interface_security_group_association.bastion](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/network_interface_security_group_association) | resource |
| [azurerm_network_security_group.bastion](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/network_security_group) | resource |
| [azurerm_public_ip.bastion](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/public_ip) | resource |
| [azurerm_virtual_machine.bastion](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/virtual_machine) | resource |

## Inputs

Expand Down
3 changes: 2 additions & 1 deletion aks/terraform/modules/bastion/main.tf
View file
Expand Up @@ -10,6 +10,7 @@ resource "azurerm_public_ip" "bastion" {
location = var.region
resource_group_name = var.resource_group_name
allocation_method = "Static"
sku = "Standard"
}

resource "azurerm_network_security_group" "bastion" {
Expand Down Expand Up @@ -78,7 +79,7 @@ resource "azurerm_virtual_machine" "bastion" {
location = var.region
resource_group_name = var.resource_group_name
network_interface_ids = [azurerm_network_interface.bastion[0].id]
vm_size = "Standard_B1ls"
vm_size = "Standard_B1s"

delete_os_disk_on_termination = true

Expand Down
2 changes: 1 addition & 1 deletion aks/terraform/modules/bastion/versions.tf
View file
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "3.81.0"
version = "3.94.0"
}
}
}
6 changes: 3 additions & 3 deletions aks/terraform/modules/broker-node-pool/README.md
View file
Expand Up @@ -4,13 +4,13 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 3.81.0 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 3.94.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.81.0 |
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.94.0 |

## Modules

Expand All @@ -20,7 +20,7 @@ No modules.

| Name | Type |
|------|------|
| [azurerm_kubernetes_cluster_node_pool.this](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/kubernetes_cluster_node_pool) | resource |
| [azurerm_kubernetes_cluster_node_pool.this](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/kubernetes_cluster_node_pool) | resource |

## Inputs

Expand Down
2 changes: 1 addition & 1 deletion aks/terraform/modules/broker-node-pool/versions.tf
View file
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "3.81.0"
version = "3.94.0"
}
}
}
28 changes: 15 additions & 13 deletions aks/terraform/modules/cluster/README.md
View file
Expand Up @@ -4,15 +4,15 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | 2.46.0 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 3.81.0 |
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | 2.47.0 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 3.94.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_azuread"></a> [azuread](#provider\_azuread) | 2.46.0 |
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.81.0 |
| <a name="provider_azuread"></a> [azuread](#provider\_azuread) | 2.47.0 |
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.94.0 |

## Modules

Expand All @@ -27,14 +27,14 @@

| Name | Type |
|------|------|
| [azurerm_kubernetes_cluster.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/kubernetes_cluster) | resource |
| [azurerm_log_analytics_workspace.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/log_analytics_workspace) | resource |
| [azurerm_monitor_diagnostic_setting.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/monitor_diagnostic_setting) | resource |
| [azurerm_role_assignment.cluster_admin](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/role_assignment) | resource |
| [azurerm_role_assignment.cluster_route_table](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/role_assignment) | resource |
| [azurerm_role_assignment.cluster_subnet](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/role_assignment) | resource |
| [azurerm_user_assigned_identity.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/user_assigned_identity) | resource |
| [azuread_user.cluster_admin](https://registry.terraform.io/providers/hashicorp/azuread/2.46.0/docs/data-sources/user) | data source |
| [azurerm_kubernetes_cluster.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/kubernetes_cluster) | resource |
| [azurerm_log_analytics_workspace.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/log_analytics_workspace) | resource |
| [azurerm_monitor_diagnostic_setting.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/monitor_diagnostic_setting) | resource |
| [azurerm_role_assignment.cluster_admin](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/role_assignment) | resource |
| [azurerm_role_assignment.cluster_route_table](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/role_assignment) | resource |
| [azurerm_role_assignment.cluster_subnet](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/role_assignment) | resource |
| [azurerm_user_assigned_identity.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/user_assigned_identity) | resource |
| [azuread_user.cluster_admin](https://registry.terraform.io/providers/hashicorp/azuread/2.47.0/docs/data-sources/user) | data source |

## Inputs

Expand All @@ -61,5 +61,7 @@

## Outputs

No outputs.
| Name | Description |
|------|-------------|
| <a name="output_cluster_name"></a> [cluster\_name](#output\_cluster\_name) | n/a |
<!-- END_TF_DOCS -->
3 changes: 3 additions & 0 deletions aks/terraform/modules/cluster/outputs.tf
View file
@@ -0,0 +1,3 @@
output "cluster_name" {
value = azurerm_kubernetes_cluster.cluster.name
}
4 changes: 2 additions & 2 deletions aks/terraform/modules/cluster/versions.tf
View file
Expand Up @@ -4,12 +4,12 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "3.81.0"
version = "3.94.0"
}

azuread = {
source = "hashicorp/azuread"
version = "2.46.0"
version = "2.47.0"
}
}
}
14 changes: 7 additions & 7 deletions aks/terraform/modules/network/README.md
View file
Expand Up @@ -4,13 +4,13 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 3.81.0 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 3.94.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.81.0 |
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.94.0 |

## Modules

Expand All @@ -20,11 +20,11 @@ No modules.

| Name | Type |
|------|------|
| [azurerm_route.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/route) | resource |
| [azurerm_route_table.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/route_table) | resource |
| [azurerm_subnet.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/subnet) | resource |
| [azurerm_subnet_route_table_association.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/subnet_route_table_association) | resource |
| [azurerm_virtual_network.this](https://registry.terraform.io/providers/hashicorp/azurerm/3.81.0/docs/resources/virtual_network) | resource |
| [azurerm_route.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/route) | resource |
| [azurerm_route_table.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/route_table) | resource |
| [azurerm_subnet.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/subnet) | resource |
| [azurerm_subnet_route_table_association.cluster](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/subnet_route_table_association) | resource |
| [azurerm_virtual_network.this](https://registry.terraform.io/providers/hashicorp/azurerm/3.94.0/docs/resources/virtual_network) | resource |

## Inputs

Expand Down
2 changes: 1 addition & 1 deletion aks/terraform/modules/network/versions.tf
View file
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "3.81.0"
version = "3.94.0"
}
}
}
4 changes: 2 additions & 2 deletions eks/README.md
View file
Expand Up @@ -216,7 +216,7 @@ helm repo add autoscaler https://kubernetes.github.io/autoscaler
helm repo update autoscaler

terraform output -raw -state=terraform/terraform.tfstate cluster_autoscaler_helm_values | \
helm upgrade --install cluster-autoscaler autoscaler/cluster-autoscaler --version 9.29.0 -n kube-system --values - --set image.tag=<version>
helm upgrade --install cluster-autoscaler autoscaler/cluster-autoscaler --version 9.35.0 -n kube-system --values - --set image.tag=<version>
```

### Deploying AWS Load Balancer Controller <a name="eks-deploy-lb"></a>
Expand All @@ -227,5 +227,5 @@ helm repo add eks https://aws.github.io/eks-charts
helm repo update eks

terraform output -raw -state=terraform/terraform.tfstate load_balancer_controller_helm_values | \
helm install aws-load-balancer-controller eks/aws-load-balancer-controller --version 1.5.3 -n kube-system --values -
helm install aws-load-balancer-controller eks/aws-load-balancer-controller --version 1.7.1 -n kube-system --values -
```
28 changes: 14 additions & 14 deletions eks/terraform/modules/bastion/README.md
View file
Expand Up @@ -4,13 +4,13 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 5.26.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 5.39.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.26.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.39.0 |

## Modules

Expand All @@ -20,18 +20,18 @@ No modules.

| Name | Type |
|------|------|
| [aws_iam_instance_profile.bastion](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/iam_instance_profile) | resource |
| [aws_iam_role.bastion](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/iam_role) | resource |
| [aws_iam_role_policy_attachment.bastion_AmazonSSMManagedInstanceCore](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/iam_role_policy_attachment) | resource |
| [aws_instance.bastion](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/instance) | resource |
| [aws_key_pair.bastion](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/key_pair) | resource |
| [aws_security_group.bastion](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/security_group) | resource |
| [aws_security_group_rule.bastion_egress](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/security_group_rule) | resource |
| [aws_security_group_rule.bastion_ssh](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/security_group_rule) | resource |
| [aws_security_group_rule.cluster_from_bastion](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/security_group_rule) | resource |
| [aws_ami.amazon-linux](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/data-sources/ami) | data source |
| [aws_iam_policy_document.bastion](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/data-sources/iam_policy_document) | data source |
| [aws_partition.current](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/data-sources/partition) | data source |
| [aws_iam_instance_profile.bastion](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/iam_instance_profile) | resource |
| [aws_iam_role.bastion](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/iam_role) | resource |
| [aws_iam_role_policy_attachment.bastion_AmazonSSMManagedInstanceCore](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/iam_role_policy_attachment) | resource |
| [aws_instance.bastion](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/instance) | resource |
| [aws_key_pair.bastion](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/key_pair) | resource |
| [aws_security_group.bastion](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/security_group) | resource |
| [aws_security_group_rule.bastion_egress](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/security_group_rule) | resource |
| [aws_security_group_rule.bastion_ssh](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/security_group_rule) | resource |
| [aws_security_group_rule.cluster_from_bastion](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/security_group_rule) | resource |
| [aws_ami.amazon-linux](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/data-sources/ami) | data source |
| [aws_iam_policy_document.bastion](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/data-sources/iam_policy_document) | data source |
| [aws_partition.current](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/data-sources/partition) | data source |

## Inputs

Expand Down
2 changes: 1 addition & 1 deletion eks/terraform/modules/bastion/versions.tf
View file
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "5.26.0"
version = "5.39.0"
}
}
}
16 changes: 8 additions & 8 deletions eks/terraform/modules/broker-node-group/README.md
View file
Expand Up @@ -4,13 +4,13 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.3 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 5.26.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | 5.39.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.26.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.39.0 |

## Modules

Expand All @@ -20,12 +20,12 @@ No modules.

| Name | Type |
|------|------|
| [aws_autoscaling_group_tag.labels_tags](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/autoscaling_group_tag) | resource |
| [aws_autoscaling_group_tag.name_tag](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/autoscaling_group_tag) | resource |
| [aws_autoscaling_group_tag.resources_tags](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/autoscaling_group_tag) | resource |
| [aws_autoscaling_group_tag.taints_tags](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/autoscaling_group_tag) | resource |
| [aws_eks_node_group.this](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/eks_node_group) | resource |
| [aws_launch_template.this](https://registry.terraform.io/providers/hashicorp/aws/5.26.0/docs/resources/launch_template) | resource |
| [aws_autoscaling_group_tag.labels_tags](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/autoscaling_group_tag) | resource |
| [aws_autoscaling_group_tag.name_tag](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/autoscaling_group_tag) | resource |
| [aws_autoscaling_group_tag.resources_tags](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/autoscaling_group_tag) | resource |
| [aws_autoscaling_group_tag.taints_tags](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/autoscaling_group_tag) | resource |
| [aws_eks_node_group.this](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/eks_node_group) | resource |
| [aws_launch_template.this](https://registry.terraform.io/providers/hashicorp/aws/5.39.0/docs/resources/launch_template) | resource |

## Inputs

Expand Down
2 changes: 1 addition & 1 deletion eks/terraform/modules/broker-node-group/versions.tf
View file
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "5.26.0"
version = "5.39.0"
}
}
}

0 comments on commit fc59e8c

Please sign in to comment.