diff --git a/deploy/infrastructure/common/ecr.tf b/deploy/infrastructure/common/ecr.tf index 7ebeee68e..b2de0aedd 100644 --- a/deploy/infrastructure/common/ecr.tf +++ b/deploy/infrastructure/common/ecr.tf @@ -4,7 +4,6 @@ module "ecr_ue2" { repositories = [ "storetheindex/storetheindex", "index-observer/index-observer", - "autoretrieve/autoretrieve", "index-provider/index-provider", "indexstar/indexstar", "ipni/heyfil", diff --git a/deploy/infrastructure/common/github_actions.tf b/deploy/infrastructure/common/github_actions.tf index c53235144..c9d7acb85 100644 --- a/deploy/infrastructure/common/github_actions.tf +++ b/deploy/infrastructure/common/github_actions.tf @@ -58,7 +58,6 @@ module "github_actions_role" { "repo:filecoin-project/storetheindex:*", "repo:filecoin-project/index-provider:*", "repo:filecoin-shipyard/index-observer:*", - "repo:application-research/autoretrieve:*", "repo:filecoin-shipyard/indexstar:*", "repo:ipni/*:*" ] diff --git a/deploy/infrastructure/dev/us-east-2/autoretrieve.tf b/deploy/infrastructure/dev/us-east-2/autoretrieve.tf deleted file mode 100644 index 998133a0e..000000000 --- a/deploy/infrastructure/dev/us-east-2/autoretrieve.tf +++ /dev/null @@ -1,70 +0,0 @@ -resource "aws_kms_alias" "kms_autoretrieve" { - target_key_id = aws_kms_key.kms_autoretrieve.key_id - name = "alias${local.iam_path}autoretrieve" -} - -resource "aws_kms_key" "kms_autoretrieve" { - description = "Key used to encrypt autoretrieve tenant secrets" - policy = data.aws_iam_policy_document.kms_autoretrieve.json - is_enabled = true - - tags = local.tags -} - -data "aws_iam_policy_document" "kms_autoretrieve" { - statement { - sid = "Enable IAM User Permissions" - - principals { - type = "AWS" - identifiers = ["arn:aws:iam::407967248065:root"] - } - - actions = ["kms:*"] - resources = ["*"] - } - - statement { - sid = "Allow access for Devs via sops" - - principals { - type = "AWS" - - identifiers = [ - "arn:aws:iam::407967248065:user/masih", - "arn:aws:iam::407967248065:user/gammazero", - "arn:aws:iam::407967248065:user/will.scott", - "arn:aws:iam::407967248065:user/kylehuntsman", - "arn:aws:iam::407967248065:user/ischasny", - "arn:aws:iam::407967248065:user/hannahhoward", - ] - } - - actions = [ - "kms:Encrypt", - "kms:Decrypt", - "kms:ReEncrypt*", - "kms:GenerateDataKey*", - "kms:DescribeKey" - ] - - resources = ["*"] - } - - - statement { - sid = "Allow Flux to decrypt" - - principals { - type = "AWS" - - identifiers = [ - module.kustomize_controller_role.iam_role_arn - ] - } - actions = [ - "kms:Decrypt", - "kms:DescribeKey", - ] - } -} diff --git a/deploy/infrastructure/dev/us-east-2/eks.tf b/deploy/infrastructure/dev/us-east-2/eks.tf index a11ad9e0d..fd900bb64 100644 --- a/deploy/infrastructure/dev/us-east-2/eks.tf +++ b/deploy/infrastructure/dev/us-east-2/eks.tf @@ -71,7 +71,7 @@ module "eks" { subnet_ids = [data.aws_subnet.ue2c1.id, data.aws_subnet.ue2c2.id] } - # Node group primarily used by autoretrieve with PVC in us-east2a availability zone. + # Node group primarily used by tornado with PVC in us-east2a availability zone. dev-ue2a-r5a-2xl = { min_size = 1 max_size = 7 diff --git a/deploy/infrastructure/dev/us-east-2/kms.tf b/deploy/infrastructure/dev/us-east-2/kms.tf index 4d4b68e7b..64447106b 100644 --- a/deploy/infrastructure/dev/us-east-2/kms.tf +++ b/deploy/infrastructure/dev/us-east-2/kms.tf @@ -77,7 +77,7 @@ data "aws_iam_policy_document" "kust_ctrlr" { "kms:DescribeKey", ] - resources = [aws_kms_key.kms_sti.arn, aws_kms_key.kms_cluster.arn, aws_kms_key.kms_autoretrieve.arn, aws_kms_key.kms_index_provider.arn, aws_kms_key.kms_tornado.arn] + resources = [aws_kms_key.kms_sti.arn, aws_kms_key.kms_cluster.arn, aws_kms_key.kms_index_provider.arn, aws_kms_key.kms_tornado.arn] } } diff --git a/deploy/infrastructure/dev/us-east-2/outputs.tf b/deploy/infrastructure/dev/us-east-2/outputs.tf index c506db898..93a844005 100644 --- a/deploy/infrastructure/dev/us-east-2/outputs.tf +++ b/deploy/infrastructure/dev/us-east-2/outputs.tf @@ -6,10 +6,6 @@ output "kms_cluster_alias_arn" { value = aws_kms_alias.kms_cluster.arn } -output "kms_autoretrieve_alias_arn" { - value = aws_kms_alias.kms_autoretrieve.arn -} - output "kms_tornado_alias_arn" { value = aws_kms_alias.kms_tornado.arn } diff --git a/deploy/manifests/dev/us-east-2/cluster/autoretrieve/.sops.yaml b/deploy/manifests/dev/us-east-2/cluster/autoretrieve/.sops.yaml deleted file mode 100644 index 647e6f35f..000000000 --- a/deploy/manifests/dev/us-east-2/cluster/autoretrieve/.sops.yaml +++ /dev/null @@ -1,6 +0,0 @@ -creation_rules: - - path_regex: '.+\.env' - kms: 'arn:aws:kms:us-east-2:407967248065:alias/dev/us-east-2/cluster' - - path_regex: '.+\.y(a)?ml' - encrypted_regex: '^(data|stringData)$' - kms: 'arn:aws:kms:us-east-2:407967248065:alias/dev/us-east-2/cluster' diff --git a/deploy/manifests/dev/us-east-2/cluster/autoretrieve/README.md b/deploy/manifests/dev/us-east-2/cluster/autoretrieve/README.md deleted file mode 100644 index 4686e243d..000000000 --- a/deploy/manifests/dev/us-east-2/cluster/autoretrieve/README.md +++ /dev/null @@ -1,18 +0,0 @@ -# Autoretrieve - -This directory contains a temporary `autoretrieve` _cluster-level_ Flux tenancy configuration that -creates a K8S namespace dedicated to `autoretrieve`, along with all Flux CRDs to set up and manage -continuous delivery for it. - -The rationale is to set up an automated continuous delivery pipeline to facilitate a tight debug -loop while the long term plans are being decided. This deployment also facilitates metrics -forwarding to the PL grafana for `autoretrieve`. - -Note that the [_application -level_ manifests](https://github.com/filecoin-project/autoretrieve-deploy/tree/main/deploy/manifests/dev/us-east-2) -are located in a seperate repo - -See: - -- https://github.com/application-research/autoretrieve -- https://github.com/filecoin-project/autoretrieve-deploy diff --git a/deploy/manifests/dev/us-east-2/cluster/autoretrieve/event-recorder-cd.yaml b/deploy/manifests/dev/us-east-2/cluster/autoretrieve/event-recorder-cd.yaml deleted file mode 100644 index 898308b89..000000000 --- a/deploy/manifests/dev/us-east-2/cluster/autoretrieve/event-recorder-cd.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: image.toolkit.fluxcd.io/v1beta1 -kind: ImageRepository -metadata: - name: lassie-event-recorder -spec: - interval: 5m - image: ghcr.io/filecoin-project/lassie-event-recorder - ---- -apiVersion: image.toolkit.fluxcd.io/v1alpha1 -kind: ImagePolicy -metadata: - name: lassie-event-recorder -spec: - filterTags: - pattern: '^(?P\d+)-(?P