diff options
author | Andreas Eriksen <andreer@yahooinc.com> | 2022-06-28 12:20:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-28 12:20:44 +0200 |
commit | e39df2776929f5043e7fb371c252cbc8d0156e66 (patch) | |
tree | 6ccb4e080580a00a35c0689b0baaa987f28b3b7e /controller-server | |
parent | 307b8c5c44656d968a154b8a0ef58b29cad3183b (diff) |
Revert "Revert "log certificate version on deploy" (#23256)"
This reverts commit 307b8c5c44656d968a154b8a0ef58b29cad3183b.
Diffstat (limited to 'controller-server')
3 files changed, 10 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index e48ad7596ea..cd90d14f9ff 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -446,7 +446,7 @@ public class ApplicationController { } /** Deploys an application package for an existing application instance. */ - public ActivateResult deploy(JobId job, boolean deploySourceVersions) { + public ActivateResult deploy(JobId job, boolean deploySourceVersions, Consumer<String> deployLogger) { if (job.application().instance().isTester()) throw new IllegalArgumentException("'" + job.application() + "' is a tester application!"); @@ -479,6 +479,8 @@ public class ApplicationController { applicationPackage = applicationPackage.withTrustedCertificate(run.testerCertificate().get()); endpointCertificateMetadata = endpointCertificates.getMetadata(instance, zone, applicationPackage.deploymentSpec()); + endpointCertificateMetadata.ifPresent(e -> deployLogger.accept("Deploying with CA signed certificate version %s".formatted(e.version()))); + containerEndpoints = controller.routing().of(deployment).prepare(application); } // Release application lock while doing the deployment, which is a lengthy task. diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index 813e3454e80..50e6951f8be 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -174,7 +174,7 @@ public class InternalStepRunner implements StepRunner { private Optional<RunStatus> deployReal(RunId id, boolean setTheStage, DualLogger logger) { Optional<X509Certificate> testerCertificate = controller.jobController().run(id).testerCertificate(); - return deploy(() -> controller.applications().deploy(id.job(), setTheStage), + return deploy(() -> controller.applications().deploy(id.job(), setTheStage, logger::log), controller.jobController().run(id) .stepInfo(setTheStage ? deployInitialReal : deployReal).get() .startTime().get(), diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json index 3b505bc11fd..10cbb3706e0 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json @@ -105,6 +105,11 @@ { "at": 1600000000000, "type": "info", + "message": "Deploying with CA signed certificate version 1" + }, + { + "at": 1600000000000, + "type": "info", "message": "Deployment successful." }, { @@ -354,7 +359,7 @@ } ] }, - "lastId": 66, + "lastId": 67, "steps": { "deployTester": { "status": "succeeded", |