Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/pmm-ha/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: pmm-ha
description: A Helm chart for Percona Monitoring and Management (PMM)
type: application
version: 1.6.0
version: 1.6.2
appVersion: "3.9.0"
home: https://github.com/percona/pmm
maintainers:
Expand Down
75 changes: 0 additions & 75 deletions charts/pmm-ha/templates/haproxy-init-configmap.yaml

This file was deleted.

31 changes: 6 additions & 25 deletions charts/pmm-ha/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -522,31 +522,12 @@ haproxy:
labelSelector:
matchLabels:
app.kubernetes.io/name: haproxy
# Init container to wait for PMM instances to be ready
initContainers:
- name: wait-for-pmm-ready
image: "alpine:latest"
command:
- /bin/sh
- /scripts/wait-for-pmm.sh
volumeMounts:
- name: init-script
mountPath: /scripts
readOnly: true
resources:
requests:
cpu: 50m
memory: 32Mi
limits:
cpu: 100m
memory: 64Mi

# Additional volumes for init container
extraVolumes:
- name: init-script
configMap:
name: pmm-ha-haproxy-init-script
defaultMode: 0755
# No init container. HAProxy starts immediately and discovers PMM itself:
# server-template carries "init-addr last,libc,none", so a backend whose DNS name does
# not resolve yet is held with no address rather than aborting startup, and the
# /v1/server/leaderHealthCheck check brings it UP only once it is genuinely serving.
# Waiting for every replica first turned "HAProxy up, no backends yet" into "no HAProxy
# at all" - see PMM-15394.
# Disable default ConfigMap creation - we create our own
configMap:
enabled: false
Expand Down
Loading