Added infrastructure params for flavour

2026-01-27 11:12:08 +00:00 · 2025-02-06 22:02:38 +00:00
parent d757202f88
commit 73ea337071
40 changed files with 98 additions and 87 deletions
--- a/charts/infrastructure/redundant/spegel.yaml
+++ b/charts/infrastructure/redundant/spegel.yaml
@@ -30,9 +30,11 @@ spec:
        {{- if eq .Values.environment.mode "staging" }}
        {{- else if eq .Values.environment.mode "production" }}
        {{- end }}
+        {{- if eq .Values.environment.flavour "talos"}}
        spegel:
          spegel:
-            containerdRegistryConfigPath: /etc/cri/conf.d/hosts
+            containerdRegistryConfigPath: /etc/cri/conf.d/hosts # talos linux specific path for containerd registry config
+        {{- end }}
  #project: spegel
  project: default
  syncPolicy:
--- a/charts/infrastructure/templates/argocd.yaml
+++ b/charts/infrastructure/templates/argocd.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/argocd
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/auth.yaml
+++ b/charts/infrastructure/templates/auth.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/auth
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/cert-manager.yaml
+++ b/charts/infrastructure/templates/cert-manager.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/cert-manager
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  project: default
--- a/charts/infrastructure/templates/cilium.yaml
+++ b/charts/infrastructure/templates/cilium.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/cilium
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  #project: cilium
--- a/charts/infrastructure/templates/cloudflared.yaml
+++ b/charts/infrastructure/templates/cloudflared.yaml
@@ -21,8 +21,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/cloudflared
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/crossplane-late.yaml
+++ b/charts/infrastructure/templates/crossplane-late.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/crossplane-late
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/crossplane-provider.yaml
+++ b/charts/infrastructure/templates/crossplane-provider.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/crossplane-provider
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/crossplane.yaml
+++ b/charts/infrastructure/templates/crossplane.yaml
@@ -21,8 +21,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/crossplane
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/descheduler.yaml
+++ b/charts/infrastructure/templates/descheduler.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/descheduler
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  project: default
--- a/charts/infrastructure/templates/external-snapshotter.yaml
+++ b/charts/infrastructure/templates/external-snapshotter.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/external-snapshotter
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  project: default
--- a/charts/infrastructure/templates/foundryvtt.yaml
+++ b/charts/infrastructure/templates/foundryvtt.yaml
@@ -21,8 +21,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/foundryvtt
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  #project: foundryvtt
--- a/charts/infrastructure/templates/gateway-api.yaml
+++ b/charts/infrastructure/templates/gateway-api.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/gateway-api
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  #project: gateway-api
--- a/charts/infrastructure/templates/ghost.yaml
+++ b/charts/infrastructure/templates/ghost.yaml
@@ -21,8 +21,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/ghost
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  #project: ghost
--- a/charts/infrastructure/templates/grafana-operator.yaml
+++ b/charts/infrastructure/templates/grafana-operator.yaml
@@ -13,7 +13,7 @@ spec:
  source:
    path: charts/grafana-operator
    repoURL: {{ .Values.global.repo }}
-    targetRevision: {{ .Values.global.branch }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |-
        type: {{ .Values.type }}
--- a/charts/infrastructure/templates/home-assistant.yaml
+++ b/charts/infrastructure/templates/home-assistant.yaml
@@ -21,8 +21,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/home-assistant
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/jellyfin.yaml
+++ b/charts/infrastructure/templates/jellyfin.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/jellyfin
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  #project: jellyfin
--- a/charts/infrastructure/templates/keycloak-late.yaml
+++ b/charts/infrastructure/templates/keycloak-late.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/keycloak-late
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/knative-eventing.yaml
+++ b/charts/infrastructure/templates/knative-eventing.yaml
@@ -22,8 +22,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/knative-eventing
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/knative-operator.yaml
+++ b/charts/infrastructure/templates/knative-operator.yaml
@@ -22,8 +22,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/knative-operator
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/knative-serving.yaml
+++ b/charts/infrastructure/templates/knative-serving.yaml
@@ -22,8 +22,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/knative-serving
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/metrics-server.yaml
+++ b/charts/infrastructure/templates/metrics-server.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/metrics-server
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  project: default
--- a/charts/infrastructure/templates/metrics.yaml
+++ b/charts/infrastructure/templates/metrics.yaml
@@ -22,8 +22,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/metrics
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/minio-operator.yaml
+++ b/charts/infrastructure/templates/minio-operator.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/minio-operator
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  #project: minio-operator
--- a/charts/infrastructure/templates/nextcloud.yaml
+++ b/charts/infrastructure/templates/nextcloud.yaml
@@ -21,8 +21,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/nextcloud
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/node-feature-discovery.yaml
+++ b/charts/infrastructure/templates/node-feature-discovery.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/node-feature-discovery
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  project: default
--- a/charts/infrastructure/templates/nvidia-device-plugin.yaml
+++ b/charts/infrastructure/templates/nvidia-device-plugin.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/nvidia-device-plugin
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  #project: nvidia-device-plugin
--- a/charts/infrastructure/templates/ollama.yaml
+++ b/charts/infrastructure/templates/ollama.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/ollama
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  #project: ollama
--- a/charts/infrastructure/templates/open-webui.yaml
+++ b/charts/infrastructure/templates/open-webui.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/open-webui
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/prometheus.yaml
+++ b/charts/infrastructure/templates/prometheus.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/prometheus
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  #project: kube-prometheus
--- a/charts/infrastructure/templates/qbittorrent.yaml
+++ b/charts/infrastructure/templates/qbittorrent.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/qbittorrent
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  #project: qbittorrent
--- a/charts/infrastructure/templates/renovate.yaml
+++ b/charts/infrastructure/templates/renovate.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/renovate
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  project: renovate
--- a/charts/infrastructure/templates/rook.yaml
+++ b/charts/infrastructure/templates/rook.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/rook
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  project: default
--- a/charts/infrastructure/templates/sealed-secrets.yaml
+++ b/charts/infrastructure/templates/sealed-secrets.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/sealed-secrets
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  project: default
--- a/charts/infrastructure/templates/teleport.yaml
+++ b/charts/infrastructure/templates/teleport.yaml
@@ -21,8 +21,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/teleport
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |
        {{- include "defaultEnvironment" . | indent 8 }}
--- a/charts/infrastructure/templates/traefik.yaml
+++ b/charts/infrastructure/templates/traefik.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/traefik
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  project: default
--- a/charts/infrastructure/templates/volsync.yaml
+++ b/charts/infrastructure/templates/volsync.yaml
@@ -12,8 +12,8 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/volsync
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: HEAD
+    repoURL: {{ .Values.global.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    #helm:
    #  values: |
  #project: volsync
--- a/charts/infrastructure/values.yaml
+++ b/charts/infrastructure/values.yaml
@@ -1,5 +1,4 @@
 global:
-  revision: HEAD
  repo: https://gitlab.com/deepcypher/dc-kc.git

 # chart specific override for our own meta cert-manager-app.yaml and children
@@ -28,8 +27,9 @@ metallb:
 environment:
  name: talos # not to be used for hard checks but to display to user
  hardware: metal # to be used to enable on-prem specific features like ceph, cilium, etc
+  flavour: talos # what flavor of k8s is this talos,kubespray,eks,aks,gke,kubeadm
  mode: production # to be used to configure backup movement and additional debugging features
-  revision: main # to be used to pull from different git branches
+  revision: HEAD # to be used to pull from different git branches
  baseDomain: deepcypher.me # to be used to override default chart domains to configure environments
  location:
    name: unknown # not to be used for hard checks purely informational
--- a/charts/init/templates/cluster.yaml
+++ b/charts/init/templates/cluster.yaml
@@ -12,13 +12,16 @@ spec:
    server: 'https://kubernetes.default.svc'
  source:
    path: charts/infrastructure
-    repoURL: 'https://gitlab.com/deepcypher/dc-kc.git'
-    targetRevision: {{ .Values.global.revision }}
-    # chart: cluster
+    repoURL: {{ .Values.infra.repo }}
+    targetRevision: {{ .Values.environment.revision }}
    helm:
      values: |-
        global:
-          revision: {{ .Values.global.revision }}
+          repo: {{ .Values.infra.repo }}
+        {{- with .Values.environment }}
+        environment:
+        {{- toYaml . | nindent 10 }}
+        {{- end }}
  project: default
  syncPolicy:
    automated:
--- a/charts/init/values.yaml
+++ b/charts/init/values.yaml
@@ -1,10 +1,16 @@
-argo-cd:
-  # installCRDs: false
-  # global:
-  #   image:
-  #     tag: v2.3.3
-  dex:
-    enabled: false
+environment:
+  name: talos # not to be used for hard checks but to display to user
+  hardware: metal # to be used to enable on-prem specific features like ceph, cilium, etc
+  flavour: talos # what flavor of k8s is this talos,kubespray,eks,aks,gke,kubeadm
+  mode: production # to be used to configure backup movement and additional debugging features
+  revision: HEAD # to be used to pull from different git branches
+  baseDomain: deepcypher.me # to be used to override default chart domains to configure environments
+  location:
+    name: unknown # not to be used for hard checks purely informational
+  contact:
+    name: George Onoufriou
+    email: noreply@deepcypher.me

-global:
-  revision: HEAD
+infra:
+  repo: https://gitlab.com/deepcypher/dc-kc.git
+  path: charts/infrastructure