From 126a0038dcd8f415d9e010f358109fc8385680b6 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Tue, 13 Feb 2024 10:23:24 +0100 Subject: [PATCH] fix: rename env-values.yaml to values-env.yaml --- applications/cerbos.yaml | 2 +- applications/rabbitmq.yaml | 2 +- argo/kustomize-helm-with-rewrite/generate.sh | 2 +- .../archmeister-env-secret.yaml | 0 .../{prod-values.yaml => values-prod.yaml} | 0 charts/archmeister/values-review.yaml | 25 ------------------- ...taging-values.yaml => values-staging.yaml} | 0 .../{prod-values.yaml => values-prod.yaml} | 0 ...taging-values.yaml => values-staging.yaml} | 0 .../{prod-values.yaml => values-prod.yaml} | 0 ...taging-values.yaml => values-staging.yaml} | 0 .../{prod-values.yaml => values-prod.yaml} | 0 ...taging-values.yaml => values-staging.yaml} | 0 .../{prod-values.yaml => values-prod.yaml} | 0 ...taging-values.yaml => values-staging.yaml} | 0 .../{prod-values.yaml => values-prod.yaml} | 0 ...taging-values.yaml => values-staging.yaml} | 0 .../{prod-values.yaml => values-prod.yaml} | 0 ...taging-values.yaml => values-staging.yaml} | 0 .../{prod-values.yaml => values-prod.yaml} | 0 ...taging-values.yaml => values-staging.yaml} | 0 .../{prod-values.yaml => values-prod.yaml} | 0 ...taging-values.yaml => values-staging.yaml} | 0 .../{prod-values.yaml => values-prod.yaml} | 0 ...taging-values.yaml => values-staging.yaml} | 0 .../{prod-values.yaml => values-prod.yaml} | 0 ...taging-values.yaml => values-staging.yaml} | 0 27 files changed, 3 insertions(+), 28 deletions(-) rename charts/archmeister/{manifests => base}/archmeister-env-secret.yaml (100%) rename charts/archmeister/{prod-values.yaml => values-prod.yaml} (100%) delete mode 100644 charts/archmeister/values-review.yaml rename charts/archmeister/{staging-values.yaml => values-staging.yaml} (100%) rename charts/atlantis/{prod-values.yaml => values-prod.yaml} (100%) rename charts/atlantis/{staging-values.yaml => values-staging.yaml} (100%) rename charts/busynix/{prod-values.yaml => values-prod.yaml} (100%) rename charts/busynix/{staging-values.yaml => values-staging.yaml} (100%) rename charts/cerbos/{prod-values.yaml => values-prod.yaml} (100%) rename charts/cerbos/{staging-values.yaml => values-staging.yaml} (100%) rename charts/dex/{prod-values.yaml => values-prod.yaml} (100%) rename charts/dex/{staging-values.yaml => values-staging.yaml} (100%) rename charts/geoserver/{prod-values.yaml => values-prod.yaml} (100%) rename charts/geoserver/{staging-values.yaml => values-staging.yaml} (100%) rename charts/hipster/{prod-values.yaml => values-prod.yaml} (100%) rename charts/hipster/{staging-values.yaml => values-staging.yaml} (100%) rename charts/osm-tile-server/{prod-values.yaml => values-prod.yaml} (100%) rename charts/osm-tile-server/{staging-values.yaml => values-staging.yaml} (100%) rename charts/petimeter/{prod-values.yaml => values-prod.yaml} (100%) rename charts/petimeter/{staging-values.yaml => values-staging.yaml} (100%) rename charts/rabbitmq/{prod-values.yaml => values-prod.yaml} (100%) rename charts/rabbitmq/{staging-values.yaml => values-staging.yaml} (100%) rename charts/sorcerer/{prod-values.yaml => values-prod.yaml} (100%) rename charts/sorcerer/{staging-values.yaml => values-staging.yaml} (100%) diff --git a/applications/cerbos.yaml b/applications/cerbos.yaml index 4b808064..f3ab0cfe 100644 --- a/applications/cerbos.yaml +++ b/applications/cerbos.yaml @@ -26,7 +26,7 @@ spec: helm: valueFiles: - $values/charts/cerbos/values.yaml - - $values/charts/cerbos/{{ env }}-values.yaml + - $values/charts/cerbos/values-{{ env }}.yaml - repoURL: https://gitlab.com/oceanbox/manifests.git targetRevision: dev ref: values diff --git a/applications/rabbitmq.yaml b/applications/rabbitmq.yaml index b3223010..34b66166 100644 --- a/applications/rabbitmq.yaml +++ b/applications/rabbitmq.yaml @@ -27,7 +27,7 @@ spec: chart: rabbitmq helm: valueFiles: - - $values/charts/rabbitmq/{{ env }}-values.yaml + - $values/charts/rabbitmq/values-{{ env }}.yaml - repoURL: https://gitlab.com/oceanbox/manifests.git targetRevision: dev path: charts/rabbitmq/{{ env }} diff --git a/argo/kustomize-helm-with-rewrite/generate.sh b/argo/kustomize-helm-with-rewrite/generate.sh index ea9ee7b5..99d40568 100644 --- a/argo/kustomize-helm-with-rewrite/generate.sh +++ b/argo/kustomize-helm-with-rewrite/generate.sh @@ -19,7 +19,7 @@ fi [ -f chart/values.yaml ] && VALUES="-f chart/values.yaml" [ -f values.yaml ] && VALUES="$VALUES -f values.yaml" -[ -f $PARAM_ENV-values.yaml ] && VALUES="$VALUES -f $PARAM_ENV-values.yaml" +[ -f values-$PARAM_ENV.yaml ] && VALUES="$VALUES -f values-$PARAM_ENV.yaml" VALUES="$VALUES -f parameters.yaml" mkdir -p base diff --git a/charts/archmeister/manifests/archmeister-env-secret.yaml b/charts/archmeister/base/archmeister-env-secret.yaml similarity index 100% rename from charts/archmeister/manifests/archmeister-env-secret.yaml rename to charts/archmeister/base/archmeister-env-secret.yaml diff --git a/charts/archmeister/prod-values.yaml b/charts/archmeister/values-prod.yaml similarity index 100% rename from charts/archmeister/prod-values.yaml rename to charts/archmeister/values-prod.yaml diff --git a/charts/archmeister/values-review.yaml b/charts/archmeister/values-review.yaml deleted file mode 100644 index a393a6e1..00000000 --- a/charts/archmeister/values-review.yaml +++ /dev/null @@ -1,25 +0,0 @@ -fullnameOverride: archmeister - -image: - tag: latest - -ingress: - annotations: - cert-manager.io/cluster-issuer: letsencrypt-staging - nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 - internal: - annotations: {} - # nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 - -cluster: - backupEnabled: false - instances: 1 - imageName: ghcr.io/cloudnative-pg/postgis:15-3.3 - bootstrap: - initdb: - postInitTemplateSQL: - - CREATE EXTENSION postgis; - - CREATE EXTENSION postgis_topology; - - CREATE EXTENSION fuzzystrmatch; - - CREATE EXTENSION postgis_tiger_geocoder; - - ALTER USER app WITH SUPERUSER; diff --git a/charts/archmeister/staging-values.yaml b/charts/archmeister/values-staging.yaml similarity index 100% rename from charts/archmeister/staging-values.yaml rename to charts/archmeister/values-staging.yaml diff --git a/charts/atlantis/prod-values.yaml b/charts/atlantis/values-prod.yaml similarity index 100% rename from charts/atlantis/prod-values.yaml rename to charts/atlantis/values-prod.yaml diff --git a/charts/atlantis/staging-values.yaml b/charts/atlantis/values-staging.yaml similarity index 100% rename from charts/atlantis/staging-values.yaml rename to charts/atlantis/values-staging.yaml diff --git a/charts/busynix/prod-values.yaml b/charts/busynix/values-prod.yaml similarity index 100% rename from charts/busynix/prod-values.yaml rename to charts/busynix/values-prod.yaml diff --git a/charts/busynix/staging-values.yaml b/charts/busynix/values-staging.yaml similarity index 100% rename from charts/busynix/staging-values.yaml rename to charts/busynix/values-staging.yaml diff --git a/charts/cerbos/prod-values.yaml b/charts/cerbos/values-prod.yaml similarity index 100% rename from charts/cerbos/prod-values.yaml rename to charts/cerbos/values-prod.yaml diff --git a/charts/cerbos/staging-values.yaml b/charts/cerbos/values-staging.yaml similarity index 100% rename from charts/cerbos/staging-values.yaml rename to charts/cerbos/values-staging.yaml diff --git a/charts/dex/prod-values.yaml b/charts/dex/values-prod.yaml similarity index 100% rename from charts/dex/prod-values.yaml rename to charts/dex/values-prod.yaml diff --git a/charts/dex/staging-values.yaml b/charts/dex/values-staging.yaml similarity index 100% rename from charts/dex/staging-values.yaml rename to charts/dex/values-staging.yaml diff --git a/charts/geoserver/prod-values.yaml b/charts/geoserver/values-prod.yaml similarity index 100% rename from charts/geoserver/prod-values.yaml rename to charts/geoserver/values-prod.yaml diff --git a/charts/geoserver/staging-values.yaml b/charts/geoserver/values-staging.yaml similarity index 100% rename from charts/geoserver/staging-values.yaml rename to charts/geoserver/values-staging.yaml diff --git a/charts/hipster/prod-values.yaml b/charts/hipster/values-prod.yaml similarity index 100% rename from charts/hipster/prod-values.yaml rename to charts/hipster/values-prod.yaml diff --git a/charts/hipster/staging-values.yaml b/charts/hipster/values-staging.yaml similarity index 100% rename from charts/hipster/staging-values.yaml rename to charts/hipster/values-staging.yaml diff --git a/charts/osm-tile-server/prod-values.yaml b/charts/osm-tile-server/values-prod.yaml similarity index 100% rename from charts/osm-tile-server/prod-values.yaml rename to charts/osm-tile-server/values-prod.yaml diff --git a/charts/osm-tile-server/staging-values.yaml b/charts/osm-tile-server/values-staging.yaml similarity index 100% rename from charts/osm-tile-server/staging-values.yaml rename to charts/osm-tile-server/values-staging.yaml diff --git a/charts/petimeter/prod-values.yaml b/charts/petimeter/values-prod.yaml similarity index 100% rename from charts/petimeter/prod-values.yaml rename to charts/petimeter/values-prod.yaml diff --git a/charts/petimeter/staging-values.yaml b/charts/petimeter/values-staging.yaml similarity index 100% rename from charts/petimeter/staging-values.yaml rename to charts/petimeter/values-staging.yaml diff --git a/charts/rabbitmq/prod-values.yaml b/charts/rabbitmq/values-prod.yaml similarity index 100% rename from charts/rabbitmq/prod-values.yaml rename to charts/rabbitmq/values-prod.yaml diff --git a/charts/rabbitmq/staging-values.yaml b/charts/rabbitmq/values-staging.yaml similarity index 100% rename from charts/rabbitmq/staging-values.yaml rename to charts/rabbitmq/values-staging.yaml diff --git a/charts/sorcerer/prod-values.yaml b/charts/sorcerer/values-prod.yaml similarity index 100% rename from charts/sorcerer/prod-values.yaml rename to charts/sorcerer/values-prod.yaml diff --git a/charts/sorcerer/staging-values.yaml b/charts/sorcerer/values-staging.yaml similarity index 100% rename from charts/sorcerer/staging-values.yaml rename to charts/sorcerer/values-staging.yaml