Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
32 changes: 16 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Install uv
run: curl -LsSf https://astral.sh/uv/install.sh | sh
Expand All @@ -58,7 +58,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Install uv
run: curl -LsSf https://astral.sh/uv/install.sh | sh
Expand All @@ -82,7 +82,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Install uv
run: curl -LsSf https://astral.sh/uv/install.sh | sh
Expand All @@ -106,7 +106,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Install uv
run: curl -LsSf https://astral.sh/uv/install.sh | sh
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Install uv
run: curl -LsSf https://astral.sh/uv/install.sh | sh
Expand Down Expand Up @@ -170,17 +170,17 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Log into registry
if: github.event_name == 'push' || github.event.inputs.push == 'true'
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ${{ secrets.DOCKER_REGISTRY }}
username: ${{ secrets.DOCKER_REGISTRY_USER }}
Expand All @@ -190,11 +190,11 @@ jobs:
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: ${{ secrets.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}

- uses: actions/github-script@v6
- uses: actions/github-script@v9
id: tags
with:
script: |
Expand All @@ -215,7 +215,7 @@ jobs:
run: |
echo "${{ steps.tags.outputs.result }}"

- uses: actions/github-script@v6
- uses: actions/github-script@v9
id: normalized
with:
script: |
Expand All @@ -239,7 +239,7 @@ jobs:
# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v7
with:
context: .
file: deploy/docker/Dockerfile
Expand Down Expand Up @@ -271,7 +271,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Install uv
run: curl -LsSf https://astral.sh/uv/install.sh | sh
Expand All @@ -291,12 +291,12 @@ jobs:
env:
DOC_GITHUB_TOKEN: '${{ secrets.DOC_TOKEN }}'
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
if: startsWith(github.ref, 'refs/tags/')
with:
ref: master

- uses: actions/checkout@v4
- uses: actions/checkout@v7
if: github.ref == 'refs/heads/master'

- name: Get result
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
---
sidebar_key: docker-easy-haproxy
tags: [docker, devops]
---

# EasyHAProxy

[![Sponsor](https://img.shields.io/badge/Sponsor-%23ea4aaa?logo=githubsponsors&logoColor=white&labelColor=0d1117)](https://github.com/sponsors/byjg)
Expand Down
3 changes: 2 additions & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ EasyHAProxy follows [Semantic Versioning](https://semver.org/):
- **MINOR**: New features, plugin additions, backward-compatible changes
- **PATCH**: Bug fixes, documentation updates, minor improvements

**Current Version:** `6.0.1` (as of Chart.yaml)
**Current Version:** `6.1.0` (as of Chart.yaml)

## Automated Release (Recommended)

Expand Down Expand Up @@ -329,6 +329,7 @@ helm show chart byjg/easyhaproxy

| Version | Release Date | Type | Highlights |
|---------|--------------|-------|---------------------------------------------------------------------------------------------------------------------------------------|
| 6.1.0 | 2026-06-24 | Minor | FastCGI protocol support, certbot sidecar plugin, dependency updates |
| 6.0.1 | 2026-02-23 | Patch | HAProxy dashboard, real-time monitoring dashboard with live traffic charts, ACME e2e test fixes |
| 6.0.0 | 2026-XX-XX | Major | Python module refactoring (one-class-per-file), IngressClassName support (spec.ingressClassName + deprecated annotation fallback), modernized build system (uv/pyproject.toml), improved version management and release tooling, GitHub Actions workflow_dispatch push control |
| 5.0.0 | 2025-12-04 | Major | Plugin framework (builtin plugins: JWT, FastCGI, Cloudflare, IP whitelist, deny pages, cleanup), docs restructure, examples refreshed |
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
easyhaproxy:
image: byjg/easy-haproxy:6.0.1
image: byjg/easy-haproxy:6.1.0
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- certs_certbot:/etc/easyhaproxy/certs/certbot
Expand Down
26 changes: 13 additions & 13 deletions deploy/kubernetes/easyhaproxy-clusterip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-2.0.2
helm.sh/chart: easyhaproxy-2.0.3
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "6.0.1"
app.kubernetes.io/version: "6.1.0"
app.kubernetes.io/managed-by: Helm
---
# Source: easyhaproxy/templates/clusterrole.yaml
Expand All @@ -19,10 +19,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-2.0.2
helm.sh/chart: easyhaproxy-2.0.3
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "6.0.1"
app.kubernetes.io/version: "6.1.0"
app.kubernetes.io/managed-by: Helm
rules:
- apiGroups:
Expand Down Expand Up @@ -83,10 +83,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-2.0.2
helm.sh/chart: easyhaproxy-2.0.3
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "6.0.1"
app.kubernetes.io/version: "6.1.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -105,10 +105,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-2.0.2
helm.sh/chart: easyhaproxy-2.0.3
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "6.0.1"
app.kubernetes.io/version: "6.1.0"
app.kubernetes.io/managed-by: Helm
annotations:
{}
Expand Down Expand Up @@ -140,10 +140,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-2.0.2
helm.sh/chart: easyhaproxy-2.0.3
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "6.0.1"
app.kubernetes.io/version: "6.1.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -164,7 +164,7 @@ spec:
- name: easyhaproxy
securityContext:
{}
image: "byjg/easy-haproxy:6.0.1"
image: "byjg/easy-haproxy:6.1.0"
imagePullPolicy: Always
ports:
- name: http
Expand Down Expand Up @@ -217,10 +217,10 @@ kind: IngressClass
metadata:
name: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-2.0.2
helm.sh/chart: easyhaproxy-2.0.3
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "6.0.1"
app.kubernetes.io/version: "6.1.0"
app.kubernetes.io/managed-by: Helm
spec:
controller: byjg.com/easyhaproxy
22 changes: 11 additions & 11 deletions deploy/kubernetes/easyhaproxy-daemonset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-2.0.2
helm.sh/chart: easyhaproxy-2.0.3
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "6.0.1"
app.kubernetes.io/version: "6.1.0"
app.kubernetes.io/managed-by: Helm
---
# Source: easyhaproxy/templates/clusterrole.yaml
Expand All @@ -19,10 +19,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-2.0.2
helm.sh/chart: easyhaproxy-2.0.3
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "6.0.1"
app.kubernetes.io/version: "6.1.0"
app.kubernetes.io/managed-by: Helm
rules:
- apiGroups:
Expand Down Expand Up @@ -83,10 +83,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-2.0.2
helm.sh/chart: easyhaproxy-2.0.3
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "6.0.1"
app.kubernetes.io/version: "6.1.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -104,10 +104,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-2.0.2
helm.sh/chart: easyhaproxy-2.0.3
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "6.0.1"
app.kubernetes.io/version: "6.1.0"
app.kubernetes.io/managed-by: Helm
spec:
selector:
Expand Down Expand Up @@ -136,7 +136,7 @@ spec:
- name: easyhaproxy
securityContext:
{}
image: "byjg/easy-haproxy:6.0.1"
image: "byjg/easy-haproxy:6.1.0"
imagePullPolicy: Always
ports:
- name: http
Expand Down Expand Up @@ -189,10 +189,10 @@ kind: IngressClass
metadata:
name: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-2.0.2
helm.sh/chart: easyhaproxy-2.0.3
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "6.0.1"
app.kubernetes.io/version: "6.1.0"
app.kubernetes.io/managed-by: Helm
spec:
controller: byjg.com/easyhaproxy
Loading
Loading