Skip to content

Commit 40f9a5a

Browse files
authored
Merge pull request #25 from Ajay-sops/main
did changes in vpc-cni module for updating its envirnoment variable
2 parents 1b024d4 + a455b49 commit 40f9a5a

6 files changed

Lines changed: 41 additions & 0 deletions

File tree

examples/complete/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ This example is useful for users who are new to a module and want to quickly lea
1414
|------|---------|
1515
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
1616
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.43.0 |
17+
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | >= 1.7.0 |
1718
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.0.2 |
1819

1920
## Providers

examples/complete/provider.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,10 @@ provider "helm" {
2626
token = data.aws_eks_cluster_auth.cluster.token
2727
}
2828
}
29+
30+
provider "kubectl" {
31+
host = data.aws_eks_cluster.cluster.endpoint
32+
cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority.0.data)
33+
token = data.aws_eks_cluster_auth.cluster.token
34+
load_config_file = false
35+
}

examples/complete/version.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,9 @@ terraform {
99
source = "hashicorp/kubernetes"
1010
version = ">= 2.0.2"
1111
}
12+
kubectl = {
13+
source = "gavinbunney/kubectl"
14+
version = ">= 1.7.0"
15+
}
1216
}
1317
}

modules/kubernetes-addons/aws-vpc-cni/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ The Amazon VPC CNI plugin for Kubernetes is the networking plugin for pod networ
1010
|------|---------|
1111
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
1212
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.10 |
13+
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | >= 1.7.0 |
1314

1415
## Providers
1516

1617
| Name | Version |
1718
|------|---------|
1819
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.10 |
20+
| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | >= 1.7.0 |
1921

2022
## Modules
2123

@@ -29,6 +31,7 @@ The Amazon VPC CNI plugin for Kubernetes is the networking plugin for pod networ
2931
|------|------|
3032
| [aws_eks_addon.vpc_cni](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_addon) | resource |
3133
| [aws_iam_policy.cni_ipv6_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
34+
| [kubectl_manifest.update_aws_vpc_cni](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
3235
| [aws_eks_addon_version.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_addon_version) | data source |
3336
| [aws_iam_policy_document.ipv6_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
3437

modules/kubernetes-addons/aws-vpc-cni/main.tf

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,25 @@ data "aws_iam_policy_document" "ipv6_policy" {
7878
resources = ["arn:${var.addon_context.aws_partition_id}:ec2:*:*:network-interface/*"]
7979
}
8080
}
81+
82+
83+
84+
resource "kubectl_manifest" "update_aws_vpc_cni" {
85+
yaml_body = <<-EOT
86+
apiVersion: apps/v1
87+
kind: DaemonSet
88+
metadata:
89+
name: aws-node
90+
namespace: kube-system
91+
spec:
92+
template:
93+
spec:
94+
containers:
95+
- name: aws-node
96+
env:
97+
- name: ENABLE_PREFIX_DELEGATION
98+
value: "true"
99+
EOT
100+
101+
depends_on = [aws_eks_addon.vpc_cni]
102+
}

modules/kubernetes-addons/aws-vpc-cni/versions.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,9 @@ terraform {
66
source = "hashicorp/aws"
77
version = ">= 4.10"
88
}
9+
kubectl = {
10+
source = "gavinbunney/kubectl"
11+
version = ">= 1.7.0"
12+
}
913
}
1014
}

0 commit comments

Comments
 (0)