Skip to content

Commit

Permalink
fixing deployment resource consistence
Browse files Browse the repository at this point in the history
  • Loading branch information
cmendesce committed Jul 29, 2024
1 parent d305fca commit 7b167c8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import java.util.Map;
import java.util.concurrent.TimeUnit;

import static io.resiliencebench.support.Annotations.CONTAINER;

@Service
public class EnvironmentStep extends ExecutorStep<Deployment> {

Expand All @@ -44,7 +46,7 @@ protected boolean isApplicable(Scenario scenario) {
public void applyServiceEnvironment(Scenario scenario, io.resiliencebench.resources.scenario.Service service) {
var env = service.getEnvs();
var resilientService = resilientServiceRepository.get(scenario.getMetadata().getNamespace(), service.getName());
var containerName = resilientService.getMetadata().getAnnotations().get("resiliencebench.io/container");
var containerName = resilientService.getMetadata().getAnnotations().get(CONTAINER);

var deployment = kubernetesClient()
.apps()
Expand Down Expand Up @@ -89,8 +91,13 @@ public void applyNewVariables(Deployment targetDeployment, String containerName,
}
}

logger.info("Deleting pods for deployment {}", targetDeployment.getMetadata().getName());
getPods(targetDeployment).delete();
kubernetesClient().apps().deployments()
.inNamespace(targetDeployment.getMetadata().getNamespace())
.resource(targetDeployment)
.update();

// logger.info("Deleting pods for deployment {}", targetDeployment.getMetadata().getName());
// getPods(targetDeployment).delete();
logger.info("Waiting for the pods to restart.");
getPods(targetDeployment).waitUntilCondition(this::waitUntilCondition, 60, TimeUnit.SECONDS);
logger.info("Pods restarted successfully");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ public interface Annotations {
String OWNED_BY = "resiliencebench.io/owned-by";

String CREATED_BY = "resiliencebench.io/created-by";

String CONTAINER = "resiliencebench.io/container";
}

0 comments on commit 7b167c8

Please sign in to comment.