badblocks/docker-easy-haproxy
1
0
Fork 0
Code Activity

Prepare version 6.0.0

Browse source
This commit is contained in:
Joao Gilberto Magalhaes 2026-02-18 17:38:46 -05:00
parent 1262946a3e
commit 711bb43572
20 changed files with 56 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
deploy/docker/docker-compose.yml
View file

@ -1,6 +1,6 @@
services:
easyhaproxy:
image: byjg/easy-haproxy:5.0.0
image: byjg/easy-haproxy:6.0.0
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- certs_certbot:/etc/easyhaproxy/certs/certbot

26
deploy/kubernetes/easyhaproxy-clusterip.yml
View file

@ -6,10 +6,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
---
# Source: easyhaproxy/templates/clusterrole.yaml
@ -19,10 +19,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
rules:
- apiGroups:
@ -83,10 +83,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
@ -105,10 +105,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
{}
@ -137,10 +137,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
@ -161,7 +161,7 @@ spec:
- name: easyhaproxy
securityContext:
{}
image: "byjg/easy-haproxy:5.0.0"
image: "byjg/easy-haproxy:6.0.0"
imagePullPolicy: Always
ports:
- name: http
@ -211,10 +211,10 @@ kind: IngressClass
metadata:
name: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
spec:
controller: byjg.com/easyhaproxy

22
deploy/kubernetes/easyhaproxy-daemonset.yml
View file

@ -6,10 +6,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
---
# Source: easyhaproxy/templates/clusterrole.yaml
@ -19,10 +19,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
rules:
- apiGroups:
@ -83,10 +83,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
@ -104,10 +104,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
spec:
selector:
@ -136,7 +136,7 @@ spec:
- name: easyhaproxy
securityContext:
{}
image: "byjg/easy-haproxy:5.0.0"
image: "byjg/easy-haproxy:6.0.0"
imagePullPolicy: Always
ports:
- name: http
@ -186,10 +186,10 @@ kind: IngressClass
metadata:
name: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
spec:
controller: byjg.com/easyhaproxy

26
deploy/kubernetes/easyhaproxy-nodeport.yml
View file

@ -6,10 +6,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
---
# Source: easyhaproxy/templates/clusterrole.yaml
@ -19,10 +19,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
rules:
- apiGroups:
@ -83,10 +83,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
@ -105,10 +105,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
{}
@ -137,10 +137,10 @@ metadata:
name: ingress-easyhaproxy
namespace: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
@ -161,7 +161,7 @@ spec:
- name: easyhaproxy
securityContext:
{}
image: "byjg/easy-haproxy:5.0.0"
image: "byjg/easy-haproxy:6.0.0"
imagePullPolicy: Always
ports:
- name: http
@ -211,10 +211,10 @@ kind: IngressClass
metadata:
name: easyhaproxy
labels:
helm.sh/chart: easyhaproxy-1.0.0
helm.sh/chart: easyhaproxy-2.0.0
app.kubernetes.io/name: easyhaproxy
app.kubernetes.io/instance: ingress
app.kubernetes.io/version: "5.0.0"
app.kubernetes.io/version: "6.0.0"
app.kubernetes.io/managed-by: Helm
spec:
controller: byjg.com/easyhaproxy

2
docs/acme.md
View file

@ -156,7 +156,7 @@ Here's a complete `docker-compose.yml` showing proper ACME configuration:
```yaml
services:
easyhaproxy:
image: byjg/easy-haproxy:5.0.0
image: byjg/easy-haproxy:6.0.0
volumes:
- /var/run/docker.sock:/var/run/docker.sock
# REQUIRED: Persist Certbot certificates (ACME)

2
docs/kubernetes.md
View file

@ -48,7 +48,7 @@ kubectl label nodes node-01 "easyhaproxy/node=master"
kubectl create namespace easyhaproxy
kubectl apply -f \
https://raw.githubusercontent.com/byjg/docker-easy-haproxy/5.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
https://raw.githubusercontent.com/byjg/docker-easy-haproxy/6.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
```
If necessary, you can configure environment variables. To get a list of the variables, please follow the [environment variable guide](environment-variable.md)

2
docs/ssl.md
View file

@ -82,7 +82,7 @@ docker cp single.pem easyhaproxy:/etc/easyhaproxy/certs/haproxy/example.com.pem
```yaml
services:
easyhaproxy:
image: byjg/easy-haproxy:5.0.0
image: byjg/easy-haproxy:6.0.0
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- certs_haproxy:/etc/easyhaproxy/certs/haproxy

2
docs/swarm.md
View file

@ -33,7 +33,7 @@ And then deploy the EasyHAProxy stack:
```yaml
services:
haproxy:
image: byjg/easy-haproxy:5.0.0
image: byjg/easy-haproxy:6.0.0
volumes:
- /var/run/docker.sock:/var/run/docker.sock
deploy:

4
helm/easyhaproxy/Chart.yaml
View file

@ -15,12 +15,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.0.0
version: 2.0.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "5.0.0"
appVersion: "6.0.0"
icon: https://opensource.byjg.com/img/easy_haproxy_logo.png

2
pyproject.toml
View file

@ -4,7 +4,7 @@ build-backend = "hatchling.build"
[project]
name = "easyhaproxy"
version = "5.0.0"
version = "6.0.0"
description = "HAProxy label based routing with service discovery for Docker, Swarm, and Kubernetes"
readme = "README.md"
license = {file = "LICENSE"}

2
scripts/bump-version.sh
View file

@ -147,6 +147,8 @@ NEXT_CHART_VERSION=$(IFS='.'; echo "${_parts[*]}")
sed -i -E "s/^version: .*/version: $NEXT_CHART_VERSION/" "$CHART_FILE"
sed -i -E "s/helm\\.sh\\/chart: easyhaproxy-[0-9\\.]+/helm.sh\\/chart: easyhaproxy-$NEXT_CHART_VERSION/" deploy/kubernetes/easyhaproxy-*.yml
uv sync --dev
echo "Done. Updated appVersion to $NEW_VERSION and chart version to $NEXT_CHART_VERSION."
echo "Next steps:"
echo " 1) git status (review changes)"

2
tests_e2e/docker/docker-compose-acme.yml
View file

@ -60,7 +60,7 @@
services:
haproxy:
image: byjg/easy-haproxy:5.0.0
image: byjg/easy-haproxy:6.0.0
volumes:
- /var/run/docker.sock:/var/run/docker.sock
# Persist the CERTBOT to avoid re-challenge when the server restarts

2
tests_e2e/docker/docker-compose-portainer.yml
View file

@ -59,7 +59,7 @@
services:
easyhaproxy:
image: byjg/easy-haproxy:5.0.0
image: byjg/easy-haproxy:6.0.0
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- certs_certbot:/etc/easyhaproxy/certs/certbot

2
tests_e2e/kubernetes/cloudflare.yml
View file

@ -12,7 +12,7 @@
# ```bash
# # 1. Ensure EasyHAProxy is installed in your cluster
# kubectl create namespace easyhaproxy
# kubectl apply -f https://raw.githubusercontent.com/byjg/docker-easy-haproxy/5.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
# kubectl apply -f https://raw.githubusercontent.com/byjg/docker-easy-haproxy/6.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
#
# # 2. Download Cloudflare IP ranges
# curl -s https://www.cloudflare.com/ips-v4 > cloudflare_ips.lst

2
tests_e2e/kubernetes/ip-whitelist.yml
View file

@ -12,7 +12,7 @@
# ```bash
# # 1. Ensure EasyHAProxy is installed in your cluster
# kubectl create namespace easyhaproxy
# kubectl apply -f https://raw.githubusercontent.com/byjg/docker-easy-haproxy/5.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
# kubectl apply -f https://raw.githubusercontent.com/byjg/docker-easy-haproxy/6.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
#
# # 2. IMPORTANT: Edit this file (line 80) and update allowed_ips
# # with your actual office/VPN IP addresses or networks

2
tests_e2e/kubernetes/jwt-validator.yml
View file

@ -30,7 +30,7 @@
# ```bash
# # 1. Ensure EasyHAProxy is installed in your cluster
# kubectl create namespace easyhaproxy
# kubectl apply -f https://raw.githubusercontent.com/byjg/docker-easy-haproxy/5.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
# kubectl apply -f https://raw.githubusercontent.com/byjg/docker-easy-haproxy/6.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
#
# # 2. Generate RSA key pair (idempotent - skips if exists)
# [ -f jwt_private.pem ] || openssl genrsa -out jwt_private.pem 2048

2
tests_e2e/kubernetes/plugins-combined.yml
View file

@ -15,7 +15,7 @@
# ```bash
# # 1. Ensure EasyHAProxy is installed in your cluster
# kubectl create namespace easyhaproxy
# kubectl apply -f https://raw.githubusercontent.com/byjg/docker-easy-haproxy/5.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
# kubectl apply -f https://raw.githubusercontent.com/byjg/docker-easy-haproxy/6.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
#
# # 2. Generate JWT keys (idempotent - skips if exists)
# [ -f jwt_private.pem ] || openssl genrsa -out jwt_private.pem 2048

2
tests_e2e/kubernetes/service.yml
View file

@ -12,7 +12,7 @@
# ```bash
# # 1. Ensure EasyHAProxy is installed in your cluster
# kubectl create namespace easyhaproxy
# kubectl apply -f https://raw.githubusercontent.com/byjg/docker-easy-haproxy/5.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
# kubectl apply -f https://raw.githubusercontent.com/byjg/docker-easy-haproxy/6.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
#
# # 2. Label the node where EasyHAProxy will run
# kubectl label nodes <node-name> "easyhaproxy/node=master"

2
tests_e2e/kubernetes/service_tls.yml
View file

@ -12,7 +12,7 @@
# ```bash
# # 1. Ensure EasyHAProxy is installed in your cluster
# kubectl create namespace easyhaproxy
# kubectl apply -f https://raw.githubusercontent.com/byjg/docker-easy-haproxy/5.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
# kubectl apply -f https://raw.githubusercontent.com/byjg/docker-easy-haproxy/6.0.0/deploy/kubernetes/easyhaproxy-daemonset.yml
#
# # 2. Label the node where EasyHAProxy will run
# kubectl label nodes <node-name> "easyhaproxy/node=master"

2
uv.lock generated
View file

@ -351,7 +351,7 @@ wheels = [
[[package]]
name = "easyhaproxy"
version = "5.0.0"
version = "6.0.0"
source = { editable = "." }
dependencies = [
{ name = "deepdiff" },