diff --git a/extensions/knative/model/src/generated/java/io/fabric8/knative/pkg/apis/ConditionSet.java b/extensions/knative/model/src/generated/java/io/fabric8/knative/pkg/apis/ConditionSet.java index 0920925f33..2e2bbfd36d 100644 --- a/extensions/knative/model/src/generated/java/io/fabric8/knative/pkg/apis/ConditionSet.java +++ b/extensions/knative/model/src/generated/java/io/fabric8/knative/pkg/apis/ConditionSet.java @@ -1,16 +1,13 @@ package io.fabric8.knative.pkg.apis; -import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import javax.annotation.Generated; 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.builder.Editable; @@ -37,8 +34,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "dependents", - "happy" + }) @ToString @EqualsAndHashCode @@ -65,48 +61,9 @@ public class ConditionSet implements Editable , KubernetesResource { - @JsonProperty("dependents") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List dependents = new ArrayList<>(); - @JsonProperty("happy") - private String happy; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); - /** - * No args constructor for use in serialization - * - */ - public ConditionSet() { - } - - public ConditionSet(List dependents, String happy) { - super(); - this.dependents = dependents; - this.happy = happy; - } - - @JsonProperty("dependents") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getDependents() { - return dependents; - } - - @JsonProperty("dependents") - public void setDependents(List dependents) { - this.dependents = dependents; - } - - @JsonProperty("happy") - public String getHappy() { - return happy; - } - - @JsonProperty("happy") - public void setHappy(String happy) { - this.happy = happy; - } - @JsonIgnore public ConditionSetBuilder edit() { return new ConditionSetBuilder(this); diff --git a/extensions/knative/model/src/generated/java/io/fabric8/knative/pkg/apis/FieldError.java b/extensions/knative/model/src/generated/java/io/fabric8/knative/pkg/apis/FieldError.java index 93820d2fa7..880d850cef 100644 --- a/extensions/knative/model/src/generated/java/io/fabric8/knative/pkg/apis/FieldError.java +++ b/extensions/knative/model/src/generated/java/io/fabric8/knative/pkg/apis/FieldError.java @@ -40,8 +40,7 @@ "Details", "Level", "Message", - "Paths", - "errors" + "Paths" }) @ToString @EqualsAndHashCode @@ -77,9 +76,6 @@ public class FieldError implements Editable , KubernetesResou @JsonProperty("Paths") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List paths = new ArrayList<>(); - @JsonProperty("errors") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List errors = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -90,13 +86,12 @@ public class FieldError implements Editable , KubernetesResou public FieldError() { } - public FieldError(String details, Integer level, String message, List paths, List errors) { + public FieldError(String details, Integer level, String message, List paths) { super(); this.details = details; this.level = level; this.message = message; this.paths = paths; - this.errors = errors; } @JsonProperty("Details") @@ -140,17 +135,6 @@ public void setPaths(List paths) { this.paths = paths; } - @JsonProperty("errors") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getErrors() { - return errors; - } - - @JsonProperty("errors") - public void setErrors(List errors) { - this.errors = errors; - } - @JsonIgnore public FieldErrorBuilder edit() { return new FieldErrorBuilder(this); diff --git a/extensions/tekton/model/src/generated/java/io/fabric8/tekton/triggers/v1alpha1/StatusError.java b/extensions/tekton/model/src/generated/java/io/fabric8/tekton/triggers/v1alpha1/StatusError.java index 50c11647ad..0e52402d8d 100644 --- a/extensions/tekton/model/src/generated/java/io/fabric8/tekton/triggers/v1alpha1/StatusError.java +++ b/extensions/tekton/model/src/generated/java/io/fabric8/tekton/triggers/v1alpha1/StatusError.java @@ -8,7 +8,6 @@ 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.builder.Editable; @@ -35,7 +34,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "s" + }) @ToString @EqualsAndHashCode @@ -62,33 +61,9 @@ public class StatusError implements Editable , KubernetesResource { - @JsonProperty("s") - private Status s; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); - /** - * No args constructor for use in serialization - * - */ - public StatusError() { - } - - public StatusError(Status s) { - super(); - this.s = s; - } - - @JsonProperty("s") - public Status getS() { - return s; - } - - @JsonProperty("s") - public void setS(Status s) { - this.s = s; - } - @JsonIgnore public StatusErrorBuilder edit() { return new StatusErrorBuilder(this); diff --git a/extensions/tekton/model/src/generated/java/io/fabric8/tekton/triggers/v1beta1/StatusError.java b/extensions/tekton/model/src/generated/java/io/fabric8/tekton/triggers/v1beta1/StatusError.java index 11a04d767b..8395a9e9b9 100644 --- a/extensions/tekton/model/src/generated/java/io/fabric8/tekton/triggers/v1beta1/StatusError.java +++ b/extensions/tekton/model/src/generated/java/io/fabric8/tekton/triggers/v1beta1/StatusError.java @@ -8,7 +8,6 @@ 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.builder.Editable; @@ -35,7 +34,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "s" + }) @ToString @EqualsAndHashCode @@ -62,33 +61,9 @@ public class StatusError implements Editable , KubernetesResource { - @JsonProperty("s") - private Status s; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); - /** - * No args constructor for use in serialization - * - */ - public StatusError() { - } - - public StatusError(Status s) { - super(); - this.s = s; - } - - @JsonProperty("s") - public Status getS() { - return s; - } - - @JsonProperty("s") - public void setS(Status s) { - this.s = s; - } - @JsonIgnore public StatusErrorBuilder edit() { return new StatusErrorBuilder(this); diff --git a/kubernetes-model-generator/openapi/generator/cmd/openapi.go b/kubernetes-model-generator/openapi/generator/cmd/openapi.go index c5e485fc74..4d1d190f96 100644 --- a/kubernetes-model-generator/openapi/generator/cmd/openapi.go +++ b/kubernetes-model-generator/openapi/generator/cmd/openapi.go @@ -51,9 +51,9 @@ var modules = []module{ {outputName: "openshift-generated", getDefinitionsFunc: generated_openshift_openapi.GetOpenAPIDefinitions, patterns: packages.OpenShiftPackagePatterns}, {outputName: "dev.knative", getDefinitionsFunc: generated_knative_openapi.GetOpenAPIDefinitions, patterns: packages.KnativePackagePatterns}, {outputName: "dev.tekton", getDefinitionsFunc: generated_tekton_openapi.GetOpenAPIDefinitions, patterns: packages.TektonPackagePatterns}, + //{outputName: "io.istio", getDefinitionsFunc: generated_istio_openapi.GetOpenAPIDefinitions, patterns: packages.IstioPackagePatterns}, {outputName: "io.k8s.autoscaling", getDefinitionsFunc: generated_autoscaling_openapi.GetOpenAPIDefinitions, patterns: packages.AutoscalingPackagePatterns}, {outputName: "io.k8s.storage.snapshot", getDefinitionsFunc: generated_volumesnapshot_openapi.GetOpenAPIDefinitions, patterns: packages.VolumeSnapshotPackagePatterns}, - //{outputName: "io.istio", getDefinitionsFunc: generated_istio_openapi.GetOpenAPIDefinitions, patterns: packages.IstioPackagePatterns}, {outputName: "sh.volcano", getDefinitionsFunc: generated_volcano_openapi.GetOpenAPIDefinitions, patterns: packages.VolcanoPackagePatterns}, } diff --git a/kubernetes-model-generator/openapi/generator/pkg/openapi/openapi-gen.go b/kubernetes-model-generator/openapi/generator/pkg/openapi/openapi-gen.go index 3bd8f639ac..21c7989005 100644 --- a/kubernetes-model-generator/openapi/generator/pkg/openapi/openapi-gen.go +++ b/kubernetes-model-generator/openapi/generator/pkg/openapi/openapi-gen.go @@ -39,8 +39,10 @@ type GoGenerator struct { func (g *GoGenerator) Generate() error { g.ReportFilename = g.OutputFile + ".report.txt" g.processors = []func(context *generator.Context, pkg *types.Package, t *types.Type, member *types.Member, memberIndex int){ + processMapKeyTypes, + processOmitPrivateFields, + processPatchComments, processSwaggerIgnore, - fixVerticalPodAutoscalerInvalidMap, } return gengo.Execute( generators.NameSystems(), @@ -152,7 +154,46 @@ func (g *GoGenerator) KubernetesFilterFunc(c *generator.Context, t *types.Type) return false } -// Processors used to fix specific issues +//////////////////////////////////////////// +// Processors used to fix specific issues // +//////////////////////////////////////////// + +// processMapKeyTypes function to process the map key types and replace them by string in case they are not +// https://github.com/kubernetes/kube-openapi/blob/67ed5848f094e4cd74f5bdc458cd98f12767c538/pkg/generators/openapi.go#L1062-L1065 +// Example errors: +// - failed to generate map property in k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1.HistogramCheckpoint: BucketWeights: map with non-string keys are not supported by OpenAPI in map[int]uint32 +// - failed to generate map property in istio.io/api/security/v1beta1.PeerAuthentication: PortLevelMtls: map with non-string keys are not supported by OpenAPI in map[uint32]*istio.io/api/security/v1beta1.PeerAuthentication_MutualTLS +func processMapKeyTypes(context *generator.Context, _ *types.Package, t *types.Type, m *types.Member, memberIndex int) { + if m.Type.Kind == types.Map && m.Type.Key != nil && m.Type.Key.Name.Name != "string" { + t.Members[memberIndex].Type.Key = context.Universe.Type(types.Name{Name: "string"}) + } +} + +// processOmitPrivateFields +// Ignore private fields by adding the json:"-" tag +func processOmitPrivateFields(_ *generator.Context, _ *types.Package, t *types.Type, m *types.Member, memberIndex int) { + // Skip types that are not exported + if !unicode.IsUpper(rune(m.Name[0])) { + t.Members[memberIndex].Tags = "json:\"-\"" + } +} + +var patchTags = []string{"patchStrategy", "patchMergeKey"} + +// processPatchComments function to process the patchStrategy and patchMergeKey comment tags and add them to the field tags if necessary +// See https://github.com/fabric8io/kubernetes-client/issues/6426#issuecomment-2431653451 +func processPatchComments(_ *generator.Context, _ *types.Package, t *types.Type, m *types.Member, memberIndex int) { + for _, patchTag := range patchTags { + tag := reflect.StructTag(m.Tags).Get(patchTag) + if tag != "" { + continue // Value already set, there is no problem + } + tags, ok := gengo.ExtractCommentTags("+", m.CommentLines)[patchTag] + if ok { + t.Members[memberIndex].Tags = t.Members[memberIndex].Tags + " " + patchTag + ":\"" + tags[0] + "\"" + } + } +} // processSwaggerIgnore function to process the swaggerignore tag and add json:omitted so that kube-openapi ignores the field. func processSwaggerIgnore(_ *generator.Context, _ *types.Package, t *types.Type, m *types.Member, memberIndex int) { @@ -166,16 +207,3 @@ func processSwaggerIgnore(_ *generator.Context, _ *types.Package, t *types.Type, } } } - -// fixVerticalPodAutoscaler invalidMap key property (replaces it by string) -// failed to generate map property in k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1.HistogramCheckpoint: BucketWeights: map with non-string keys are not supported by OpenAPI in map[int]uint32 -// https://github.com/kubernetes/kube-openapi/blob/67ed5848f094e4cd74f5bdc458cd98f12767c538/pkg/generators/openapi.go#L1062-L1065 -func fixVerticalPodAutoscalerInvalidMap(context *generator.Context, pkg *types.Package, t *types.Type, m *types.Member, memberIndex int) { - // https://github.com/kubernetes/autoscaler/blob/bb94d270d71795339fc750f1dafeee2a95ed03f5/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1beta1/types.go#L318 - // https://github.com/kubernetes/autoscaler/blob/bb94d270d71795339fc750f1dafeee2a95ed03f5/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1beta2/types.go#L347 - // https://github.com/kubernetes/autoscaler/blob/bb94d270d71795339fc750f1dafeee2a95ed03f5/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1/types.go#L420C2-L420C15 - if m.Name == "BucketWeights" && strings.HasPrefix(pkg.Path, "k8s.io/autoscaler/vertical-pod-autoscaler/") { - stringType := context.Universe.Type(types.Name{Name: "string"}) - t.Members[memberIndex].Type.Key = stringType - } -} diff --git a/kubernetes-model-generator/openapi/generator/pkg/packages/packages.go b/kubernetes-model-generator/openapi/generator/pkg/packages/packages.go index b275b6353f..c174b126e5 100644 --- a/kubernetes-model-generator/openapi/generator/pkg/packages/packages.go +++ b/kubernetes-model-generator/openapi/generator/pkg/packages/packages.go @@ -61,16 +61,15 @@ var ChaosMeshPackagePatterns = []string{ } var IstioPackagePatterns = []string{ + "istio.io/api/analysis/v...", "istio.io/api/meta/v...", + "istio.io/api/security/v...", "istio.io/api/type/v...", "istio.io/client-go/pkg/apis/extensions/v...", - "istio.io/api/extensions/v...", "istio.io/client-go/pkg/apis/networking/v...", - //"istio.io/api/networking/v...", + "istio.io/api/networking/v...", "istio.io/client-go/pkg/apis/security/v...", - //"istio.io/api/security/v...", "istio.io/client-go/pkg/apis/telemetry/v...", - "istio.io/api/telemetry/v...", } var KnativePackagePatterns = []string{ diff --git a/kubernetes-model-generator/openapi/generator/tools/generator/openapi.go b/kubernetes-model-generator/openapi/generator/tools/generator/openapi.go index 74ea2cbf7d..b00071b0b6 100644 --- a/kubernetes-model-generator/openapi/generator/tools/generator/openapi.go +++ b/kubernetes-model-generator/openapi/generator/tools/generator/openapi.go @@ -36,7 +36,7 @@ var modules = []module{ {patterns: packages.AutoscalingPackagePatterns, outputName: "generated_autoscaling_openapi"}, // https://github.com/chaos-mesh/chaos-mesh/issues/4517 //{patterns: packages.ChaosMeshPackagePatterns, outputName: "generated_chaosmesh_openapi"}, - //{patterns: packages.IstioPackagePatterns, outputName: "generated_istio_openapi"}, + {patterns: packages.IstioPackagePatterns, outputName: "generated_istio_openapi"}, {patterns: packages.KnativePackagePatterns, outputName: "generated_knative_openapi"}, {patterns: packages.TektonPackagePatterns, outputName: "generated_tekton_openapi"}, {patterns: packages.VolcanoPackagePatterns, outputName: "generated_volcano_openapi"}, diff --git a/kubernetes-model-generator/openapi/schemas/dev.knative.json b/kubernetes-model-generator/openapi/schemas/dev.knative.json index fbd03c5731..3ba4bfa7d6 100644 --- a/kubernetes-model-generator/openapi/schemas/dev.knative.json +++ b/kubernetes-model-generator/openapi/schemas/dev.knative.json @@ -7649,23 +7649,6 @@ "dev.knative.pkg.apis.ConditionSet": { "description": "ConditionSet is an abstract collection of the possible ConditionType values that a particular resource might expose. It also holds the \"happy condition\" for that resource, which we define to be one of Ready or Succeeded depending on whether it is a Living or Batch process respectively.", "type": "object", - "required": [ - "happy", - "dependents" - ], - "properties": { - "dependents": { - "type": "array", - "items": { - "type": "string", - "default": "" - } - }, - "happy": { - "type": "string", - "default": "" - } - }, "x-fabric8-info": { "Type": "nested", "Group": "", @@ -7680,8 +7663,7 @@ "required": [ "Message", "Paths", - "Level", - "errors" + "Level" ], "properties": { "Details": { @@ -7707,13 +7689,6 @@ "type": "string", "default": "" } - }, - "errors": { - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/dev.knative.pkg.apis.FieldError" - } } }, "x-fabric8-info": { diff --git a/kubernetes-model-generator/openapi/schemas/dev.tekton.json b/kubernetes-model-generator/openapi/schemas/dev.tekton.json index 116e0c5cc4..1e92cc0900 100644 --- a/kubernetes-model-generator/openapi/schemas/dev.tekton.json +++ b/kubernetes-model-generator/openapi/schemas/dev.tekton.json @@ -2006,15 +2006,6 @@ }, "dev.tekton.triggers.v1alpha1.StatusError": { "type": "object", - "required": [ - "s" - ], - "properties": { - "s": { - "default": {}, - "$ref": "#/definitions/dev.tekton.triggers.v1alpha1.Status" - } - }, "x-fabric8-info": { "Type": "nested", "Group": "triggers.tekton.dev", @@ -3171,15 +3162,6 @@ }, "dev.tekton.triggers.v1beta1.StatusError": { "type": "object", - "required": [ - "s" - ], - "properties": { - "s": { - "default": {}, - "$ref": "#/definitions/dev.tekton.triggers.v1beta1.Status" - } - }, "x-fabric8-info": { "Type": "nested", "Group": "triggers.tekton.dev", diff --git a/kubernetes-model-generator/openapi/schemas/openshift-generated.json b/kubernetes-model-generator/openapi/schemas/openshift-generated.json index 063d5afe0b..b6378c98f0 100644 --- a/kubernetes-model-generator/openapi/schemas/openshift-generated.json +++ b/kubernetes-model-generator/openapi/schemas/openshift-generated.json @@ -772,15 +772,6 @@ "com.coreos.monitoring.v1.AuthorizationValidationError": { "description": "AuthorizationValidationError is returned by Authorization.Validate() on semantically invalid configurations.", "type": "object", - "required": [ - "err" - ], - "properties": { - "err": { - "type": "string", - "default": "" - } - }, "x-fabric8-info": { "Type": "nested", "Group": "monitoring.coreos.com", @@ -1973,15 +1964,6 @@ }, "com.coreos.monitoring.v1.OAuth2ValidationError": { "type": "object", - "required": [ - "err" - ], - "properties": { - "err": { - "type": "string", - "default": "" - } - }, "x-fabric8-info": { "Type": "nested", "Group": "monitoring.coreos.com", @@ -2599,15 +2581,6 @@ "com.coreos.monitoring.v1.ProbeTargetsValidationError": { "description": "ProbeTargetsValidationError is returned by ProbeTargets.Validate() on semantically invalid configurations.", "type": "object", - "required": [ - "err" - ], - "properties": { - "err": { - "type": "string", - "default": "" - } - }, "x-fabric8-info": { "Type": "nested", "Group": "monitoring.coreos.com", @@ -59983,20 +59956,6 @@ }, "io.metal3.v1alpha1.SchemaSettingError": { "type": "object", - "required": [ - "name", - "message" - ], - "properties": { - "message": { - "type": "string", - "default": "" - }, - "name": { - "type": "string", - "default": "" - } - }, "x-fabric8-info": { "Type": "nested", "Group": "metal3.io", @@ -65742,18 +65701,6 @@ "io.openshift.cloudcredential.v1.ProviderCodec": { "description": "ProviderCodec is a runtime codec for providers.", "type": "object", - "required": [ - "encoder", - "decoder" - ], - "properties": { - "decoder": { - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.Decoder" - }, - "encoder": { - "$ref": "#/definitions/io.k8s.apimachinery.pkg.runtime.Encoder" - } - }, "x-fabric8-info": { "Type": "nested", "Group": "cloudcredential.openshift.io", diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/SchemaSettingError.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/SchemaSettingError.java index 926539af0a..4cb6865607 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/SchemaSettingError.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/SchemaSettingError.java @@ -8,7 +8,6 @@ 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.builder.Editable; @@ -35,8 +34,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "message", - "name" + }) @ToString @EqualsAndHashCode @@ -63,46 +61,9 @@ public class SchemaSettingError implements Editable , KubernetesResource { - @JsonProperty("message") - private String message; - @JsonProperty("name") - private String name; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); - /** - * No args constructor for use in serialization - * - */ - public SchemaSettingError() { - } - - public SchemaSettingError(String message, String name) { - super(); - this.message = message; - this.name = name; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - @JsonIgnore public SchemaSettingErrorBuilder edit() { return new SchemaSettingErrorBuilder(this); diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AuthorizationValidationError.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AuthorizationValidationError.java index 5d32a85547..8e4fcc9147 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AuthorizationValidationError.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AuthorizationValidationError.java @@ -8,7 +8,6 @@ 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.builder.Editable; @@ -35,7 +34,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "err" + }) @ToString @EqualsAndHashCode @@ -62,33 +61,9 @@ public class AuthorizationValidationError implements Editable , KubernetesResource { - @JsonProperty("err") - private String err; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); - /** - * No args constructor for use in serialization - * - */ - public AuthorizationValidationError() { - } - - public AuthorizationValidationError(String err) { - super(); - this.err = err; - } - - @JsonProperty("err") - public String getErr() { - return err; - } - - @JsonProperty("err") - public void setErr(String err) { - this.err = err; - } - @JsonIgnore public AuthorizationValidationErrorBuilder edit() { return new AuthorizationValidationErrorBuilder(this); diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/OAuth2ValidationError.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/OAuth2ValidationError.java index 8143e89a4f..10add4225f 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/OAuth2ValidationError.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/OAuth2ValidationError.java @@ -8,7 +8,6 @@ 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.builder.Editable; @@ -35,7 +34,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "err" + }) @ToString @EqualsAndHashCode @@ -62,33 +61,9 @@ public class OAuth2ValidationError implements Editable , KubernetesResource { - @JsonProperty("err") - private String err; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); - /** - * No args constructor for use in serialization - * - */ - public OAuth2ValidationError() { - } - - public OAuth2ValidationError(String err) { - super(); - this.err = err; - } - - @JsonProperty("err") - public String getErr() { - return err; - } - - @JsonProperty("err") - public void setErr(String err) { - this.err = err; - } - @JsonIgnore public OAuth2ValidationErrorBuilder edit() { return new OAuth2ValidationErrorBuilder(this); diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ProbeTargetsValidationError.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ProbeTargetsValidationError.java index 212b3f03c3..35a44ff8a6 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ProbeTargetsValidationError.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ProbeTargetsValidationError.java @@ -8,7 +8,6 @@ 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.builder.Editable; @@ -35,7 +34,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "err" + }) @ToString @EqualsAndHashCode @@ -62,33 +61,9 @@ public class ProbeTargetsValidationError implements Editable , KubernetesResource { - @JsonProperty("err") - private String err; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); - /** - * No args constructor for use in serialization - * - */ - public ProbeTargetsValidationError() { - } - - public ProbeTargetsValidationError(String err) { - super(); - this.err = err; - } - - @JsonProperty("err") - public String getErr() { - return err; - } - - @JsonProperty("err") - public void setErr(String err) { - this.err = err; - } - @JsonIgnore public ProbeTargetsValidationErrorBuilder edit() { return new ProbeTargetsValidationErrorBuilder(this);