diff --git a/doc/content/design/trusted-certificates.md b/doc/content/design/trusted-certificates.md index eb51b0d1682..cce33d87d6c 100644 --- a/doc/content/design/trusted-certificates.md +++ b/doc/content/design/trusted-certificates.md @@ -3,7 +3,7 @@ title: Trusted certificates for identity validation in TLS connections layout: default design_doc: true revision: 2 -status: draft +status: released (26.1.12) --- # Overview diff --git a/ocaml/idl/datamodel_lifecycle.ml b/ocaml/idl/datamodel_lifecycle.ml index 20aa69fc973..eae29fed212 100644 --- a/ocaml/idl/datamodel_lifecycle.ml +++ b/ocaml/idl/datamodel_lifecycle.ml @@ -70,7 +70,7 @@ let prototyped_of_field = function | "Repository", "gpgkey_path" -> Some "22.12.0" | "Certificate", "purpose" -> - Some "26.1.9-next" + Some "26.1.12" | "Certificate", "fingerprint_sha1" -> Some "24.20.0" | "Certificate", "fingerprint_sha256" -> @@ -292,13 +292,13 @@ let prototyped_of_message = function | "VM", "set_groups" -> Some "24.19.1" | "pool", "exchange_crls_on_join" -> - Some "26.1.9-next" + Some "26.1.12" | "pool", "exchange_trusted_certificates_on_join" -> - Some "26.1.9-next" + Some "26.1.12" | "pool", "uninstall_trusted_certificate" -> - Some "26.1.9-next" + Some "26.1.12" | "pool", "install_trusted_certificate" -> - Some "26.1.9-next" + Some "26.1.12" | "pool", "set_ssh_auto_mode" -> Some "25.27.0" | "pool", "set_console_idle_timeout" -> diff --git a/ocaml/idl/datamodel_pool.ml b/ocaml/idl/datamodel_pool.ml index 6912f1d8814..6af8e11bd3d 100644 --- a/ocaml/idl/datamodel_pool.ml +++ b/ocaml/idl/datamodel_pool.ml @@ -835,7 +835,11 @@ let install_ca_certificate = ; (String, "cert", "The certificate in PEM format") ] ~allowed_roles:(_R_POOL_OP ++ _R_CLIENT_CERT) - ~lifecycle:[(Published, "1.290.0", "Install TLS CA certificate")] + ~lifecycle: + [ + (Published, "1.290.0", "Install TLS CA certificate") + ; (Deprecated, "26.1.12", "Use Pool.install_trusted_certificate instead") + ] () let certificate_uninstall = @@ -887,6 +891,7 @@ let uninstall_ca_certificate = , "Added --force option to allow DB entries to be removed for \ non-existent files" ) + ; (Deprecated, "26.1.12", "Use Pool.uninstall_trusted_certificate instead") ] ()