Skip to content

Commit

Permalink
Renaming fsx to netapp (#260)
Browse files Browse the repository at this point in the history
  • Loading branch information
@miguelhar
miguelhar authored Aug 23, 2024
1 parent 3cf2bbb commit 2bae486
Show file tree
Hide file tree
Showing 16 changed files with 78 additions and 78 deletions.
2 changes: 1 addition & 1 deletion modules/eks/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
| <a name="input_deploy_id"></a> [deploy\_id](#input\_deploy\_id) | Domino Deployment ID | `string` | n/a | yes |
| <a name="input_efs_security_group"></a> [efs\_security\_group](#input\_efs\_security\_group) | Security Group ID for EFS | `string` | `null` | no |
| <a name="input_eks"></a> [eks](#input\_eks) | service\_ipv4\_cidr = CIDR for EKS cluster kubernetes\_network\_config.<br> creation\_role\_name = Name of the role to import.<br> k8s\_version = EKS cluster k8s version.<br> nodes\_master Grants the nodes role system:master access. NOT recomended<br> kubeconfig = {<br> extra\_args = Optional extra args when generating kubeconfig.<br> path = Fully qualified path name to write the kubeconfig file.<br> }<br> public\_access = {<br> enabled = Enable EKS API public endpoint.<br> cidrs = List of CIDR ranges permitted for accessing the EKS public endpoint.<br> }<br> Custom role maps for aws auth configmap<br> custom\_role\_maps = {<br> rolearn = string<br> username = string<br> groups = list(string)<br> }<br> master\_role\_names = IAM role names to be added as masters in eks.<br> cluster\_addons = EKS cluster addons. vpc-cni is installed separately.<br> vpc\_cni = Configuration for AWS VPC CNI<br> ssm\_log\_group\_name = CloudWatch log group to send the SSM session logs to.<br> identity\_providers = Configuration for IDP(Identity Provider).<br> } | <pre>object({<br> service_ipv4_cidr = optional(string, "172.20.0.0/16")<br> creation_role_name = optional(string, null)<br> k8s_version = optional(string, "1.27")<br> nodes_master = optional(bool, false)<br> kubeconfig = optional(object({<br> extra_args = optional(string, "")<br> path = optional(string, null)<br> }), {})<br> public_access = optional(object({<br> enabled = optional(bool, false)<br> cidrs = optional(list(string), [])<br> }), {})<br> custom_role_maps = optional(list(object({<br> rolearn = string<br> username = string<br> groups = list(string)<br> })), [])<br> master_role_names = optional(list(string), [])<br> cluster_addons = optional(list(string), ["kube-proxy", "coredns", "vpc-cni"])<br> ssm_log_group_name = optional(string, "session-manager")<br> vpc_cni = optional(object({<br> prefix_delegation = optional(bool, false)<br> annotate_pod_ip = optional(bool, true)<br> }))<br> identity_providers = optional(list(object({<br> client_id = string<br> groups_claim = optional(string, null)<br> groups_prefix = optional(string, null)<br> identity_provider_config_name = string<br> issuer_url = optional(string, null)<br> required_claims = optional(string, null)<br> username_claim = optional(string, null)<br> username_prefix = optional(string, null)<br> })), []),<br> })</pre> | `{}` | no |
| <a name="input_fsx"></a> [fsx](#input\_fsx) | Configuration for FSX | <pre>object({<br> astra_trident_operator_role = optional(string, null)<br> svm = optional(object({<br> id = optional(string, null)<br> management_ip = optional(string, null)<br> nfs_ip = optional(string, null)<br> }), null)<br> filesystem = optional(object({<br> id = optional(string, null)<br> security_group_id = optional(string, null)<br> }), null)<br> })</pre> | `null` | no |
| <a name="input_ignore_tags"></a> [ignore\_tags](#input\_ignore\_tags) | Tag keys to be ignored by the aws provider. | `list(string)` | `[]` | no |
| <a name="input_kms_info"></a> [kms\_info](#input\_kms\_info) | key\_id = KMS key id.<br> key\_arn = KMS key arn.<br> enabled = KMS key is enabled | <pre>object({<br> key_id = string<br> key_arn = string<br> enabled = bool<br> })</pre> | n/a | yes |
| <a name="input_netapp"></a> [netapp](#input\_netapp) | Configuration for NETAPP | <pre>object({<br> astra_trident_operator_role = optional(string, null)<br> svm = optional(object({<br> id = optional(string, null)<br> management_ip = optional(string, null)<br> nfs_ip = optional(string, null)<br> }), null)<br> filesystem = optional(object({<br> id = optional(string, null)<br> security_group_id = optional(string, null)<br> }), null)<br> })</pre> | `null` | no |
| <a name="input_network_info"></a> [network\_info](#input\_network\_info) | id = VPC ID.<br> subnets = {<br> public = List of public Subnets.<br> [{<br> name = Subnet name.<br> subnet\_id = Subnet ud<br> az = Subnet availability\_zone<br> az\_id = Subnet availability\_zone\_id<br> }]<br> private = List of private Subnets.<br> [{<br> name = Subnet name.<br> subnet\_id = Subnet ud<br> az = Subnet availability\_zone<br> az\_id = Subnet availability\_zone\_id<br> }]<br> pod = List of pod Subnets.<br> [{<br> name = Subnet name.<br> subnet\_id = Subnet ud<br> az = Subnet availability\_zone<br> az\_id = Subnet availability\_zone\_id<br> }]<br> } | <pre>object({<br> vpc_id = string<br> subnets = object({<br> public = list(object({<br> name = string<br> subnet_id = string<br> az = string<br> az_id = string<br> }))<br> private = list(object({<br> name = string<br> subnet_id = string<br> az = string<br> az_id = string<br> }))<br> pod = list(object({<br> name = string<br> subnet_id = string<br> az = string<br> az_id = string<br> }))<br> })<br> vpc_cidrs = optional(string, "10.0.0.0/16")<br> })</pre> | n/a | yes |
| <a name="input_node_iam_policies"></a> [node\_iam\_policies](#input\_node\_iam\_policies) | Additional IAM Policy Arns for Nodes | `list(string)` | n/a | yes |
| <a name="input_privatelink"></a> [privatelink](#input\_privatelink) | {<br> enabled = Enable Private Link connections.<br> namespace = Namespace for IAM Policy conditions.<br> monitoring\_bucket = Bucket for NLBs monitoring.<br> route53\_hosted\_zone\_name = Hosted zone for External DNS zone.<br> vpc\_endpoint\_services = [{<br> name = Name of the VPC Endpoint Service.<br> ports = List of ports exposing the VPC Endpoint Service. i.e [8080, 8081]<br> cert\_arn = Certificate ARN used by the NLB associated for the given VPC Endpoint Service.<br> private\_dns = Private DNS for the VPC Endpoint Service.<br> }]<br> } | <pre>object({<br> enabled = optional(bool, false)<br> namespace = optional(string, "domino-platform")<br> monitoring_bucket = optional(string, null)<br> route53_hosted_zone_name = optional(string, null)<br> vpc_endpoint_services = optional(list(object({<br> name = optional(string)<br> ports = optional(list(number))<br> cert_arn = optional(string)<br> private_dns = optional(string)<br> })), [])<br> })</pre> | `{}` | no |
Expand Down
8 changes: 4 additions & 4 deletions modules/eks/node-group.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ moved {
to = aws_security_group_rule.shared_storage["efs_2049_2049"]
}

### FSX
### NETAPP

locals {
shared_storage_type = var.fsx != null ? "fsx" : "efs"
inbound_rules = local.shared_storage_type == "fsx" ? {
shared_storage_type = var.netapp != null ? "netapp" : "efs"
inbound_rules = local.shared_storage_type == "netapp" ? {
rules = [
{ protocol = "all", from_port = 0, to_port = 65535, description = "All traffic from EKS nodes." },
]
security_group_id = var.fsx.filesystem.security_group_id
security_group_id = var.netapp.filesystem.security_group_id
} : {
rules = [
{ protocol = "tcp", from_port = 2049, to_port = 2049, description = "EFS access" }
Expand Down
2 changes: 1 addition & 1 deletion modules/eks/submodules/k8s/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ No modules.
|------|-------------|------|---------|:--------:|
| <a name="input_bastion_info"></a> [bastion\_info](#input\_bastion\_info) | user = Bastion username.<br> public\_ip = Bastion public ip.<br> security\_group\_id = Bastion sg id.<br> ssh\_bastion\_command = Command to ssh onto bastion. | <pre>object({<br> user = string<br> public_ip = string<br> security_group_id = string<br> ssh_bastion_command = string<br> })</pre> | n/a | yes |
| <a name="input_eks_info"></a> [eks\_info](#input\_eks\_info) | cluster = {<br> version = K8s version.<br> arn = EKS Cluster arn.<br> security\_group\_id = EKS Cluster security group id.<br> endpoint = EKS Cluster API endpoint.<br> roles = Default IAM Roles associated with the EKS cluster. {<br> name = string<br> arn = string<br> }<br> custom\_roles = Custom IAM Roles associated with the EKS cluster. {<br> rolearn = string<br> username = string<br> groups = list(string)<br> }<br> oidc = {<br> arn = OIDC provider ARN.<br> url = OIDC provider url.<br> }<br> }<br> nodes = {<br> security\_group\_id = EKS Nodes security group id.<br> roles = IAM Roles associated with the EKS Nodes.{<br> name = string<br> arn = string<br> }<br> }<br> kubeconfig = Kubeconfig details.{<br> path = string<br> extra\_args = string<br> }<br> calico = {<br> version = Configuration the version for Calico<br> image\_registry = Configure the image registry for Calico<br> } | <pre>object({<br> cluster = object({<br> version = string<br> arn = string<br> security_group_id = string<br> endpoint = string<br> roles = list(object({<br> name = string<br> arn = string<br> }))<br> custom_roles = list(object({<br> rolearn = string<br> username = string<br> groups = list(string)<br> }))<br> oidc = object({<br> arn = string<br> url = string<br> })<br> })<br> nodes = object({<br> nodes_master = bool<br> security_group_id = string<br> roles = list(object({<br> name = string<br> arn = string<br> }))<br> })<br> kubeconfig = object({<br> path = string<br> extra_args = string<br> })<br> calico = object({<br> version = string<br> image_registry = string<br> })<br> })</pre> | n/a | yes |
| <a name="input_fsx"></a> [fsx](#input\_fsx) | Configuration for FSx | <pre>object({<br> astra_trident_operator_role = optional(string, null)<br> svm = optional(object({<br> id = optional(string, null)<br> management_ip = optional(string, null)<br> nfs_ip = optional(string, null)<br> }), null)<br> filesystem = optional(object({<br> id = optional(string, null)<br> }), null)<br> })</pre> | `null` | no |
| <a name="input_netapp"></a> [netapp](#input\_netapp) | Configuration for NetApp | <pre>object({<br> astra_trident_operator_role = optional(string, null)<br> svm = optional(object({<br> id = optional(string, null)<br> management_ip = optional(string, null)<br> nfs_ip = optional(string, null)<br> }), null)<br> filesystem = optional(object({<br> id = optional(string, null)<br> }), null)<br> })</pre> | `null` | no |
| <a name="input_ssh_key"></a> [ssh\_key](#input\_ssh\_key) | path = SSH private key filepath.<br> key\_pair\_name = AWS key\_pair name. | <pre>object({<br> path = string<br> key_pair_name = string<br> })</pre> | n/a | yes |
| <a name="input_use_fips_endpoint"></a> [use\_fips\_endpoint](#input\_use\_fips\_endpoint) | Use aws FIPS endpoints | `bool` | `false` | no |

Expand Down
2 changes: 1 addition & 1 deletion modules/eks/submodules/k8s/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ locals {
calico_version = var.eks_info.calico.version
calico_fips_mode = var.use_fips_endpoint ? "Enabled" : "Disabled"
calico_image_registry = var.eks_info.calico.image_registry
fsx = var.fsx
netapp = var.netapp
})
}

Expand Down
4 changes: 2 additions & 2 deletions modules/eks/submodules/k8s/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ variable "use_fips_endpoint" {
default = false
}

variable "fsx" {
description = "Configuration for FSx"
variable "netapp" {
description = "Configuration for NetApp"
type = object({
astra_trident_operator_role = optional(string, null)
svm = optional(object({
Expand Down
4 changes: 2 additions & 2 deletions modules/eks/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@ variable "calico" {
}


variable "fsx" {
description = "Configuration for FSX"
variable "netapp" {
description = "Configuration for NETAPP"
type = object({
astra_trident_operator_role = optional(string, null)
svm = optional(object({
Expand Down
Loading

0 comments on commit 2bae486

Please sign in to comment.