Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #3460: support for deserializing templates with non-string params #3526

Merged
merged 2 commits into from
Nov 3, 2021
Merged

fix #3460: support for deserializing templates with non-string params #3526

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
1dd4775
fix #3460: support for deserializing templates with non-string params
shawkins Oct 11, 2021
765bd0e
test: assertion verifies GenericKubernetesResource fallback
manusa Nov 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/SerializationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.api.model.batch.v1.Job;
import io.fabric8.kubernetes.client.CustomResource;
import io.fabric8.kubernetes.model.annotation.Group;
import io.fabric8.kubernetes.model.annotation.Version;
Expand Down
23 changes: 21 additions & 2 deletions ...netes-model-core/src/main/java/io/fabric8/kubernetes/internal/KubernetesDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonNode;

import com.fasterxml.jackson.databind.exc.InvalidFormatException;
import io.fabric8.kubernetes.api.KubernetesResourceMappingProvider;
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
import io.fabric8.kubernetes.api.model.HasMetadata;
Expand All @@ -50,6 +50,9 @@ public class KubernetesDeserializer extends JsonDeserializer<KubernetesResource>

private static final Mapping mapping = new Mapping();

// template deserialization can fail if unless we use generic resources
private static ThreadLocal<Boolean> IN_TEMPLATE = ThreadLocal.withInitial(() -> false);

@Override
public KubernetesResource deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
JsonNode node = jp.readValueAsTree();
Expand Down Expand Up @@ -84,7 +87,23 @@ private static KubernetesResource fromObjectNode(JsonParser jp, JsonNode node) t
if (resourceType == null) {
return jp.getCodec().treeToValue(node, GenericKubernetesResource.class);
} else if (KubernetesResource.class.isAssignableFrom(resourceType)){
return jp.getCodec().treeToValue(node, resourceType);
boolean inTemplate = IN_TEMPLATE.get();
if (!inTemplate && "io.fabric8.openshift.api.model.Template".equals(resourceType.getName())) {
inTemplate = true;
IN_TEMPLATE.set(true);
}
try {
return jp.getCodec().treeToValue(node, resourceType);
} catch (InvalidFormatException e) {
if (!inTemplate) {
throw e;
}
return jp.getCodec().treeToValue(node, GenericKubernetesResource.class);
} finally {
if (inTemplate) {
IN_TEMPLATE.remove();
}
}
}
}
return null;
Expand Down
19 changes: 19 additions & 0 deletions kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TemplateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package io.fabric8.openshift.client.server.mock;

import io.fabric8.kubernetes.api.model.APIGroupListBuilder;
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.api.model.KubernetesList;
import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
Expand All @@ -26,6 +27,7 @@
import io.fabric8.kubernetes.api.model.ServiceSpec;
import io.fabric8.kubernetes.api.model.StatusBuilder;
import io.fabric8.kubernetes.client.utils.IOHelpers;
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.openshift.api.model.ParameterBuilder;
import io.fabric8.openshift.api.model.Template;
import io.fabric8.openshift.api.model.TemplateBuilder;
Expand All @@ -44,6 +46,7 @@
import java.util.Map;

import static java.util.Collections.singletonMap;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand Down Expand Up @@ -183,6 +186,22 @@ void shouldLoadTemplateWithNumberParameters() {
map.put("PORT", "8080");
KubernetesList list = client.templates().withParameters(map).load(getClass().getResourceAsStream("/template-with-number-params.yml")).processLocally(map);
assertListIsServiceWithPort8080(list);
assertThat(list.getItems()).singleElement()
.isInstanceOf(Service.class)
.extracting("spec.ports").asList().singleElement()
.hasFieldOrPropertyWithValue("port", 8080);
}

@Test
void shouldGetTemplateWithNumberParameters() {
OpenShiftClient client = new DefaultOpenShiftClient(new OpenShiftConfigBuilder().withDisableApiGroupCheck(true).build());
Template template = client.templates().load(getClass().getResourceAsStream("/template-with-number-params.yml")).get();
assertThat(template)
.extracting(Template::getObjects).asList()
.singleElement()
.isInstanceOf(GenericKubernetesResource.class)
.extracting("additionalProperties.spec.ports").asList().singleElement()
.hasFieldOrPropertyWithValue("port", "${PORT}");
}

protected void assertListIsServiceWithPort8080(KubernetesList list) {
Expand Down