Add ingress status update and support for ingress class changes

.github/workflows/build.yml

@@ -36,19 +36,134 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install requirements
+      - name: Install uv
+        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+
+      - name: Install dependencies
         run: |
-          cd src/
-          pip install -r requirements.txt
+          export PATH="$HOME/.local/bin:$PATH"
+          uv sync --group dev
 
       - name: Run tests
         run: |
-          cd src/
-          pytest -s tests/ -vv
+          export PATH="$HOME/.local/bin:$PATH"
+          uv run pytest -s tests/ -vv
+
+  Tests-E2E-Docker:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    needs: [Test]
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+
+      - name: Install dependencies
+        run: |
+          export PATH="$HOME/.local/bin:$PATH"
+          uv sync --group dev
+
+      - name: Run Docker Compose E2E tests
+        run: |
+          export PATH="$HOME/.local/bin:$PATH"
+          uv run pytest tests_e2e/test_docker_compose.py -sv --tb=short
+
+  Tests-E2E-Kubernetes:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    needs: [Test]
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+
+      - name: Install dependencies
+        run: |
+          export PATH="$HOME/.local/bin:$PATH"
+          uv sync --group dev
+
+      - name: Run Kubernetes E2E tests
+        run: |
+          export PATH="$HOME/.local/bin:$PATH"
+          uv run pytest tests_e2e/test_kubernetes.py -sv --tb=short
+
+  Tests-E2E-Additional:
+    runs-on: ubuntu-latest
+    needs: [Test]
+    timeout-minutes: 20
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+
+      - name: Install dependencies
+        run: |
+          export PATH="$HOME/.local/bin:$PATH"
+          uv sync --group dev
+
+      - name: Clean Docker build cache
+        run: docker builder prune -af
+
+      - name: Run Static E2E tests
+        run: |
+          export PATH="$HOME/.local/bin:$PATH"
+          uv run pytest tests_e2e/test_static.py -sv --tb=short
+
+      - name: Run Proxy Headers E2E tests
+        run: |
+          export PATH="$HOME/.local/bin:$PATH"
+          uv run pytest tests_e2e/test_proxy_headers.py -sv --tb=short
+
+  Tests-E2E-Swarm:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    needs: [Test]
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+
+      - name: Install dependencies
+        run: |
+          export PATH="$HOME/.local/bin:$PATH"
+          uv sync --group dev
+
+      - name: Clean Docker build cache
+        run: docker builder prune -af
+
+      - name: Build Docker image
+        env:
+          DOCKER_BUILDKIT: "0"
+        run: docker build -t byjg/easy-haproxy:local -f deploy/docker/Dockerfile .
+
+      - name: Run Swarm E2E tests
+        run: |
+          export PATH="$HOME/.local/bin:$PATH"
+          uv run pytest tests_e2e/test_swarm.py -sv --tb=short
 
   Build:
     runs-on: ubuntu-latest
-    needs: Test
+    needs: [Test, Tests-E2E-Docker, Tests-E2E-Kubernetes, Tests-E2E-Additional, Tests-E2E-Swarm]
     permissions:
       contents: read
       packages: write
@@ -64,7 +179,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Log into registry
-        if: github.event_name != 'pull_request' || github.event.inputs.push == 'true'
+        if: github.event_name == 'push' || github.event.inputs.push == 'true'
         uses: docker/login-action@v3
         with:
           registry: ${{ secrets.DOCKER_REGISTRY }}
@@ -127,11 +242,11 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: build/Dockerfile
+          file: deploy/docker/Dockerfile
           build-args: |
             RELEASE_VERSION_ARG="${{ steps.tags.outputs.result }}"
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' || github.event.inputs.push == 'true' }}
+          push: ${{ github.event_name == 'push' || github.event.inputs.push == 'true' }}
           tags: ${{ steps.normalized.outputs.result }}
           labels: ${{ steps.meta.outputs.labels }}
 
@@ -140,12 +255,35 @@ jobs:
 
 
       # - name: Docker Hub Description
-      #   if: github.event_name != 'pull_request' || github.event.inputs.push == 'true'
+      #   if: github.event_name == 'push' || github.event.inputs.push == 'true'
       #   run: |
       #     wget -q  https://github.com/christian-korneck/docker-pushrm/releases/download/v1.8.0/docker-pushrm_linux_amd64 -O $HOME/.docker/cli-plugins/docker-pushrm
       #     chmod +x $HOME/.docker/cli-plugins/docker-pushrm
       #     docker pushrm ${{ env.IMAGE_NAME }}
 
+  Publish-PyPI:
+    runs-on: ubuntu-latest
+    needs: [Test, Tests-E2E-Docker, Tests-E2E-Kubernetes, Tests-E2E-Additional, Tests-E2E-Swarm]
+    if: startsWith(github.ref, 'refs/tags/')
+    permissions:
+      contents: read
+      id-token: write  # Required for OIDC trusted publisher
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install uv
+        run: curl -LsSf https://astral.sh/uv/install.sh | sh
+
+      - name: Build package
+        run: |
+          export PATH="$HOME/.local/bin:$PATH"
+          uv build
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+
   Helm:
     runs-on: 'ubuntu-latest'
     needs: Build
@@ -191,4 +329,5 @@ jobs:
     with:
       folder: devops
       project: ${{ github.event.repository.name }}
-    secrets: inherit
+    secrets:
+      DOC_TOKEN: ${{ secrets.DOC_TOKEN }}

.gitignore

@@ -6,12 +6,21 @@ __pycache__
 .pytest_cache
 *.pyc
 .env
-/examples/static/conf/config.yml
-/examples/docker/certs/haproxy/.place_holder_cert.pem
-/examples/static/host1.local.pem
-/examples/swarm/certs/host1.local.pem
-/examples/docker/host2.local.pem
-/examples/swarm/certs/host2.local.pem
-/examples/docker/jwt_private.pem
-/examples/docker/jwt_pubkey.pem
-/examples/docker/cloudflare_ips.lst
+
+# uv
+.venv/
+
+# Build artifacts
+dist/
+*.egg-info/
+
+/tests_e2e/static/conf/config.yml
+/tests_e2e/docker/certs/haproxy/.place_holder_cert.pem
+/tests_e2e/static/host1.local.pem
+/tests_e2e/swarm/certs/host1.local.pem
+/tests_e2e/docker/host2.local.pem
+/tests_e2e/swarm/certs/host2.local.pem
+/tests_e2e/docker/jwt_private.pem
+/tests_e2e/docker/jwt_pubkey.pem
+/tests_e2e/docker/cloudflare_ips.lst
+/tests_e2e/docker/pebble-ca.pem

.python-version

@@ -0,0 +1 @@
+3.12

.run/pytest in tests.run.xml

@@ -5,16 +5,17 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <option name="SDK_HOME" value="" />
-    <option name="SDK_NAME" value="Python 3.12 (docker-easy-haproxy)" />
+    <option name="SDK_NAME" value="uv (docker-easy-haproxy)" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="RUN_TOOL" value="true" />
     <option name="_new_keywords" value="&quot;&quot;" />
     <option name="_new_parameters" value="&quot;&quot;" />
     <option name="_new_additionalArguments" value="&quot;&quot;" />
-    <option name="_new_target" value="&quot;$PROJECT_DIR$/src/tests&quot;" />
+    <option name="_new_target" value="&quot;$PROJECT_DIR$/tests&quot;" />
     <option name="_new_targetType" value="&quot;PATH&quot;" />
     <method v="2" />
   </configuration>

Makefile

@@ -2,8 +2,24 @@ VERSION := $(shell git rev-parse --short HEAD)
 
 .PHONY: build
 build:
-	docker build -t byjg/easy-haproxy --build-arg RELEASE_VERSION_ARG="$(VERSION)" -t byjg/easy-haproxy:local -f build/Dockerfile .
+	docker build -t byjg/easy-haproxy --build-arg RELEASE_VERSION_ARG="$(VERSION)" -t byjg/easy-haproxy:local -f deploy/docker/Dockerfile .
 
 .PHONY: test
 test:
-	cd src/ && pytest tests/ -vv
+	uv run pytest tests/ -vv
+
+.PHONY: sync
+sync:
+	uv sync --dev
+
+.PHONY: lint
+lint:
+	uv run ruff check src/ tests/
+
+.PHONY: fix
+fix:
+	uv run ruff check --fix src/ tests/
+
+.PHONY: format
+format:
+	uv run ruff format src/ tests/

README.md

@@ -100,6 +100,47 @@ Detailed configuration guides for advanced setups:
 - [Other Configurations](docs/other.md) - Additional configurations (ports, custom errors, etc.)
 - [Limitations](docs/limitations.md) - Important limitations and considerations
 
+## Development
+
+### Requirements
+
+- Python 3.11 or higher
+- [uv](https://github.com/astral-sh/uv) package manager
+
+### Installation for Development
+
+```bash
+# Install uv (if not already installed)
+curl -LsSf https://astral.sh/uv/install.sh | sh
+
+# Clone the repository
+git clone https://github.com/byjg/docker-easy-haproxy.git
+cd docker-easy-haproxy
+
+# Install dependencies (creates virtual environment automatically)
+uv sync --dev
+
+# Run tests
+make test
+# or directly: uv run pytest tests/ -vv
+
+# Run linting
+make lint
+
+# Format code
+make format
+```
+
+### Installing the Package
+
+```bash
+# Install with uv
+uv pip install easymapping
+
+# Or install from source
+uv pip install -e ".[dev]"
+```
+
 ## See EasyHAProxy in action
 
 Click on the image to see the videos (use HD for better visualization)
@@ -111,7 +152,7 @@ Click on the image to see the videos (use HD for better visualization)
 [![Static Configuration](docs/video-static.png)](https://youtu.be/B_bYZnRTGJM)
 [![TCP Mode](docs/video-tcp-mysql.png)](https://youtu.be/JHqcq9crbDI)
 
-[Here is the code](https://gist.github.com/byjg/e125e478a0562190176d69ea795fd3d4) applied in the examples above.
+[Here is the code](https://gist.github.com/byjg/e125e478a0562190176d69ea795fd3d4) applied in the test examples above.
 
 
 ----

RELEASE.md

@@ -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:** `5.0.0` (as of Chart.yaml)
+**Current Version:** `6.0.0` (as of Chart.yaml)
 
 ## Automated Release (Recommended)
 
@@ -80,7 +80,7 @@ The automated release process is triggered by pushing a semantic version tag.
    ```bash
    make build
    # Or manually:
-   docker build -t byjg/easy-haproxy:local -f build/Dockerfile .
+   docker build -t byjg/easy-haproxy:local -f deploy/docker/Dockerfile .
    ```
 
 ### Step 2: Bump Versions (script + PR)
@@ -329,6 +329,7 @@ helm show chart byjg/easyhaproxy
 
 | Version | Release Date | Type  | Highlights                                                                                                                            |
 |---------|--------------|-------|---------------------------------------------------------------------------------------------------------------------------------------|
+| 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 |
 | 4.6.0   | 2024-11-27   | Minor | FastCGI plugin, JWT enhancements                                                                                                      |
 | 4.5.0   | 2024-XX-XX   | Minor | Previous release                                                                                                                      |

build-multiarch.sh

@@ -17,7 +17,7 @@ podman run --rm --events-backend=file --cgroup-manager=cgroupfs --privileged doc
 
 for VERSION in $VERSIONS
 do
-  DOCKERFILE=build/Dockerfile
+  DOCKERFILE=deploy/docker/Dockerfile
 
   buildah manifest create byjg/easy-haproxy:$VERSION