Skip to content

Commit 999a851

Browse files
sunixsunix
committed
fixup! chore (kubernetes-model-generator) : Update Kubernetes Model to v1.28.2
1 parent c3fda6e commit 999a851

File tree

20 files changed

+419
-455
lines changed

20 files changed

+419
-455
lines changed

‎kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicy.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.fabric8.kubernetes.api.model.IntOrString;
1818
import io.fabric8.kubernetes.api.model.LabelSelector;
1919
import io.fabric8.kubernetes.api.model.LocalObjectReference;
20-
import io.fabric8.kubernetes.api.model.Namespaced;
2120
import io.fabric8.kubernetes.api.model.ObjectReference;
2221
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
2322
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
@@ -66,7 +65,7 @@
6665
@Version("v1beta1")
6766
@Group("admissionregistration.k8s.io")
6867
@Generated("jsonschema2pojo")
69-
public class ValidatingAdmissionPolicy implements Editable<ValidatingAdmissionPolicyBuilder> , HasMetadata, Namespaced
68+
public class ValidatingAdmissionPolicy implements Editable<ValidatingAdmissionPolicyBuilder> , HasMetadata
7069
{
7170

7271
/**

‎kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBinding.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.fabric8.kubernetes.api.model.IntOrString;
1818
import io.fabric8.kubernetes.api.model.LabelSelector;
1919
import io.fabric8.kubernetes.api.model.LocalObjectReference;
20-
import io.fabric8.kubernetes.api.model.Namespaced;
2120
import io.fabric8.kubernetes.api.model.ObjectReference;
2221
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
2322
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
@@ -65,7 +64,7 @@
6564
@Version("v1beta1")
6665
@Group("admissionregistration.k8s.io")
6766
@Generated("jsonschema2pojo")
68-
public class ValidatingAdmissionPolicyBinding implements Editable<ValidatingAdmissionPolicyBindingBuilder> , HasMetadata, Namespaced
67+
public class ValidatingAdmissionPolicyBinding implements Editable<ValidatingAdmissionPolicyBindingBuilder> , HasMetadata
6968
{
7069

7170
/**

‎kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,8 +1488,7 @@
14881488
"additionalProperties": true,
14891489
"javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy",
14901490
"javaInterfaces": [
1491-
"io.fabric8.kubernetes.api.model.HasMetadata",
1492-
"io.fabric8.kubernetes.api.model.Namespaced"
1491+
"io.fabric8.kubernetes.api.model.HasMetadata"
14931492
]
14941493
},
14951494
"kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBinding": {
@@ -1517,8 +1516,7 @@
15171516
"additionalProperties": true,
15181517
"javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding",
15191518
"javaInterfaces": [
1520-
"io.fabric8.kubernetes.api.model.HasMetadata",
1521-
"io.fabric8.kubernetes.api.model.Namespaced"
1519+
"io.fabric8.kubernetes.api.model.HasMetadata"
15221520
]
15231521
},
15241522
"kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingList": {

‎kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json‎

Lines changed: 77 additions & 78 deletions
Large diffs are not rendered by default.

‎kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json‎

Lines changed: 50 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2578,13 +2578,13 @@
25782578
},
25792579
"customresourcecolumndefinition": {
25802580
"properties": {
2581-
"description": {
2581+
"JSONPath": {
25822582
"type": "string"
25832583
},
2584-
"format": {
2584+
"description": {
25852585
"type": "string"
25862586
},
2587-
"jsonPath": {
2587+
"format": {
25882588
"type": "string"
25892589
},
25902590
"name": {
@@ -2601,19 +2601,12 @@
26012601
},
26022602
"customresourceconversion": {
26032603
"properties": {
2604-
"conversionReviewVersions": {
2605-
"type": "array",
2606-
"javaOmitEmpty": true,
2607-
"items": {
2608-
"type": "string"
2609-
}
2610-
},
26112604
"strategy": {
26122605
"type": "string"
26132606
},
2614-
"webhookClientConfig": {
2615-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_WebhookClientConfig",
2616-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.WebhookClientConfig"
2607+
"webhook": {
2608+
"$ref": "#/definitions/kubernetes_apiextensions_v1_WebhookConversion",
2609+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.WebhookConversion"
26172610
}
26182611
},
26192612
"additionalProperties": true
@@ -2670,14 +2663,14 @@
26702663
"properties": {
26712664
"apiVersion": {
26722665
"type": "string",
2673-
"default": "apiextensions.k8s.io/v1beta1",
2666+
"default": "apiextensions.k8s.io/v1",
26742667
"required": true
26752668
},
26762669
"items": {
26772670
"type": "array",
26782671
"items": {
2679-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinition",
2680-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition"
2672+
"$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinition",
2673+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition"
26812674
}
26822675
},
26832676
"kind": {
@@ -2813,12 +2806,12 @@
28132806
"customresourcesubresources": {
28142807
"properties": {
28152808
"scale": {
2816-
"$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceScale",
2817-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceScale"
2809+
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceScale",
2810+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceScale"
28182811
},
28192812
"status": {
2820-
"$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceStatus",
2821-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceStatus"
2813+
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceStatus",
2814+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceStatus"
28222815
}
28232816
},
28242817
"additionalProperties": true
@@ -2843,8 +2836,8 @@
28432836
"customresourcevalidation": {
28442837
"properties": {
28452838
"openAPIV3Schema": {
2846-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps",
2847-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps"
2839+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps",
2840+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps"
28482841
}
28492842
},
28502843
"additionalProperties": true
@@ -2972,48 +2965,48 @@
29722965
"type": "string"
29732966
},
29742967
"additionalItems": {
2975-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrBool",
2976-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrBool"
2968+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrBool",
2969+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrBool"
29772970
},
29782971
"additionalProperties": {
2979-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrBool",
2980-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrBool"
2972+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrBool",
2973+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrBool"
29812974
},
29822975
"allOf": {
29832976
"type": "array",
29842977
"javaOmitEmpty": true,
29852978
"items": {
2986-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps",
2987-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps"
2979+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps",
2980+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps"
29882981
}
29892982
},
29902983
"anyOf": {
29912984
"type": "array",
29922985
"javaOmitEmpty": true,
29932986
"items": {
2994-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps",
2995-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps"
2987+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps",
2988+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps"
29962989
}
29972990
},
29982991
"default": {
2999-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON",
2992+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSON",
30002993
"existingJavaType": "com.fasterxml.jackson.databind.JsonNode"
30012994
},
30022995
"definitions": {
30032996
"type": "object",
30042997
"additionalProperties": {
3005-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps",
3006-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps"
2998+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps",
2999+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps"
30073000
},
3008-
"existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e"
3001+
"existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e"
30093002
},
30103003
"dependencies": {
30113004
"type": "object",
30123005
"additionalProperties": {
3013-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrStringArray",
3014-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray"
3006+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrStringArray",
3007+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray"
30153008
},
3016-
"existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray\u003e"
3009+
"existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray\u003e"
30173010
},
30183011
"description": {
30193012
"type": "string"
@@ -3022,12 +3015,12 @@
30223015
"type": "array",
30233016
"javaOmitEmpty": true,
30243017
"items": {
3025-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON",
3018+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSON",
30263019
"existingJavaType": "com.fasterxml.jackson.databind.JsonNode"
30273020
}
30283021
},
30293022
"example": {
3030-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON",
3023+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSON",
30313024
"existingJavaType": "com.fasterxml.jackson.databind.JsonNode"
30323025
},
30333026
"exclusiveMaximum": {
@@ -3037,8 +3030,8 @@
30373030
"type": "boolean"
30383031
},
30393032
"externalDocs": {
3040-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ExternalDocumentation",
3041-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ExternalDocumentation"
3033+
"$ref": "#/definitions/kubernetes_apiextensions_v1_ExternalDocumentation",
3034+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ExternalDocumentation"
30423035
},
30433036
"format": {
30443037
"type": "string"
@@ -3047,8 +3040,8 @@
30473040
"type": "string"
30483041
},
30493042
"items": {
3050-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrArray",
3051-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrArray"
3043+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrArray",
3044+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrArray"
30523045
},
30533046
"maxItems": {
30543047
"type": "integer",
@@ -3084,8 +3077,8 @@
30843077
"type": "number"
30853078
},
30863079
"not": {
3087-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps",
3088-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps"
3080+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps",
3081+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps"
30893082
},
30903083
"nullable": {
30913084
"type": "boolean"
@@ -3094,8 +3087,8 @@
30943087
"type": "array",
30953088
"javaOmitEmpty": true,
30963089
"items": {
3097-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps",
3098-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps"
3090+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps",
3091+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps"
30993092
}
31003093
},
31013094
"pattern": {
@@ -3104,18 +3097,18 @@
31043097
"patternProperties": {
31053098
"type": "object",
31063099
"additionalProperties": {
3107-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps",
3108-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps"
3100+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps",
3101+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps"
31093102
},
3110-
"existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e"
3103+
"existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e"
31113104
},
31123105
"properties": {
31133106
"type": "object",
31143107
"additionalProperties": {
3115-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps",
3116-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps"
3108+
"$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps",
3109+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps"
31173110
},
3118-
"existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e"
3111+
"existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e"
31193112
},
31203113
"required": {
31213114
"type": "array",
@@ -3159,8 +3152,8 @@
31593152
"type": "array",
31603153
"javaOmitEmpty": true,
31613154
"items": {
3162-
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ValidationRule",
3163-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ValidationRule"
3155+
"$ref": "#/definitions/kubernetes_apiextensions_v1_ValidationRule",
3156+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ValidationRule"
31643157
}
31653158
}
31663159
},
@@ -3700,8 +3693,8 @@
37003693
"type": "string"
37013694
},
37023695
"service": {
3703-
"$ref": "#/definitions/kubernetes_apiextensions_v1_ServiceReference",
3704-
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ServiceReference"
3696+
"$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ServiceReference",
3697+
"existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ServiceReference"
37053698
},
37063699
"url": {
37073700
"type": "string"

0 commit comments

Comments
 (0)