diff --git a/infra/overlays/aks-dev/kustomization.yaml b/infra/overlays/aks-dev/kustomization.yaml index fd2a6b5..a5256ca 100644 --- a/infra/overlays/aks-dev/kustomization.yaml +++ b/infra/overlays/aks-dev/kustomization.yaml @@ -50,4 +50,4 @@ patches: patch: | - op: replace path: /spec/source/path - value: secrets/aks-dev + value: secrets/overlays/aks-dev diff --git a/infra/overlays/aks-prod/kustomization.yaml b/infra/overlays/aks-prod/kustomization.yaml index 73b0aaa..9891905 100644 --- a/infra/overlays/aks-prod/kustomization.yaml +++ b/infra/overlays/aks-prod/kustomization.yaml @@ -1,7 +1,19 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../base +- ../../base/cert-manager-application +- ../../base/cluster-resources-application +- ../../base/grafana +- ../../base/grafana-dashboards +- ../../base/kyverno +- ../../base/kyverno-policies +- ../../base/loki +- ../../base/opencost +- ../../base/prometheus +- ../../base/sealedsecrets +- ../../base/secrets +- ../../base/tempo +- ../../base/traefik-application patches: # Traefik: swap upc-dev → aks-prod @@ -13,16 +25,7 @@ patches: path: /spec/sources/0/helm/valueFiles/1 value: $values/infra/values/aks-prod/traefik-values.yaml -# Keycloak: swap upc-dev → aks-prod -- target: - kind: Application - name: keycloak - patch: | - - op: replace - path: /spec/sources/0/helm/valueFiles/1 - value: $values/infra/values/aks-prod/keycloak-values.yaml - -# Grafana: swap upc-dev → aks-prod +# Grafana: swap upc-dev → aks-prod - target: kind: Application name: grafana @@ -31,15 +34,6 @@ patches: path: /spec/sources/0/helm/valueFiles/1 value: $values/infra/values/aks-prod/grafana-values.yaml -# Gitea: swap upc-dev → aks-prod -- target: - kind: Application - name: gitea - patch: | - - op: replace - path: /spec/sources/0/helm/valueFiles/1 - value: $values/infra/values/aks-prod/gitea-values.yaml - # OpenCost: swap upc-dev → aks-prod - target: kind: Application @@ -56,13 +50,4 @@ patches: patch: | - op: replace path: /spec/source/path - value: secrets/aks-prod - -# Enterprise-apps: point to aks-prod overlay -- target: - kind: Application - name: enterprise-apps - patch: | - - op: replace - path: /spec/source/path - value: apps/overlays/aks-prod + value: secrets/overlays/aks-prod diff --git a/infra/overlays/eks-dev/kustomization.yaml b/infra/overlays/eks-dev/kustomization.yaml index 16e542a..9d015c8 100644 --- a/infra/overlays/eks-dev/kustomization.yaml +++ b/infra/overlays/eks-dev/kustomization.yaml @@ -1,7 +1,19 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../base +- ../../base/cert-manager-application +- ../../base/cluster-resources-application +- ../../base/grafana +- ../../base/grafana-dashboards +- ../../base/kyverno +- ../../base/kyverno-policies +- ../../base/loki +- ../../base/opencost +- ../../base/prometheus +- ../../base/sealedsecrets +- ../../base/secrets +- ../../base/tempo +- ../../base/traefik-application patches: # Traefik: swap upc-dev → eks-dev @@ -13,16 +25,7 @@ patches: path: /spec/sources/0/helm/valueFiles/1 value: $values/infra/values/eks-dev/traefik-values.yaml -# Keycloak: swap upc-dev → eks-dev -- target: - kind: Application - name: keycloak - patch: | - - op: replace - path: /spec/sources/0/helm/valueFiles/1 - value: $values/infra/values/eks-dev/keycloak-values.yaml - -# Grafana: swap upc-dev → eks-dev +# Grafana: swap upc-dev → eks-dev - target: kind: Application name: grafana @@ -31,15 +34,6 @@ patches: path: /spec/sources/0/helm/valueFiles/1 value: $values/infra/values/eks-dev/grafana-values.yaml -# Gitea: swap upc-dev → eks-dev -- target: - kind: Application - name: gitea - patch: | - - op: replace - path: /spec/sources/0/helm/valueFiles/1 - value: $values/infra/values/eks-dev/gitea-values.yaml - # OpenCost: swap upc-dev → eks-dev - target: kind: Application @@ -56,13 +50,4 @@ patches: patch: | - op: replace path: /spec/source/path - value: secrets/eks-dev - -# Enterprise-apps: point to eks-dev overlay -- target: - kind: Application - name: enterprise-apps - patch: | - - op: replace - path: /spec/source/path - value: apps/overlays/eks-dev + value: secrets/overlays/eks-dev diff --git a/infra/overlays/eks-prod/kustomization.yaml b/infra/overlays/eks-prod/kustomization.yaml index 46be9a9..282342d 100644 --- a/infra/overlays/eks-prod/kustomization.yaml +++ b/infra/overlays/eks-prod/kustomization.yaml @@ -1,7 +1,19 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../base +- ../../base/cert-manager-application +- ../../base/cluster-resources-application +- ../../base/grafana +- ../../base/grafana-dashboards +- ../../base/kyverno +- ../../base/kyverno-policies +- ../../base/loki +- ../../base/opencost +- ../../base/prometheus +- ../../base/sealedsecrets +- ../../base/secrets +- ../../base/tempo +- ../../base/traefik-application patches: # Traefik: swap upc-dev → eks-prod @@ -13,16 +25,7 @@ patches: path: /spec/sources/0/helm/valueFiles/1 value: $values/infra/values/eks-prod/traefik-values.yaml -# Keycloak: swap upc-dev → eks-prod -- target: - kind: Application - name: keycloak - patch: | - - op: replace - path: /spec/sources/0/helm/valueFiles/1 - value: $values/infra/values/eks-prod/keycloak-values.yaml - -# Grafana: swap upc-dev → eks-prod +# Grafana: swap upc-dev → eks-prod - target: kind: Application name: grafana @@ -31,15 +34,6 @@ patches: path: /spec/sources/0/helm/valueFiles/1 value: $values/infra/values/eks-prod/grafana-values.yaml -# Gitea: swap upc-dev → eks-prod -- target: - kind: Application - name: gitea - patch: | - - op: replace - path: /spec/sources/0/helm/valueFiles/1 - value: $values/infra/values/eks-prod/gitea-values.yaml - # OpenCost: swap upc-dev → eks-prod - target: kind: Application @@ -56,13 +50,4 @@ patches: patch: | - op: replace path: /spec/source/path - value: secrets/eks-prod - -# Enterprise-apps: point to eks-prod overlay -- target: - kind: Application - name: enterprise-apps - patch: | - - op: replace - path: /spec/source/path - value: apps/overlays/eks-prod + value: secrets/overlays/eks-prod diff --git a/infra/overlays/gke-dev/kustomization.yaml b/infra/overlays/gke-dev/kustomization.yaml index 4d3da3e..8930f58 100644 --- a/infra/overlays/gke-dev/kustomization.yaml +++ b/infra/overlays/gke-dev/kustomization.yaml @@ -1,7 +1,19 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../base +- ../../base/cert-manager-application +- ../../base/cluster-resources-application +- ../../base/grafana +- ../../base/grafana-dashboards +- ../../base/kyverno +- ../../base/kyverno-policies +- ../../base/loki +- ../../base/opencost +- ../../base/prometheus +- ../../base/sealedsecrets +- ../../base/secrets +- ../../base/tempo +- ../../base/traefik-application patches: # Traefik: swap upc-dev → gke-dev @@ -13,16 +25,7 @@ patches: path: /spec/sources/0/helm/valueFiles/1 value: $values/infra/values/gke-dev/traefik-values.yaml -# Keycloak: swap upc-dev → gke-dev -- target: - kind: Application - name: keycloak - patch: | - - op: replace - path: /spec/sources/0/helm/valueFiles/1 - value: $values/infra/values/gke-dev/keycloak-values.yaml - -# Grafana: swap upc-dev → gke-dev +# Grafana: swap upc-dev → gke-dev - target: kind: Application name: grafana @@ -31,15 +34,6 @@ patches: path: /spec/sources/0/helm/valueFiles/1 value: $values/infra/values/gke-dev/grafana-values.yaml -# Gitea: swap upc-dev → gke-dev -- target: - kind: Application - name: gitea - patch: | - - op: replace - path: /spec/sources/0/helm/valueFiles/1 - value: $values/infra/values/gke-dev/gitea-values.yaml - # OpenCost: swap upc-dev → gke-dev - target: kind: Application @@ -56,13 +50,4 @@ patches: patch: | - op: replace path: /spec/source/path - value: secrets/gke-dev - -# Enterprise-apps: point to gke-dev overlay -- target: - kind: Application - name: enterprise-apps - patch: | - - op: replace - path: /spec/source/path - value: apps/overlays/gke-dev + value: secrets/overlays/gke-dev diff --git a/infra/overlays/gke-prod/kustomization.yaml b/infra/overlays/gke-prod/kustomization.yaml index 0f4a583..59f7053 100644 --- a/infra/overlays/gke-prod/kustomization.yaml +++ b/infra/overlays/gke-prod/kustomization.yaml @@ -1,7 +1,19 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../base +- ../../base/cert-manager-application +- ../../base/cluster-resources-application +- ../../base/grafana +- ../../base/grafana-dashboards +- ../../base/kyverno +- ../../base/kyverno-policies +- ../../base/loki +- ../../base/opencost +- ../../base/prometheus +- ../../base/sealedsecrets +- ../../base/secrets +- ../../base/tempo +- ../../base/traefik-application patches: # Traefik: swap upc-dev → gke-prod @@ -13,16 +25,7 @@ patches: path: /spec/sources/0/helm/valueFiles/1 value: $values/infra/values/gke-prod/traefik-values.yaml -# Keycloak: swap upc-dev → gke-prod -- target: - kind: Application - name: keycloak - patch: | - - op: replace - path: /spec/sources/0/helm/valueFiles/1 - value: $values/infra/values/gke-prod/keycloak-values.yaml - -# Grafana: swap upc-dev → gke-prod +# Grafana: swap upc-dev → gke-prod - target: kind: Application name: grafana @@ -31,15 +34,6 @@ patches: path: /spec/sources/0/helm/valueFiles/1 value: $values/infra/values/gke-prod/grafana-values.yaml -# Gitea: swap upc-dev → gke-prod -- target: - kind: Application - name: gitea - patch: | - - op: replace - path: /spec/sources/0/helm/valueFiles/1 - value: $values/infra/values/gke-prod/gitea-values.yaml - # OpenCost: swap upc-dev → gke-prod - target: kind: Application @@ -56,13 +50,4 @@ patches: patch: | - op: replace path: /spec/source/path - value: secrets/gke-prod - -# Enterprise-apps: point to gke-prod overlay -- target: - kind: Application - name: enterprise-apps - patch: | - - op: replace - path: /spec/source/path - value: apps/overlays/gke-prod + value: secrets/overlays/gke-prod diff --git a/infra/overlays/upc-prod/kustomization.yaml b/infra/overlays/upc-prod/kustomization.yaml index 59ae0fa..a81cb99 100644 --- a/infra/overlays/upc-prod/kustomization.yaml +++ b/infra/overlays/upc-prod/kustomization.yaml @@ -1,10 +1,22 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../base +- ../../base/cert-manager-application +- ../../base/cluster-resources-application +- ../../base/grafana +- ../../base/grafana-dashboards +- ../../base/kyverno +- ../../base/kyverno-policies +- ../../base/loki +- ../../base/opencost +- ../../base/prometheus +- ../../base/sealedsecrets +- ../../base/secrets +- ../../base/tempo +- ../../base/traefik-application patches: -# Traefik: swap upc-dev → upc-prod in valueFiles +# Traefik: swap upc-dev → upc-prod - target: kind: Application name: traefik @@ -13,16 +25,7 @@ patches: path: /spec/sources/0/helm/valueFiles/1 value: $values/infra/values/upc-prod/traefik-values.yaml -# Keycloak: swap upc-dev → upc-prod -- target: - kind: Application - name: keycloak - patch: | - - op: replace - path: /spec/sources/0/helm/valueFiles/1 - value: $values/infra/values/upc-prod/keycloak-values.yaml - -# Grafana: swap upc-dev → upc-prod +# Grafana: swap upc-dev → upc-prod - target: kind: Application name: grafana @@ -31,15 +34,6 @@ patches: path: /spec/sources/0/helm/valueFiles/1 value: $values/infra/values/upc-prod/grafana-values.yaml -# Gitea: swap upc-dev → upc-prod -- target: - kind: Application - name: gitea - patch: | - - op: replace - path: /spec/sources/0/helm/valueFiles/1 - value: $values/infra/values/upc-prod/gitea-values.yaml - # OpenCost: swap upc-dev → upc-prod - target: kind: Application @@ -57,12 +51,3 @@ patches: - op: replace path: /spec/source/path value: secrets/overlays/upc-prod - -# Enterprise-apps: point to upc-prod overlay -- target: - kind: Application - name: enterprise-apps - patch: | - - op: replace - path: /spec/source/path - value: apps/overlays/upc-prod