Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move ingress handling to a resource processor #3157

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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ Please see the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest

## Next Release

### Ambasssador API Gateway + Ambassador Edge Stack

- Bugfix: Fix an issue that caused Dev Portal to sporadically respond with upstream connect timeout when loading content
- Bugfix: Prevent potential reconcile loop when updating the status of an Ingress.

## [1.11.1] February 04, 2021
[1.11.1]: https://github.com/datawire/ambassador/compare/v1.11.0...v1.11.1
Expand Down
2 changes: 0 additions & 2 deletions python/ambassador/config/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ def __init__(self, schema_dir_path: Optional[str]=None) -> None:

self.logger.debug("SCHEMA DIR %s" % os.path.abspath(self.schema_dir_path))
self.k8s_status_updates: Dict[str, Tuple[str, str, Optional[Dict[str, Any]]]] = {} # Tuple is (name, namespace, status_json)
self.k8s_ingresses: Dict[str, Any] = {}
self.k8s_ingress_classes: Dict[str, Any] = {}
self.pod_labels: Dict[str, str] = {}
self._reset()

Expand Down
15 changes: 15 additions & 0 deletions python/ambassador/fetch/dependency.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,21 @@ def watt_key(self) -> str:
return 'secret'


class IngressClassesDependency (Dependency):
"""
A dependency that provides the list of ingress classes that are valid (i.e.,
have the proper controller) for this cluster.
"""

ingress_classes: MutableSet[str]

def __init__(self):
self.ingress_classes = set()

def watt_key(self) -> str:
return 'ingressclasses'


D = TypeVar('D', bound=Dependency)


Expand Down
Loading