projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make vca config optional in lcm charm
[osm/devops.git]
/
installers
/
charm
/
nbi
/
src
/
charm.py
diff --git
a/installers/charm/nbi/src/charm.py
b/installers/charm/nbi/src/charm.py
index
7efc5b0
..
550c88b
100755
(executable)
--- a/
installers/charm/nbi/src/charm.py
+++ b/
installers/charm/nbi/src/charm.py
@@
-56,8
+56,10
@@
class ConfigModel(ModelValidator):
log_level: str
max_file_size: int
site_url: Optional[str]
log_level: str
max_file_size: int
site_url: Optional[str]
+ cluster_issuer: Optional[str]
ingress_whitelist_source_range: Optional[str]
tls_secret_name: Optional[str]
ingress_whitelist_source_range: Optional[str]
tls_secret_name: Optional[str]
+ mongodb_uri: Optional[str]
@validator("auth_backend")
def validate_auth_backend(cls, v):
@validator("auth_backend")
def validate_auth_backend(cls, v):
@@
-91,6
+93,12
@@
class ConfigModel(ModelValidator):
ip_network(v)
return v
ip_network(v)
return v
+ @validator("mongodb_uri")
+ def validate_mongodb_uri(cls, v):
+ if v and not v.startswith("mongodb://"):
+ raise ValueError("mongodb_uri is not properly formed")
+ return v
+
class NbiCharm(CharmedOsmBase):
def __init__(self, *args) -> NoReturn:
class NbiCharm(CharmedOsmBase):
def __init__(self, *args) -> NoReturn:
@@
-133,7
+141,7
@@
class NbiCharm(CharmedOsmBase):
if self.kafka_client.is_missing_data_in_unit():
missing_relations.append("kafka")
if self.kafka_client.is_missing_data_in_unit():
missing_relations.append("kafka")
- if self.mongodb_client.is_missing_data_in_unit():
+ if
not config.mongodb_uri and
self.mongodb_client.is_missing_data_in_unit():
missing_relations.append("mongodb")
if self.prometheus_client.is_missing_data_in_app():
missing_relations.append("prometheus")
missing_relations.append("mongodb")
if self.prometheus_client.is_missing_data_in_app():
missing_relations.append("prometheus")
@@
-147,10
+155,16
@@
class NbiCharm(CharmedOsmBase):
def build_pod_spec(self, image_info):
# Validate config
config = ConfigModel(**dict(self.config))
def build_pod_spec(self, image_info):
# Validate config
config = ConfigModel(**dict(self.config))
+
+ if config.mongodb_uri and not self.mongodb_client.is_missing_data_in_unit():
+ raise Exception("Mongodb data cannot be provided via config and relation")
+
# Check relations
self._check_missing_dependencies(config)
# Check relations
self._check_missing_dependencies(config)
+
# Create Builder for the PodSpec
pod_spec_builder = PodSpecV3Builder()
# Create Builder for the PodSpec
pod_spec_builder = PodSpecV3Builder()
+
# Build Init Container
pod_spec_builder.add_init_container(
{
# Build Init Container
pod_spec_builder.add_init_container(
{
@@
-163,6
+177,7
@@
class NbiCharm(CharmedOsmBase):
],
}
)
],
}
)
+
# Build Container
container_builder = ContainerV3Builder(self.app.name, image_info)
container_builder.add_port(name=self.app.name, port=PORT)
# Build Container
container_builder = ContainerV3Builder(self.app.name, image_info)
container_builder.add_port(name=self.app.name, port=PORT)
@@
-188,7
+203,8
@@
class NbiCharm(CharmedOsmBase):
"OSMNBI_MESSAGE_PORT": self.kafka_client.port,
# Database configuration
"OSMNBI_DATABASE_DRIVER": "mongo",
"OSMNBI_MESSAGE_PORT": self.kafka_client.port,
# Database configuration
"OSMNBI_DATABASE_DRIVER": "mongo",
- "OSMNBI_DATABASE_URI": self.mongodb_client.connection_string,
+ "OSMNBI_DATABASE_URI": config.mongodb_uri
+ or self.mongodb_client.connection_string,
"OSMNBI_DATABASE_COMMONKEY": config.database_commonkey,
# Storage configuration
"OSMNBI_STORAGE_DRIVER": "mongo",
"OSMNBI_DATABASE_COMMONKEY": config.database_commonkey,
# Storage configuration
"OSMNBI_STORAGE_DRIVER": "mongo",
@@
-218,8
+234,10
@@
class NbiCharm(CharmedOsmBase):
}
)
container = container_builder.build()
}
)
container = container_builder.build()
+
# Add container to pod spec
pod_spec_builder.add_container(container)
# Add container to pod spec
pod_spec_builder.add_container(container)
+
# Add ingress resources to pod spec if site url exists
if config.site_url:
parsed = urlparse(config.site_url)
# Add ingress resources to pod spec if site url exists
if config.site_url:
parsed = urlparse(config.site_url)
@@
-240,6
+258,9
@@
class NbiCharm(CharmedOsmBase):
"nginx.ingress.kubernetes.io/whitelist-source-range"
] = config.ingress_whitelist_source_range
"nginx.ingress.kubernetes.io/whitelist-source-range"
] = config.ingress_whitelist_source_range
+ if config.cluster_issuer:
+ annotations["cert-manager.io/cluster-issuer"] = config.cluster_issuer
+
if parsed.scheme == "https":
ingress_resource_builder.add_tls(
[parsed.hostname], config.tls_secret_name
if parsed.scheme == "https":
ingress_resource_builder.add_tls(
[parsed.hostname], config.tls_secret_name
@@
-250,7
+271,9
@@
class NbiCharm(CharmedOsmBase):
ingress_resource_builder.add_rule(parsed.hostname, self.app.name, PORT)
ingress_resource = ingress_resource_builder.build()
pod_spec_builder.add_ingress_resource(ingress_resource)
ingress_resource_builder.add_rule(parsed.hostname, self.app.name, PORT)
ingress_resource = ingress_resource_builder.build()
pod_spec_builder.add_ingress_resource(ingress_resource)
+
logger.debug(pod_spec_builder.build())
logger.debug(pod_spec_builder.build())
+
return pod_spec_builder.build()
return pod_spec_builder.build()