Skip to content

No kubectl #15

Merged
merged 41 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
ac4f0e3
try kubernetes_manifest
morga471 Jan 22, 2025
39e8c27
minor
morga471 Jan 22, 2025
1d8c1aa
updated ver
morga471 Jan 22, 2025
8817640
add v
morga471 Jan 22, 2025
58ed4f6
add custom helm charts
morga471 Jan 22, 2025
d429bf8
vars
morga471 Jan 23, 2025
bc59b27
more renames
morga471 Jan 23, 2025
d37c9ca
yaml
morga471 Jan 23, 2025
f815a13
simpler
morga471 Jan 23, 2025
5d830dc
tasg
morga471 Jan 23, 2025
29c4242
fromJson
morga471 Jan 23, 2025
6b31095
native tf and lints
morga471 Jan 23, 2025
9bbcad0
up one
morga471 Jan 23, 2025
2939ea6
separate files
morga471 Jan 23, 2025
241ab96
expireAfter
morga471 Jan 23, 2025
44d6127
spec.template.spec.expireAfter
morga471 Jan 23, 2025
ddcca28
.sh not .k8s.aws
morga471 Jan 23, 2025
c7156e2
expireAfter issues
morga471 Jan 23, 2025
9ec633a
update depends
morga471 Jan 23, 2025
88349fb
add chart for crds
morga471 Jan 23, 2025
f8606b7
update depends
morga471 Jan 23, 2025
0d45c90
update depends
morga471 Jan 24, 2025
b0ce823
not this
morga471 Jan 24, 2025
64cfbd1
maybe
morga471 Jan 24, 2025
f172757
not this
morga471 Jan 24, 2025
afc0fed
add wait
morga471 Jan 24, 2025
9ad0f6b
rollout true
morga471 Jan 24, 2025
49fd0f0
fields and rollout are mutually exclusive
morga471 Jan 24, 2025
2b0977e
comment ftm
morga471 Jan 24, 2025
8395be0
add ref to helm chart
morga471 Jan 24, 2025
1c2717d
add values
morga471 Jan 24, 2025
6771246
add index to metadata
morga471 Jan 24, 2025
ba3304b
use chart name
morga471 Jan 24, 2025
d9dbf79
how about now
morga471 Jan 24, 2025
32f77ee
locals?
morga471 Jan 24, 2025
96e18f2
add pool back
morga471 Jan 24, 2025
13d8637
readme
morga471 Jan 25, 2025
b6206c4
cruft
morga471 Jan 25, 2025
00d4e41
fix pre-commit
morga471 Jan 25, 2025
7b43032
remove commented code
morga471 Jan 25, 2025
699a05d
add tags
morga471 Jan 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ repos:
- id: trailing-whitespace
args: [--markdown-linebreak-ext=md]
exclude: CHANGELOG.md

- id: check-yaml
- id: check-merge-conflict
- id: check-executables-have-shebangs
Expand Down
170 changes: 0 additions & 170 deletions .pre-commit-hooks.yaml

This file was deleted.

21 changes: 9 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,48 +20,45 @@ The module deploys Karpenter needed AWS resources, namely in IAM. It copies the
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.14.0 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.11.0 |
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | >= 1.14.0 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.23.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.73.0 |
| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.16.1 |
| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | 1.14.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.84.0 |
| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.17.0 |
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.35.1 |

## Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_images"></a> [images](#module\_images) | git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/ | tf-upgrade |
| <a name="module_karpenter_resources"></a> [karpenter\_resources](#module\_karpenter\_resources) | git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git//modules/karpenter | v20.24.3 |
| <a name="module_karpenter_resources"></a> [karpenter\_resources](#module\_karpenter\_resources) | git@github.e.it.census.gov:SCT-Engineering/terraform-aws-eks.git//modules/karpenter | v20.33.1 |

## Resources

| Name | Type |
|------|------|
| [aws_iam_instance_profile.karpenter_node_instance_profile](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_instance_profile) | resource |
| [helm_release.karpenter](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
| [kubectl_manifest.karpenter_ec2_node_class](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.karpenter_node_pool](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
| [kubernetes_manifest.karpenter_node_class](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/manifest) | resource |
| [kubernetes_manifest.karpenter_node_pool](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/manifest) | resource |
| [aws_arn.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/arn) | data source |
| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
| [aws_default_tags.default_tags](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/default_tags) | data source |
| [aws_ecr_image.karpenter_image](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ecr_image) | data source |
| [aws_ecr_image.kubectl_image](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ecr_image) | data source |

## Inputs

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_cluster_endpoint"></a> [cluster\_endpoint](#input\_cluster\_endpoint) | Endpoint for your Kubernetes API server | `string` | n/a | yes |
| <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | EKS cluster name name component used through out the EKS cluster describing its purpose (ex: dice-dev) | `string` | n/a | yes |
| <a name="input_karpenter_helm_chart"></a> [karpenter\_helm\_chart](#input\_karpenter\_helm\_chart) | Which helm chart of karpenter | `string` | `"1.0.6"` | no |
| <a name="input_karpenter_helm_chart"></a> [karpenter\_helm\_chart](#input\_karpenter\_helm\_chart) | Which helm chart of karpenter | `string` | `"1.1.1"` | no |
| <a name="input_karpenter_helm_repo"></a> [karpenter\_helm\_repo](#input\_karpenter\_helm\_repo) | Helm repo for official karpenter chart | `string` | `"oci://public.ecr.aws/karpenter"` | no |
| <a name="input_karpenter_node_group_name"></a> [karpenter\_node\_group\_name](#input\_karpenter\_node\_group\_name) | The cluster node group that will host karpenter, should not be a karpenter managed node group | `string` | n/a | yes |
| <a name="input_karpenter_tag"></a> [karpenter\_tag](#input\_karpenter\_tag) | Which tag of karpenter image | `string` | `"1.0.6"` | no |
| <a name="input_kubectl_tag"></a> [kubectl\_tag](#input\_kubectl\_tag) | Which tag of kubectl image | `string` | `"1.30.4"` | no |
| <a name="input_karpenter_tag"></a> [karpenter\_tag](#input\_karpenter\_tag) | Which tag of karpenter image | `string` | `"1.1.1"` | no |
| <a name="input_oidc_provider_arn"></a> [oidc\_provider\_arn](#input\_oidc\_provider\_arn) | The ARN of the OIDC Provider if `enable_irsa = true` | `string` | n/a | yes |
| <a name="input_profile"></a> [profile](#input\_profile) | AWS config profile | `string` | `""` | no |
| <a name="input_region"></a> [region](#input\_region) | AWS region | `string` | n/a | yes |
Expand Down
2 changes: 0 additions & 2 deletions aws_data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@ data "aws_caller_identity" "current" {}
data "aws_arn" "current" {
arn = data.aws_caller_identity.current.arn
}

data "aws_default_tags" "default_tags" {}
10 changes: 0 additions & 10 deletions copy_images.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
locals {
karpenter_key = format("%v#%v", "karpenter/controller", var.karpenter_tag)
kubectl_key = format("%v#%v", "bitnami/kubectl", var.kubectl_tag)

image_config = [
{
Expand All @@ -12,15 +11,6 @@ locals {
source_tag = var.karpenter_tag
tag = var.karpenter_tag
},
{
enabled = true
dest_path = null
name = "bitnami/kubectl"
source_image = "bitnami/kubectl"
source_registry = "docker.io"
source_tag = var.kubectl_tag
tag = var.kubectl_tag
},
]
}

Expand Down
63 changes: 0 additions & 63 deletions ec2_node_class.yaml.tpl

This file was deleted.

67 changes: 0 additions & 67 deletions ec2_node_pool.yaml.tpl

This file was deleted.

Loading