Skip to content

Commit 689eea3

Browse files
committed
Ref #25533: support empty pod patches
1 parent dfd6c26 commit 689eea3

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
import io.fabric8.kubernetes.client.internal.readiness.Readiness;
7777
import io.fabric8.kubernetes.client.utils.Serialization;
7878
import org.apache.commons.io.IOUtils;
79+
import org.apache.commons.lang.StringUtils;
7980

8081
import javax.inject.Inject;
8182
import javax.json.JsonPatch;
@@ -367,6 +368,10 @@ private JsonPatch readPatchFromSpec(ContainerSpec containerSpec, Proxy proxy) th
367368
userService.getCurrentAuth().getCredentials());
368369
String expressionAwarePatch = expressionResolver.evaluateToString(patchAsString, context);
369370

371+
if (StringUtils.isBlank(expressionAwarePatch)) {
372+
return null;
373+
}
374+
370375
ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());
371376
yamlReader.registerModule(new JSR353Module());
372377
return yamlReader.readValue(expressionAwarePatch, JsonPatch.class);

src/main/java/eu/openanalytics/containerproxy/service/ProxyService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ public class ProxyService {
103103
@Inject
104104
private Environment environment;
105105

106-
@Inject
107-
private ParametersService parametersService;
106+
@Inject
107+
private RuntimeValueService runtimeValueService;
108108

109109
private boolean stopAppsOnShutdown;
110110

0 commit comments

Comments
 (0)