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

fix: don't annotate KubeSchema and ValidationSchema classes #5759

Merged
merged 1 commit into from
Feb 21, 2024
Merged

fix: don't annotate KubeSchema and ValidationSchema classes #5759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#### Bugs
* Fix #5729: ensure that kind is set for generic resource lists
* Fix #3032: JUnit5 Kubernetes Extension works with Nested tests
* Fix #5759: Don't annotate KubeSchema and ValidationSchema classes

#### Improvements
* Fix #5701: Owner reference validity check regarding scope and namespace
Expand All @@ -19,6 +20,8 @@
* Fix #5711: Kube API Test - Kubernetes API Server JUnit Test Support

#### _**Note**_: Breaking changes
* KubeSchema and Validation Schema generated classes are no longer annotated with Jackson, Lombok, and Sundrio annotations.
This implies that builders will no longer be generated for these classes and that they won't have special deserialization/serialization behavior.

### 6.10.0 (2024-01-10)

Expand Down
190 changes: 6 additions & 184 deletions ...-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java
View file
Open in desktop

Large diffs are not rendered by default.

190 changes: 6 additions & 184 deletions ...sionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java
View file
Open in desktop

Large diffs are not rendered by default.

97 changes: 48 additions & 49 deletions ...r/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4555,7 +4555,7 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "authorization.k8s.io/v1beta1",
"default": "authorization.k8s.io/v1",
"required": true
},
"kind": {
Expand All @@ -4568,12 +4568,12 @@
"existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta"
},
"spec": {
"$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewSpec"
"$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewSpec"
},
"status": {
"$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus"
"$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus"
}
},
"additionalProperties": true
Expand Down Expand Up @@ -4653,14 +4653,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 @@ -4669,8 +4668,8 @@
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition"
"$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchCondition",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition"
}
},
"matchPolicy": {
Expand Down Expand Up @@ -4711,7 +4710,7 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "admissionregistration.k8s.io/v1",
"default": "admissionregistration.k8s.io/v1beta1",
"required": true
},
"kind": {
Expand All @@ -4727,8 +4726,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 @@ -5156,7 +5155,7 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "authorization.k8s.io/v1beta1",
"default": "authorization.k8s.io/v1",
"required": true
},
"kind": {
Expand All @@ -5169,25 +5168,25 @@
"existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta"
},
"spec": {
"$ref": "#/definitions/kubernetes_authorization_v1beta1_SelfSubjectAccessReviewSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReviewSpec"
"$ref": "#/definitions/kubernetes_authorization_v1_SelfSubjectAccessReviewSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReviewSpec"
},
"status": {
"$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus"
"$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus"
}
},
"additionalProperties": true
},
"selfsubjectaccessreviewspec": {
"properties": {
"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"
}
},
"additionalProperties": true
Expand Down Expand Up @@ -5228,7 +5227,7 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "authorization.k8s.io/v1beta1",
"default": "authorization.k8s.io/v1",
"required": true
},
"kind": {
Expand All @@ -5241,12 +5240,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 @@ -5710,7 +5709,7 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "admissionregistration.k8s.io/v1beta1",
"default": "admissionregistration.k8s.io/v1alpha1",
"required": true
},
"kind": {
Expand All @@ -5723,8 +5722,8 @@
"existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta"
},
"spec": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingSpec"
"$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyBindingSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingSpec"
}
},
"additionalProperties": true
Expand Down Expand Up @@ -5759,12 +5758,12 @@
"validatingadmissionpolicybindingspec": {
"properties": {
"matchResources": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchResources",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchResources"
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchResources",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources"
},
"paramRef": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ParamRef",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ParamRef"
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ParamRef",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamRef"
},
"policyName": {
"type": "string"
Expand Down Expand Up @@ -5812,8 +5811,8 @@
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_AuditAnnotation",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.AuditAnnotation"
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_AuditAnnotation",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.AuditAnnotation"
}
},
"failurePolicy": {
Expand All @@ -5823,32 +5822,32 @@
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchCondition",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchCondition"
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition"
}
},
"matchConstraints": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchResources",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchResources"
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchResources",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources"
},
"paramKind": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ParamKind",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ParamKind"
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ParamKind",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamKind"
},
"validations": {
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Validation",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Validation"
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_Validation",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Validation"
}
},
"variables": {
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Variable",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Variable"
"$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_Variable",
"existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Variable"
}
}
},
Expand Down Expand Up @@ -5934,7 +5933,7 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "admissionregistration.k8s.io/v1",
"default": "admissionregistration.k8s.io/v1beta1",
"required": true
},
"kind": {
Expand All @@ -5950,8 +5949,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
Loading
Loading