refactor: rename helmfile values to env

envs/environments.yaml.gotmpl

@@ -1,23 +1,23 @@
 environments:
   default:
     values:
-    - ../values/values.yaml
+    - ../values/env.yaml
-    - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
+    - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-    - ../values/*/values.yaml.gotmpl
+    - ../values/*/env.yaml.gotmpl
-    - ../values/*/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+    - ../values/*/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
     missingFileHandler: Info
   prod:
     values:
-    - ../values.yaml
+    - ../values/env.yaml
-    - ../values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
+    - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-    - ../values/*/values.yaml.gotmpl
+    - ../values/*/env.yaml.gotmpl
-    - ../values/*/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+    - ../values/*/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
     missingFileHandler: Info
   staging:
     values:
-    - ../values.yaml
+    - ../values/env.yaml
-    - ../values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
+    - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-    - ../values/*/values.yaml.gotmpl
+    - ../values/*/env.yaml.gotmpl
-    - ../values/*/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+    - ../values/*/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
     missingFileHandler: Info
 

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/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-  - ../values/argo/values.yaml.gotmpl
+  - ../values/argo/env.yaml.gotmpl
-  - ../values/argo/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+  - ../values/argo/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
   hooks:
   - events: [ prepare, cleanup ]
     showlogs: true

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/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-  - ../values/cert-manager/values.yaml.gotmpl
+  - ../values/cert-manager/env.yaml.gotmpl
-  - ../values/cert-manager/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+  - ../values/cert-manager/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
   hooks:
   - events: [ prepare, cleanup ]
     showlogs: true

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/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-  - ../values/cilium/values.yaml.gotmpl
+  - ../values/cilium/env.yaml.gotmpl
-  - ../values/cilium/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+  - ../values/cilium/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
   hooks:
   - events: [ prepare, cleanup ]
     showlogs: true

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/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-  - ../values/ingress-nginx/values.yaml.gotmpl
+  - ../values/ingress-nginx/env.yaml.gotmpl
-  - ../values/ingress-nginx/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+  - ../values/ingress-nginx/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
   hooks:
   - events: [ prepare, cleanup ]
     showlogs: true

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/env.yaml
-  - ../values/kyverno/values.yaml.gotmpl
+  - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-  - ../values/kyverno/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+  - ../values/kyverno/env.yaml.gotmpl
+  - ../values/kyverno/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
   hooks:
   - events: [ prepare, cleanup ]
     showlogs: true

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/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-  - ../values/metrics-server/values.yaml.gotmpl
+  - ../values/metrics-server/env.yaml.gotmpl
-  - ../values/metrics-server/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+  - ../values/metrics-server/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
   hooks:
   - events: [ prepare, cleanup ]
     showlogs: true

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/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-  - ../values/nfs-provisioner/values.yaml.gotmpl
+  - ../values/nfs-provisioner/env.yaml.gotmpl
-  - ../values/nfs-provisioner/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+  - ../values/nfs-provisioner/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
   hooks:
   - events: [ prepare, cleanup ]
     showlogs: true

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/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-  - ../values/postgres-operator/values.yaml.gotmpl
+  - ../values/postgres-operator/env.yaml.gotmpl
-  - ../values/postgres-operator/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+  - ../values/postgres-operator/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
   hooks:
   - events: [ prepare, cleanup ]
     showlogs: true

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/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-  - ../values/prometheus/values.yaml.gotmpl
+  - ../values/prometheus/env.yaml.gotmpl
-  - ../values/prometheus/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+  - ../values/prometheus/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
   hooks:
   - events: [ prepare, cleanup ]
     showlogs: true

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/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-  - ../values/velero/values.yaml.gotmpl
+  - ../values/velero/env.yaml.gotmpl
-  - ../values/velero/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+  - ../values/velero/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
   hooks:
   - events: [ prepare, cleanup ]
     showlogs: true

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/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
-  - ../values/x509-exporter/values.yaml.gotmpl
+  - ../values/x509-exporter/env.yaml.gotmpl
-  - ../values/x509-exporter/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
+  - ../values/x509-exporter/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
   hooks:
   - events: [ prepare, cleanup ]
     showlogs: true

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:

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

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/<tenant>/oauth2/v2.0"
+    #  secret_ref:
+    #    name: azure-oidc
+    #  group_id: "<group_id>"
+    #- name: github
+    #  provider: github
+    #  secret_ref:
+    #    name: github-oidc
+    #  allowed_organizations: <org>
+    #  allowed_teams: <team-id>

values/values.yaml

@@ -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/<tenant>/oauth2/v2.0"
-    #  secret_ref:
-    #    name: azure-oidc
-    #  group_id: "<group_id>"
-    #- name: github
-    #  provider: github
-    #  secret_ref:
-    #    name: github-oidc
-    #  allowed_organizations: <org>
-    #  allowed_teams: <team-id>
-
-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
-