fix: Ensure a default ip_family value is provided to guarantee a CNI policy is attached to nodes (#2967)

This commit is contained in:
Bryant Biggs
2024-03-11 11:02:59 -04:00
committed by GitHub
parent a95487e5f2
commit 29dcca335d
13 changed files with 17 additions and 12 deletions

View File

@@ -91,7 +91,7 @@ module "self_managed_node_group" {
| <a name="input_capacity_reservation_specification"></a> [capacity\_reservation\_specification](#input\_capacity\_reservation\_specification) | Targeting for EC2 capacity reservations | `any` | `{}` | no |
| <a name="input_cluster_auth_base64"></a> [cluster\_auth\_base64](#input\_cluster\_auth\_base64) | Base64 encoded CA of associated EKS cluster | `string` | `""` | no |
| <a name="input_cluster_endpoint"></a> [cluster\_endpoint](#input\_cluster\_endpoint) | Endpoint of associated EKS cluster | `string` | `""` | no |
| <a name="input_cluster_ip_family"></a> [cluster\_ip\_family](#input\_cluster\_ip\_family) | The IP family used to assign Kubernetes pod and service addresses. Valid values are `ipv4` (default) and `ipv6` | `string` | `null` | no |
| <a name="input_cluster_ip_family"></a> [cluster\_ip\_family](#input\_cluster\_ip\_family) | The IP family used to assign Kubernetes pod and service addresses. Valid values are `ipv4` (default) and `ipv6` | `string` | `"ipv4"` | no |
| <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | Name of associated EKS cluster | `string` | `""` | no |
| <a name="input_cluster_primary_security_group_id"></a> [cluster\_primary\_security\_group\_id](#input\_cluster\_primary\_security\_group\_id) | The ID of the EKS cluster primary security group to associate with the instance(s). This is the security group that is automatically created by the EKS service | `string` | `null` | no |
| <a name="input_cluster_service_cidr"></a> [cluster\_service\_cidr](#input\_cluster\_service\_cidr) | The CIDR block (IPv4 or IPv6) used by the cluster to assign Kubernetes service IP addresses. This is derived from the cluster itself | `string` | `""` | no |

View File

@@ -41,7 +41,7 @@ module "user_data" {
################################################################################
data "aws_ec2_instance_type" "this" {
count = var.enable_efa_support && local.instance_type_provided ? 1 : 0
count = var.create && var.enable_efa_support && local.instance_type_provided ? 1 : 0
instance_type = var.instance_type
}

View File

@@ -549,7 +549,7 @@ variable "create_iam_instance_profile" {
variable "cluster_ip_family" {
description = "The IP family used to assign Kubernetes pod and service addresses. Valid values are `ipv4` (default) and `ipv6`"
type = string
default = null
default = "ipv4"
}
variable "iam_instance_profile_arn" {