From e9acc82f88a52bd5875a78967c89655239e09879 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sat, 16 Sep 2023 17:33:05 -0400 Subject: [PATCH] Remove the legacy AWS owned test account 607362164682 Signed-off-by: Davanum Srinivas --- .../organization-accounts-workloads-non-prod.tf | 3 +-- .../test-pods/externalsecrets_legacy.yaml | 14 -------------- .../resources/test-pods/externalsecrets.yaml | 14 -------------- 3 files changed, 1 insertion(+), 30 deletions(-) diff --git a/infra/aws/terraform/management-account/organization-accounts-workloads-non-prod.tf b/infra/aws/terraform/management-account/organization-accounts-workloads-non-prod.tf index be0422faf6e..d6043f53979 100644 --- a/infra/aws/terraform/management-account/organization-accounts-workloads-non-prod.tf +++ b/infra/aws/terraform/management-account/organization-accounts-workloads-non-prod.tf @@ -44,8 +44,7 @@ module "prow_canary" { } } -# Account used as replacement for AWS account 607362164682 -# See https://github.com/kubernetes/k8s.io/issues/5194 +# Shared AWS account used for kops/eks related repositories module "k8s_infra_eks_e2e_shared_001" { source = "../modules/org-account" diff --git a/infra/aws/terraform/prow-build-cluster/resources/test-pods/externalsecrets_legacy.yaml b/infra/aws/terraform/prow-build-cluster/resources/test-pods/externalsecrets_legacy.yaml index 0a91204968a..eaafad64052 100644 --- a/infra/aws/terraform/prow-build-cluster/resources/test-pods/externalsecrets_legacy.yaml +++ b/infra/aws/terraform/prow-build-cluster/resources/test-pods/externalsecrets_legacy.yaml @@ -51,20 +51,6 @@ # apiVersion: kubernetes-client.io/v1 # kind: ExternalSecret # metadata: -# name: aws-credentials-607362164682 # The name of the Kubernetes Secret -# namespace: test-pods -# spec: -# backendType: gcpSecretsManager -# projectId: k8s-infra-prow-build -# data: -# - key: gke_k8s-prow-builds_us-central1-f_prow__test-pods__aws-credentials-607362164682 # The name of the GSM Secret -# name: credentials # The key to write to in the Kubernetes Secret -# version: latest # The version of the GSM Secret -# property: credentials -# --- -# apiVersion: kubernetes-client.io/v1 -# kind: ExternalSecret -# metadata: # name: aws-ssh-key-secret # The name of the Kubernetes Secret # namespace: test-pods # spec: diff --git a/infra/gcp/terraform/k8s-infra-prow-build/prow-build/resources/test-pods/externalsecrets.yaml b/infra/gcp/terraform/k8s-infra-prow-build/prow-build/resources/test-pods/externalsecrets.yaml index 5c868c72feb..3afd1b2e758 100644 --- a/infra/gcp/terraform/k8s-infra-prow-build/prow-build/resources/test-pods/externalsecrets.yaml +++ b/infra/gcp/terraform/k8s-infra-prow-build/prow-build/resources/test-pods/externalsecrets.yaml @@ -46,20 +46,6 @@ spec: --- apiVersion: kubernetes-client.io/v1 kind: ExternalSecret -metadata: - name: aws-credentials-607362164682 # The name of the Kubernetes Secret - namespace: test-pods -spec: - backendType: gcpSecretsManager - projectId: k8s-infra-prow-build - data: - - key: gke_k8s-prow-builds_us-central1-f_prow__test-pods__aws-credentials-607362164682 # The name of the GSM Secret - name: credentials # The key to write to in the Kubernetes Secret - version: latest # The version of the GSM Secret - property: credentials ---- -apiVersion: kubernetes-client.io/v1 -kind: ExternalSecret metadata: name: aws-ssh-key-secret # The name of the Kubernetes Secret namespace: test-pods