From ec94cc7cd0c96ca520738977bc392dea9691a7c6 Mon Sep 17 00:00:00 2001 From: Simon Woodman Date: Wed, 3 Oct 2018 12:03:39 +0100 Subject: [PATCH 1/2] minor logging :lipstick --- .../java/io/streamzi/ev/watcher/DeploymentConfigWatcher.java | 2 +- .../src/main/java/io/streamzi/ev/watcher/DeploymentWatcher.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Operator/src/main/java/io/streamzi/ev/watcher/DeploymentConfigWatcher.java b/Operator/src/main/java/io/streamzi/ev/watcher/DeploymentConfigWatcher.java index d682d60..54fe6bf 100644 --- a/Operator/src/main/java/io/streamzi/ev/watcher/DeploymentConfigWatcher.java +++ b/Operator/src/main/java/io/streamzi/ev/watcher/DeploymentConfigWatcher.java @@ -35,7 +35,7 @@ public void eventReceived(Action action, DeploymentConfig dc) { final Map labels = dc.getMetadata().getLabels(); final String name = dc.getMetadata().getName(); - logger.info("DeploymentConfig watch received event " + action + " on map " + name + " with labels" + labels); + logger.info("DeploymentConfig watch received event " + action + " on deploymentconfig " + name + " with labels" + labels); try { switch (action) { diff --git a/Operator/src/main/java/io/streamzi/ev/watcher/DeploymentWatcher.java b/Operator/src/main/java/io/streamzi/ev/watcher/DeploymentWatcher.java index d51ad84..e58e1e2 100644 --- a/Operator/src/main/java/io/streamzi/ev/watcher/DeploymentWatcher.java +++ b/Operator/src/main/java/io/streamzi/ev/watcher/DeploymentWatcher.java @@ -36,7 +36,7 @@ public void eventReceived(Action action, Deployment dc) { final Map labels = dc.getMetadata().getLabels(); final String name = dc.getMetadata().getName(); - logger.info("Deployment watch received event " + action + " on map " + name + " with labels" + labels); + logger.info("Deployment watch received event " + action + " on deployment " + name + " with labels" + labels); try { switch (action) { From fe322dc810864c515a5df30131f0581822b5f637 Mon Sep 17 00:00:00 2001 From: Simon Woodman Date: Wed, 3 Oct 2018 13:14:31 +0100 Subject: [PATCH 2/2] Sets empty String to null when checking if an EnvVar exists --- .../io/streamzi/ev/operator/DeploymentConfigOperator.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Operator/src/main/java/io/streamzi/ev/operator/DeploymentConfigOperator.java b/Operator/src/main/java/io/streamzi/ev/operator/DeploymentConfigOperator.java index b08004e..6962cc2 100644 --- a/Operator/src/main/java/io/streamzi/ev/operator/DeploymentConfigOperator.java +++ b/Operator/src/main/java/io/streamzi/ev/operator/DeploymentConfigOperator.java @@ -58,7 +58,10 @@ private void deploymentConfigAdded(DeploymentConfig dc) { for (String key : cm.getData().keySet()) { - final EnvVar ev = new EnvVar(Util.sanitiseEnvVar(key), cm.getData().get(key), null); + String evValue = cm.getData().get(key); + if(evValue.equals("")) evValue = null; + + final EnvVar ev = new EnvVar(Util.sanitiseEnvVar(key), evValue, null); final List containers = dc.getSpec().getTemplate().getSpec().getContainers();