Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: move karpenter ECR auth token and provider out of the module #2067

Merged
merged 31 commits into from
Jun 26, 2023
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c87fe31
fix(tigera-operator): do not manage CRDs by default
ArchiFleKs Jun 3, 2023
1b5c0a4
fix(aws/tigera-operator): do not manage CRDs by default
ArchiFleKs Jun 3, 2023
01962f7
fix: move karpenter ECR auth token and provider out of the module
oleksiimorozenko Jun 5, 2023
a4bf30a
fix: move karpenter ECR auth token and provider out of the module
oleksiimorozenko Jun 5, 2023
4e3792a
Fix pre-commit docs hook
oleksiimorozenko Jun 7, 2023
586b077
feat(charts): update helm release kong to v2.23.0 (#2068)
renovate[bot] Jun 5, 2023
5bc4840
feat(charts): update helm release traefik to v23.1.0 (#2069)
renovate[bot] Jun 6, 2023
e41f5b9
fix(charts): update helm release loki to v5.6.2 (#2070)
renovate[bot] Jun 6, 2023
47990b2
fix(charts): update helm release loki to v5.6.3 (#2071)
renovate[bot] Jun 7, 2023
49ba503
feat(charts): update helm release kube-prometheus-stack to v46.7.0 (#…
renovate[bot] Jun 7, 2023
b3cc764
feat(charts): update helm release external-dns to v1.13.0 (#2072)
renovate[bot] Jun 7, 2023
6a448d6
fix(charts): update helm release promtail to v6.11.3 (#2074)
renovate[bot] Jun 8, 2023
35bd8d4
fix(charts): update helm release velero to v4.0.3 (#2075)
renovate[bot] Jun 8, 2023
616e9bc
fix(charts): update helm release loki to v5.6.4 (#2076)
renovate[bot] Jun 8, 2023
05dec6b
feat(charts): update helm release prometheus-blackbox-exporter to v7.…
renovate[bot] Jun 8, 2023
7a8bcf5
feat(charts): update helm release kube-prometheus-stack to v46.8.0 (#…
renovate[bot] Jun 8, 2023
3e2d28c
fix(charts): update helm release aws-efs-csi-driver to v2.4.5 (#2079)
renovate[bot] Jun 9, 2023
7d9122f
fix(charts): update helm release cluster-autoscaler to v9.29.1 (#2080)
renovate[bot] Jun 14, 2023
3dd3edd
feat(charts): update helm release loki to v5.8.0 (#2084)
renovate[bot] Jun 14, 2023
0c0ac47
fix(charts): update helm release thanos to v12.6.3 (#2082)
renovate[bot] Jun 14, 2023
f64de33
fix(charts): update helm release secrets-store-csi-driver to v1.3.4 (…
renovate[bot] Jun 14, 2023
49499d5
fix(charts): update karpenter docker tag to v0.27.6 (#2083)
renovate[bot] Jun 14, 2023
8f811b9
feat(charts): update karpenter docker tag to v0.28.0 (#2085)
renovate[bot] Jun 15, 2023
0d4fea6
Update terrafodm docs
oleksiimorozenko Jun 15, 2023
359007c
feat(charts): update helm release sealed-secrets to v2.10.0 (#2086)
renovate[bot] Jun 15, 2023
a975f60
Merge branch 'main' into main
oleksiimorozenko Jun 15, 2023
5b2bdb0
Merge branch 'main' into main
oleksiimorozenko Jun 16, 2023
a2a2448
Merge branch 'main' into main
oleksiimorozenko Jun 18, 2023
6a1ebe6
Merge branch 'particuleio:main' into main
oleksiimorozenko Jun 21, 2023
6025dd3
Restore modules/aws/.terraform-docs.yml
oleksiimorozenko Jun 21, 2023
97d3acb
Merge branch 'main' into main
oleksiimorozenko Jun 26, 2023
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
2 changes: 0 additions & 2 deletions modules/aws/.terraform-docs.yml

This file was deleted.

20 changes: 9 additions & 11 deletions modules/aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,16 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing-

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.42 |
| <a name="provider_aws.ecr_public"></a> [aws.ecr\_public](#provider\_aws.ecr\_public) | >= 4.42 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.3.0 |
| <a name="provider_flux"></a> [flux](#provider\_flux) | 1.0.0-rc.5 |
| <a name="provider_github"></a> [github](#provider\_github) | ~> 5.0 |
| <a name="provider_helm"></a> [helm](#provider\_helm) | ~> 2.0 |
| <a name="provider_http"></a> [http](#provider\_http) | >= 3 |
| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | ~> 1.0 |
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | ~> 2.0, != 2.12 |
| <a name="provider_random"></a> [random](#provider\_random) | n/a |
| <a name="provider_time"></a> [time](#provider\_time) | n/a |
| <a name="provider_tls"></a> [tls](#provider\_tls) | ~> 4.0 |
| <a name="provider_github"></a> [github](#provider\_github) | 5.27.0 |
| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.10.1 |
| <a name="provider_http"></a> [http](#provider\_http) | 3.3.0 |
| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | 1.14.0 |
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.21.1 |
| <a name="provider_random"></a> [random](#provider\_random) | 3.5.1 |
| <a name="provider_time"></a> [time](#provider\_time) | 0.9.1 |
| <a name="provider_tls"></a> [tls](#provider\_tls) | 4.0.4 |

## Modules

Expand Down Expand Up @@ -310,7 +309,6 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing-
| [tls_self_signed_cert.thanos-tls-querier-ca-cert](https://registry.terraform.io/providers/hashicorp/tls/latest/docs/resources/self_signed_cert) | resource |
| [tls_self_signed_cert.webhook_issuer_tls](https://registry.terraform.io/providers/hashicorp/tls/latest/docs/resources/self_signed_cert) | resource |
| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
| [aws_ecrpublic_authorization_token.token](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ecrpublic_authorization_token) | data source |
| [aws_iam_policy_document.aws-ebs-csi-driver](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
| [aws_iam_policy_document.aws-ebs-csi-driver_default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
| [aws_iam_policy_document.aws-ebs-csi-driver_kms](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
Expand Down
17 changes: 5 additions & 12 deletions modules/aws/karpenter.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ locals {
irsa_namespace_service_accounts = ["karpenter:karpenter"]
allowed_cidrs = ["0.0.0.0/0"]
iam_role_arn = ""
repository_username = ""
repository_password = ""

},
var.karpenter
)
Expand All @@ -34,16 +37,6 @@ locals {

}

data "aws_ecrpublic_authorization_token" "token" {
provider = aws.ecr_public
}

provider "aws" {
region = "us-east-1"
alias = "ecr_public"
}


data "aws_iam_policy_document" "karpenter_additional" {
count = local.karpenter["enabled"] ? 1 : 0

Expand Down Expand Up @@ -111,8 +104,8 @@ resource "kubernetes_namespace" "karpenter" {
resource "helm_release" "karpenter" {
count = local.karpenter["enabled"] ? 1 : 0
repository = local.karpenter["repository"]
repository_username = data.aws_ecrpublic_authorization_token.token.user_name
repository_password = data.aws_ecrpublic_authorization_token.token.password
repository_username = local.karpenter["repository_username"]
repository_password = local.karpenter["repository_password"]
name = local.karpenter["name"]
chart = local.karpenter["chart"]
version = local.karpenter["chart_version"]
Expand Down