From f5bd86dffbf2637d801ac6f68c1220e8d0b8614a Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Thu, 19 Jun 2025 14:25:11 +0200 Subject: [PATCH] refactor: rename helmfile values to env --- envs/environments.yaml.gotmpl | 24 ++-- helmfile.d/argo.yaml.gotmpl | 6 +- helmfile.d/cert-manager.yaml.gotmpl | 6 +- helmfile.d/cilium.yaml.gotmpl | 6 +- helmfile.d/ingress-nginx.yaml.gotmpl | 6 +- helmfile.d/kyverno.yaml.gotmpl | 7 +- helmfile.d/metrics-server.yaml.gotmpl | 6 +- helmfile.d/nfs-provisioner.yaml.gotmpl | 6 +- helmfile.d/postgres-operator.yaml.gotmpl | 6 +- helmfile.d/prometheus.yaml.gotmpl | 6 +- helmfile.d/velero.yaml.gotmpl | 6 +- helmfile.d/x509-exporter.yaml.gotmpl | 6 +- .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 ...x.yaml.gotmpl => env-oceanbox.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 2 +- .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 ...values-oceanbox.yaml => env-oceanbox.yaml} | 5 - values/env.yaml | 43 ++++++ .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 ...x.yaml.gotmpl => env-oceanbox.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 ...x.yaml.gotmpl => env-oceanbox.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 values/values.yaml | 136 ------------------ .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 .../{values.yaml.gotmpl => env.yaml.gotmpl} | 0 37 files changed, 90 insertions(+), 187 deletions(-) rename values/argo/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/atlantis/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/cert-manager/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/cilium/{values-oceanbox.yaml.gotmpl => env-oceanbox.yaml.gotmpl} (100%) rename values/cilium/{values.yaml.gotmpl => env.yaml.gotmpl} (90%) rename values/dapr/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/{values-oceanbox.yaml => env-oceanbox.yaml} (93%) create mode 100644 values/env.yaml rename values/ingress-nginx/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/keycloak/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/kyverno/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/loki/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/metrics-server/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/nfs-provisioner/{values-oceanbox.yaml.gotmpl => env-oceanbox.yaml.gotmpl} (100%) rename values/nfs-provisioner/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/openfga/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/postgres-operator/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/prometheus/{values-oceanbox.yaml.gotmpl => env-oceanbox.yaml.gotmpl} (100%) rename values/prometheus/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/rabbitmq/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/redis/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/tempo/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) delete mode 100644 values/values.yaml rename values/velero/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) rename values/x509-exporter/{values.yaml.gotmpl => env.yaml.gotmpl} (100%) diff --git a/envs/environments.yaml.gotmpl b/envs/environments.yaml.gotmpl index d95ffed7..2c44b21c 100644 --- a/envs/environments.yaml.gotmpl +++ b/envs/environments.yaml.gotmpl @@ -1,23 +1,23 @@ environments: default: values: - - ../values/values.yaml - - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/*/values.yaml.gotmpl - - ../values/*/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env.yaml + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/*/env.yaml.gotmpl + - ../values/*/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl missingFileHandler: Info prod: values: - - ../values.yaml - - ../values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/*/values.yaml.gotmpl - - ../values/*/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env.yaml + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/*/env.yaml.gotmpl + - ../values/*/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl missingFileHandler: Info staging: values: - - ../values.yaml - - ../values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/*/values.yaml.gotmpl - - ../values/*/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env.yaml + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/*/env.yaml.gotmpl + - ../values/*/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl missingFileHandler: Info diff --git a/helmfile.d/argo.yaml.gotmpl b/helmfile.d/argo.yaml.gotmpl index db7cdb12..ab2583c1 100644 --- a/helmfile.d/argo.yaml.gotmpl +++ b/helmfile.d/argo.yaml.gotmpl @@ -52,9 +52,9 @@ releases: condition: argo.enabled missingFileHandler: Info values: - - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/argo/values.yaml.gotmpl - - ../values/argo/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/argo/env.yaml.gotmpl + - ../values/argo/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl hooks: - events: [ prepare, cleanup ] showlogs: true diff --git a/helmfile.d/cert-manager.yaml.gotmpl b/helmfile.d/cert-manager.yaml.gotmpl index 90c328d0..c635f15d 100644 --- a/helmfile.d/cert-manager.yaml.gotmpl +++ b/helmfile.d/cert-manager.yaml.gotmpl @@ -27,9 +27,9 @@ releases: condition: cert_manager.enabled missingFileHandler: Info values: - - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/cert-manager/values.yaml.gotmpl - - ../values/cert-manager/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/cert-manager/env.yaml.gotmpl + - ../values/cert-manager/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl hooks: - events: [ prepare, cleanup ] showlogs: true diff --git a/helmfile.d/cilium.yaml.gotmpl b/helmfile.d/cilium.yaml.gotmpl index 07416579..6b75a900 100644 --- a/helmfile.d/cilium.yaml.gotmpl +++ b/helmfile.d/cilium.yaml.gotmpl @@ -41,9 +41,9 @@ releases: condition: cilium.enabled missingFileHandler: Info values: - - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/cilium/values.yaml.gotmpl - - ../values/cilium/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/cilium/env.yaml.gotmpl + - ../values/cilium/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl hooks: - events: [ prepare, cleanup ] showlogs: true diff --git a/helmfile.d/ingress-nginx.yaml.gotmpl b/helmfile.d/ingress-nginx.yaml.gotmpl index 2645bb14..fa03f08d 100644 --- a/helmfile.d/ingress-nginx.yaml.gotmpl +++ b/helmfile.d/ingress-nginx.yaml.gotmpl @@ -27,9 +27,9 @@ releases: condition: nginx.enabled missingFileHandler: Info values: - - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/ingress-nginx/values.yaml.gotmpl - - ../values/ingress-nginx/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/ingress-nginx/env.yaml.gotmpl + - ../values/ingress-nginx/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl hooks: - events: [ prepare, cleanup ] showlogs: true diff --git a/helmfile.d/kyverno.yaml.gotmpl b/helmfile.d/kyverno.yaml.gotmpl index aa611c53..957f034b 100644 --- a/helmfile.d/kyverno.yaml.gotmpl +++ b/helmfile.d/kyverno.yaml.gotmpl @@ -30,9 +30,10 @@ releases: condition: kyverno.enabled missingFileHandler: Info values: - - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/kyverno/values.yaml.gotmpl - - ../values/kyverno/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env.yaml + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/kyverno/env.yaml.gotmpl + - ../values/kyverno/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl hooks: - events: [ prepare, cleanup ] showlogs: true diff --git a/helmfile.d/metrics-server.yaml.gotmpl b/helmfile.d/metrics-server.yaml.gotmpl index 697ffedd..0cef34ba 100644 --- a/helmfile.d/metrics-server.yaml.gotmpl +++ b/helmfile.d/metrics-server.yaml.gotmpl @@ -27,9 +27,9 @@ releases: condition: metrics_server.enabled missingFileHandler: Info values: - - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/metrics-server/values.yaml.gotmpl - - ../values/metrics-server/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/metrics-server/env.yaml.gotmpl + - ../values/metrics-server/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl hooks: - events: [ prepare, cleanup ] showlogs: true diff --git a/helmfile.d/nfs-provisioner.yaml.gotmpl b/helmfile.d/nfs-provisioner.yaml.gotmpl index c012c751..d3f5eff5 100644 --- a/helmfile.d/nfs-provisioner.yaml.gotmpl +++ b/helmfile.d/nfs-provisioner.yaml.gotmpl @@ -27,9 +27,9 @@ releases: condition: nfs_provisioner.enabled missingFileHandler: Info values: - - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/nfs-provisioner/values.yaml.gotmpl - - ../values/nfs-provisioner/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/nfs-provisioner/env.yaml.gotmpl + - ../values/nfs-provisioner/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl hooks: - events: [ prepare, cleanup ] showlogs: true diff --git a/helmfile.d/postgres-operator.yaml.gotmpl b/helmfile.d/postgres-operator.yaml.gotmpl index 848dce9a..d04da36c 100644 --- a/helmfile.d/postgres-operator.yaml.gotmpl +++ b/helmfile.d/postgres-operator.yaml.gotmpl @@ -30,9 +30,9 @@ releases: condition: postgres_operator.enabled missingFileHandler: Info values: - - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/postgres-operator/values.yaml.gotmpl - - ../values/postgres-operator/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/postgres-operator/env.yaml.gotmpl + - ../values/postgres-operator/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl hooks: - events: [ prepare, cleanup ] showlogs: true diff --git a/helmfile.d/prometheus.yaml.gotmpl b/helmfile.d/prometheus.yaml.gotmpl index f6b37c1f..dbf34749 100644 --- a/helmfile.d/prometheus.yaml.gotmpl +++ b/helmfile.d/prometheus.yaml.gotmpl @@ -27,9 +27,9 @@ releases: condition: prometheus.enabled missingFileHandler: Info values: - - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/prometheus/values.yaml.gotmpl - - ../values/prometheus/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/prometheus/env.yaml.gotmpl + - ../values/prometheus/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl hooks: - events: [ prepare, cleanup ] showlogs: true diff --git a/helmfile.d/velero.yaml.gotmpl b/helmfile.d/velero.yaml.gotmpl index 06725915..c54c709c 100644 --- a/helmfile.d/velero.yaml.gotmpl +++ b/helmfile.d/velero.yaml.gotmpl @@ -30,9 +30,9 @@ releases: condition: velero.enabled missingFileHandler: Info values: - - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/velero/values.yaml.gotmpl - - ../values/velero/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/velero/env.yaml.gotmpl + - ../values/velero/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl hooks: - events: [ prepare, cleanup ] showlogs: true diff --git a/helmfile.d/x509-exporter.yaml.gotmpl b/helmfile.d/x509-exporter.yaml.gotmpl index b7ef13ac..0d1abae5 100644 --- a/helmfile.d/x509-exporter.yaml.gotmpl +++ b/helmfile.d/x509-exporter.yaml.gotmpl @@ -27,9 +27,9 @@ releases: condition: x509_exporter.enabled missingFileHandler: Info values: - - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/x509-exporter/values.yaml.gotmpl - - ../values/x509-exporter/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/x509-exporter/env.yaml.gotmpl + - ../values/x509-exporter/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl hooks: - events: [ prepare, cleanup ] showlogs: true diff --git a/values/argo/values.yaml.gotmpl b/values/argo/env.yaml.gotmpl similarity index 100% rename from values/argo/values.yaml.gotmpl rename to values/argo/env.yaml.gotmpl diff --git a/values/atlantis/values.yaml.gotmpl b/values/atlantis/env.yaml.gotmpl similarity index 100% rename from values/atlantis/values.yaml.gotmpl rename to values/atlantis/env.yaml.gotmpl diff --git a/values/cert-manager/values.yaml.gotmpl b/values/cert-manager/env.yaml.gotmpl similarity index 100% rename from values/cert-manager/values.yaml.gotmpl rename to values/cert-manager/env.yaml.gotmpl diff --git a/values/cilium/values-oceanbox.yaml.gotmpl b/values/cilium/env-oceanbox.yaml.gotmpl similarity index 100% rename from values/cilium/values-oceanbox.yaml.gotmpl rename to values/cilium/env-oceanbox.yaml.gotmpl diff --git a/values/cilium/values.yaml.gotmpl b/values/cilium/env.yaml.gotmpl similarity index 90% rename from values/cilium/values.yaml.gotmpl rename to values/cilium/env.yaml.gotmpl index c7cee1b0..be253268 100644 --- a/values/cilium/values.yaml.gotmpl +++ b/values/cilium/env.yaml.gotmpl @@ -16,7 +16,7 @@ cilium: enabled: false nodePort: enabled: false - # NOTE: Requires that ingresscontroller is also enabled + # NOTE: Requires that ingresscontroller is also enabled gatewayAPI: enabled: false ingressController: diff --git a/values/dapr/values.yaml.gotmpl b/values/dapr/env.yaml.gotmpl similarity index 100% rename from values/dapr/values.yaml.gotmpl rename to values/dapr/env.yaml.gotmpl diff --git a/values/values-oceanbox.yaml b/values/env-oceanbox.yaml similarity index 93% rename from values/values-oceanbox.yaml rename to values/env-oceanbox.yaml index f3e203fd..d324e0ac 100644 --- a/values/values-oceanbox.yaml +++ b/values/env-oceanbox.yaml @@ -1,7 +1,5 @@ clusterConfig: manifests: https://gitlab.com/oceanbox/manifests.git - argo: - enabled: true env: "prod" distro: "talos" domain: "adm.oceanbox.io" @@ -33,6 +31,3 @@ clusterConfig: - 172.16.0.0/12 - 192.168.0.0/16 - 172.19.255.0/24 -install: - otel: - enabled: true diff --git a/values/env.yaml b/values/env.yaml new file mode 100644 index 00000000..b39f89f2 --- /dev/null +++ b/values/env.yaml @@ -0,0 +1,43 @@ +clusterConfig: + manifests: https://gitlab.com/oceanbox/manifests.git + argo: + enabled: true + cilium: + enabled: true + env: "" #[dev, test, staging, prod] + initca: "" + domain: ".local" + apiserver: "" + apiserverip: "" + etcd_nodes: [] + k8s_nodes: [] + cluster: "" + ingress_nodes: [] + ingress_replica_count: 3 + fileserver: "" + acme_email: "" + nodenames: [] + nodes: [] + s3: + hosts: [] + patterns: [] + cidr: [] + ingress_clusterissuer: "letsencrypt-production" + ingress_whitelist_ips: + - 10.0.0.0/8 + - 172.16.0.0/12 + - 192.168.0.0/16 + - 172.19.255.0/24 + oidc: [] + #- name: azure + # provider: azuread + # tenant: "https://login.microsoftonline.com//oauth2/v2.0" + # secret_ref: + # name: azure-oidc + # group_id: "" + #- name: github + # provider: github + # secret_ref: + # name: github-oidc + # allowed_organizations: + # allowed_teams: diff --git a/values/ingress-nginx/values.yaml.gotmpl b/values/ingress-nginx/env.yaml.gotmpl similarity index 100% rename from values/ingress-nginx/values.yaml.gotmpl rename to values/ingress-nginx/env.yaml.gotmpl diff --git a/values/keycloak/values.yaml.gotmpl b/values/keycloak/env.yaml.gotmpl similarity index 100% rename from values/keycloak/values.yaml.gotmpl rename to values/keycloak/env.yaml.gotmpl diff --git a/values/kyverno/values.yaml.gotmpl b/values/kyverno/env.yaml.gotmpl similarity index 100% rename from values/kyverno/values.yaml.gotmpl rename to values/kyverno/env.yaml.gotmpl diff --git a/values/loki/values.yaml.gotmpl b/values/loki/env.yaml.gotmpl similarity index 100% rename from values/loki/values.yaml.gotmpl rename to values/loki/env.yaml.gotmpl diff --git a/values/metrics-server/values.yaml.gotmpl b/values/metrics-server/env.yaml.gotmpl similarity index 100% rename from values/metrics-server/values.yaml.gotmpl rename to values/metrics-server/env.yaml.gotmpl diff --git a/values/nfs-provisioner/values-oceanbox.yaml.gotmpl b/values/nfs-provisioner/env-oceanbox.yaml.gotmpl similarity index 100% rename from values/nfs-provisioner/values-oceanbox.yaml.gotmpl rename to values/nfs-provisioner/env-oceanbox.yaml.gotmpl diff --git a/values/nfs-provisioner/values.yaml.gotmpl b/values/nfs-provisioner/env.yaml.gotmpl similarity index 100% rename from values/nfs-provisioner/values.yaml.gotmpl rename to values/nfs-provisioner/env.yaml.gotmpl diff --git a/values/openfga/values.yaml.gotmpl b/values/openfga/env.yaml.gotmpl similarity index 100% rename from values/openfga/values.yaml.gotmpl rename to values/openfga/env.yaml.gotmpl diff --git a/values/postgres-operator/values.yaml.gotmpl b/values/postgres-operator/env.yaml.gotmpl similarity index 100% rename from values/postgres-operator/values.yaml.gotmpl rename to values/postgres-operator/env.yaml.gotmpl diff --git a/values/prometheus/values-oceanbox.yaml.gotmpl b/values/prometheus/env-oceanbox.yaml.gotmpl similarity index 100% rename from values/prometheus/values-oceanbox.yaml.gotmpl rename to values/prometheus/env-oceanbox.yaml.gotmpl diff --git a/values/prometheus/values.yaml.gotmpl b/values/prometheus/env.yaml.gotmpl similarity index 100% rename from values/prometheus/values.yaml.gotmpl rename to values/prometheus/env.yaml.gotmpl diff --git a/values/rabbitmq/values.yaml.gotmpl b/values/rabbitmq/env.yaml.gotmpl similarity index 100% rename from values/rabbitmq/values.yaml.gotmpl rename to values/rabbitmq/env.yaml.gotmpl diff --git a/values/redis/values.yaml.gotmpl b/values/redis/env.yaml.gotmpl similarity index 100% rename from values/redis/values.yaml.gotmpl rename to values/redis/env.yaml.gotmpl diff --git a/values/tempo/values.yaml.gotmpl b/values/tempo/env.yaml.gotmpl similarity index 100% rename from values/tempo/values.yaml.gotmpl rename to values/tempo/env.yaml.gotmpl diff --git a/values/values.yaml b/values/values.yaml deleted file mode 100644 index 12296a2f..00000000 --- a/values/values.yaml +++ /dev/null @@ -1,136 +0,0 @@ -clusterConfig: - manifests: https://gitlab.com/oceanbox/manifests.git - policies: policies/sys - resources: resources/sys - distro: "" #[nixos, talos] - env: "" #[dev, test, staging, prod] - initca: "" - domain: ".local" - apiserver: "" - apiserverip: "" - etcd_nodes: [] - k8s_nodes: [] - cluster: "" - ingress_nodes: [] - ingress_replica_count: 3 - fileserver: "" - acme_email: "" - nodenames: [] - nodes: [] - s3: - hosts: [] - patterns: [] - cidr: [] - ingress_clusterissuer: "letsencrypt-production" - ingress_whitelist_ips: - - 10.0.0.0/8 - - 172.16.0.0/12 - - 192.168.0.0/16 - - 172.19.255.0/24 - oidc: [] - #- name: azure - # provider: azuread - # tenant: "https://login.microsoftonline.com//oauth2/v2.0" - # secret_ref: - # name: azure-oidc - # group_id: "" - #- name: github - # provider: github - # secret_ref: - # name: github-oidc - # allowed_organizations: - # allowed_teams: - -install: - argo: - argocd: - enabled: true - apps: - enabled: true - rollouts: - enabled: false - workflows: - enabled: false - atlantis: - enabled: false - envs: - - prod - - staging - sorcerer: - enabled: false - envs: - - prod - - staging - openfga: - enabled: false - envs: - - prod - - staging - - cilium: - enabled: false - linkerd: - enabled: true - thanos: - enabled: false - prometheus: - enabled: true - nfs_provisioner: - enabled: true - cert_manager: - autosync: true - kubernetes_dashboard: - enabled: false - metrics_server: - autosync: true - nginx: - enabled: true - kyverno: - enabled: false - velero: - enabled: true - x509_exporter: - enabled: true - downscaler: - enabled: false - actions_runner_controller: - enabled: false - gitlab_runner: - enabled: true - postgres_operator: - enabled: true - rabbitmq_operator: - enabled: false - jaeger_operator: - enabled: false - loki: - enabled: false - tempo: - enabled: false - otel: - enabled: false - promtail: - enabled: false - mariadb_operator: - enabled: false - chartmuseum: - enabled: false - clickhouse_operator: - enabled: false - oncall: - enabled: false - dapr: - enable: true - busynix.enable: false - headscale.enable: false - plausible.enable: false - dex.enable: false - keycloak.enable: false - rabbitmq.enable: false - redis.enable: false - wordpress.enable: false - yolo-dl.enable: false - yolo-registry.enable: false - osm-tile-server.enable: false - geoserver.enable: false - diff --git a/values/velero/values.yaml.gotmpl b/values/velero/env.yaml.gotmpl similarity index 100% rename from values/velero/values.yaml.gotmpl rename to values/velero/env.yaml.gotmpl diff --git a/values/x509-exporter/values.yaml.gotmpl b/values/x509-exporter/env.yaml.gotmpl similarity index 100% rename from values/x509-exporter/values.yaml.gotmpl rename to values/x509-exporter/env.yaml.gotmpl