summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@verizonmedia.com>2022-06-28 12:20:39 +0200
committerGitHub <noreply@github.com>2022-06-28 12:20:39 +0200
commit307b8c5c44656d968a154b8a0ef58b29cad3183b (patch)
treecbbec006fbd1d88b8f5380cf7ecca5c47893ca31 /controller-server
parent4d22023e62ec900ab77405c6e9f1481bd74cf561 (diff)
Revert "log certificate version on deploy" (#23256)
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java4
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java2
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json7
3 files changed, 3 insertions, 10 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 cd90d14f9ff..e48ad7596ea 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, Consumer<String> deployLogger) {
+ public ActivateResult deploy(JobId job, boolean deploySourceVersions) {
if (job.application().instance().isTester())
throw new IllegalArgumentException("'" + job.application() + "' is a tester application!");
@@ -479,8 +479,6 @@ 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 50e6951f8be..813e3454e80 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, logger::log),
+ return deploy(() -> controller.applications().deploy(id.job(), setTheStage),
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 10cbb3706e0..3b505bc11fd 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,11 +105,6 @@
{
"at": 1600000000000,
"type": "info",
- "message": "Deploying with CA signed certificate version 1"
- },
- {
- "at": 1600000000000,
- "type": "info",
"message": "Deployment successful."
},
{
@@ -359,7 +354,7 @@
}
]
},
- "lastId": 67,
+ "lastId": 66,
"steps": {
"deployTester": {
"status": "succeeded",