Skip to content

Commit

Permalink
fix fabric8io#3625: removing default objectmeta
Browse files Browse the repository at this point in the history
  • Loading branch information
shawkins committed May 25, 2022
1 parent 12ec5f4 commit 54b74b1
Show file tree
Hide file tree
Showing 284 changed files with 657 additions and 1,003 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
public abstract class CustomResource<S, T> implements HasMetadata {
private static final Logger LOG = LoggerFactory.getLogger(CustomResource.class);

@JsonInclude(value = Include.CUSTOM, valueFilter = ObjectMeta.class)
private ObjectMeta metadata = new ObjectMeta();

@JsonProperty("spec")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@ public class KubeSchema {
@JsonProperty("MutatingWebhookConfigurationList")
private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList;
@JsonProperty("ObjectMeta")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta;
@JsonProperty("Patch")
private Patch patch;
@JsonProperty("PatchOptions")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ public class MutatingWebhookConfiguration implements HasMetadata
@JsonProperty("kind")
private String kind = "MutatingWebhookConfiguration";
@JsonProperty("metadata")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
@JsonProperty("webhooks")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<MutatingWebhook> webhooks = new ArrayList<MutatingWebhook>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ public class ValidatingWebhookConfiguration implements HasMetadata
@JsonProperty("kind")
private String kind = "ValidatingWebhookConfiguration";
@JsonProperty("metadata")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
@JsonProperty("webhooks")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<ValidatingWebhook> webhooks = new ArrayList<ValidatingWebhook>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ public class MutatingWebhookConfiguration implements HasMetadata
@JsonProperty("kind")
private String kind = "MutatingWebhookConfiguration";
@JsonProperty("metadata")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
@JsonProperty("webhooks")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<MutatingWebhook> webhooks = new ArrayList<MutatingWebhook>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ public class ValidatingWebhookConfiguration implements HasMetadata
@JsonProperty("kind")
private String kind = "ValidatingWebhookConfiguration";
@JsonProperty("metadata")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
@JsonProperty("webhooks")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<ValidatingWebhook> webhooks = new ArrayList<ValidatingWebhook>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ public class TokenReview implements HasMetadata
@JsonProperty("kind")
private String kind = "TokenReview";
@JsonProperty("metadata")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
@JsonProperty("spec")
private TokenReviewSpec spec;
@JsonProperty("status")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ public class LocalSubjectAccessReview implements HasMetadata, Namespaced
@JsonProperty("kind")
private String kind = "LocalSubjectAccessReview";
@JsonProperty("metadata")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
@JsonProperty("spec")
private SubjectAccessReviewSpec spec;
@JsonProperty("status")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ public class SelfSubjectAccessReview implements HasMetadata
@JsonProperty("kind")
private String kind = "SelfSubjectAccessReview";
@JsonProperty("metadata")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
@JsonProperty("spec")
private SelfSubjectAccessReviewSpec spec;
@JsonProperty("status")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ public class SelfSubjectRulesReview implements HasMetadata
@JsonProperty("kind")
private String kind = "SelfSubjectRulesReview";
@JsonProperty("metadata")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
@JsonProperty("spec")
private SelfSubjectRulesReviewSpec spec;
@JsonProperty("status")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ public class SubjectAccessReview implements HasMetadata
@JsonProperty("kind")
private String kind = "SubjectAccessReview";
@JsonProperty("metadata")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
@JsonProperty("spec")
private SubjectAccessReviewSpec spec;
@JsonProperty("status")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ public class LocalSubjectAccessReview implements HasMetadata, Namespaced
@JsonProperty("kind")
private String kind = "LocalSubjectAccessReview";
@JsonProperty("metadata")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
@JsonProperty("spec")
private SubjectAccessReviewSpec spec;
@JsonProperty("status")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ public class SelfSubjectAccessReview implements HasMetadata
@JsonProperty("kind")
private String kind = "SelfSubjectAccessReview";
@JsonProperty("metadata")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
@JsonProperty("spec")
private SelfSubjectAccessReviewSpec spec;
@JsonProperty("status")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ public class SelfSubjectRulesReview implements HasMetadata
@JsonProperty("kind")
private String kind = "SelfSubjectRulesReview";
@JsonProperty("metadata")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
@JsonProperty("spec")
private SelfSubjectRulesReviewSpec spec;
@JsonProperty("status")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ public class SubjectAccessReview implements HasMetadata
@JsonProperty("kind")
private String kind = "SubjectAccessReview";
@JsonProperty("metadata")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta metadata;
@JsonProperty("spec")
private SubjectAccessReviewSpec spec;
@JsonProperty("status")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3304,7 +3304,7 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "authorization.k8s.io/v1",
"default": "authorization.k8s.io/v1beta1",
"required": true
},
"kind": {
Expand All @@ -3317,12 +3317,12 @@
"existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta"
},
"spec": {
"$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewSpec"
"$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewSpec"
},
"status": {
"$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus"
"$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus"
}
},
"additionalProperties": true
Expand Down Expand Up @@ -3359,14 +3359,13 @@
"properties": {
"admissionReviewVersions": {
"type": "array",
"javaOmitEmpty": true,
"items": {
"type": "string"
}
},
"clientConfig": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_WebhookClientConfig",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.WebhookClientConfig"
"$ref": "#/definitions/kubernetes_admissionregistration_v1_WebhookClientConfig",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.WebhookClientConfig"
},
"failurePolicy": {
"type": "string"
Expand All @@ -3392,8 +3391,8 @@
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_RuleWithOperations",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.RuleWithOperations"
"$ref": "#/definitions/kubernetes_admissionregistration_v1_RuleWithOperations",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations"
}
},
"sideEffects": {
Expand All @@ -3409,7 +3408,7 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "admissionregistration.k8s.io/v1",
"default": "admissionregistration.k8s.io/v1beta1",
"required": true
},
"kind": {
Expand All @@ -3425,8 +3424,8 @@
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhook",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhook"
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MutatingWebhook",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhook"
}
}
},
Expand Down Expand Up @@ -3811,12 +3810,12 @@
"selfsubjectaccessreviewspec": {
"properties": {
"nonResourceAttributes": {
"$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceAttributes",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceAttributes"
"$ref": "#/definitions/kubernetes_authorization_v1_NonResourceAttributes",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceAttributes"
},
"resourceAttributes": {
"$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceAttributes",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceAttributes"
"$ref": "#/definitions/kubernetes_authorization_v1_ResourceAttributes",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes"
}
},
"additionalProperties": true
Expand All @@ -3825,7 +3824,7 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "authorization.k8s.io/v1beta1",
"default": "authorization.k8s.io/v1",
"required": true
},
"kind": {
Expand All @@ -3838,12 +3837,12 @@
"existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta"
},
"spec": {
"$ref": "#/definitions/kubernetes_authorization_v1beta1_SelfSubjectRulesReviewSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReviewSpec"
"$ref": "#/definitions/kubernetes_authorization_v1_SelfSubjectRulesReviewSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReviewSpec"
},
"status": {
"$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectRulesReviewStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectRulesReviewStatus"
"$ref": "#/definitions/kubernetes_authorization_v1_SubjectRulesReviewStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectRulesReviewStatus"
}
},
"additionalProperties": true
Expand Down Expand Up @@ -3965,7 +3964,7 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "authorization.k8s.io/v1",
"default": "authorization.k8s.io/v1beta1",
"required": true
},
"kind": {
Expand All @@ -3978,12 +3977,12 @@
"existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta"
},
"spec": {
"$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewSpec"
"$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewSpec"
},
"status": {
"$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus"
"$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus"
}
},
"additionalProperties": true
Expand All @@ -4000,20 +3999,20 @@
},
"existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e"
},
"groups": {
"group": {
"type": "array",
"javaOmitEmpty": true,
"items": {
"type": "string"
}
},
"nonResourceAttributes": {
"$ref": "#/definitions/kubernetes_authorization_v1_NonResourceAttributes",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceAttributes"
"$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceAttributes",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceAttributes"
},
"resourceAttributes": {
"$ref": "#/definitions/kubernetes_authorization_v1_ResourceAttributes",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes"
"$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceAttributes",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceAttributes"
},
"uid": {
"type": "string"
Expand Down Expand Up @@ -4209,14 +4208,13 @@
"properties": {
"admissionReviewVersions": {
"type": "array",
"javaOmitEmpty": true,
"items": {
"type": "string"
}
},
"clientConfig": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_WebhookClientConfig",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.WebhookClientConfig"
"$ref": "#/definitions/kubernetes_admissionregistration_v1_WebhookClientConfig",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.WebhookClientConfig"
},
"failurePolicy": {
"type": "string"
Expand All @@ -4239,8 +4237,8 @@
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_RuleWithOperations",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.RuleWithOperations"
"$ref": "#/definitions/kubernetes_admissionregistration_v1_RuleWithOperations",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations"
}
},
"sideEffects": {
Expand All @@ -4256,7 +4254,7 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "admissionregistration.k8s.io/v1",
"default": "admissionregistration.k8s.io/v1beta1",
"required": true
},
"kind": {
Expand All @@ -4272,8 +4270,8 @@
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhook",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhook"
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhook",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhook"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@ public class KubeSchema {
@JsonProperty("ListOptions")
private ListOptions listOptions;
@JsonProperty("ObjectMeta")
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class)
private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta();
private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta;
@JsonProperty("ObjectReference")
private io.fabric8.kubernetes.api.model.ObjectReference objectReference;
@JsonProperty("Patch")
Expand Down
Loading

0 comments on commit 54b74b1

Please sign in to comment.