From bdcfd21858b4231ee54211040c25e0c4c0704f97 Mon Sep 17 00:00:00 2001 From: Megan Davidson <33814653+MDavidson17@users.noreply.github.com> Date: Fri, 27 Oct 2023 11:24:01 +1300 Subject: [PATCH] refactor: rename ./config to ./infra TDE-915 (#209) #### Motivation `./config` is not the correct term for the infrastructure as code in this repo #### Modification `./config` and its references have been renamed to `./infra` #### Checklist _If not applicable, provide explanation of why._ ~~- [ ] Tests updated~~ no tests required for folder naming - [x] Docs updated - [x] Issue linked in Title --- README.md | 2 +- cdk.json | 2 +- cdk8s.yaml | 2 +- docs/concurrency.md | 4 ++-- {config => infra}/README.md | 2 +- {config => infra}/cdk.ts | 0 {config => infra}/cdk8s.ts | 0 {config => infra}/charts/argo.semaphores.ts | 0 {config => infra}/charts/fluentbit.ts | 0 {config => infra}/charts/karpenter.ts | 0 {config => infra}/charts/kube-system.coredns.ts | 0 {config => infra}/constants.ts | 0 {config => infra}/eks/cluster.ts | 0 {config => infra}/imports/karpenter.k8s.aws.ts | 0 {config => infra}/imports/karpenter.sh.ts | 0 {config => infra}/util/build.ts | 0 {config => infra}/util/cloud.formation.ts | 0 {config => infra}/util/eks.cluster.ts | 0 {config => infra}/util/labels.ts | 0 19 files changed, 6 insertions(+), 6 deletions(-) rename {config => infra}/README.md (99%) rename {config => infra}/cdk.ts (100%) rename {config => infra}/cdk8s.ts (100%) rename {config => infra}/charts/argo.semaphores.ts (100%) rename {config => infra}/charts/fluentbit.ts (100%) rename {config => infra}/charts/karpenter.ts (100%) rename {config => infra}/charts/kube-system.coredns.ts (100%) rename {config => infra}/constants.ts (100%) rename {config => infra}/eks/cluster.ts (100%) rename {config => infra}/imports/karpenter.k8s.aws.ts (100%) rename {config => infra}/imports/karpenter.sh.ts (100%) rename {config => infra}/util/build.ts (100%) rename {config => infra}/util/cloud.formation.ts (100%) rename {config => infra}/util/eks.cluster.ts (100%) rename {config => infra}/util/labels.ts (100%) diff --git a/README.md b/README.md index 095b1f696..788285e32 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Topo Workflows -Topo workflows are run on a AWS EKS Cluster using [Argo Workflows](https://argoproj.github.io/argo-workflows/). The detailed configuration is available in [this repo](./config/). +Topo workflows are run on a AWS EKS Cluster using [Argo Workflows](https://argoproj.github.io/argo-workflows/). The detailed configuration is available in [this repo](./infra/). To get setup you need access to the Argo user role inside the EKS cluster, you will need to contact someone from Topo Data Engineering to get access, all Imagery maintainers will already have access. diff --git a/cdk.json b/cdk.json index 99e88d5a7..2c5bb3f20 100644 --- a/cdk.json +++ b/cdk.json @@ -1 +1 @@ -{ "app": "npx tsx config/cdk.ts" } +{ "app": "npx tsx infra/cdk.ts" } diff --git a/cdk8s.yaml b/cdk8s.yaml index 5375d20e5..a593cdf76 100644 --- a/cdk8s.yaml +++ b/cdk8s.yaml @@ -1,4 +1,4 @@ -app: npx tsx config/cdk8s.ts +app: npx tsx infra/cdk8s.ts language: typescript imports: - https://raw.githubusercontent.com/aws/karpenter/main/pkg/apis/crds/karpenter.sh_provisioners.yaml diff --git a/docs/concurrency.md b/docs/concurrency.md index c321ad337..20cb79754 100644 --- a/docs/concurrency.md +++ b/docs/concurrency.md @@ -3,7 +3,7 @@ Some workflows may need limits on how many can be run concurrently. This can be achieved using Argo's [synchronization][1] feature. -The desired limit can be added in a ConfigMap in [config/semaphores.yml][2], e.g. +The desired limit can be added in a ConfigMap in [infra/charts/argo.semaphores.ts][2], e.g. ```yaml apiVersion: v1 @@ -32,4 +32,4 @@ Any further instances which are started while two are running will be queued, and start automatically when running workflows complete. [1]: https://argoproj.github.io/argo-workflows/synchronization/ -[2]: config/semaphores.yml +[2]: infra/charts/argo.semaphores.ts diff --git a/config/README.md b/infra/README.md similarity index 99% rename from config/README.md rename to infra/README.md index 07b8af353..8651fb082 100644 --- a/config/README.md +++ b/infra/README.md @@ -35,7 +35,7 @@ To generate the Helm Construct for a specific Chart, follow the instructions [he Specify the output for the imports: -`--output config/imports/` +`--output infra/imports/` However, some of the component Helm charts do not have a `values.schema.json`. For those we won't generate any code and use the default `Helm` construct: diff --git a/config/cdk.ts b/infra/cdk.ts similarity index 100% rename from config/cdk.ts rename to infra/cdk.ts diff --git a/config/cdk8s.ts b/infra/cdk8s.ts similarity index 100% rename from config/cdk8s.ts rename to infra/cdk8s.ts diff --git a/config/charts/argo.semaphores.ts b/infra/charts/argo.semaphores.ts similarity index 100% rename from config/charts/argo.semaphores.ts rename to infra/charts/argo.semaphores.ts diff --git a/config/charts/fluentbit.ts b/infra/charts/fluentbit.ts similarity index 100% rename from config/charts/fluentbit.ts rename to infra/charts/fluentbit.ts diff --git a/config/charts/karpenter.ts b/infra/charts/karpenter.ts similarity index 100% rename from config/charts/karpenter.ts rename to infra/charts/karpenter.ts diff --git a/config/charts/kube-system.coredns.ts b/infra/charts/kube-system.coredns.ts similarity index 100% rename from config/charts/kube-system.coredns.ts rename to infra/charts/kube-system.coredns.ts diff --git a/config/constants.ts b/infra/constants.ts similarity index 100% rename from config/constants.ts rename to infra/constants.ts diff --git a/config/eks/cluster.ts b/infra/eks/cluster.ts similarity index 100% rename from config/eks/cluster.ts rename to infra/eks/cluster.ts diff --git a/config/imports/karpenter.k8s.aws.ts b/infra/imports/karpenter.k8s.aws.ts similarity index 100% rename from config/imports/karpenter.k8s.aws.ts rename to infra/imports/karpenter.k8s.aws.ts diff --git a/config/imports/karpenter.sh.ts b/infra/imports/karpenter.sh.ts similarity index 100% rename from config/imports/karpenter.sh.ts rename to infra/imports/karpenter.sh.ts diff --git a/config/util/build.ts b/infra/util/build.ts similarity index 100% rename from config/util/build.ts rename to infra/util/build.ts diff --git a/config/util/cloud.formation.ts b/infra/util/cloud.formation.ts similarity index 100% rename from config/util/cloud.formation.ts rename to infra/util/cloud.formation.ts diff --git a/config/util/eks.cluster.ts b/infra/util/eks.cluster.ts similarity index 100% rename from config/util/eks.cluster.ts rename to infra/util/eks.cluster.ts diff --git a/config/util/labels.ts b/infra/util/labels.ts similarity index 100% rename from config/util/labels.ts rename to infra/util/labels.ts