Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cc7e2ec859 |
@@ -4,12 +4,10 @@ metadata:
|
|||||||
name: {{ route.resource_name }}
|
name: {{ route.resource_name }}
|
||||||
namespace: {{ namespace }}
|
namespace: {{ namespace }}
|
||||||
annotations:
|
annotations:
|
||||||
{%- if not compatibility %}
|
|
||||||
site-publish.fritzlab.net/artifact: {{ route.artifact | tojson }}
|
site-publish.fritzlab.net/artifact: {{ route.artifact | tojson }}
|
||||||
site-publish.fritzlab.net/access: {{ route.access | tojson }}
|
site-publish.fritzlab.net/access: {{ route.access | tojson }}
|
||||||
site-publish.fritzlab.net/bucket: {{ route.artifact_config.bucket | tojson }}
|
site-publish.fritzlab.net/bucket: {{ route.artifact_config.bucket | tojson }}
|
||||||
site-publish.fritzlab.net/route-path: {{ route.path | tojson }}
|
site-publish.fritzlab.net/route-path: {{ route.path | tojson }}
|
||||||
{%- endif %}
|
|
||||||
traefik.ingress.kubernetes.io/router.middlewares: https-redirect@file,retry-upstream@file{% if route.access_middleware %},{{ route.access_middleware }}@file{% endif %}{% for m in route.middlewares %},{{ m }}@file{% endfor %}
|
traefik.ingress.kubernetes.io/router.middlewares: https-redirect@file,retry-upstream@file{% if route.access_middleware %},{{ route.access_middleware }}@file{% endif %}{% for m in route.middlewares %},{{ m }}@file{% endfor %}
|
||||||
spec:
|
spec:
|
||||||
ingressClassName: traefik
|
ingressClassName: traefik
|
||||||
|
|||||||
@@ -307,14 +307,12 @@ class GenerationTests(unittest.TestCase):
|
|||||||
self.assertFalse(stale.exists())
|
self.assertFalse(stale.exists())
|
||||||
|
|
||||||
def test_legacy_names_and_garage_s3_target_are_preserved(self):
|
def test_legacy_names_and_garage_s3_target_are_preserved(self):
|
||||||
tmp, app_dir, files = self.render(fixture("legacy-site.yaml"))
|
tmp, _, files = self.render(fixture("legacy-site.yaml"))
|
||||||
self.addCleanup(tmp.cleanup)
|
self.addCleanup(tmp.cleanup)
|
||||||
self.assertIn("manifests/service.yaml", files)
|
self.assertIn("manifests/service.yaml", files)
|
||||||
self.assertIn("manifests/ingress.yaml", files)
|
self.assertIn("manifests/ingress.yaml", files)
|
||||||
self.assertIn("garage-s3.storage.svc.k8s.sjc001.fritzlab.net", files["manifests/service.yaml"])
|
self.assertIn("garage-s3.storage.svc.k8s.sjc001.fritzlab.net", files["manifests/service.yaml"])
|
||||||
self.assertNotIn("passhostheader", files["manifests/ingress.yaml"])
|
self.assertNotIn("passhostheader", files["manifests/ingress.yaml"])
|
||||||
self.assertNotIn("site-publish.fritzlab.net", files["manifests/ingress.yaml"])
|
|
||||||
self.assertEqual({}, deploy.previous_route_contracts(app_dir))
|
|
||||||
|
|
||||||
|
|
||||||
class BuildTests(unittest.TestCase):
|
class BuildTests(unittest.TestCase):
|
||||||
|
|||||||
Reference in New Issue
Block a user