Expose NBI and NG-UI
Adds ingress rules for K8s installation to expose the NBI, the
NG-UI and allow for unlimited content size.
Fixes bug 1171
Change-Id: Id286dfe1f26969337ef937bf6c5bff541e89cf26
Signed-off-by: beierlm <mark.beierl@canonical.com>
diff --git a/installers/charm/nbi-k8s/reactive/spec_template.yaml b/installers/charm/nbi-k8s/reactive/spec_template.yaml
index 18adec4..5c030d9 100644
--- a/installers/charm/nbi-k8s/reactive/spec_template.yaml
+++ b/installers/charm/nbi-k8s/reactive/spec_template.yaml
@@ -28,14 +28,14 @@
OSMNBI_DATABASE_DRIVER: mongo
OSMNBI_DATABASE_URI: %(mongo_uri)s
OSMNBI_DATABASE_COMMONKEY: %(DATABASE_COMMONKEY)s
-
+
OSMNBI_STORAGE_DRIVER: mongo
OSMNBI_STORAGE_PATH: /app/storage
OSMNBI_STORAGE_COLLECTION: files
OSMNBI_STORAGE_URI: %(mongo_uri)s
OSMNBI_STATIC_DIR: /app/osm_nbi/html_public
-
+
OSMNBI_PROMETHEUS_HOST: %(prometheus_host)s
OSMNBI_PROMETHEUS_PORT: %(prometheus_port)s
- OSMNBI_LOG_LEVEL: %(log_level)s
\ No newline at end of file
+ OSMNBI_LOG_LEVEL: %(log_level)s
diff --git a/installers/charm/ng-ui/src/charm.py b/installers/charm/ng-ui/src/charm.py
index 33d9ade..ce48927 100755
--- a/installers/charm/ng-ui/src/charm.py
+++ b/installers/charm/ng-ui/src/charm.py
@@ -63,7 +63,7 @@
# Only apply the spec if this unit is a leader.
unit = self.model.unit
if not unit.is_leader():
- unit.status = ActiveStatus("Ready")
+ unit.status = ActiveStatus("ready")
return
if not self.state.nbi_host or not self.state.nbi_port:
unit.status = WaitingStatus("Waiting for NBI")
@@ -72,11 +72,11 @@
new_spec = self.make_pod_spec()
if new_spec == self.state.spec:
- unit.status = ActiveStatus("Ready")
+ unit.status = ActiveStatus("ready")
return
self.framework.model.pod.set_spec(new_spec)
self.state.spec = new_spec
- unit.status = ActiveStatus("Ready")
+ unit.status = ActiveStatus("ready")
def make_pod_spec(self):
config = self.framework.model.config
@@ -129,7 +129,7 @@
]
port = config["https_port"] if ssl_enabled else config["port"]
ports = [
- {"name": "port", "containerPort": port, "protocol": "TCP",},
+ {"name": "port", "containerPort": port, "protocol": "TCP", },
]
kubernetes = {
diff --git a/installers/charm/pla/src/charm.py b/installers/charm/pla/src/charm.py
index 2e199b3..1fc6386 100755
--- a/installers/charm/pla/src/charm.py
+++ b/installers/charm/pla/src/charm.py
@@ -61,7 +61,7 @@
# Only apply the spec if this unit is a leader.
unit = self.model.unit
if not unit.is_leader():
- unit.status = ActiveStatus("Ready")
+ unit.status = ActiveStatus("ready")
return
if not self.state.kafka_host or not self.state.kafka_port:
unit.status = WaitingStatus("Waiting for Kafka")
@@ -74,17 +74,17 @@
new_spec = self.make_pod_spec()
if new_spec == self.state.spec:
- unit.status = ActiveStatus("Ready")
+ unit.status = ActiveStatus("ready")
return
self.framework.model.pod.set_spec(new_spec)
self.state.spec = new_spec
- unit.status = ActiveStatus("Ready")
+ unit.status = ActiveStatus("ready")
def make_pod_spec(self):
config = self.framework.model.config
ports = [
- {"name": "port", "containerPort": config["port"], "protocol": "TCP",},
+ {"name": "port", "containerPort": config["port"], "protocol": "TCP", },
]
config_spec = {