2e61810547
Replace Helm lookup functions with FluxCD valuesFrom mechanism for reading cluster and namespace configuration. Changes: - Create Secret cozystack-values in each namespace with values.yaml key containing _cluster and _namespace configuration as nested YAML - Configure HelmReleases to read from this Secret via valuesFrom (valuesKey defaults to values.yaml, so it can be omitted) - Update cozy-lib helpers to access config via .Values._cluster - Add default values for required _cluster keys to ensure all fields exist - Update Go code (cozystack-api and helm reconciler) to use new format This eliminates the need for Helm lookup functions while maintaining the same configuration interface for charts. Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
95 lines
2.9 KiB
YAML
95 lines
2.9 KiB
YAML
---
|
|
apiVersion: postgresql.cnpg.io/v1
|
|
kind: Cluster
|
|
metadata:
|
|
name: {{ .Release.Name }}
|
|
spec:
|
|
instances: {{ .Values.replicas }}
|
|
{{- if .Values.backup.enabled }}
|
|
backup:
|
|
barmanObjectStore:
|
|
destinationPath: {{ .Values.backup.destinationPath }}
|
|
endpointURL: {{ .Values.backup.endpointURL }}
|
|
s3Credentials:
|
|
accessKeyId:
|
|
name: {{ .Release.Name }}-s3-creds
|
|
key: AWS_ACCESS_KEY_ID
|
|
secretAccessKey:
|
|
name: {{ .Release.Name }}-s3-creds
|
|
key: AWS_SECRET_ACCESS_KEY
|
|
retentionPolicy: {{ .Values.backup.retentionPolicy }}
|
|
{{- end }}
|
|
|
|
{{- if .Values.bootstrap.enabled }}
|
|
bootstrap:
|
|
recovery:
|
|
source: {{ .Values.bootstrap.oldName }}
|
|
{{- if .Values.bootstrap.recoveryTime }}
|
|
recoveryTarget:
|
|
targetTime: {{ .Values.bootstrap.recoveryTime }}
|
|
{{- end }}
|
|
externalClusters:
|
|
- name: {{ .Values.bootstrap.oldName }}
|
|
barmanObjectStore:
|
|
destinationPath: {{ .Values.backup.destinationPath }}
|
|
endpointURL: {{ .Values.backup.endpointURL }}
|
|
s3Credentials:
|
|
accessKeyId:
|
|
name: {{ .Release.Name }}-s3-creds
|
|
key: AWS_ACCESS_KEY_ID
|
|
secretAccessKey:
|
|
name: {{ .Release.Name }}-s3-creds
|
|
key: AWS_SECRET_ACCESS_KEY
|
|
{{- end }}
|
|
|
|
resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 4 }}
|
|
|
|
imageName: ghcr.io/cloudnative-pg/postgresql:{{ include "postgres.versionMap" $ | trimPrefix "v" }}
|
|
enableSuperuserAccess: true
|
|
{{- if .Values._cluster.scheduling }}
|
|
{{- $rawConstraints := get .Values._cluster.scheduling "globalAppTopologySpreadConstraints" }}
|
|
{{- if $rawConstraints }}
|
|
{{- $rawConstraints | fromYaml | toYaml | nindent 2 }}
|
|
labelSelector:
|
|
matchLabels:
|
|
cnpg.io/cluster: {{ .Release.Name }}
|
|
{{- end }}
|
|
{{- end }}
|
|
postgresql:
|
|
parameters:
|
|
max_wal_senders: "30"
|
|
{{- with .Values.postgresql.parameters.max_connections }}
|
|
max_connections: "{{ . }}"
|
|
{{- end }}
|
|
|
|
minSyncReplicas: {{ .Values.quorum.minSyncReplicas }}
|
|
maxSyncReplicas: {{ .Values.quorum.maxSyncReplicas }}
|
|
|
|
monitoring:
|
|
enablePodMonitor: true
|
|
|
|
storage:
|
|
size: {{ required ".Values.size is required" .Values.size }}
|
|
{{- with .Values.storageClass }}
|
|
storageClass: {{ . }}
|
|
{{- end }}
|
|
|
|
inheritedMetadata:
|
|
labels:
|
|
policy.cozystack.io/allow-to-apiserver: "true"
|
|
app.kubernetes.io/name: postgres.apps.cozystack.io
|
|
app.kubernetes.io/instance: {{ $.Release.Name }}
|
|
---
|
|
apiVersion: cozystack.io/v1alpha1
|
|
kind: WorkloadMonitor
|
|
metadata:
|
|
name: {{ $.Release.Name }}
|
|
spec:
|
|
replicas: {{ .Values.replicas }}
|
|
minReplicas: 1
|
|
kind: postgres
|
|
type: postgres
|
|
selector:
|
|
app.kubernetes.io/name: postgres.apps.cozystack.io
|
|
app.kubernetes.io/instance: {{ $.Release.Name }}
|
|
version: {{ $.Chart.Version }}
|