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

Revert "Feat/sagemaker llms update main" #187

Closed
wants to merge 1 commit into from
Closed

Revert "Feat/sagemaker llms update main" #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 2 additions & 33 deletions infra/airflow_dag_processor.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,28 +200,10 @@ data "aws_iam_policy_document" "airflow_team" {
actions = [
"sts:AssumeRole",
]

resources = var.airflow_dag_processors[count.index].assume_roles
}
}

dynamic "statement" {
for_each = length(var.airflow_dag_processors[count.index].buckets) > 0 ? [1] : []
content {
actions = [
"s3:ListBucket",
]
resources = var.airflow_dag_processors[count.index].buckets
}
}

dynamic "statement" {
for_each = length(var.airflow_dag_processors[count.index].buckets) > 0 ? [1] : []
content {
actions = [
"s3:GetObject",
]
resources = [for s in var.airflow_dag_processors[count.index].buckets : "${s}/*"]
}
}

statement {
Expand Down Expand Up @@ -253,20 +235,7 @@ data "aws_iam_policy_document" "airflow_team" {
]

resources = [
"arn:aws:secretsmanager:${data.aws_region.aws_region.name}:${data.aws_caller_identity.aws_caller_identity.account_id}:secret:${var.prefix}/airflow/${var.airflow_dag_processors[count.index].name}-*",
"arn:aws:secretsmanager:${data.aws_region.aws_region.name}:${data.aws_caller_identity.aws_caller_identity.account_id}:secret:${var.prefix}/airflow/${var.airflow_dag_processors[count.index].name}_2-*"
]
}

# This just gives a permission to call BatchGetSecretValue, but doesn't actually give permission
# to look at any secret values themselves - secretsmanager:GetSecretValue does that
statement {
actions = [
"secretsmanager:BatchGetSecretValue"
]

resources = [
"*"
"arn:aws:secretsmanager:${data.aws_region.aws_region.name}:${data.aws_caller_identity.aws_caller_identity.account_id}:secret:${var.prefix}/airflow/${var.airflow_dag_processors[count.index].name}-*"
]
}

Expand Down
144 changes: 0 additions & 144 deletions infra/ecr.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,154 +1,67 @@
// We only ever deploy tagged images, so all ECR repos have a lifecycle policy to delete untagged
// images.
//
// The current exceptions are the visualisation_base repos, where historically images were used
// using the sha256 hash, although at the time of writing we're moving away from this.

resource "aws_ecr_repository" "user_provided" {
name = "${var.prefix}-user-provided"
}

resource "aws_ecr_lifecycle_policy" "user_provided_expire_untagged_after_one_day" {
repository = aws_ecr_repository.user_provided.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "admin" {
name = "${var.prefix}-admin"
}

resource "aws_ecr_lifecycle_policy" "admin_expire_untagged_after_one_day" {
repository = aws_ecr_repository.admin.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "jupyterlab_python" {
name = "${var.prefix}-jupyterlab-python"
}

resource "aws_ecr_lifecycle_policy" "jupyterlab_python_expire_untagged_after_one_day" {
repository = aws_ecr_repository.jupyterlab_python.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "rstudio" {
name = "${var.prefix}-rstudio"
}

resource "aws_ecr_lifecycle_policy" "rstudio_expire_untagged_after_one_day" {
repository = aws_ecr_repository.rstudio.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "rstudio_rv4" {
name = "${var.prefix}-rstudio-rv4"
}

resource "aws_ecr_lifecycle_policy" "rstudio_rv4_expire_untagged_after_one_day" {
repository = aws_ecr_repository.rstudio_rv4.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "pgadmin" {
name = "${var.prefix}-pgadmin"
}

resource "aws_ecr_lifecycle_policy" "pgadmin_expire_untagged_after_one_day" {
repository = aws_ecr_repository.pgadmin.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "remotedesktop" {
name = "${var.prefix}-remotedesktop"
}

resource "aws_ecr_lifecycle_policy" "remotedesktop_rv4_expire_untagged_after_one_day" {
repository = aws_ecr_repository.remotedesktop.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "theia" {
name = "${var.prefix}-theia"
}

resource "aws_ecr_lifecycle_policy" "theia_expire_untagged_after_one_day" {
repository = aws_ecr_repository.theia.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "vscode" {
name = "${var.prefix}-vscode"
}

resource "aws_ecr_lifecycle_policy" "vscode_expire_untagged_after_one_day" {
repository = aws_ecr_repository.vscode.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "s3sync" {
name = "${var.prefix}-s3sync"
}

resource "aws_ecr_lifecycle_policy" "s3sync_expire_untagged_after_one_day" {
repository = aws_ecr_repository.s3sync.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "metrics" {
name = "${var.prefix}-metrics"
}

resource "aws_ecr_lifecycle_policy" "metrics_expire_untagged_after_one_day" {
repository = aws_ecr_repository.metrics.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "sentryproxy" {
name = "${var.prefix}-sentryproxy"
}


resource "aws_ecr_lifecycle_policy" "sentryproxy_expire_untagged_after_one_day" {
repository = aws_ecr_repository.sentryproxy.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "dns_rewrite_proxy" {
name = "${var.prefix}-dns-rewrite-proxy"
}

resource "aws_ecr_lifecycle_policy" "dns_rewrite_proxy_expire_untagged_after_one_day" {
repository = aws_ecr_repository.dns_rewrite_proxy.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "healthcheck" {
name = "${var.prefix}-healthcheck"
}

resource "aws_ecr_lifecycle_policy" "healthcheck_expire_untagged_after_one_day" {
repository = aws_ecr_repository.healthcheck.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "prometheus" {
name = "${var.prefix}-prometheus"
}

resource "aws_ecr_lifecycle_policy" "prometheus_expire_untagged_after_one_day" {
repository = aws_ecr_repository.prometheus.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "gitlab" {
name = "${var.prefix}-gitlab"
}

resource "aws_ecr_lifecycle_policy" "gitlab_expire_untagged_after_one_day" {
repository = aws_ecr_repository.gitlab.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "visualisation_base" {
name = "${var.prefix}-visualisation-base"
}
Expand All @@ -165,65 +78,30 @@ resource "aws_ecr_repository" "mirrors_sync" {
name = "${var.prefix}-mirrors-sync"
}

resource "aws_ecr_lifecycle_policy" "mirrors_sync_expire_untagged_after_one_day" {
repository = aws_ecr_repository.mirrors_sync.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "mirrors_sync_cran_binary" {
name = "${var.prefix}-mirrors-sync-cran-binary"
}

resource "aws_ecr_lifecycle_policy" "mirrors_sync_cran_binary_expire_untagged_after_one_day" {
repository = aws_ecr_repository.mirrors_sync_cran_binary.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "mirrors_sync_cran_binary_rv4" {
name = "${var.prefix}-mirrors-sync-cran-binary-rv4"
}

resource "aws_ecr_lifecycle_policy" "mirrors_sync_cran_binary_rv4_expire_untagged_after_one_day" {
repository = aws_ecr_repository.mirrors_sync_cran_binary_rv4.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "superset" {
name = "${var.prefix}-superset"
}

resource "aws_ecr_lifecycle_policy" "superset_expire_untagged_after_one_day" {
repository = aws_ecr_repository.superset.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "airflow" {
name = "${var.prefix}-airflow"
}

resource "aws_ecr_lifecycle_policy" "airflow_expire_untagged_after_one_day" {
repository = aws_ecr_repository.airflow.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "flower" {
name = "${var.prefix}-flower"
}

resource "aws_ecr_lifecycle_policy" "flower_expire_untagged_after_one_day" {
repository = aws_ecr_repository.flower.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "mlflow" {
name = "${var.prefix}-mlflow"
}

resource "aws_ecr_lifecycle_policy" "mlflow_expire_untagged_after_one_day" {
repository = aws_ecr_repository.mlflow.name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

resource "aws_ecr_repository" "arango" {
count = var.arango_on ? 1 : 0
name = "${var.prefix}-arango"
Expand All @@ -233,28 +111,6 @@ resource "aws_ecr_repository" "sagemaker" {
name = "${var.prefix}-sagemaker"
}

resource "aws_ecr_lifecycle_policy" "arango_expire_untagged_after_one_day" {
count = var.arango_on ? 1 : 0
repository = aws_ecr_repository.arango[0].name
policy = data.aws_ecr_lifecycle_policy_document.expire_untagged_after_one_day.json
}

data "aws_ecr_lifecycle_policy_document" "expire_untagged_after_one_day" {
rule {
priority = 1
selection {
tag_status = "untagged"
count_type = "sinceImagePushed"
count_unit = "days"
count_number = 1
}
}
}

resource "aws_ecr_repository" "sagemaker" {
name = "${var.prefix}-sagemaker"
}

resource "aws_vpc_endpoint" "ecr_dkr" {
vpc_id = aws_vpc.main.id
service_name = "com.amazonaws.${data.aws_region.aws_region.name}.ecr.dkr"
Expand Down
2 changes: 1 addition & 1 deletion infra/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ variable "airflow_on" {
variable "airflow_db_instance_class" {}
variable "airflow_domain" {}
variable "airflow_dag_processors" {
type = list(object({ name = string, assume_roles = list(string), buckets = list(string) }))
type = list(object({ name = string, assume_roles = list(string) }))
default = []
}
variable "airflow_bucket_infix" {}
Expand Down
18 changes: 0 additions & 18 deletions infra/s3_mirrors.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,3 @@ data "aws_iam_policy_document" "mirrors" {
}
}
}

resource "aws_s3_bucket_lifecycle_configuration" "intelligent_tier" {
count = var.mirrors_bucket_name != "" ? 1 : 0

bucket = aws_s3_bucket.mirrors.*.id[count.index]

rule {
id = "Move objects >128KB to Intelligent Tier"
# Objects smaller than 128 KB will not transition by default to any storage class

status = "Enabled"

transition {
days = 0
storage_class = "INTELLIGENT_TIERING"
}
}
}
20 changes: 0 additions & 20 deletions infra/s3_notebooks.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,4 @@ data "aws_iam_policy_document" "notebooks" {
]
}
}
statement {
effect = "Allow"
principals {
type = "*"
identifiers = ["*"]
}
actions = [
"s3:GetObject",
]
resources = [
"arn:aws:s3:::${aws_s3_bucket.notebooks.id}/shared/*",
]
condition {
test = "StringEquals"
variable = "aws:SourceVpce"
values = [
aws_vpc_endpoint.s3.id
]
}
}
}
7 changes: 3 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.