Skip to content

Commit

Permalink
Fixes fabric8io#3336 Added ConversionReview in API extensions model
Browse files Browse the repository at this point in the history
  • Loading branch information
MUzairS15 authored and rohanKanojia committed Aug 10, 2021
1 parent 47efc3d commit c18c956
Show file tree
Hide file tree
Showing 10 changed files with 790 additions and 59 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* Fix #3327: Removed generated ResourceHandlers
* Fix #3349: ensuring that dsl context values always are applied over user ListOptions
* Fix #3372: Add generatePackageSuffix option to Model Generator to allow flexible package names for generated model
* Fix #3336: Add ConversionReview in Kubernetes API Extensions model

#### Dependency Upgrade

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ type Schema struct {
// Added JSONSchemaPropsorStringArray here because of
// https://github.com/joelittlejohn/jsonschema2pojo/issues/866
V1JSONSchemaPropsOrStringArray v1apiextensions.JSONSchemaPropsOrStringArray
V1ConversionReview v1apiextensions.ConversionReview
}

func main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
import io.fabric8.kubernetes.api.model.ResourceRequirements;
import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionReview;
import io.fabric8.kubernetes.api.model.version.Info;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
Expand Down Expand Up @@ -54,6 +55,7 @@
"Time",
"TypeMeta",
"UpdateOptions",
"V1ConversionReview",
"V1CustomResourceDefinition",
"V1CustomResourceDefinitionCondition",
"V1CustomResourceDefinitionList",
Expand Down Expand Up @@ -127,6 +129,8 @@ public class KubeSchema {
private TypeMeta typeMeta;
@JsonProperty("UpdateOptions")
private UpdateOptions updateOptions;
@JsonProperty("V1ConversionReview")
private ConversionReview v1ConversionReview;
@JsonProperty("V1CustomResourceDefinition")
private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition v1CustomResourceDefinition;
@JsonProperty("V1CustomResourceDefinitionCondition")
Expand Down Expand Up @@ -173,6 +177,7 @@ public KubeSchema() {
* @param objectReference
* @param jSONSchemaPropsOrStringArray
* @param v1CustomResourceDefinitionStatus
* @param v1ConversionReview
* @param v1CustomResourceDefinitionSpec
* @param createOptions
* @param aPIGroup
Expand All @@ -186,7 +191,7 @@ public KubeSchema() {
* @param time
* @param status
*/
public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition customResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition customResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList customResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames customResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec customResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus customResourceDefinitionStatus, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray jSONSchemaPropsOrStringArray, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition v1CustomResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition v1CustomResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList v1CustomResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames v1CustomResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec v1CustomResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray) {
public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition customResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition customResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList customResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames customResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec customResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus customResourceDefinitionStatus, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray jSONSchemaPropsOrStringArray, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ConversionReview v1ConversionReview, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition v1CustomResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition v1CustomResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList v1CustomResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames v1CustomResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec v1CustomResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray) {
super();
this.aPIGroup = aPIGroup;
this.aPIGroupList = aPIGroupList;
Expand All @@ -213,6 +218,7 @@ public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesLi
this.time = time;
this.typeMeta = typeMeta;
this.updateOptions = updateOptions;
this.v1ConversionReview = v1ConversionReview;
this.v1CustomResourceDefinition = v1CustomResourceDefinition;
this.v1CustomResourceDefinitionCondition = v1CustomResourceDefinitionCondition;
this.v1CustomResourceDefinitionList = v1CustomResourceDefinitionList;
Expand Down Expand Up @@ -472,6 +478,16 @@ public void setUpdateOptions(UpdateOptions updateOptions) {
this.updateOptions = updateOptions;
}

@JsonProperty("V1ConversionReview")
public ConversionReview getV1ConversionReview() {
return v1ConversionReview;
}

@JsonProperty("V1ConversionReview")
public void setV1ConversionReview(ConversionReview v1ConversionReview) {
this.v1ConversionReview = v1ConversionReview;
}

@JsonProperty("V1CustomResourceDefinition")
public io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition getV1CustomResourceDefinition() {
return v1CustomResourceDefinition;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@

package io.fabric8.kubernetes.api.model.apiextensions.v1;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.fabric8.kubernetes.api.model.Container;
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.KubernetesResource;
import io.fabric8.kubernetes.api.model.LabelSelector;
import io.fabric8.kubernetes.api.model.LocalObjectReference;
import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
import io.fabric8.kubernetes.api.model.ResourceRequirements;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import lombok.EqualsAndHashCode;
import lombok.ToString;

@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
"apiVersion",
"kind",
"metadata",
"desiredAPIVersion",
"objects",
"uid"
})
@ToString
@EqualsAndHashCode
@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
@BuildableReference(ObjectMeta.class),
@BuildableReference(LabelSelector.class),
@BuildableReference(Container.class),
@BuildableReference(PodTemplateSpec.class),
@BuildableReference(ResourceRequirements.class),
@BuildableReference(IntOrString.class),
@BuildableReference(ObjectReference.class),
@BuildableReference(LocalObjectReference.class),
@BuildableReference(PersistentVolumeClaim.class)
})
public class ConversionRequest implements KubernetesResource
{

@JsonProperty("desiredAPIVersion")
private String desiredAPIVersion;
@JsonProperty("objects")
private List<HasMetadata> objects = new ArrayList<HasMetadata>();
@JsonProperty("uid")
private String uid;
@JsonIgnore
private Map<String, Object> additionalProperties = new HashMap<String, Object>();

/**
* No args constructor for use in serialization
*
*/
public ConversionRequest() {
}

/**
*
* @param uid
* @param objects
* @param desiredAPIVersion
*/
public ConversionRequest(String desiredAPIVersion, List<HasMetadata> objects, String uid) {
super();
this.desiredAPIVersion = desiredAPIVersion;
this.objects = objects;
this.uid = uid;
}

@JsonProperty("desiredAPIVersion")
public String getDesiredAPIVersion() {
return desiredAPIVersion;
}

@JsonProperty("desiredAPIVersion")
public void setDesiredAPIVersion(String desiredAPIVersion) {
this.desiredAPIVersion = desiredAPIVersion;
}

@JsonProperty("objects")
public List<HasMetadata> getObjects() {
return objects;
}

@JsonProperty("objects")
public void setObjects(List<HasMetadata> objects) {
this.objects = objects;
}

@JsonProperty("uid")
public String getUid() {
return uid;
}

@JsonProperty("uid")
public void setUid(String uid) {
this.uid = uid;
}

@JsonAnyGetter
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
}

@JsonAnySetter
public void setAdditionalProperty(String name, Object value) {
this.additionalProperties.put(name, value);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@

package io.fabric8.kubernetes.api.model.apiextensions.v1;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.fabric8.kubernetes.api.model.Container;
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.KubernetesResource;
import io.fabric8.kubernetes.api.model.LabelSelector;
import io.fabric8.kubernetes.api.model.LocalObjectReference;
import io.fabric8.kubernetes.api.model.ObjectMeta;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
import io.fabric8.kubernetes.api.model.ResourceRequirements;
import io.fabric8.kubernetes.api.model.Status;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import lombok.EqualsAndHashCode;
import lombok.ToString;

@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
"apiVersion",
"kind",
"metadata",
"convertedObjects",
"result",
"uid"
})
@ToString
@EqualsAndHashCode
@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
@BuildableReference(ObjectMeta.class),
@BuildableReference(LabelSelector.class),
@BuildableReference(Container.class),
@BuildableReference(PodTemplateSpec.class),
@BuildableReference(ResourceRequirements.class),
@BuildableReference(IntOrString.class),
@BuildableReference(ObjectReference.class),
@BuildableReference(LocalObjectReference.class),
@BuildableReference(PersistentVolumeClaim.class)
})
public class ConversionResponse implements KubernetesResource
{

@JsonProperty("convertedObjects")
private List<HasMetadata> convertedObjects = new ArrayList<HasMetadata>();
@JsonProperty("result")
private Status result;
@JsonProperty("uid")
private String uid;
@JsonIgnore
private Map<String, Object> additionalProperties = new HashMap<String, Object>();

/**
* No args constructor for use in serialization
*
*/
public ConversionResponse() {
}

/**
*
* @param result
* @param uid
* @param convertedObjects
*/
public ConversionResponse(List<HasMetadata> convertedObjects, Status result, String uid) {
super();
this.convertedObjects = convertedObjects;
this.result = result;
this.uid = uid;
}

@JsonProperty("convertedObjects")
public List<HasMetadata> getConvertedObjects() {
return convertedObjects;
}

@JsonProperty("convertedObjects")
public void setConvertedObjects(List<HasMetadata> convertedObjects) {
this.convertedObjects = convertedObjects;
}

@JsonProperty("result")
public Status getResult() {
return result;
}

@JsonProperty("result")
public void setResult(Status result) {
this.result = result;
}

@JsonProperty("uid")
public String getUid() {
return uid;
}

@JsonProperty("uid")
public void setUid(String uid) {
this.uid = uid;
}

@JsonAnyGetter
public Map<String, Object> getAdditionalProperties() {
return this.additionalProperties;
}

@JsonAnySetter
public void setAdditionalProperty(String name, Object value) {
this.additionalProperties.put(name, value);
}

}

0 comments on commit c18c956

Please sign in to comment.