Skip to content

RajaRename ci.yml to ci.yml - #558

Open
jonokalender-coder wants to merge 19 commits into
WhatsApp:peixian/fix-hpa-templatefrom
jonokalender-coder:patch-1
Open

RajaRename ci.yml to ci.yml#558
jonokalender-coder wants to merge 19 commits into
WhatsApp:peixian/fix-hpa-templatefrom
jonokalender-coder:patch-1

Conversation

@jonokalender-coder

@jonokalender-coder jonokalender-coder commented Aug 30, 2026

Copy link
Copy Markdown

No description provided.

peixian and others added 19 commits March 28, 2025 09:55
@peixian
Fix HPA Template & Add Media Proxy Ports (WhatsApp#368)
11ff3c4
@peixian
Fix jq healthcheck to account for nulls (WhatsApp#370)
ccb8989
@kbujari
provide advice for exposing proxy publicly (WhatsApp#459)
cbad802
@peixian
Mount HAProxy config via ConfigMap instead of baking into image (What…
09adfd7 
…sApp#483)
@bsuh Brian Suh
Make HAProxy maxconn and config values templatable (v1.3.1) (WhatsApp…
f850a92 
…#519)

Co-authored-by: Brian Suh <bsuh@fb.com>
@bsuh
Add loadBalancerClass support to service template (WhatsApp#520)
b3a0ed0
@bsuh Brian Suh
Deliver HAProxy config via writable emptyDir so #PUBLIC_IP substituti…
140635a 
…on works (v1.3.3) (WhatsApp#521)

Co-authored-by: Brian Suh <bsuh@fb.com>
@bsuh Brian Suh
Support extra volumes and volumeMounts in proxy deployment (v1.3.4) (W…
0fb9d1d 
…hatsApp#523)

Co-authored-by: Brian Suh <bsuh@fb.com>
@bsuh
Fix HPA utilization calc by removing labels from test pod (WhatsApp#526)
7889b7d
@bsuh
Add optional ServiceMonitor for HAProxy Prometheus metrics (v1.3.6) (W…
ba3351f 
…hatsApp#530)
@bsuh
Add customMetrics support to HPA autoscaling (WhatsApp#531)
cf014a3
@bsuh
Consolidate wa backend servers and merge waHttp into wa (WhatsApp#532)
913c81f
@bsuh Brian Suh
Support custom HAProxy frontend config and environment (WhatsApp#535)
8b06a45 
Co-authored-by: Brian Suh <bsuh@fb.com>
@bsuh
Avoid proxy rollouts on chart metadata changes (WhatsApp#538)
9b68605
@bsuh Brian Suh
Send PROXY protocol v2 to backends by default (WhatsApp#539)
daa9d09 
Co-authored-by: Brian Suh <bsuh@fb.com>
@bsuh Brian Suh
Remove public IP rewriting from proxy image (WhatsApp#540)
b3b14fd 
Co-authored-by: Brian Suh <bsuh@fb.com>
@bsuh Brian Suh
Remove public IP rewriting from Helm chart (WhatsApp#541)
31f1888 
Co-authored-by: Brian Suh <bsuh@fb.com>
Brian Suh
Declare all HAProxy container ports unconditionally
c5bccb6 
Summary:
- Always declare every port listened on by HAProxy in the container spec.
- Keep service port configuration limited to controlling Service exposure, since omitting a containerPort does not prevent the process from listening.

Test Plan:
- ==> Linting charts/whatsapp-proxy-chart

1 chart(s) linted, 0 chart(s) failed
- ---
# Source: whatsapp-proxy-chart/templates/serviceaccount.yaml
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# License found in the LICENSE file in the root directory
# of this source tree.
apiVersion: v1
kind: ServiceAccount
metadata:
  name: whatsapp-proxy
  labels:
    helm.sh/chart: whatsapp-proxy-chart-1.3.12
    app.kubernetes.io/name: whatsapp-proxy-chart
    app.kubernetes.io/instance: test
    app: test
    app.kubernetes.io/version: "1.16.0"
    app.kubernetes.io/managed-by: Helm
---
# Source: whatsapp-proxy-chart/templates/configmap.yaml
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# License found in the LICENSE file in the root directory
# of this source tree.
apiVersion: v1
kind: ConfigMap
metadata:
  name: test-whatsapp-proxy-chart-haproxy
  labels:
    helm.sh/chart: whatsapp-proxy-chart-1.3.12
    app.kubernetes.io/name: whatsapp-proxy-chart
    app.kubernetes.io/instance: test
    app: test
    app.kubernetes.io/version: "1.16.0"
    app.kubernetes.io/managed-by: Helm
data:
  haproxy.cfg: |
    global
      tune.bufsize 4096
      maxconn 27500
      spread-checks 5
      ssl-server-verify none

    defaults
      mode tcp
      timeout client-fin 1s
      timeout server-fin 1s
      timeout connect 5s
      timeout client 200s
      timeout server 200s
      default-server inter 10s fastinter 1s downinter 3s error-limit 50

    listen stats
      bind :::8199
      mode http
      http-request use-service prometheus-exporter if { path /metrics }
      stats uri /

    frontend haproxy_v4_http
      maxconn 27495

      bind ipv4@*:80
      bind ipv4@*:8080 accept-proxy

      default_backend wa

    frontend haproxy_v4_https
      maxconn 27495

      bind ipv4@*:443 ssl crt /etc/haproxy/ssl/proxy.whatsapp.net.pem
      bind ipv4@*:8443 ssl crt /etc/haproxy/ssl/proxy.whatsapp.net.pem accept-proxy

      default_backend wa

    frontend haproxy_v4_xmpp
      maxconn 27495

      bind ipv4@*:5222
      bind ipv4@*:8222 accept-proxy

      default_backend wa

    frontend haproxy_v4_whatsapp_net
      maxconn 27495

      bind ipv4@*:587
      bind ipv4@*:7777

      default_backend wa_whatsapp_net

    backend wa_whatsapp_net
      default-server check inter 60000 observe layer4
      server whatsapp_net_443 whatsapp.net:443

    backend wa
      default-server check inter 60000 observe layer4 send-proxy-v2
      server g_whatsapp_net_5222 g.whatsapp.net:5222
      server g_whatsapp_net_80 g.whatsapp.net:80
      server g_whatsapp_net_443 g.whatsapp.net:443
      server g_fallback_whatsapp_net_5222 g-fallback.whatsapp.net:5222
      server g_fallback_whatsapp_net_80 g-fallback.whatsapp.net:80
      server g_fallback_whatsapp_net_443 g-fallback.whatsapp.net:443
---
# Source: whatsapp-proxy-chart/templates/service.yaml
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# License found in the LICENSE file in the root directory
# of this source tree.
apiVersion: v1
kind: Service
metadata:
  name: test-whatsapp-proxy-chart
  labels:
    helm.sh/chart: whatsapp-proxy-chart-1.3.12
    app.kubernetes.io/name: whatsapp-proxy-chart
    app.kubernetes.io/instance: test
    app: test
    app.kubernetes.io/version: "1.16.0"
    app.kubernetes.io/managed-by: Helm
  annotations:
    service.beta.kubernetes.io/aws-load-balancer-type: nlb

spec:
  type: LoadBalancer
  ports:
    - port: 5222
      targetPort: 5222
      protocol: TCP
      name: jabber
    - port: 80
      targetPort: 80
      protocol: TCP
      name: http
    - port: 443
      targetPort: 443
      protocol: TCP
      name: https
    - port: 587
      targetPort: 587
      protocol: TCP
      name: media

  selector:
    app.kubernetes.io/name: whatsapp-proxy-chart
    app.kubernetes.io/instance: test
    app: test
---
# Source: whatsapp-proxy-chart/templates/deployment.yaml
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# License found in the LICENSE file in the root directory
# of this source tree.
apiVersion: apps/v1
kind: Deployment
metadata:
  name: test-whatsapp-proxy-chart
  labels:
    helm.sh/chart: whatsapp-proxy-chart-1.3.12
    app.kubernetes.io/name: whatsapp-proxy-chart
    app.kubernetes.io/instance: test
    app: test
    app.kubernetes.io/version: "1.16.0"
    app.kubernetes.io/managed-by: Helm
spec:
  replicas: 10
  selector:
    matchLabels:
      app.kubernetes.io/name: whatsapp-proxy-chart
      app.kubernetes.io/instance: test
      app: test
  template:
    metadata:
      annotations:
        checksum/haproxy-config: 430df3ebfca341e61e0297d0ac17f0fff4524eec5fca23730a38270604186719
      labels:
        app.kubernetes.io/name: whatsapp-proxy-chart
        app.kubernetes.io/instance: test
        app: test
    spec:
      serviceAccountName: whatsapp-proxy
      securityContext:
        sysctls:
        - name: net.ipv4.ip_unprivileged_port_start
          value: "0"
      containers:
        - name: whatsapp-proxy-chart
          securityContext:
            {}
          image: "facebook/whatsapp_proxy:latest"
          imagePullPolicy: IfNotPresent
          ports:
            - name: http-proxy
              containerPort: 8080
              protocol: TCP
            - name: http
              containerPort: 80
              protocol: TCP
            - name: https-proxy
              containerPort: 8443
              protocol: TCP
            - name: https
              containerPort: 443
              protocol: TCP
            - name: jabber-proxy
              containerPort: 8222
              protocol: TCP
            - name: jabber
              containerPort: 5222
              protocol: TCP
            - name: media
              containerPort: 587
              protocol: TCP
            - name: media-proxy
              containerPort: 7777
              protocol: TCP
            - name: stats
              containerPort: 8199
              protocol: TCP
          readinessProbe:
            exec:
              command:
              - /usr/local/bin/healthcheck.sh
            initialDelaySeconds: 30
            periodSeconds: 30
          resources:
            {}
          volumeMounts:
            - name: haproxy-config
              mountPath: /usr/local/etc/haproxy/haproxy.cfg
              subPath: haproxy.cfg
              readOnly: true
      volumes:
        - name: haproxy-config
          configMap:
            name: test-whatsapp-proxy-chart-haproxy
---
# Source: whatsapp-proxy-chart/templates/hpa.yaml
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# License found in the LICENSE file in the root directory
# of this source tree.
---
# Source: whatsapp-proxy-chart/templates/ingress.yaml
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# License found in the LICENSE file in the root directory
# of this source tree.
---
# Source: whatsapp-proxy-chart/templates/servicemonitor.yaml
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# License found in the LICENSE file in the root directory
# of this source tree.
---
# Source: whatsapp-proxy-chart/templates/tests/test-connection.yaml
# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# License found in the LICENSE file in the root directory
# of this source tree.
apiVersion: v1
kind: Pod
metadata:
  name: "test-whatsapp-proxy-chart-test-connection"
  # Intentionally omit common/selector labels so this pod is not matched by the
  # HPA's selector. This test pod has no resource requests, and including it
  # would break the HPA's utilization calculation.
  annotations:
    "helm.sh/hook": test
    "helm.sh/hook-delete-policy": hook-succeeded
spec:
  containers:
    - name: wget
      image: busybox
      command: ['wget']
      args: ['test-whatsapp-proxy-chart:']
  restartPolicy: Never
@jonokalender-coder
Rename ci.yml to ci.yml
7d2494d
@meta-cla

meta-cla Bot commented Aug 30, 2026

Copy link
Copy Markdown

Hi @jonokalender-coder!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@meta.com. Thanks!

@jonokalender-coder
jonokalender-coder changed the base branch from pr542 to peixian/fix-hpa-template August 30, 2026 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.