The two mains shared no history, so this is a per-file three-way merge:
for each file the 65 forge-only commits touched (by patch-id), the base is
the newest version both histories held. 105 files merged or took one side
cleanly, 48 were already identical, and the 45 true conflicts and 31
modify/delete pairs were resolved by what runs on the cluster:
- The forge wins where it is live: explorer 1.5.56 (digest 45db11ff) and
its archive readers, explore-fe-hanzo's ConfigMap env (AI coin,
/v1/indexer/hanzo, /v1/chain/hanzo/rpc), exchange-api reading
luxd-archive, and explore-fe-{lux,zoo}-testnet, pinned to what they run
(v2.8.5-lux / v2.8.4-lux).
- GitHub wins where it is live: explore-fe-lux v2.8.5-lux, explore-fe-zoo
v2.8.4-lux, bankd v1.0.18, lux-build's routes.
- The forge's retirement of workloads that run nowhere stands: lux-mainnet
dex, lux-hb2, lux-market, traffic, wallet-web; the lux-testnet frontends,
indexer, exchange and gateways; lux-operator. deploy/lux-testnet/luxd.yaml
stays, since roll_luxd.sh reads it.
- GitHub's deletions stand: lux-finance and lux-financial (static sites
now), the k8s/ operator manifests, .hanzo/workflows/cicd.yml.
- Paths are /v1/chain/C/rpc where the forge had written /v1/chain/c. All
four spellings answer; this one is the documented form. The forge's
/{network}/v1 doc lines are dropped: a network is a host, and the prefix
404s.
Dry-run against the running objects (server-side, as CD applies), the
merged explorer shows no change where GitHub's showed 152 lines, and no
other live workload moves further from what runs. Every deploy/*/*.yaml
renders with charts/app; price.yaml, which failed on GitHub, now renders.
Claude-Session: https://claude.ai/code/session_01TzirYkGmD88w4GipqivUtV
67 lines
1.6 KiB
YAML
67 lines
1.6 KiB
YAML
# Generated from the live lux-bridge/consul Deployment on lux-k8s
|
|
# by hack/live2values.py. Live is the source: a repo of hand-applied
|
|
# manifests has unknown currency, the running fleet does not.
|
|
replicas: 1
|
|
selectorLabels:
|
|
app: consul
|
|
image:
|
|
repository: hashicorp/consul
|
|
tag: '1.17'
|
|
digest: sha256:fa5020e2307bc941e4317207de1ab55f2c7a8cd6b02c0592cce1cd20ec8a7f87
|
|
pullPolicy: IfNotPresent
|
|
labels:
|
|
brand: lux
|
|
command:
|
|
- sh
|
|
- -c
|
|
- exec consul agent -server -bootstrap-expect=1 -ui -client=0.0.0.0 -bind=$(POD_IP) -data-dir=/consul/data -datacenter=mainnet
|
|
env:
|
|
- name: POD_IP
|
|
valueFrom:
|
|
fieldRef:
|
|
apiVersion: v1
|
|
fieldPath: status.podIP
|
|
resources:
|
|
limits:
|
|
cpu: 250m
|
|
memory: 256Mi
|
|
requests:
|
|
cpu: 25m
|
|
memory: 64Mi
|
|
volumeMounts:
|
|
- mountPath: /consul/data
|
|
name: data
|
|
readinessProbe:
|
|
failureThreshold: 3
|
|
httpGet:
|
|
path: /v1/status/leader
|
|
port: 8500
|
|
scheme: HTTP
|
|
initialDelaySeconds: 5
|
|
periodSeconds: 10
|
|
successThreshold: 1
|
|
timeoutSeconds: 1
|
|
# One values entry names BOTH the container port and the Service port, so two
|
|
# entries on 8600 cannot both be `dns` — the Service ends with a duplicate name
|
|
# and the apply is refused. These are the live CONTAINER names (dns-tcp/dns-udp);
|
|
# the Service port for UDP 8600 is renamed `dns` -> `dns-udp` as a consequence,
|
|
# which nothing dials by name.
|
|
ports:
|
|
- containerPort: 8500
|
|
name: http
|
|
- containerPort: 8600
|
|
name: dns-tcp
|
|
- containerPort: 8600
|
|
name: dns-udp
|
|
protocol: UDP
|
|
volumes:
|
|
- name: data
|
|
rollingUpdate:
|
|
maxSurge: 25%
|
|
maxUnavailable: 25%
|
|
topologySpread:
|
|
enabled: false
|
|
lifecycle: null
|
|
terminationGracePeriodSeconds: 30
|
|
imagePullSecrets: []
|