jcoffey-dev
4b1b0e3b22
templates/enterprise-auth.yaml never set POSTGRES_ADDR/DATABASE/ USERNAME/PASSWORD at all -- enterprise-auth silently fell back to its localhost:5432 default and could never actually reach Postgres, crash-looping forever. Fixed to match api.yaml's existing pattern (Service DNS name + Secret-sourced password), plus a wait-for-postgres initContainer for the same startup-ordering reason api.yaml has one. templates/clickhouse.yaml was missing CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT -- same real bug docker-compose.yml had, now fixed there too: the official image's default user lacks CREATE USER privilege without it, so tenantprovision's -provision-tenant could never actually provision a tenant through this chart. Neither of these had ever been caught before because this chart had never been installed against a real cluster -- both surfaced and were fixed running the full "Trying the two-tenant example" walkthrough against a real kind cluster, ending with both tenants reaching status.phase: Active and real generated ClickHouse credentials in their Secrets, closing /docs/phase-4-runbook.md's last remaining gap.
114 lines
3.9 KiB
YAML
114 lines
3.9 KiB
YAML
apiVersion: apps/v1
|
|
kind: StatefulSet
|
|
metadata:
|
|
name: {{ .Release.Name }}-clickhouse
|
|
labels:
|
|
{{- include "sentry.labels" . | nindent 4 }}
|
|
{{- include "sentry.selectorLabels" (list $ "clickhouse") | nindent 4 }}
|
|
spec:
|
|
serviceName: {{ .Release.Name }}-clickhouse
|
|
replicas: 1
|
|
selector:
|
|
matchLabels:
|
|
{{- include "sentry.selectorLabels" (list $ "clickhouse") | nindent 6 }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{- include "sentry.selectorLabels" (list $ "clickhouse") | nindent 8 }}
|
|
spec:
|
|
containers:
|
|
- name: clickhouse
|
|
image: "{{ .Values.clickhouse.image.repository }}:{{ .Values.clickhouse.image.tag }}"
|
|
imagePullPolicy: {{ .Values.global.imagePullPolicy }}
|
|
env:
|
|
# Required to avoid the official image's network lockdown of
|
|
# the implicit `default` user -- see values.yaml's comment on
|
|
# this password and docker-compose.yml's original.
|
|
- name: CLICKHOUSE_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: {{ .Release.Name }}-clickhouse
|
|
key: password
|
|
# Same reasoning as docker-compose.yml's identical setting --
|
|
# enterprise/internal/tenantprovision needs CREATE USER/GRANT
|
|
# on this admin connection, which the official image's
|
|
# default user doesn't have without this. Confirmed the hard
|
|
# way: -provision-tenant failed with "Not enough
|
|
# privileges... grant CREATE USER ON *.*" against a real kind
|
|
# cluster before this was added -- this chart had never
|
|
# actually been exercised against a live cluster before that.
|
|
- name: CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT
|
|
value: "1"
|
|
ports:
|
|
- name: http
|
|
containerPort: 8123
|
|
- name: native
|
|
containerPort: 9000
|
|
volumeMounts:
|
|
- name: data
|
|
mountPath: /var/lib/clickhouse
|
|
readinessProbe:
|
|
httpGet:
|
|
path: /ping
|
|
port: http
|
|
initialDelaySeconds: 5
|
|
periodSeconds: 5
|
|
resources:
|
|
{{- toYaml .Values.clickhouse.resources | nindent 12 }}
|
|
volumeClaimTemplates:
|
|
- metadata:
|
|
name: data
|
|
spec:
|
|
accessModes: ["ReadWriteOnce"]
|
|
resources:
|
|
requests:
|
|
storage: {{ .Values.clickhouse.persistence.size }}
|
|
---
|
|
apiVersion: v1
|
|
kind: Service
|
|
metadata:
|
|
name: {{ .Release.Name }}-clickhouse
|
|
labels:
|
|
{{- include "sentry.labels" . | nindent 4 }}
|
|
{{- include "sentry.selectorLabels" (list $ "clickhouse") | nindent 4 }}
|
|
spec:
|
|
clusterIP: None
|
|
selector:
|
|
{{- include "sentry.selectorLabels" (list $ "clickhouse") | nindent 4 }}
|
|
ports:
|
|
- name: http
|
|
port: 8123
|
|
- name: native
|
|
port: 9000
|
|
---
|
|
# One-shot: applies /storage/migrations/*.sql -- same image
|
|
# storage/Dockerfile builds for docker-compose.yml's clickhouse-migrate
|
|
# service. Plain Job, not a Helm hook -- see redpanda.yaml's comment and
|
|
# deploy/helm/sentry/README.md's "Startup ordering" section.
|
|
apiVersion: batch/v1
|
|
kind: Job
|
|
metadata:
|
|
name: {{ .Release.Name }}-clickhouse-migrate
|
|
labels:
|
|
{{- include "sentry.labels" . | nindent 4 }}
|
|
spec:
|
|
backoffLimit: 6
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{- include "sentry.selectorLabels" (list $ "clickhouse-migrate") | nindent 8 }}
|
|
spec:
|
|
restartPolicy: OnFailure
|
|
containers:
|
|
- name: clickhouse-migrate
|
|
image: "{{ .Values.clickhouse.migrateImage.repository }}:{{ .Values.clickhouse.migrateImage.tag }}"
|
|
imagePullPolicy: {{ .Values.global.imagePullPolicy }}
|
|
env:
|
|
- name: CLICKHOUSE_HTTP
|
|
value: "http://{{ .Release.Name }}-clickhouse:8123"
|
|
- name: CLICKHOUSE_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: {{ .Release.Name }}-clickhouse
|
|
key: password
|