removing redundant env folder

cds-snc · Oct 29, 2024 · 6e96a2c · 6e96a2c
1 parent a125e4c
commit 6e96a2c
Show file tree

Hide file tree

Showing 57 changed files with 12 additions and 12 deletions.
diff --git a/helmfile/helmfile.yaml b/helmfile/helmfile.yaml
@@ -33,7 +33,7 @@ releases:
       category: documentation
     chart: charts/notify-documentation
     values:
-    - ./overrides/env/{{ .Environment.Name }}/notify/documentation.yaml.gotmpl
+    - ./overrides/{{ .Environment.Name }}/notify/documentation.yaml.gotmpl
 
   - name: notify-api
     namespace: notify-{{ .Environment.Name }}
@@ -43,7 +43,7 @@ releases:
       category: deliverable
     chart: charts/notify-api
     values:
-    - ./overrides/env/{{ .Environment.Name }}/notify/api.yaml.gotmpl
+    - ./overrides/{{ .Environment.Name }}/notify/api.yaml.gotmpl
 
   - name: notify-admin
     namespace: notify-{{ .Environment.Name }}
@@ -53,7 +53,7 @@ releases:
       category: deliverable
     chart: charts/notify-admin
     values:
-    - ./overrides/env/{{ .Environment.Name }}/notify/admin.yaml.gotmpl
+    - ./overrides/{{ .Environment.Name }}/notify/admin.yaml.gotmpl
 
 {{ end }}
 
@@ -77,7 +77,7 @@ releases:
     chart: oci://public.ecr.aws/karpenter/karpenter
     version: 0.36.1
     values:
-    - ./overrides/env/{{ .Environment.Name }}/system/karpenter.yaml.gotmpl
+    - ./overrides/{{ .Environment.Name }}/system/karpenter.yaml.gotmpl
 
   - name: karpenter-nodepool
     namespace: karpenter
@@ -88,7 +88,7 @@ releases:
       step: 2
     chart: charts/karpenter-nodepool
     values:
-    - ./overrides/env/{{ .Environment.Name }}/system/karpenter.yaml.gotmpl
+    - ./overrides/{{ .Environment.Name }}/system/karpenter.yaml.gotmpl
 
   - name: priority-classes
     namespace: kube-system
@@ -100,7 +100,7 @@ releases:
     chart: deliveryhero/priority-class
     version: 0.1.1
     values:
-    - ./overrides/env/{{ .Environment.Name }}/system/priority-classes.yaml.gotmpl
+    - ./overrides/{{ .Environment.Name }}/system/priority-classes.yaml.gotmpl
 
   - name: secrets-store-csi-driver
     namespace: kube-system
@@ -112,7 +112,7 @@ releases:
     chart: secrets-store-csi-driver/secrets-store-csi-driver
     version: 1.4.1
     values:
-    - ./overrides/env/{{ .Environment.Name }}/system/secrets-csi.yaml.gotmpl
+    - ./overrides/{{ .Environment.Name }}/system/secrets-csi.yaml.gotmpl
 
   - name: aws-secrets-provider
     namespace: kube-system
@@ -124,7 +124,7 @@ releases:
     chart: aws-secrets-manager/secrets-store-csi-driver-provider-aws
     version: 0.3.5
     values:
-    - ./overrides/env/{{ .Environment.Name }}/system/aws-secrets.yaml.gotmpl
+    - ./overrides/{{ .Environment.Name }}/system/aws-secrets.yaml.gotmpl
 
   - name: kube-state-metrics
     namespace: kube-system
@@ -135,7 +135,7 @@ releases:
     chart: prometheus-community/kube-state-metrics
     version: 5.18.1
     values:
-    - ./overrides/env/{{ .Environment.Name }}/system/kube-state-metrics.yaml.gotmpl
+    - ./overrides/{{ .Environment.Name }}/system/kube-state-metrics.yaml.gotmpl
 
   - name: blazer
     namespace: tools
@@ -147,7 +147,7 @@ releases:
     chart: stakater/application
     version: 2.3.2
     values:
-    - ./overrides/env/{{ .Environment.Name }}/tools/blazer.yaml.gotmpl
+    - ./overrides/{{ .Environment.Name }}/tools/blazer.yaml.gotmpl
 
   - name: ingress
     namespace: nginx
@@ -160,7 +160,7 @@ releases:
       step: 4
     chart: charts/nginx-ingress
     values:
-    - ./overrides/env/{{ .Environment.Name }}/system/nginx.yaml.gotmpl
+    - ./overrides/{{ .Environment.Name }}/system/nginx.yaml.gotmpl
 
   - name: xray-daemon
     namespace: xray
@@ -174,4 +174,4 @@ releases:
     chart: okgolove/aws-xray
     version: 4.0.8
     values:
-    - ./overrides/env/{{ .Environment.Name }}/system/xray-daemon.yaml.gotmpl
+    - ./overrides/{{ .Environment.Name }}/system/xray-daemon.yaml.gotmpl
diff --git a/...verrides/env/dev/notify/admin.yaml.gotmpl → ...le/overrides/dev/notify/admin.yaml.gotmpl b/...verrides/env/dev/notify/admin.yaml.gotmpl → ...le/overrides/dev/notify/admin.yaml.gotmpl
diff --git a/.../overrides/env/dev/notify/api.yaml.gotmpl → ...file/overrides/dev/notify/api.yaml.gotmpl b/.../overrides/env/dev/notify/api.yaml.gotmpl → ...file/overrides/dev/notify/api.yaml.gotmpl
diff --git a/.../env/dev/notify/documentation.yaml.gotmpl → ...ides/dev/notify/documentation.yaml.gotmpl b/.../env/dev/notify/documentation.yaml.gotmpl → ...ides/dev/notify/documentation.yaml.gotmpl
diff --git a/...es/env/dev/system/aws-secrets.yaml.gotmpl → ...rrides/dev/system/aws-secrets.yaml.gotmpl b/...es/env/dev/system/aws-secrets.yaml.gotmpl → ...rrides/dev/system/aws-secrets.yaml.gotmpl
diff --git a/...ev/system/github-arc-scaleset.yaml.gotmpl → ...ev/system/github-arc-scaleset.yaml.gotmpl b/...ev/system/github-arc-scaleset.yaml.gotmpl → ...ev/system/github-arc-scaleset.yaml.gotmpl
diff --git a/...des/env/dev/system/github-arc.yaml.gotmpl → ...errides/dev/system/github-arc.yaml.gotmpl b/...des/env/dev/system/github-arc.yaml.gotmpl → ...errides/dev/system/github-arc.yaml.gotmpl
diff --git a/...ides/env/dev/system/karpenter.yaml.gotmpl → ...verrides/dev/system/karpenter.yaml.gotmpl b/...ides/env/dev/system/karpenter.yaml.gotmpl → ...verrides/dev/system/karpenter.yaml.gotmpl
diff --git a/...dev/system/kube-state-metrics.yaml.gotmpl → ...dev/system/kube-state-metrics.yaml.gotmpl b/...dev/system/kube-state-metrics.yaml.gotmpl → ...dev/system/kube-state-metrics.yaml.gotmpl
diff --git a/...verrides/env/dev/system/nginx.yaml.gotmpl → ...le/overrides/dev/system/nginx.yaml.gotmpl b/...verrides/env/dev/system/nginx.yaml.gotmpl → ...le/overrides/dev/system/nginx.yaml.gotmpl
diff --git a/...v/dev/system/priority-classes.yaml.gotmpl → ...s/dev/system/priority-classes.yaml.gotmpl b/...v/dev/system/priority-classes.yaml.gotmpl → ...s/dev/system/priority-classes.yaml.gotmpl
diff --git a/...es/env/dev/system/secrets-csi.yaml.gotmpl → ...rrides/dev/system/secrets-csi.yaml.gotmpl b/...es/env/dev/system/secrets-csi.yaml.gotmpl → ...rrides/dev/system/secrets-csi.yaml.gotmpl
diff --git a/...es/env/dev/system/xray-daemon.yaml.gotmpl → ...rrides/dev/system/xray-daemon.yaml.gotmpl b/...es/env/dev/system/xray-daemon.yaml.gotmpl → ...rrides/dev/system/xray-daemon.yaml.gotmpl
diff --git a/...verrides/env/dev/tools/blazer.yaml.gotmpl → ...le/overrides/dev/tools/blazer.yaml.gotmpl b/...verrides/env/dev/tools/blazer.yaml.gotmpl → ...le/overrides/dev/tools/blazer.yaml.gotmpl
diff --git a/...env/dev/tools/blazer_postgres.yaml.gotmpl → ...des/dev/tools/blazer_postgres.yaml.gotmpl b/...env/dev/tools/blazer_postgres.yaml.gotmpl → ...des/dev/tools/blazer_postgres.yaml.gotmpl
diff --git a/...s/env/production/notify/admin.yaml.gotmpl → ...rides/production/notify/admin.yaml.gotmpl b/...s/env/production/notify/admin.yaml.gotmpl → ...rides/production/notify/admin.yaml.gotmpl
diff --git a/...des/env/production/notify/api.yaml.gotmpl → ...errides/production/notify/api.yaml.gotmpl b/...des/env/production/notify/api.yaml.gotmpl → ...errides/production/notify/api.yaml.gotmpl
diff --git a/...oduction/notify/documentation.yaml.gotmpl → ...oduction/notify/documentation.yaml.gotmpl b/...oduction/notify/documentation.yaml.gotmpl → ...oduction/notify/documentation.yaml.gotmpl
diff --git a/...production/system/aws-secrets.yaml.gotmpl → ...production/system/aws-secrets.yaml.gotmpl b/...production/system/aws-secrets.yaml.gotmpl → ...production/system/aws-secrets.yaml.gotmpl
diff --git a/...on/system/github-arc-scaleset.yaml.gotmpl → ...on/system/github-arc-scaleset.yaml.gotmpl b/...on/system/github-arc-scaleset.yaml.gotmpl → ...on/system/github-arc-scaleset.yaml.gotmpl
diff --git a/.../production/system/github-arc.yaml.gotmpl → .../production/system/github-arc.yaml.gotmpl b/.../production/system/github-arc.yaml.gotmpl → .../production/system/github-arc.yaml.gotmpl
diff --git a/...v/production/system/karpenter.yaml.gotmpl → ...s/production/system/karpenter.yaml.gotmpl b/...v/production/system/karpenter.yaml.gotmpl → ...s/production/system/karpenter.yaml.gotmpl
diff --git a/...ion/system/kube-state-metrics.yaml.gotmpl → ...ion/system/kube-state-metrics.yaml.gotmpl b/...ion/system/kube-state-metrics.yaml.gotmpl → ...ion/system/kube-state-metrics.yaml.gotmpl
diff --git a/...s/env/production/system/nginx.yaml.gotmpl → ...rides/production/system/nginx.yaml.gotmpl b/...s/env/production/system/nginx.yaml.gotmpl → ...rides/production/system/nginx.yaml.gotmpl
diff --git a/...ction/system/priority-classes.yaml.gotmpl → ...ction/system/priority-classes.yaml.gotmpl b/...ction/system/priority-classes.yaml.gotmpl → ...ction/system/priority-classes.yaml.gotmpl
diff --git a/...production/system/secrets-csi.yaml.gotmpl → ...production/system/secrets-csi.yaml.gotmpl b/...production/system/secrets-csi.yaml.gotmpl → ...production/system/secrets-csi.yaml.gotmpl
diff --git a/...production/system/xray-daemon.yaml.gotmpl → ...production/system/xray-daemon.yaml.gotmpl b/...production/system/xray-daemon.yaml.gotmpl → ...production/system/xray-daemon.yaml.gotmpl
diff --git a/...s/env/production/tools/blazer.yaml.gotmpl → ...rides/production/tools/blazer.yaml.gotmpl b/...s/env/production/tools/blazer.yaml.gotmpl → ...rides/production/tools/blazer.yaml.gotmpl
diff --git a/...duction/tools/blazer_postgres.yaml.gotmpl → ...duction/tools/blazer_postgres.yaml.gotmpl b/...duction/tools/blazer_postgres.yaml.gotmpl → ...duction/tools/blazer_postgres.yaml.gotmpl
diff --git a/...ides/env/sandbox/notify/admin.yaml.gotmpl → ...verrides/sandbox/notify/admin.yaml.gotmpl b/...ides/env/sandbox/notify/admin.yaml.gotmpl → ...verrides/sandbox/notify/admin.yaml.gotmpl
diff --git a/...rrides/env/sandbox/notify/api.yaml.gotmpl → .../overrides/sandbox/notify/api.yaml.gotmpl b/...rrides/env/sandbox/notify/api.yaml.gotmpl → .../overrides/sandbox/notify/api.yaml.gotmpl
diff --git a/.../sandbox/notify/documentation.yaml.gotmpl → .../sandbox/notify/documentation.yaml.gotmpl b/.../sandbox/notify/documentation.yaml.gotmpl → .../sandbox/notify/documentation.yaml.gotmpl
diff --git a/...nv/sandbox/system/aws-secrets.yaml.gotmpl → ...es/sandbox/system/aws-secrets.yaml.gotmpl b/...nv/sandbox/system/aws-secrets.yaml.gotmpl → ...es/sandbox/system/aws-secrets.yaml.gotmpl
diff --git a/...ox/system/github-arc-scaleset.yaml.gotmpl → ...ox/system/github-arc-scaleset.yaml.gotmpl b/...ox/system/github-arc-scaleset.yaml.gotmpl → ...ox/system/github-arc-scaleset.yaml.gotmpl
diff --git a/...env/sandbox/system/github-arc.yaml.gotmpl → ...des/sandbox/system/github-arc.yaml.gotmpl b/...env/sandbox/system/github-arc.yaml.gotmpl → ...des/sandbox/system/github-arc.yaml.gotmpl
diff --git a/.../env/sandbox/system/karpenter.yaml.gotmpl → ...ides/sandbox/system/karpenter.yaml.gotmpl b/.../env/sandbox/system/karpenter.yaml.gotmpl → ...ides/sandbox/system/karpenter.yaml.gotmpl
diff --git a/...box/system/kube-state-metrics.yaml.gotmpl → ...box/system/kube-state-metrics.yaml.gotmpl b/...box/system/kube-state-metrics.yaml.gotmpl → ...box/system/kube-state-metrics.yaml.gotmpl
diff --git a/...ides/env/sandbox/system/nginx.yaml.gotmpl → ...verrides/sandbox/system/nginx.yaml.gotmpl b/...ides/env/sandbox/system/nginx.yaml.gotmpl → ...verrides/sandbox/system/nginx.yaml.gotmpl
diff --git a/...ndbox/system/priority-classes.yaml.gotmpl → ...ndbox/system/priority-classes.yaml.gotmpl b/...ndbox/system/priority-classes.yaml.gotmpl → ...ndbox/system/priority-classes.yaml.gotmpl
diff --git a/...nv/sandbox/system/secrets-csi.yaml.gotmpl → ...es/sandbox/system/secrets-csi.yaml.gotmpl b/...nv/sandbox/system/secrets-csi.yaml.gotmpl → ...es/sandbox/system/secrets-csi.yaml.gotmpl
diff --git a/...nv/sandbox/system/xray-daemon.yaml.gotmpl → ...es/sandbox/system/xray-daemon.yaml.gotmpl b/...nv/sandbox/system/xray-daemon.yaml.gotmpl → ...es/sandbox/system/xray-daemon.yaml.gotmpl
diff --git a/...ides/env/sandbox/tools/blazer.yaml.gotmpl → ...verrides/sandbox/tools/blazer.yaml.gotmpl b/...ides/env/sandbox/tools/blazer.yaml.gotmpl → ...verrides/sandbox/tools/blazer.yaml.gotmpl
diff --git a/...sandbox/tools/blazer_postgres.yaml.gotmpl → ...sandbox/tools/blazer_postgres.yaml.gotmpl b/...sandbox/tools/blazer_postgres.yaml.gotmpl → ...sandbox/tools/blazer_postgres.yaml.gotmpl
diff --git a/...ides/env/staging/notify/admin.yaml.gotmpl → ...verrides/staging/notify/admin.yaml.gotmpl b/...ides/env/staging/notify/admin.yaml.gotmpl → ...verrides/staging/notify/admin.yaml.gotmpl
diff --git a/...rrides/env/staging/notify/api.yaml.gotmpl → .../overrides/staging/notify/api.yaml.gotmpl b/...rrides/env/staging/notify/api.yaml.gotmpl → .../overrides/staging/notify/api.yaml.gotmpl
diff --git a/.../staging/notify/documentation.yaml.gotmpl → .../staging/notify/documentation.yaml.gotmpl b/.../staging/notify/documentation.yaml.gotmpl → .../staging/notify/documentation.yaml.gotmpl
diff --git a/...nv/staging/system/aws-secrets.yaml.gotmpl → ...es/staging/system/aws-secrets.yaml.gotmpl b/...nv/staging/system/aws-secrets.yaml.gotmpl → ...es/staging/system/aws-secrets.yaml.gotmpl
diff --git a/...ng/system/github-arc-scaleset.yaml.gotmpl → ...ng/system/github-arc-scaleset.yaml.gotmpl b/...ng/system/github-arc-scaleset.yaml.gotmpl → ...ng/system/github-arc-scaleset.yaml.gotmpl
diff --git a/...env/staging/system/github-arc.yaml.gotmpl → ...des/staging/system/github-arc.yaml.gotmpl b/...env/staging/system/github-arc.yaml.gotmpl → ...des/staging/system/github-arc.yaml.gotmpl
diff --git a/.../env/staging/system/karpenter.yaml.gotmpl → ...ides/staging/system/karpenter.yaml.gotmpl b/.../env/staging/system/karpenter.yaml.gotmpl → ...ides/staging/system/karpenter.yaml.gotmpl
diff --git a/...ing/system/kube-state-metrics.yaml.gotmpl → ...ing/system/kube-state-metrics.yaml.gotmpl b/...ing/system/kube-state-metrics.yaml.gotmpl → ...ing/system/kube-state-metrics.yaml.gotmpl
diff --git a/...ides/env/staging/system/nginx.yaml.gotmpl → ...verrides/staging/system/nginx.yaml.gotmpl b/...ides/env/staging/system/nginx.yaml.gotmpl → ...verrides/staging/system/nginx.yaml.gotmpl
diff --git a/...aging/system/priority-classes.yaml.gotmpl → ...aging/system/priority-classes.yaml.gotmpl b/...aging/system/priority-classes.yaml.gotmpl → ...aging/system/priority-classes.yaml.gotmpl
diff --git a/...nv/staging/system/secrets-csi.yaml.gotmpl → ...es/staging/system/secrets-csi.yaml.gotmpl b/...nv/staging/system/secrets-csi.yaml.gotmpl → ...es/staging/system/secrets-csi.yaml.gotmpl
diff --git a/...nv/staging/system/xray-daemon.yaml.gotmpl → ...es/staging/system/xray-daemon.yaml.gotmpl b/...nv/staging/system/xray-daemon.yaml.gotmpl → ...es/staging/system/xray-daemon.yaml.gotmpl
diff --git a/...ides/env/staging/tools/blazer.yaml.gotmpl → ...verrides/staging/tools/blazer.yaml.gotmpl b/...ides/env/staging/tools/blazer.yaml.gotmpl → ...verrides/staging/tools/blazer.yaml.gotmpl
diff --git a/...staging/tools/blazer_postgres.yaml.gotmpl → ...staging/tools/blazer_postgres.yaml.gotmpl b/...staging/tools/blazer_postgres.yaml.gotmpl → ...staging/tools/blazer_postgres.yaml.gotmpl