Skip to content

Commit 621f2e0

Browse files
committed
mgr/cephadm: move ingress cert to cert store
In an effort to try and organize our cert handling and provide cert management features in the future Signed-off-by: Adam King <[email protected]>
1 parent a7e05c2 commit 621f2e0

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

src/pybind/mgr/cephadm/inventory.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,20 @@ def _save_certs_and_keys(self, spec: ServiceSpec) -> None:
376376
iscsi_spec.ssl_key,
377377
service_name=iscsi_spec.service_name(),
378378
user_made=True)
379+
elif spec.service_type == 'ingress':
380+
ingress_spec = cast(IngressSpec, spec)
381+
if ingress_spec.ssl_cert:
382+
self.mgr.cert_key_store.save_cert(
383+
'ingress_ssl_cert',
384+
ingress_spec.ssl_cert,
385+
service_name=ingress_spec.service_name(),
386+
user_made=True)
387+
if ingress_spec.ssl_key:
388+
self.mgr.cert_key_store.save_key(
389+
'ingress_ssl_key',
390+
ingress_spec.ssl_key,
391+
service_name=ingress_spec.service_name(),
392+
user_made=True)
379393

380394
def rm(self, service_name: str) -> bool:
381395
if service_name not in self._specs:
@@ -411,6 +425,9 @@ def _rm_certs_and_keys(self, spec: ServiceSpec) -> None:
411425
if spec.service_type == 'iscsi':
412426
self.mgr.cert_key_store.rm_cert('iscsi_ssl_cert', service_name=spec.service_name())
413427
self.mgr.cert_key_store.rm_key('iscsi_ssl_key', service_name=spec.service_name())
428+
if spec.service_type == 'ingress':
429+
self.mgr.cert_key_store.rm_cert('ingress_ssl_cert', service_name=spec.service_name())
430+
self.mgr.cert_key_store.rm_key('ingress_ssl_key', service_name=spec.service_name())
414431

415432
def get_created(self, spec: ServiceSpec) -> Optional[datetime.datetime]:
416433
return self.spec_created.get(spec.service_name())

0 commit comments

Comments
 (0)