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.

Sign up for GitHub

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

feat: Add ecr login #36

Merged
merged 25 commits into from
Dec 19, 2022
Merged

feat: Add ecr login #36

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
472fc2b
add helm login for example
Nov 17, 2022
9e9e482
add ecr token
Nov 17, 2022
ff9f676
Merge branch 'main' of https://github.com/season1946/terraform-aws-ek…
Dec 9, 2022
e884919
add emr container ack
Dec 9, 2022
d85232f
add emr container
Dec 9, 2022
337aaf4
update readme
Dec 9, 2022
d2ff61e
update readme
Dec 9, 2022
b4fb848
update readme
Dec 9, 2022
be36045
change emr policy
Dec 9, 2022
a9244a5
change emr policy
Dec 9, 2022
d67681d
change emr policy
Dec 9, 2022
f934cdb
change emr policy
Dec 9, 2022
07d30bf
update readme
Dec 9, 2022
6aade8f
update readme
Dec 9, 2022
f0016e3
change emr ack version
Dec 9, 2022
9510d9a
change emr version back
Dec 10, 2022
03ba034
add emr into example
Dec 10, 2022
19f6778
Merge branch 'aws-ia:main' into main
victorgu-github Dec 10, 2022
2986ec6
add ecr login
Dec 14, 2022
2fcd39a
add ecr login
Dec 14, 2022
2837db7
put ecr token into helm
Dec 15, 2022
d9f9a9f
add ecr login
Dec 15, 2022
6643881
update format
Dec 15, 2022
1b27ab0
update readme
Dec 15, 2022
1e0a451
pre-commit fix
Dec 19, 2022
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Examples codified under the [`examples`](https://github.com/aws-ia/terraform-aws
| [aws_iam_policy.emrcontainers](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
| [time_sleep.dataplane](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | 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_eks_cluster.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster) | data source |
| [aws_iam_policy.amp](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy) | data source |
| [aws_iam_policy.api_gatewayv2_admin](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy) | data source |
Expand Down
4 changes: 1 addition & 3 deletions examples/complete/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ data "aws_eks_cluster_auth" "this" {
name = module.eks_blueprints.eks_cluster_id
}

data "aws_ecr_authorization_token" "token" {}

data "aws_availability_zones" "available" {}
data "aws_caller_identity" "current" {}
data "aws_partition" "current" {}
Expand Down Expand Up @@ -104,7 +102,7 @@ module "eks_ack_addons" {
enable_rds = true
enable_amp = true
enable_emrcontainers = true

tags = local.tags
}

Expand Down
91 changes: 53 additions & 38 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ data "aws_eks_cluster" "this" {
name = local.cluster_id
}

# Equivalent of aws ecr get-login
data "aws_ecrpublic_authorization_token" "token" {}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this data source


locals {
# this makes downstream resources wait for data plane to be ready
cluster_id = time_sleep.dataplane.triggers["cluster_id"]
Expand Down Expand Up @@ -52,12 +55,14 @@ module "api_gatewayv2" {

helm_config = merge(
{
name = local.api_gatewayv2_name
chart = "apigatewayv2-chart"
repository = "oci://public.ecr.aws/aws-controllers-k8s"
version = "v0.1.4"
namespace = local.api_gatewayv2_name
description = "ACK API Gateway Controller v2 Helm chart deployment configuration"
name = local.api_gatewayv2_name
chart = "apigatewayv2-chart"
repository = "oci://public.ecr.aws/aws-controllers-k8s"
version = "v0.1.4"
namespace = local.api_gatewayv2_name
repository_username = data.aws_ecrpublic_authorization_token.token.user_name
repository_password = data.aws_ecrpublic_authorization_token.token.password
Comment on lines +63 to +64
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

repalce the data source values with ecr_username and ecr_passsword

description = "ACK API Gateway Controller v2 Helm chart deployment configuration"
values = [
# shortens pod name from `ack-api-gatewayv2-apigatewayv2-chart-xxxxxxxxxxxxx` to `ack-api-gatewayv2-xxxxxxxxxxxxx`
<<-EOT
Expand Down Expand Up @@ -126,12 +131,14 @@ module "dynamodb" {

helm_config = merge(
{
name = local.dynamodb_name
chart = "dynamodb-chart"
repository = "oci://public.ecr.aws/aws-controllers-k8s"
version = "v0-stable"
namespace = local.dynamodb_name
description = "ACK DynamoDB Controller v2 Helm chart deployment configuration"
name = local.dynamodb_name
chart = "dynamodb-chart"
repository = "oci://public.ecr.aws/aws-controllers-k8s"
version = "v0-stable"
namespace = local.dynamodb_name
repository_username = data.aws_ecrpublic_authorization_token.token.user_name
repository_password = data.aws_ecrpublic_authorization_token.token.password
Comment on lines +139 to +140
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above comment

description = "ACK DynamoDB Controller v2 Helm chart deployment configuration"
values = [
# shortens pod name from `ack-dynamodb-dynamodb-chart-xxxxxxxxxxxxx` to `ack-dynamodb-xxxxxxxxxxxxx`
<<-EOT
Expand Down Expand Up @@ -191,12 +198,14 @@ module "s3" {

helm_config = merge(
{
name = local.s3_name
chart = "s3-chart"
repository = "oci://public.ecr.aws/aws-controllers-k8s"
version = "v0.1.5"
namespace = local.s3_name
description = "ACK S3 Controller v2 Helm chart deployment configuration"
name = local.s3_name
chart = "s3-chart"
repository = "oci://public.ecr.aws/aws-controllers-k8s"
version = "v0.1.5"
namespace = local.s3_name
repository_username = data.aws_ecrpublic_authorization_token.token.user_name
repository_password = data.aws_ecrpublic_authorization_token.token.password
Comment on lines +206 to +207
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above comment

description = "ACK S3 Controller v2 Helm chart deployment configuration"
values = [
# shortens pod name from `ack-s3-s3-chart-xxxxxxxxxxxxx` to `ack-s3-xxxxxxxxxxxxx`
<<-EOT
Expand Down Expand Up @@ -256,13 +265,15 @@ module "rds" {

helm_config = merge(
{
name = local.rds_name
chart = "rds-chart"
repository = "oci://public.ecr.aws/aws-controllers-k8s"
version = "v0.1.1"
namespace = local.rds_name
create_namespace = true
description = "ACK RDS Controller v2 Helm chart deployment configuration"
name = local.rds_name
chart = "rds-chart"
repository = "oci://public.ecr.aws/aws-controllers-k8s"
version = "v0.1.1"
namespace = local.rds_name
repository_username = data.aws_ecrpublic_authorization_token.token.user_name
repository_password = data.aws_ecrpublic_authorization_token.token.password
Comment on lines +273 to +274
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above comment

create_namespace = true
description = "ACK RDS Controller v2 Helm chart deployment configuration"
values = [
# shortens pod name from `ack-rds-rds-chart-xxxxxxxxxxxxx` to `ack-rds-xxxxxxxxxxxxx`
<<-EOT
Expand Down Expand Up @@ -322,13 +333,15 @@ module "amp" {

helm_config = merge(
{
name = local.amp_name
chart = "prometheusservice-chart"
repository = "oci://public.ecr.aws/aws-controllers-k8s"
version = "v0.1.1"
namespace = local.amp_name
create_namespace = true
description = "ACK amp Controller v2 Helm chart deployment configuration"
name = local.amp_name
chart = "prometheusservice-chart"
repository = "oci://public.ecr.aws/aws-controllers-k8s"
version = "v0.1.1"
namespace = local.amp_name
repository_username = data.aws_ecrpublic_authorization_token.token.user_name
repository_password = data.aws_ecrpublic_authorization_token.token.password
Comment on lines +341 to +342
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above comment

create_namespace = true
description = "ACK amp Controller v2 Helm chart deployment configuration"
values = [
# shortens pod name from `ack-amp-amp-chart-xxxxxxxxxxxxx` to `ack-amp-xxxxxxxxxxxxx`
<<-EOT
Expand Down Expand Up @@ -388,12 +401,14 @@ module "emrcontainers" {

helm_config = merge(
{
name = local.emr_name
chart = "emrcontainers-chart"
repository = "oci://public.ecr.aws/aws-controllers-k8s"
version = "v0-stable"
namespace = local.emr_name
description = "Helm Charts for the emrcontainers controller for AWS Controllers for Kubernetes (ACK)"
name = local.emr_name
chart = "emrcontainers-chart"
repository = "oci://public.ecr.aws/aws-controllers-k8s"
version = "v0-stable"
namespace = local.emr_name
repository_username = data.aws_ecrpublic_authorization_token.token.user_name
repository_password = data.aws_ecrpublic_authorization_token.token.password
Comment on lines +409 to +410
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above comment

description = "Helm Charts for the emrcontainers controller for AWS Controllers for Kubernetes (ACK)"
values = [
# shortens pod name from `ack-emrcontainers-emrcontainers-chart-xxxxxxxxxxxxx` to `ack-emrcontainers-xxxxxxxxxxxxx`
<<-EOT
Expand Down