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

Ingress/scheme #196

Merged
merged 71 commits into from
Jul 25, 2023
Merged

Ingress/scheme #196

merged 71 commits into from
Jul 25, 2023

Conversation

PietroPasotti
Copy link
Collaborator

@PietroPasotti PietroPasotti commented Jul 5, 2023

Based on #190

Fixes #188

In tandem with: canonical/alertmanager-k8s-operator#173

lib/charms/traefik_k8s/v2/ingress.py Outdated Show resolved Hide resolved
src/charm.py Outdated Show resolved Hide resolved
PietroPasotti and others added 3 commits July 6, 2023 14:25
Co-authored-by: Jose C. Massón <939888+Abuelodelanada@users.noreply.github.com>
@sed-i
Copy link
Contributor

sed-i commented Jul 6, 2023

Would you mind changing the merge target to #190 temporarily, so the diff is easier?

@PietroPasotti PietroPasotti changed the base branch from main to fix-ingress-per-app July 6, 2023 13:20
lib/charms/traefik_k8s/v2/ingress.py Outdated Show resolved Hide resolved
lib/charms/traefik_k8s/v2/ingress.py Outdated Show resolved Hide resolved
lib/charms/traefik_k8s/v2/ingress.py Outdated Show resolved Hide resolved
lib/charms/traefik_k8s/v2/ingress.py Outdated Show resolved Hide resolved
lib/charms/traefik_k8s/v2/ingress.py Outdated Show resolved Hide resolved
src/charm.py Outdated Show resolved Hide resolved
tests/unit/test_lib_per_app_provides.py Outdated Show resolved Hide resolved
@PietroPasotti PietroPasotti requested a review from sed-i July 21, 2023 08:54
@sed-i
Copy link
Contributor

sed-i commented Jul 21, 2023

@PietroPasotti, I made a few fixes in the itests but there is an issue with the refactored tcp reldata.

tests/integration/test_charm_tcp.py::test_relation_data_shape

AssertionError: assert {'tcp-tester/...cp-tester-0'}} == {'tcp-tester/....8.219:9999'}}
  Differing items:
  {'tcp-tester/0': {'url': 'http://10.43.8.219/test-charm-tcp-i4iy-tcp-tester-0'}} != {'tcp-tester/0': {'url': '10.43.8.219:9999'}}
  Full diff:
  - {'tcp-tester/0': {'url': '10.43.8.219:9999'}}
  + {'tcp-tester/0': {'url': 'http://10.43.8.219/test-charm-tcp-i4iy-tcp-tester-0'}}

The config file looks fine btw:

tcp:
  routers:
    juju-test-charm-tcp-i4iy-tcp-tester-0-tcp-router:
      entryPoints:
      - test-charm-tcp-i4iy-tcp-tester-0
      rule: HostSNI(`*`)
      service: juju-test-charm-tcp-i4iy-tcp-tester-0-tcp-service
  services:
    juju-test-charm-tcp-i4iy-tcp-tester-0-tcp-service:
      loadBalancer:
        servers:
        - address: tcp-tester-0.tcp-tester-endpoints.test-charm-tcp-i4iy.svc.cluster.local:9999

@PietroPasotti PietroPasotti dismissed sed-i’s stale review July 25, 2023 14:38

comments have been addressed

@PietroPasotti PietroPasotti merged commit d3123f8 into main Jul 25, 2023
13 checks passed
@PietroPasotti PietroPasotti deleted the ingress/scheme branch July 25, 2023 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support HTTPS in loadBalancer servers
6 participants