Merge pull request #950 from alesstimec/juju-jimm-k8s-nginx-relation

CSS-4442 Adds nginx relation to the juju-jimm-k8s charm.
canonical · Jun 7, 2023 · d2e8a43 · d2e8a43
2 parents 1838b60 + f86eee6
commit d2e8a43
Show file tree

Hide file tree

Showing 11 changed files with 887 additions and 578 deletions.
diff --git a/charms/jimm-k8s/config.yaml b/charms/jimm-k8s/config.yaml
@@ -60,3 +60,6 @@ options:
   private-key:
     type: string
     description: The private part of JIMM's macaroon bakery keypair.
+  dns-name:
+    type: string
+    description: DNS hostname that JIMM is being served from.
diff --git a/charms/jimm-k8s/lib/charms/nginx_ingress_integrator/v0/ingress.py b/charms/jimm-k8s/lib/charms/nginx_ingress_integrator/v0/ingress.py