mirror of
https://gitlab.kube.huskypup.net/Scooby/Homelabv4.git
synced 2026-08-23 12:56:46 +00:00
Scooby HuskyandClaude Sonnet 5
6cf1d89278
The CONFIG_TEMPLATE_DIRECTORY redirect from the previous commit doesn't work - confirmed live that extraVolumes is a dead values key for the Praefect subchart specifically (its statefulset.yaml never calls the gitlab.extraVolumes helper in its volumes: list, only volumeMounts calls the corresponding helper - a real chart limitation, not a config mistake). A dangling volumeMount with no matching volume would have failed to schedule. Real fix: ignoreDifferences on ConfigMap gitlab-praefect's data field (argocd-apps/apps/gitlab.yaml) lets Helm create the object normally while ArgoCD stops reconciling its content afterward - the actual config gets kubectl-patched onto the live object directly. praefect-ha-configmap.yaml is now a git-tracked reference/documentation copy (deployed under its own harmless name) rather than something Helm/ArgoCD wires in on its own. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
84 lines
3.6 KiB
YAML
84 lines
3.6 KiB
YAML
# GitLab cross-site replication (see
|
|
# /home/scooby/.claude/plans/jiggly-snacking-iverson.md) - the chart has
|
|
# no support for registering an externally-hosted Gitaly node into an
|
|
# existing Praefect virtual storage (confirmed live: no
|
|
# virtualStorages[].nodes/address-override key exists in the template,
|
|
# gitalyReplicas just counts StatefulSet ordinals). Overriding Praefect's
|
|
# rendered config.toml is the only way to add one.
|
|
#
|
|
# A values-only CONFIG_TEMPLATE_DIRECTORY redirect (extraEnv +
|
|
# extraVolumes/extraVolumeMounts) was tried first and confirmed NOT to
|
|
# work: charts/gitlab/charts/praefect/templates/statefulset.yaml's own
|
|
# volumes: list never calls the gitlab.extraVolumes helper (only
|
|
# volumeMounts does) - a chart limitation specific to this subchart, no
|
|
# values-only fix exists.
|
|
#
|
|
# THIS ConfigMap (praefect-ha-config) is deployed as a harmless,
|
|
# otherwise-unused object - it exists purely as a git-tracked reference
|
|
# copy of the content that actually matters. The REAL live config lives
|
|
# on the chart's own gitlab-praefect ConfigMap, which
|
|
# argocd-apps/apps/gitlab.yaml's ignoreDifferences now exempts from
|
|
# ArgoCD's normal drift-reconciliation (its `data` field specifically) -
|
|
# apply this file's content to it directly:
|
|
# kubectl -n gitlab patch configmap gitlab-praefect --type merge \
|
|
# -p "{\"data\":{\"config.toml.tpl\":\"$(kubectl -n gitlab get cm \
|
|
# praefect-ha-config -o jsonpath='{.data.config\.toml\.tpl}' | \
|
|
# python3 -c 'import sys,json; print(json.dumps(sys.stdin.read())[1:-1])')\"}}"
|
|
# (or simpler: kubectl -n gitlab get cm praefect-ha-config -o
|
|
# jsonpath='{.data}' | kubectl -n gitlab patch cm gitlab-praefect --type
|
|
# merge -p "{\"data\":$(cat -)}")
|
|
#
|
|
# Content below is intentionally byte-identical to the chart's own
|
|
# current rendering for the first pass (confirmed live via `kubectl -n
|
|
# gitlab get cm gitlab-praefect -o jsonpath='{.data.config\.toml\.tpl}'`)
|
|
# - proves the ignoreDifferences + manual-patch mechanism itself doesn't
|
|
# break anything, before a follow-up switches addressing to floating
|
|
# hostnames and adds the VPS as a 4th node.
|
|
apiVersion: v1
|
|
kind: ConfigMap
|
|
metadata:
|
|
name: praefect-ha-config
|
|
namespace: gitlab
|
|
data:
|
|
config.toml.tpl: |
|
|
# TCP address to listen on
|
|
listen_addr = '0.0.0.0:8075'
|
|
prometheus_listen_addr = '0.0.0.0:9236'
|
|
|
|
prometheus_exclude_database_from_default_metrics = true
|
|
|
|
[failover]
|
|
enabled = true
|
|
read_only_after_failover = true
|
|
|
|
[auth]
|
|
token = {% file.Read "/etc/gitlab-secrets/praefect/praefect_token" | strings.TrimSpace | data.ToJSON %}
|
|
|
|
transitioning = false
|
|
|
|
[logging]
|
|
|
|
[[virtual_storage]]
|
|
name = 'default'
|
|
[[virtual_storage.node]]
|
|
storage = 'gitlab-gitaly-default-0'
|
|
address = 'tcp://gitlab-gitaly-default-0.gitlab-gitaly-default.gitlab.svc:8075'
|
|
token = {% file.Read "/etc/gitlab-secrets/praefect/gitaly_token" | strings.TrimSpace | data.ToJSON %}
|
|
[[virtual_storage.node]]
|
|
storage = 'gitlab-gitaly-default-1'
|
|
address = 'tcp://gitlab-gitaly-default-1.gitlab-gitaly-default.gitlab.svc:8075'
|
|
token = {% file.Read "/etc/gitlab-secrets/praefect/gitaly_token" | strings.TrimSpace | data.ToJSON %}
|
|
[[virtual_storage.node]]
|
|
storage = 'gitlab-gitaly-default-2'
|
|
address = 'tcp://gitlab-gitaly-default-2.gitlab-gitaly-default.gitlab.svc:8075'
|
|
token = {% file.Read "/etc/gitlab-secrets/praefect/gitaly_token" | strings.TrimSpace | data.ToJSON %}
|
|
|
|
|
|
[database]
|
|
host = 'pg-praefect-rw.gitlab.svc.cluster.local'
|
|
port = 5432
|
|
user = 'app'
|
|
password = {% file.Read "/etc/gitlab-secrets/praefect/db_password" | strings.TrimSpace | data.ToJSON %}
|
|
dbname = 'praefect_production'
|
|
sslmode = 'disable'
|