Skip to content
This repository has been archived by the owner on Nov 13, 2019. It is now read-only.

Stopping infinite loop #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Stopping infinite loop #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec94cc7
minor logging :lipstick
sjwoodman Oct 3, 2018
fe322dc
Sets empty String to null when checking if an EnvVar exists
sjwoodman Oct 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion Operator/src/main/java/io/streamzi/ev/operator/DeploymentConfigOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Container> containers = dc.getSpec().getTemplate().getSpec().getContainers();

Expand Down
2 changes: 1 addition & 1 deletion Operator/src/main/java/io/streamzi/ev/watcher/DeploymentConfigWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void eventReceived(Action action, DeploymentConfig dc) {

final Map<String, String> 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) {
Expand Down
2 changes: 1 addition & 1 deletion Operator/src/main/java/io/streamzi/ev/watcher/DeploymentWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void eventReceived(Action action, Deployment dc) {

final Map<String, String> 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) {
Expand Down