From e40a0c1331729c3f8a9e23de2536012641fb669c Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Wed, 4 Mar 2020 10:56:27 +0100 Subject: withSecurityOpts -> withSecurityOpt --- .../com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java | 2 +- .../src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java | 2 +- .../yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java | 5 ++--- .../yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java index ecfe9b2468a..30d79c57296 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java @@ -91,7 +91,7 @@ class CreateContainerCommandImpl implements Docker.CreateContainerCommand { } @Override - public Docker.CreateContainerCommand withSecurityOpts(String securityOpt) { + public Docker.CreateContainerCommand withSecurityOpt(String securityOpt) { securityOpts.add(securityOpt); return this; } diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java index 648c94d71ab..477d0edf8be 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/Docker.java @@ -52,7 +52,7 @@ public interface Docker { CreateContainerCommand withManagedBy(String manager); CreateContainerCommand withAddCapability(String capabilityName); CreateContainerCommand withDropCapability(String capabilityName); - CreateContainerCommand withSecurityOpts(String securityOpt); + CreateContainerCommand withSecurityOpt(String securityOpt); CreateContainerCommand withDnsOption(String dnsOption); CreateContainerCommand withPrivileged(boolean privileged); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java index 782f8592350..7e3e17701b7 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java @@ -84,9 +84,8 @@ public class DockerOperationsImpl implements DockerOperations { .withAddCapability("SYS_ADMIN") // Needed for perf .withAddCapability("SYS_NICE"); // Needed for set_mempolicy to work - if (context.node().membership().map(NodeMembership::clusterType).map("content"::equalsIgnoreCase).orElse(false)) { - command.withSecurityOpts("seccomp=unconfined"); - } + if (context.node().membership().map(NodeMembership::clusterType).map("content"::equalsIgnoreCase).orElse(false)) + command.withSecurityOpt("seccomp=unconfined"); DockerNetworking networking = context.dockerNetworking(); command.withNetworkMode(networking.getDockerNetworkMode()); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java index 69bc9f5e092..1484e40afe9 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java @@ -176,7 +176,7 @@ public class DockerMock implements Docker { } @Override - public CreateContainerCommand withSecurityOpts(String securityOpt) { + public CreateContainerCommand withSecurityOpt(String securityOpt) { return this; } -- cgit v1.2.3