Unified Ingress Implementation - Fixes #205 #219
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Introduced a unified PostgreSQL configuration structure in values.yaml, replacing the old db configuration. - Added new helper functions for managing PostgreSQL environment variables and secrets based on the selected configuration type (postgrescluster, external-plaintext, external-secret). - Removed old database-related templates (ConfigMap, Deployment, PVC, Secrets, Service) that are no longer needed. - Updated the pgstacbootstrap job and configmap templates to align with the new PostgreSQL configuration. - Implemented validation for PostgreSQL settings to ensure required fields are set based on the selected type.
…ude DATABASE_URL for connection string
…he external secret (host, port, database) will override the corresponding values defined in external.host, external.port, and external.database.
Confirmed that the conditional blocks in deployment.yaml were already consolidated to eliminate redundancy. The file was already using a single include statement for PostgreSQL environment variables:
env:
{{- include "eoapi.postgresqlEnv" $ | nindent 12 }}
Removed the unused eoapi.mapLegacyPostgresql helper function from _helpers.tpl as it wasn't being referenced anywhere in the codebase.
…ik, streamline values.yaml, and update related documentation and tests
emmanuelmathot
requested review from
pantierra and
sunu
and removed request for
sunu
Contributor
Author
|
need #209 to be merged first |
…ansformation annotations
…S support and remove deprecated middleware
This was referenced Apr 29, 2025
sunu
reviewed
Apr 30, 2025
sunu
reviewed
Apr 30, 2025
sunu
approved these changes
Apr 30, 2025
Member
sunu
left a comment
sunu
left a comment
There was a problem hiding this comment.
Added some minor comments but it looks great to me overall!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR implements a consolidated ingress approach for the eoAPI Helm chart that unifies the NGINX and Traefik implementations, addressing issue #205.
Changes
Created Files
helm-chart/eoapi/templates/services/ingress.yaml- The new unified ingress templatehelm-chart/eoapi/templates/services/doc-server.yaml- Unified document server implementationhelm-chart/eoapi/templates/services/traefik-middleware.yaml- Traefik-specific path handling middlewarehelm-chart/eoapi/tests/ingress_tests.yaml- Comprehensive tests for the new approachdocs/unified-ingress.md- Documentation explaining the unified approachRemoved Files
helm-chart/eoapi/templates/services/ingress-nginx.yamlhelm-chart/eoapi/templates/services/ingress-traefik.yamlhelm-chart/eoapi/templates/services/nginx-doc-server.yamlhelm-chart/eoapi/templates/services/traefik-doc-server.yamlhelm-chart/eoapi/tests/ingress_tests_nginx.yamlUpdated Files
helm-chart/eoapi/values.yaml- Added new configuration options for the unified approachhelm-chart/eoapi/templates/_helpers.tpl- Removed the Traefik validation function.github/workflows/helm-tests.yml- Updated CI tests to work with the unified approachhelm-chart/eoapi/test-k3s-unittest-values.yaml- Updated test values for CIImplementation Details
Ingress Configuration
Traefik Implementation
Key Improvements
The implementation maintains backward compatibility while providing a more flexible, maintainable, and consistent way to handle ingress across different controllers.
Fixes #205