Skip to content

Commit

Permalink
deprecate: replace aws-calico by aws-network-policy-agent
Browse files Browse the repository at this point in the history
  • Loading branch information
Downager committed Dec 26, 2023
1 parent 4c0d5c7 commit 00b8a5a
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 704 deletions.
2 changes: 0 additions & 2 deletions docs/variables/master.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ This document gives an overview of variables used in the Ignition of the Kuberne
| [ignition_file.apiserver_kubelet_client_key](https://registry.terraform.io/providers/community-terraform-providers/ignition/2.1.2/docs/data-sources/file) | data source |
| [ignition_file.audit_log_policy](https://registry.terraform.io/providers/community-terraform-providers/ignition/2.1.2/docs/data-sources/file) | data source |
| [ignition_file.aws_cloud_controller_manager](https://registry.terraform.io/providers/community-terraform-providers/ignition/2.1.2/docs/data-sources/file) | data source |
| [ignition_file.aws_cni_calico_yaml](https://registry.terraform.io/providers/community-terraform-providers/ignition/2.1.2/docs/data-sources/file) | data source |
| [ignition_file.aws_vpc_cni_yaml](https://registry.terraform.io/providers/community-terraform-providers/ignition/2.1.2/docs/data-sources/file) | data source |
| [ignition_file.bootstrap_token_rbac](https://registry.terraform.io/providers/community-terraform-providers/ignition/2.1.2/docs/data-sources/file) | data source |
| [ignition_file.bootstrap_token_secret](https://registry.terraform.io/providers/community-terraform-providers/ignition/2.1.2/docs/data-sources/file) | data source |
Expand Down Expand Up @@ -83,7 +82,6 @@ This document gives an overview of variables used in the Ignition of the Kuberne
| <a name="input_containers"></a> [containers](#input\_containers) | Desired containers(kube-apiserver, kube-controller-manager, cfssl, coredns, and so on) repo and tag. | <pre>map(object({<br> repo = string<br> tag = string<br> }))</pre> | `{}` | no |
| <a name="input_controller_manager_flags"></a> [controller\_manager\_flags](#input\_controller\_manager\_flags) | The flags of kube-controller-manager. The variables need to follow https://kubernetes.io/docs/reference/command-line-tools-reference/kube-controller-manager/. Do not use underline. | `map(any)` | `{}` | no |
| <a name="input_coredns_config"></a> [coredns\_config](#input\_coredns\_config) | The configuration of CoreDNS. | `map(any)` | `{}` | no |
| <a name="input_enable_calico"></a> [enable\_calico](#input\_enable\_calico) | (optional) whether enable the calico | `bool` | `false` | no |
| <a name="input_enable_eni_prefix"></a> [enable\_eni\_prefix](#input\_enable\_eni\_prefix) | (Optional) assign prefix to AWS EC2 network interface | `bool` | `true` | no |
| <a name="input_enable_iam_auth"></a> [enable\_iam\_auth](#input\_enable\_iam\_auth) | Enable AWS IAM authenticator or not. | `bool` | `false` | no |
| <a name="input_enable_irsa"></a> [enable\_irsa](#input\_enable\_irsa) | Enable AWS IAM role service account or not. | `bool` | `false` | no |
Expand Down
1 change: 0 additions & 1 deletion modules/kubelet/files/scripts/kubelet-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ exec /opt/bin/nerdctl run --name kubelet \
--volume /sys/fs/cgroup:/sys/fs/cgroup \
--volume /usr/share/ca-certificates:/usr/share/ca-certificates:ro \
--volume /var/lib/containerd/:/var/lib/containerd \
--volume /var/lib/calico:/var/lib/calico:ro \
--volume /var/lib/kubelet:/var/lib/kubelet:rshared \
--volume /var/log:/var/log \
--volume /var/run/lock:/var/run/lock \
Expand Down
17 changes: 0 additions & 17 deletions network-plugins.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,6 @@ data "ignition_file" "aws_vpc_cni_yaml" {
}
}

data "ignition_file" "aws_cni_calico_yaml" {
count = var.enable_calico ? 1 : 0

mode = 420
path = "${local.etc_path}/addons/calico-cni.yaml"
overwrite = true

content {
content = templatefile("${path.module}/templates/network-plugins/amazon-vpc/calico.yaml.tpl", {
node_image = "${local.containers["calico_node"].repo}:${local.containers["calico_node"].tag}"
typha_image = "${local.containers["calico_typha"].repo}:${local.containers["calico_typha"].tag}"
autoscaler_image = "${local.containers["calico_autoscaler"].repo}:${local.containers["calico_autoscaler"].tag}"
})
mime = "text/yaml"
}
}

data "ignition_file" "flannel_yaml" {
count = var.network_plugin == "flannel" ? 1 : 0

Expand Down
3 changes: 0 additions & 3 deletions outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ output "files" {
var.network_plugin == "cilium-vxlan" ? [
data.ignition_file.cilium_vxlan_yaml[0].rendered,
] : [],
var.enable_calico ? [
data.ignition_file.aws_cni_calico_yaml[0].rendered,
] : [],
module.kubelet.files,
module.admin_kubeconfig.files,
module.controller_manager_kubeconfig.files,
Expand Down
Loading

0 comments on commit 00b8a5a

Please sign in to comment.