diff --git a/extensions/chaosmesh/model/src/generated/java/io/fabric8/chaosmesh/v1alpha1/HTTPChaosSpec.java b/extensions/chaosmesh/model/src/generated/java/io/fabric8/chaosmesh/v1alpha1/HTTPChaosSpec.java index e1543f44877..6ae1ebe71a4 100644 --- a/extensions/chaosmesh/model/src/generated/java/io/fabric8/chaosmesh/v1alpha1/HTTPChaosSpec.java +++ b/extensions/chaosmesh/model/src/generated/java/io/fabric8/chaosmesh/v1alpha1/HTTPChaosSpec.java @@ -238,6 +238,7 @@ public void setReplace(PodHttpChaosReplaceActions replace) { } @JsonProperty("request_headers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public Map getRequestHeaders() { return requestHeaders; } @@ -248,6 +249,7 @@ public void setRequestHeaders(Map requestHeaders) { } @JsonProperty("response_headers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public Map getResponseHeaders() { return responseHeaders; } diff --git a/extensions/chaosmesh/model/src/generated/java/io/fabric8/chaosmesh/v1alpha1/PodHttpChaosSelector.java b/extensions/chaosmesh/model/src/generated/java/io/fabric8/chaosmesh/v1alpha1/PodHttpChaosSelector.java index fc705c0be4d..aebb27f7c25 100644 --- a/extensions/chaosmesh/model/src/generated/java/io/fabric8/chaosmesh/v1alpha1/PodHttpChaosSelector.java +++ b/extensions/chaosmesh/model/src/generated/java/io/fabric8/chaosmesh/v1alpha1/PodHttpChaosSelector.java @@ -142,6 +142,7 @@ public void setPort(Integer port) { } @JsonProperty("request_headers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public Map getRequestHeaders() { return requestHeaders; } @@ -152,6 +153,7 @@ public void setRequestHeaders(Map requestHeaders) { } @JsonProperty("response_headers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public Map getResponseHeaders() { return responseHeaders; } diff --git a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/internal/protobuf/types/Value.java b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/internal/protobuf/types/Value.java index 930f23fd742..3ccceec39f6 100644 --- a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/internal/protobuf/types/Value.java +++ b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/internal/protobuf/types/Value.java @@ -82,6 +82,7 @@ public Value(IsValueKind kind) { } @JsonProperty("Kind") + @JsonUnwrapped public IsValueKind getKind() { return kind; } diff --git a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/EnvoyFilterEnvoyConfigObjectMatch.java b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/EnvoyFilterEnvoyConfigObjectMatch.java index a73621a740c..773ae590602 100644 --- a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/EnvoyFilterEnvoyConfigObjectMatch.java +++ b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/EnvoyFilterEnvoyConfigObjectMatch.java @@ -90,6 +90,7 @@ public EnvoyFilterEnvoyConfigObjectMatch(IsEnvoyFilterEnvoyConfigObjectMatchObje } @JsonProperty("ObjectTypes") + @JsonUnwrapped public IsEnvoyFilterEnvoyConfigObjectMatchObjectTypes getObjectTypes() { return objectTypes; } diff --git a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPBody.java b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPBody.java index 8bdbccb0135..a57e12b64ad 100644 --- a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPBody.java +++ b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPBody.java @@ -82,6 +82,7 @@ public HTTPBody(IsHTTPBodySpecifier specifier) { } @JsonProperty("Specifier") + @JsonUnwrapped public IsHTTPBodySpecifier getSpecifier() { return specifier; } diff --git a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPFaultInjectionAbort.java b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPFaultInjectionAbort.java index a8c4400b98c..f569173586e 100644 --- a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPFaultInjectionAbort.java +++ b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPFaultInjectionAbort.java @@ -86,6 +86,7 @@ public HTTPFaultInjectionAbort(IsHTTPFaultInjectionAbortErrorType errorType, Per } @JsonProperty("ErrorType") + @JsonUnwrapped public IsHTTPFaultInjectionAbortErrorType getErrorType() { return errorType; } diff --git a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPFaultInjectionDelay.java b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPFaultInjectionDelay.java index d188df9d394..f5faecbfa2d 100644 --- a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPFaultInjectionDelay.java +++ b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPFaultInjectionDelay.java @@ -90,6 +90,7 @@ public HTTPFaultInjectionDelay(IsHTTPFaultInjectionDelayHttpDelayType httpDelayT } @JsonProperty("HttpDelayType") + @JsonUnwrapped public IsHTTPFaultInjectionDelayHttpDelayType getHttpDelayType() { return httpDelayType; } diff --git a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPRedirect.java b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPRedirect.java index 4db4d70d27a..0492f333343 100644 --- a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPRedirect.java +++ b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/HTTPRedirect.java @@ -98,6 +98,7 @@ public HTTPRedirect(IsHTTPRedirectRedirectPort redirectPort, String authority, I } @JsonProperty("RedirectPort") + @JsonUnwrapped public IsHTTPRedirectRedirectPort getRedirectPort() { return redirectPort; } diff --git a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/LoadBalancerSettings.java b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/LoadBalancerSettings.java index c10d9c3518a..b00a84da01b 100644 --- a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/LoadBalancerSettings.java +++ b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/LoadBalancerSettings.java @@ -90,6 +90,7 @@ public LoadBalancerSettings(IsLoadBalancerSettingsLbPolicy lbPolicy, LocalityLoa } @JsonProperty("LbPolicy") + @JsonUnwrapped public IsLoadBalancerSettingsLbPolicy getLbPolicy() { return lbPolicy; } diff --git a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/LoadBalancerSettingsConsistentHashLB.java b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/LoadBalancerSettingsConsistentHashLB.java index 34abb59e42f..f2362428dc7 100644 --- a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/LoadBalancerSettingsConsistentHashLB.java +++ b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/LoadBalancerSettingsConsistentHashLB.java @@ -91,6 +91,7 @@ public LoadBalancerSettingsConsistentHashLB(IsLoadBalancerSettingsConsistentHash } @JsonProperty("HashAlgorithm") + @JsonUnwrapped public IsLoadBalancerSettingsConsistentHashLBHashAlgorithm getHashAlgorithm() { return hashAlgorithm; } @@ -101,6 +102,7 @@ public void setHashAlgorithm(IsLoadBalancerSettingsConsistentHashLBHashAlgorithm } @JsonProperty("HashKey") + @JsonUnwrapped public IsLoadBalancerSettingsConsistentHashLBHashKey getHashKey() { return hashKey; } diff --git a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/ReadinessProbe.java b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/ReadinessProbe.java index 3e304c9c2bc..21e120e6696 100644 --- a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/ReadinessProbe.java +++ b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/ReadinessProbe.java @@ -102,6 +102,7 @@ public ReadinessProbe(IsReadinessProbeHealthCheckMethod healthCheckMethod, Integ } @JsonProperty("HealthCheckMethod") + @JsonUnwrapped public IsReadinessProbeHealthCheckMethod getHealthCheckMethod() { return healthCheckMethod; } diff --git a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/StringMatch.java b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/StringMatch.java index c56b46f64a6..f5bec8cdc1b 100644 --- a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/StringMatch.java +++ b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/networking/v1alpha3/StringMatch.java @@ -82,6 +82,7 @@ public StringMatch(IsStringMatchMatchType matchType) { } @JsonProperty("MatchType") + @JsonUnwrapped public IsStringMatchMatchType getMatchType() { return matchType; } diff --git a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/telemetry/v1alpha1/MetricSelector.java b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/telemetry/v1alpha1/MetricSelector.java index a08d56b833f..012c27c9a43 100644 --- a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/telemetry/v1alpha1/MetricSelector.java +++ b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/telemetry/v1alpha1/MetricSelector.java @@ -86,6 +86,7 @@ public MetricSelector(IsMetricSelectorMetricMatch metricMatch, WorkloadMode mode } @JsonProperty("MetricMatch") + @JsonUnwrapped public IsMetricSelectorMetricMatch getMetricMatch() { return metricMatch; } diff --git a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/telemetry/v1alpha1/TracingCustomTag.java b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/telemetry/v1alpha1/TracingCustomTag.java index 1aa828f3296..8f539e74211 100644 --- a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/telemetry/v1alpha1/TracingCustomTag.java +++ b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/telemetry/v1alpha1/TracingCustomTag.java @@ -82,6 +82,7 @@ public TracingCustomTag(IsTracingCustomTagType type) { } @JsonProperty("Type") + @JsonUnwrapped public IsTracingCustomTagType getType() { return type; } diff --git a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPBody.java b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPBody.java index 6893fcdb42f..12ab0eabfd6 100644 --- a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPBody.java +++ b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPBody.java @@ -82,6 +82,7 @@ public HTTPBody(IsHTTPBodySpecifier specifier) { } @JsonProperty("Specifier") + @JsonUnwrapped public IsHTTPBodySpecifier getSpecifier() { return specifier; } diff --git a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPFaultInjectionAbort.java b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPFaultInjectionAbort.java index 3787e2443f4..ae35a025298 100644 --- a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPFaultInjectionAbort.java +++ b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPFaultInjectionAbort.java @@ -86,6 +86,7 @@ public HTTPFaultInjectionAbort(IsHTTPFaultInjectionAbortErrorType errorType, Per } @JsonProperty("ErrorType") + @JsonUnwrapped public IsHTTPFaultInjectionAbortErrorType getErrorType() { return errorType; } diff --git a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPFaultInjectionDelay.java b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPFaultInjectionDelay.java index f263e8c6827..d10821d4f3b 100644 --- a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPFaultInjectionDelay.java +++ b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPFaultInjectionDelay.java @@ -90,6 +90,7 @@ public HTTPFaultInjectionDelay(IsHTTPFaultInjectionDelayHttpDelayType httpDelayT } @JsonProperty("HttpDelayType") + @JsonUnwrapped public IsHTTPFaultInjectionDelayHttpDelayType getHttpDelayType() { return httpDelayType; } diff --git a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPRedirect.java b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPRedirect.java index ae22c6b50fa..42268c4d026 100644 --- a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPRedirect.java +++ b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/HTTPRedirect.java @@ -98,6 +98,7 @@ public HTTPRedirect(IsHTTPRedirectRedirectPort redirectPort, String authority, I } @JsonProperty("RedirectPort") + @JsonUnwrapped public IsHTTPRedirectRedirectPort getRedirectPort() { return redirectPort; } diff --git a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/LoadBalancerSettings.java b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/LoadBalancerSettings.java index a9e784c8448..d9c0790c2b8 100644 --- a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/LoadBalancerSettings.java +++ b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/LoadBalancerSettings.java @@ -90,6 +90,7 @@ public LoadBalancerSettings(IsLoadBalancerSettingsLbPolicy lbPolicy, LocalityLoa } @JsonProperty("LbPolicy") + @JsonUnwrapped public IsLoadBalancerSettingsLbPolicy getLbPolicy() { return lbPolicy; } diff --git a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/LoadBalancerSettingsConsistentHashLB.java b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/LoadBalancerSettingsConsistentHashLB.java index f445a09706c..5179398d502 100644 --- a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/LoadBalancerSettingsConsistentHashLB.java +++ b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/LoadBalancerSettingsConsistentHashLB.java @@ -91,6 +91,7 @@ public LoadBalancerSettingsConsistentHashLB(IsLoadBalancerSettingsConsistentHash } @JsonProperty("HashAlgorithm") + @JsonUnwrapped public IsLoadBalancerSettingsConsistentHashLBHashAlgorithm getHashAlgorithm() { return hashAlgorithm; } @@ -101,6 +102,7 @@ public void setHashAlgorithm(IsLoadBalancerSettingsConsistentHashLBHashAlgorithm } @JsonProperty("HashKey") + @JsonUnwrapped public IsLoadBalancerSettingsConsistentHashLBHashKey getHashKey() { return hashKey; } diff --git a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/ReadinessProbe.java b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/ReadinessProbe.java index e9bd7e93171..58c6eee4f47 100644 --- a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/ReadinessProbe.java +++ b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/ReadinessProbe.java @@ -102,6 +102,7 @@ public ReadinessProbe(IsReadinessProbeHealthCheckMethod healthCheckMethod, Integ } @JsonProperty("HealthCheckMethod") + @JsonUnwrapped public IsReadinessProbeHealthCheckMethod getHealthCheckMethod() { return healthCheckMethod; } diff --git a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/StringMatch.java b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/StringMatch.java index e6aa13993e1..1130304bddd 100644 --- a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/StringMatch.java +++ b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/networking/v1beta1/StringMatch.java @@ -82,6 +82,7 @@ public StringMatch(IsStringMatchMatchType matchType) { } @JsonProperty("MatchType") + @JsonUnwrapped public IsStringMatchMatchType getMatchType() { return matchType; } diff --git a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/security/v1beta1/AuthorizationPolicySpec.java b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/security/v1beta1/AuthorizationPolicySpec.java index d56227c9e34..afbd0578291 100644 --- a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/security/v1beta1/AuthorizationPolicySpec.java +++ b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/security/v1beta1/AuthorizationPolicySpec.java @@ -103,6 +103,7 @@ public AuthorizationPolicySpec(IsAuthorizationPolicyActionDetail actionDetail, A } @JsonProperty("ActionDetail") + @JsonUnwrapped public IsAuthorizationPolicyActionDetail getActionDetail() { return actionDetail; } diff --git a/extensions/open-cluster-management/model-policy/src/generated/java/io/fabric8/openclustermanagement/api/model/governancepolicypropagator/policy/v1/PolicySpec.java b/extensions/open-cluster-management/model-policy/src/generated/java/io/fabric8/openclustermanagement/api/model/governancepolicypropagator/policy/v1/PolicySpec.java index c5f3f0fa120..59b3efde02b 100644 --- a/extensions/open-cluster-management/model-policy/src/generated/java/io/fabric8/openclustermanagement/api/model/governancepolicypropagator/policy/v1/PolicySpec.java +++ b/extensions/open-cluster-management/model-policy/src/generated/java/io/fabric8/openclustermanagement/api/model/governancepolicypropagator/policy/v1/PolicySpec.java @@ -101,6 +101,7 @@ public void setDisabled(Boolean disabled) { } @JsonProperty("policy-templates") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getPolicyTemplates() { return policyTemplates; } diff --git a/extensions/open-cluster-management/model-policy/src/generated/java/io/fabric8/openclustermanagement/api/model/governancepolicypropagator/policy/v1beta1/AutomationDef.java b/extensions/open-cluster-management/model-policy/src/generated/java/io/fabric8/openclustermanagement/api/model/governancepolicypropagator/policy/v1beta1/AutomationDef.java index c1e804320a3..b9bba09bc81 100644 --- a/extensions/open-cluster-management/model-policy/src/generated/java/io/fabric8/openclustermanagement/api/model/governancepolicypropagator/policy/v1beta1/AutomationDef.java +++ b/extensions/open-cluster-management/model-policy/src/generated/java/io/fabric8/openclustermanagement/api/model/governancepolicypropagator/policy/v1beta1/AutomationDef.java @@ -93,6 +93,7 @@ public AutomationDef(Map extraVars, java.lang.String name, java. } @JsonProperty("extra_vars") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public Map getExtraVars() { return extraVars; } diff --git a/extensions/open-virtual-networking/model-v1/src/generated/java/io/fabric8/kubernetes/api/model/ovn/v1/ExternalNextHops.java b/extensions/open-virtual-networking/model-v1/src/generated/java/io/fabric8/kubernetes/api/model/ovn/v1/ExternalNextHops.java index d037a5772a3..6f7cb132297 100644 --- a/extensions/open-virtual-networking/model-v1/src/generated/java/io/fabric8/kubernetes/api/model/ovn/v1/ExternalNextHops.java +++ b/extensions/open-virtual-networking/model-v1/src/generated/java/io/fabric8/kubernetes/api/model/ovn/v1/ExternalNextHops.java @@ -99,6 +99,7 @@ public void setDynamic(List dynamic) { } @JsonProperty("static") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getStatic() { return _static; } diff --git a/extensions/tekton/model-v1/src/generated/java/io/fabric8/tekton/pipeline/v1/PipelineSpec.java b/extensions/tekton/model-v1/src/generated/java/io/fabric8/tekton/pipeline/v1/PipelineSpec.java index db9975e691c..0af6f2aec86 100644 --- a/extensions/tekton/model-v1/src/generated/java/io/fabric8/tekton/pipeline/v1/PipelineSpec.java +++ b/extensions/tekton/model-v1/src/generated/java/io/fabric8/tekton/pipeline/v1/PipelineSpec.java @@ -131,6 +131,7 @@ public void setDisplayName(String displayName) { } @JsonProperty("finally") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getFinally() { return _finally; } diff --git a/extensions/tekton/model-v1alpha1/src/generated/java/io/fabric8/tekton/v1alpha1/internal/pipeline/pkg/apis/pipeline/v1beta1/ParamValue.java b/extensions/tekton/model-v1alpha1/src/generated/java/io/fabric8/tekton/v1alpha1/internal/pipeline/pkg/apis/pipeline/v1beta1/ParamValue.java index 3f9f5b31a7f..514dbf43ce6 100644 --- a/extensions/tekton/model-v1alpha1/src/generated/java/io/fabric8/tekton/v1alpha1/internal/pipeline/pkg/apis/pipeline/v1beta1/ParamValue.java +++ b/extensions/tekton/model-v1alpha1/src/generated/java/io/fabric8/tekton/v1alpha1/internal/pipeline/pkg/apis/pipeline/v1beta1/ParamValue.java @@ -96,6 +96,7 @@ public ParamValue(List arrayVal, Map objectVal } @JsonProperty("ArrayVal") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getArrayVal() { return arrayVal; } @@ -106,6 +107,7 @@ public void setArrayVal(List arrayVal) { } @JsonProperty("ObjectVal") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public Map getObjectVal() { return objectVal; } diff --git a/extensions/tekton/model-v1beta1/src/generated/java/io/fabric8/tekton/pipeline/v1beta1/PipelineSpec.java b/extensions/tekton/model-v1beta1/src/generated/java/io/fabric8/tekton/pipeline/v1beta1/PipelineSpec.java index 3aa974ef168..65c4317edf2 100644 --- a/extensions/tekton/model-v1beta1/src/generated/java/io/fabric8/tekton/pipeline/v1beta1/PipelineSpec.java +++ b/extensions/tekton/model-v1beta1/src/generated/java/io/fabric8/tekton/pipeline/v1beta1/PipelineSpec.java @@ -136,6 +136,7 @@ public void setDisplayName(String displayName) { } @JsonProperty("finally") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getFinally() { return _finally; } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/UserInfo.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/UserInfo.java index 830b4960b6c..f56f14e3589 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/UserInfo.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/UserInfo.java @@ -61,7 +61,7 @@ public class UserInfo implements Editable , KubernetesResource @JsonProperty("extra") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map> extra = new LinkedHashMap<>(); + private Map> extra = new LinkedHashMap<>(); @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List groups = new ArrayList<>(); @@ -79,7 +79,7 @@ public class UserInfo implements Editable , KubernetesResource public UserInfo() { } - public UserInfo(Map> extra, List groups, String uid, String username) { + public UserInfo(Map> extra, List groups, String uid, String username) { super(); this.extra = extra; this.groups = groups; @@ -89,12 +89,12 @@ public UserInfo(Map> extra, List groups, Strin @JsonProperty("extra") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map> getExtra() { + public Map> getExtra() { return extra; } @JsonProperty("extra") - public void setExtra(Map> extra) { + public void setExtra(Map> extra) { this.extra = extra; } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReviewSpec.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReviewSpec.java index 38cd6667ff0..04dacda51f7 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReviewSpec.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReviewSpec.java @@ -63,7 +63,7 @@ public class SubjectAccessReviewSpec implements Editable> extra = new LinkedHashMap<>(); + private Map> extra = new LinkedHashMap<>(); @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List groups = new ArrayList<>(); @@ -85,7 +85,7 @@ public class SubjectAccessReviewSpec implements Editable> extra, List groups, NonResourceAttributes nonResourceAttributes, ResourceAttributes resourceAttributes, String uid, String user) { + public SubjectAccessReviewSpec(Map> extra, List groups, NonResourceAttributes nonResourceAttributes, ResourceAttributes resourceAttributes, String uid, String user) { super(); this.extra = extra; this.groups = groups; @@ -97,12 +97,12 @@ public SubjectAccessReviewSpec(Map> extra, List> getExtra() { + public Map> getExtra() { return extra; } @JsonProperty("extra") - public void setExtra(Map> extra) { + public void setExtra(Map> extra) { this.extra = extra; } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReviewSpec.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReviewSpec.java index fd77a93e593..757020519fb 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReviewSpec.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReviewSpec.java @@ -63,7 +63,7 @@ public class SubjectAccessReviewSpec implements Editable> extra = new LinkedHashMap<>(); + private Map> extra = new LinkedHashMap<>(); @JsonProperty("group") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List group = new ArrayList<>(); @@ -85,7 +85,7 @@ public class SubjectAccessReviewSpec implements Editable> extra, List group, NonResourceAttributes nonResourceAttributes, ResourceAttributes resourceAttributes, String uid, String user) { + public SubjectAccessReviewSpec(Map> extra, List group, NonResourceAttributes nonResourceAttributes, ResourceAttributes resourceAttributes, String uid, String user) { super(); this.extra = extra; this.group = group; @@ -97,12 +97,12 @@ public SubjectAccessReviewSpec(Map> extra, List> getExtra() { + public Map> getExtra() { return extra; } @JsonProperty("extra") - public void setExtra(Map> extra) { + public void setExtra(Map> extra) { this.extra = extra; } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json index a11b3b713aa..9c3ec404daa 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json @@ -3378,7 +3378,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -3762,7 +3762,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -4122,7 +4122,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "group": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json index babb9324d2c..13f0039083e 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json @@ -3378,7 +3378,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -3762,7 +3762,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -4122,7 +4122,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "group": { "type": "array", @@ -5093,14 +5093,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" @@ -5109,8 +5108,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": { @@ -5151,7 +5150,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "kind": { @@ -5167,8 +5166,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MutatingWebhook", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhook" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhook", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhook" } } }, @@ -5620,12 +5619,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 @@ -5634,7 +5633,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authentication.k8s.io/v1alpha1", + "default": "authentication.k8s.io/v1beta1", "required": true }, "kind": { @@ -5647,8 +5646,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "status": { - "$ref": "#/definitions/kubernetes_authentication_v1alpha1_SelfSubjectReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReviewStatus" + "$ref": "#/definitions/kubernetes_authentication_v1beta1_SelfSubjectReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReviewStatus" } }, "additionalProperties": true @@ -5839,9 +5838,9 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, - "group": { + "groups": { "type": "array", "javaOmitEmpty": true, "items": { @@ -5849,12 +5848,12 @@ } }, "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" }, "uid": { "type": "string" @@ -5893,15 +5892,15 @@ "nonResourceRules": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_authorization_v1_NonResourceRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceRule" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceRule" } }, "resourceRules": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_authorization_v1_ResourceRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceRule" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceRule" } } }, @@ -6034,8 +6033,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ExpressionWarning", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ExpressionWarning" + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ExpressionWarning", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ExpressionWarning" } } }, @@ -6090,7 +6089,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -6139,7 +6138,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "kind": { @@ -6152,8 +6151,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_v1_ValidatingAdmissionPolicyBindingSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyBindingSpec" } }, "additionalProperties": true @@ -6162,15 +6161,15 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "items": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBinding", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingAdmissionPolicyBinding", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyBinding" } }, "kind": { @@ -6241,8 +6240,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": { @@ -6252,32 +6251,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" } } }, @@ -6298,8 +6297,8 @@ "existingJavaType": "Long" }, "typeChecking": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_TypeChecking", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.TypeChecking" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_TypeChecking", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.TypeChecking" } }, "additionalProperties": true @@ -6308,13 +6307,14 @@ "properties": { "admissionReviewVersions": { "type": "array", + "javaOmitEmpty": true, "items": { "type": "string" } }, "clientConfig": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_WebhookClientConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.WebhookClientConfig" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_WebhookClientConfig", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.WebhookClientConfig" }, "failurePolicy": { "type": "string" @@ -6323,8 +6323,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" } }, "matchPolicy": { @@ -6362,7 +6362,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "kind": { @@ -6378,8 +6378,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhook", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhook" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhook", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhook" } } }, @@ -6445,8 +6445,8 @@ "type": "string" }, "service": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ServiceReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_ServiceReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference" }, "url": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaProps.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaProps.java index 70297684815..563602affc3 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaProps.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaProps.java @@ -358,6 +358,7 @@ public void setDescription(String description) { } @JsonProperty("enum") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getEnum() { return _enum; } @@ -652,6 +653,7 @@ public void setXKubernetesIntOrString(Boolean xKubernetesIntOrString) { } @JsonProperty("x-kubernetes-list-map-keys") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getXKubernetesListMapKeys() { return xKubernetesListMapKeys; } @@ -692,6 +694,7 @@ public void setXKubernetesPreserveUnknownFields(Boolean xKubernetesPreserveUnkno } @JsonProperty("x-kubernetes-validations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getXKubernetesValidations() { return xKubernetesValidations; } diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaPropsOrArray.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaPropsOrArray.java index 5eadc026526..cbd00e16699 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaPropsOrArray.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaPropsOrArray.java @@ -81,6 +81,7 @@ public JSONSchemaPropsOrArray(List jSONSchemas, JSONSchemaProps } @JsonProperty("JSONSchemas") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getJSONSchemas() { return jSONSchemas; } diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaPropsOrStringArray.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaPropsOrStringArray.java index 5add1da51b6..95ff0313b14 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaPropsOrStringArray.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaPropsOrStringArray.java @@ -81,6 +81,7 @@ public JSONSchemaPropsOrStringArray(List property, JSONSchemaProps schem } @JsonProperty("Property") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getProperty() { return property; } diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaProps.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaProps.java index 94e8ed43fc9..6d0c1831c92 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaProps.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaProps.java @@ -358,6 +358,7 @@ public void setDescription(String description) { } @JsonProperty("enum") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getEnum() { return _enum; } @@ -652,6 +653,7 @@ public void setXKubernetesIntOrString(Boolean xKubernetesIntOrString) { } @JsonProperty("x-kubernetes-list-map-keys") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getXKubernetesListMapKeys() { return xKubernetesListMapKeys; } @@ -692,6 +694,7 @@ public void setXKubernetesPreserveUnknownFields(Boolean xKubernetesPreserveUnkno } @JsonProperty("x-kubernetes-validations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getXKubernetesValidations() { return xKubernetesValidations; } diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaPropsOrArray.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaPropsOrArray.java index 51fc401678c..b7bbec875b0 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaPropsOrArray.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaPropsOrArray.java @@ -81,6 +81,7 @@ public JSONSchemaPropsOrArray(List jSONSchemas, JSONSchemaProps } @JsonProperty("JSONSchemas") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getJSONSchemas() { return jSONSchemas; } diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaPropsOrStringArray.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaPropsOrStringArray.java index b7a2843465c..d5d6ddba87b 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaPropsOrStringArray.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaPropsOrStringArray.java @@ -81,6 +81,7 @@ public JSONSchemaPropsOrStringArray(List property, JSONSchemaProps schem } @JsonProperty("Property") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getProperty() { return property; } diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json index 7f99436f1b7..b9a3ecf0354 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json @@ -2615,13 +2615,13 @@ }, "customresourcecolumndefinition": { "properties": { - "description": { + "JSONPath": { "type": "string" }, - "format": { + "description": { "type": "string" }, - "jsonPath": { + "format": { "type": "string" }, "name": { @@ -2638,19 +2638,12 @@ }, "customresourceconversion": { "properties": { - "conversionReviewVersions": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } - }, "strategy": { "type": "string" }, - "webhookClientConfig": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_WebhookClientConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.WebhookClientConfig" + "webhook": { + "$ref": "#/definitions/kubernetes_apiextensions_v1_WebhookConversion", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.WebhookConversion" } }, "additionalProperties": true @@ -2659,7 +2652,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "apiextensions.k8s.io/v1", + "default": "apiextensions.k8s.io/v1beta1", "required": true }, "kind": { @@ -2672,12 +2665,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec" }, "status": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus" } }, "additionalProperties": true @@ -2706,14 +2699,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "apiextensions.k8s.io/v1", + "default": "apiextensions.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition" } }, "kind": { @@ -2761,16 +2754,24 @@ }, "customresourcedefinitionspec": { "properties": { + "additionalPrinterColumns": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceColumnDefinition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceColumnDefinition" + } + }, "conversion": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceConversion", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceConversion" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceConversion", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceConversion" }, "group": { "type": "string" }, "names": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionNames", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionNames", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames" }, "preserveUnknownFields": { "type": "boolean" @@ -2778,11 +2779,31 @@ "scope": { "type": "string" }, + "selectableFields": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_SelectableField", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.SelectableField" + } + }, + "subresources": { + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresources", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresources" + }, + "validation": { + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceValidation", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceValidation" + }, + "version": { + "type": "string" + }, "versions": { "type": "array", + "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionVersion", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionVersion" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionVersion", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionVersion" } } }, @@ -2791,14 +2812,14 @@ "customresourcedefinitionstatus": { "properties": { "acceptedNames": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionNames", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionNames", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames" }, "conditions": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition" } }, "storedVersions": { @@ -2887,8 +2908,8 @@ "customresourcevalidation": { "properties": { "openAPIV3Schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "additionalProperties": true @@ -3232,8 +3253,8 @@ "type": "boolean" }, "Schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "additionalProperties": true @@ -3744,8 +3765,8 @@ "type": "string" }, "service": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_ServiceReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ServiceReference" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ServiceReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ServiceReference" }, "url": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json index 414d3f77bb3..2fae9fdb505 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json @@ -2848,25 +2848,32 @@ "externalmetricsource": { "properties": { "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" }, "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" } }, "additionalProperties": true }, "externalmetricstatus": { "properties": { - "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + "currentAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + "currentValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + }, + "metricName": { + "type": "string" + }, + "metricSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" } }, "additionalProperties": true @@ -2907,7 +2914,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v2beta1", + "default": "autoscaling/v1", "required": true }, "kind": { @@ -2920,12 +2927,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscalerSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerSpec" + "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscalerSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerSpec" }, "status": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscalerStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscalerStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerStatus" } }, "additionalProperties": true @@ -2933,12 +2940,12 @@ "horizontalpodautoscalerbehavior": { "properties": { "scaleDown": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" }, "scaleUp": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" } }, "additionalProperties": true @@ -2991,6 +2998,10 @@ }, "horizontalpodautoscalerspec": { "properties": { + "behavior": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerBehavior", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerBehavior" + }, "maxReplicas": { "type": "integer" }, @@ -2998,24 +3009,36 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_MetricSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.MetricSpec" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricSpec" } }, "minReplicas": { "type": "integer" }, "scaleTargetRef": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.CrossVersionObjectReference" } }, "additionalProperties": true }, "horizontalpodautoscalerstatus": { "properties": { - "currentCPUUtilizationPercentage": { - "type": "integer" + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerCondition" + } + }, + "currentMetrics": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricStatus" + } }, "currentReplicas": { "type": "integer" @@ -3053,8 +3076,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingPolicy", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingPolicy" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingPolicy" } }, "selectPolicy": { @@ -3269,24 +3292,24 @@ "metricspec": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ContainerResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ContainerResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ContainerResourceMetricSource" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ExternalMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ExternalMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ExternalMetricSource" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ObjectMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ObjectMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ObjectMetricSource" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_PodsMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_PodsMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.PodsMetricSource" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ResourceMetricSource" }, "type": { "type": "string" @@ -3297,24 +3320,24 @@ "metricstatus": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ContainerResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ContainerResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ContainerResourceMetricStatus" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ExternalMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ExternalMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ExternalMetricStatus" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ObjectMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ObjectMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ObjectMetricStatus" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_PodsMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_PodsMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.PodsMetricStatus" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ResourceMetricStatus" }, "type": { "type": "string" @@ -3435,17 +3458,24 @@ }, "objectmetricsource": { "properties": { - "describedObject": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference" + "averageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + "metricName": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" + }, + "targetValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" } }, "additionalProperties": true @@ -3533,13 +3563,16 @@ }, "podsmetricsource": { "properties": { - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + "metricName": { + "type": "string" }, - "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "targetAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" } }, "additionalProperties": true @@ -3587,18 +3620,24 @@ "name": { "type": "string" }, - "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" + "targetAverageUtilization": { + "type": "integer" + }, + "targetAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" } }, "additionalProperties": true }, "resourcemetricstatus": { "properties": { - "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" + "currentAverageUtilization": { + "type": "integer" + }, + "currentAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, "name": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json index 9c5a6e37824..918e61838f4 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json @@ -5236,8 +5236,8 @@ "type": "integer" }, "jobTemplate": { - "$ref": "#/definitions/kubernetes_batch_v1_JobTemplateSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobTemplateSpec" + "$ref": "#/definitions/kubernetes_batch_v1beta1_JobTemplateSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.JobTemplateSpec" }, "schedule": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequestSpec.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequestSpec.java index 8835a7d70b3..017b17cf1a2 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequestSpec.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequestSpec.java @@ -67,7 +67,7 @@ public class CertificateSigningRequestSpec implements Editable> extra = new LinkedHashMap<>(); + private Map> extra = new LinkedHashMap<>(); @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List groups = new ArrayList<>(); @@ -92,7 +92,7 @@ public class CertificateSigningRequestSpec implements Editable> extra, List groups, String request, String signerName, String uid, List usages, String username) { + public CertificateSigningRequestSpec(Integer expirationSeconds, Map> extra, List groups, String request, String signerName, String uid, List usages, String username) { super(); this.expirationSeconds = expirationSeconds; this.extra = extra; @@ -116,12 +116,12 @@ public void setExpirationSeconds(Integer expirationSeconds) { @JsonProperty("extra") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map> getExtra() { + public Map> getExtra() { return extra; } @JsonProperty("extra") - public void setExtra(Map> extra) { + public void setExtra(Map> extra) { this.extra = extra; } diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequestSpec.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequestSpec.java index eac9c846a2a..52cdfbfc6bc 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequestSpec.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequestSpec.java @@ -67,7 +67,7 @@ public class CertificateSigningRequestSpec implements Editable> extra = new LinkedHashMap<>(); + private Map> extra = new LinkedHashMap<>(); @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List groups = new ArrayList<>(); @@ -92,7 +92,7 @@ public class CertificateSigningRequestSpec implements Editable> extra, List groups, String request, String signerName, String uid, List usages, String username) { + public CertificateSigningRequestSpec(Integer expirationSeconds, Map> extra, List groups, String request, String signerName, String uid, List usages, String username) { super(); this.expirationSeconds = expirationSeconds; this.extra = extra; @@ -116,12 +116,12 @@ public void setExpirationSeconds(Integer expirationSeconds) { @JsonProperty("extra") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map> getExtra() { + public Map> getExtra() { return extra; } @JsonProperty("extra") - public void setExtra(Map> extra) { + public void setExtra(Map> extra) { this.extra = extra; } diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/kube-schema.json index 86b6cc07f30..a98fb86aca6 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/kube-schema.json @@ -838,7 +838,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -1076,7 +1076,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json index 104cf984f7a..b9dc38f8390 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json @@ -838,7 +838,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -1076,7 +1076,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -1316,7 +1316,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "certificates.k8s.io/v1beta1", + "default": "certificates.k8s.io/v1", "required": true }, "kind": { @@ -1329,12 +1329,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec" + "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec" }, "status": { - "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus" + "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus" } }, "additionalProperties": true @@ -1366,14 +1366,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "certificates.k8s.io/v1", + "default": "certificates.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest" + "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest" } }, "kind": { @@ -1401,7 +1401,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/AuthInfo.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/AuthInfo.java index 45ed3220860..04f11c778d9 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/AuthInfo.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/AuthInfo.java @@ -58,7 +58,7 @@ public class AuthInfo implements Editable , KubernetesResource private String asUid; @JsonProperty("as-user-extra") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map> asUserExtra = new LinkedHashMap<>(); + private Map> asUserExtra = new LinkedHashMap<>(); @JsonProperty("auth-provider") private AuthProviderConfig authProvider; @JsonProperty("client-certificate") @@ -92,7 +92,7 @@ public class AuthInfo implements Editable , KubernetesResource public AuthInfo() { } - public AuthInfo(String as, List asGroups, String asUid, Map> asUserExtra, AuthProviderConfig authProvider, String clientCertificate, String clientCertificateData, String clientKey, String clientKeyData, ExecConfig exec, List extensions, String password, String token, String tokenFile, String username) { + public AuthInfo(String as, List asGroups, String asUid, Map> asUserExtra, AuthProviderConfig authProvider, String clientCertificate, String clientCertificateData, String clientKey, String clientKeyData, ExecConfig exec, List extensions, String password, String token, String tokenFile, String username) { super(); this.as = as; this.asGroups = asGroups; @@ -122,6 +122,7 @@ public void setAs(String as) { } @JsonProperty("as-groups") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getAsGroups() { return asGroups; } @@ -142,12 +143,13 @@ public void setAsUid(String asUid) { } @JsonProperty("as-user-extra") - public Map> getAsUserExtra() { + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map> getAsUserExtra() { return asUserExtra; } @JsonProperty("as-user-extra") - public void setAsUserExtra(Map> asUserExtra) { + public void setAsUserExtra(Map> asUserExtra) { this.asUserExtra = asUserExtra; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRangeItem.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRangeItem.java index be01b649f44..69e9b40cc14 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRangeItem.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRangeItem.java @@ -76,6 +76,7 @@ public LimitRangeItem(Map _def } @JsonProperty("default") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public Map getDefault() { return _default; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json index 732cd90f6df..15a701d6dca 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json @@ -1164,7 +1164,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "auth-provider": { "$ref": "#/definitions/kubernetes_config_AuthProviderConfig", diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json index 3c29d8a2d6f..4b41305a757 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json @@ -1164,7 +1164,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "auth-provider": { "$ref": "#/definitions/kubernetes_config_AuthProviderConfig", @@ -8558,7 +8558,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "auth-provider": { "$ref": "#/definitions/kubernetes_config_AuthProviderConfig", diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json index 9b830219ce7..d7713815d9d 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json @@ -1486,14 +1486,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "discovery.k8s.io/v1beta1", + "default": "discovery.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointSlice", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice" + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointSlice", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json index bf174742be7..b5157b29281 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json @@ -2551,7 +2551,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", "required": true }, "kind": { @@ -2564,12 +2564,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1_FlowSchemaSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaSpec" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaSpec" }, "status": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1_FlowSchemaStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchemaStatus" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaStatus" } }, "additionalProperties": true @@ -2598,14 +2598,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1", + "default": "flowcontrol.apiserver.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1_FlowSchema", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchema" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchema", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema" } }, "kind": { @@ -2623,22 +2623,22 @@ "flowschemaspec": { "properties": { "distinguisherMethod": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowDistinguisherMethod", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowDistinguisherMethod" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowDistinguisherMethod", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowDistinguisherMethod" }, "matchingPrecedence": { "type": "integer" }, "priorityLevelConfiguration": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationReference" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PriorityLevelConfigurationReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationReference" }, "rules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PolicyRulesWithSubjects", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PolicyRulesWithSubjects" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PolicyRulesWithSubjects", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PolicyRulesWithSubjects" } } }, @@ -2650,8 +2650,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowSchemaCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaCondition" } } }, @@ -2667,9 +2667,6 @@ }, "limitedprioritylevelconfiguration": { "properties": { - "assuredConcurrencyShares": { - "type": "integer" - }, "borrowingLimitPercent": { "type": "integer" }, @@ -2677,8 +2674,11 @@ "type": "integer" }, "limitResponse": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitResponse" + "$ref": "#/definitions/kubernetes_flowcontrol_v1_LimitResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.LimitResponse" + }, + "nominalConcurrencyShares": { + "type": "integer" } }, "additionalProperties": true @@ -2862,23 +2862,23 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_NonResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.NonResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_NonResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.NonResourcePolicyRule" } }, "resourceRules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_ResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ResourcePolicyRule" } }, "subjects": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_Subject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.Subject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_Subject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.Subject" } } }, @@ -2888,7 +2888,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta3", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", "required": true }, "kind": { @@ -2901,12 +2901,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PriorityLevelConfigurationSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationSpec" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationSpec" }, "status": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PriorityLevelConfigurationStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationStatus" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationStatus" } }, "additionalProperties": true @@ -2968,12 +2968,12 @@ "prioritylevelconfigurationspec": { "properties": { "exempt": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_ExemptPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ExemptPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ExemptPriorityLevelConfiguration" }, "limited": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_LimitedPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.LimitedPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_LimitedPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.LimitedPriorityLevelConfiguration" }, "type": { "type": "string" @@ -2987,8 +2987,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1_PriorityLevelConfigurationCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationCondition" } } }, @@ -3183,19 +3183,19 @@ "subject": { "properties": { "group": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_GroupSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.GroupSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1_GroupSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.GroupSubject" }, "kind": { "type": "string" }, "serviceAccount": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ServiceAccountSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ServiceAccountSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1_ServiceAccountSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.ServiceAccountSubject" }, "user": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_UserSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.UserSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1_UserSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.UserSubject" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json index 94ecb2bca39..96585a5a2e3 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json @@ -3122,7 +3122,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "kind": { @@ -3160,7 +3160,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "kind": { @@ -3187,14 +3187,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1_GatewayClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClass" } }, "kind": { @@ -3267,14 +3267,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_Gateway", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1_Gateway", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1.Gateway" } }, "kind": { @@ -3762,7 +3762,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "kind": { @@ -3821,14 +3821,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1_HTTPRoute", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRoute" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPRoute", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute" } }, "kind": { @@ -4365,14 +4365,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_ReferenceGrant", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_ReferenceGrant", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java b/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java index 3aafbb61312..7ec5f0bb15d 100644 --- a/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java +++ b/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/KubernetesCoreTypeAnnotator.java @@ -17,6 +17,7 @@ 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.annotation.JsonUnwrapped; import com.fasterxml.jackson.databind.JsonDeserializer; @@ -25,6 +26,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sun.codemodel.JAnnotationArrayMember; import com.sun.codemodel.JAnnotationUse; +import com.sun.codemodel.JAnnotationValue; import com.sun.codemodel.JClass; import com.sun.codemodel.JClassAlreadyExistsException; import com.sun.codemodel.JCodeModel; @@ -244,20 +246,18 @@ public void propertyGetter(JMethod getter, JDefinedClass clazz, String propertyN super.propertyGetter(getter, clazz, propertyName); // https://github.com/fabric8io/kubernetes-client/issues/6085 // https://github.com/quarkusio/quarkus/issues/39934 - final JFieldVar field = clazz.fields().get(propertyName); + final JFieldVar field = clazz.fields().values().stream() + .filter(f -> f.annotations().stream() + .anyMatch(a -> a.getAnnotationClass().fullName().equals(JsonProperty.class.getName()) + && annotationValue(a.getAnnotationMembers().get("value")).equals("\"" + propertyName + "\""))) + .findAny().orElse(null); if (field != null) { for (JAnnotationUse annotation : field.annotations()) { if (annotation.getAnnotationClass().fullName().equals(JsonInclude.class.getName())) { final JAnnotationUse methodAnnotation = getter.annotate(JsonInclude.class); annotation.getAnnotationMembers() - .forEach((key, value) -> { - final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - final PrintWriter pw = new PrintWriter(new BufferedOutputStream(baos)); - value.generate(new JFormatter(pw)); - pw.flush(); - methodAnnotation.param(key, Enum.valueOf(JsonInclude.Include.class, - baos.toString().replace(JsonInclude.Include.class.getCanonicalName() + ".", ""))); - }); + .forEach((key, value) -> methodAnnotation.param(key, Enum.valueOf(JsonInclude.Include.class, + annotationValue(value).replace(JsonInclude.Include.class.getCanonicalName() + ".", "")))); } if (annotation.getAnnotationClass().fullName().equals(JsonUnwrapped.class.getName())) { getter.annotate(JsonUnwrapped.class); @@ -266,6 +266,17 @@ public void propertyGetter(JMethod getter, JDefinedClass clazz, String propertyN } } + private static String annotationValue(JAnnotationValue annotationValue) { + if (annotationValue == null) { + return ""; + } + final ByteArrayOutputStream baos = new ByteArrayOutputStream(); + final PrintWriter pw = new PrintWriter(new BufferedOutputStream(baos)); + annotationValue.generate(new JFormatter(pw)); + pw.flush(); + return baos.toString(); + } + protected void processBuildable(JDefinedClass clazz) { JAnnotationUse buildable = clazz.annotate(Buildable.class) .param("editableEnabled", false) diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json index 270a18311f8..dc0544f69d2 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json @@ -2416,8 +2416,8 @@ "paths": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_HTTPIngressPath", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.HTTPIngressPath" + "$ref": "#/definitions/kubernetes_networking_v1_HTTPIngressPath", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.HTTPIngressPath" } } }, @@ -2686,9 +2686,9 @@ }, "ingressspec": { "properties": { - "backend": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressBackend", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressBackend" + "defaultBackend": { + "$ref": "#/definitions/kubernetes_networking_v1_IngressBackend", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressBackend" }, "ingressClassName": { "type": "string" @@ -2697,16 +2697,16 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressRule" + "$ref": "#/definitions/kubernetes_networking_v1_IngressRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressRule" } }, "tls": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressTLS", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressTLS" + "$ref": "#/definitions/kubernetes_networking_v1_IngressTLS", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressTLS" } } }, @@ -2715,8 +2715,8 @@ "ingressstatus": { "properties": { "loadBalancer": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressLoadBalancerStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressLoadBalancerStatus" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressLoadBalancerStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressLoadBalancerStatus" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json index c83f2537704..0f8ed880cdb 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json @@ -1121,14 +1121,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "node.k8s.io/v1alpha1", + "default": "node.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_node_v1alpha_RuntimeClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass" + "$ref": "#/definitions/kubernetes_node_v1_RuntimeClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1.RuntimeClass" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/validation-schema.json index c1aeb7cf8c8..f3dfed97a47 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/validation-schema.json @@ -1432,7 +1432,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "policy/v1beta1", + "default": "policy/v1", "required": true }, "deleteOptions": { @@ -1849,7 +1849,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "policy/v1beta1", + "default": "policy/v1", "required": true }, "kind": { @@ -1862,12 +1862,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetSpec" + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetSpec" }, "status": { - "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetStatus" + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetStatus" } }, "additionalProperties": true @@ -1876,14 +1876,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "policy/v1beta1", + "default": "policy/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudget", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget" + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudget", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json index 9cee5bc59e9..4a06f4a2968 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json @@ -1502,14 +1502,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "scheduling.k8s.io/v1beta1", + "default": "scheduling.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_scheduling_v1beta1_PriorityClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass" + "$ref": "#/definitions/kubernetes_scheduling_v1_PriorityClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json index a86640cee29..ac3132af39d 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json @@ -3183,7 +3183,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1", + "default": "storage.k8s.io/v1beta1", "required": true }, "kind": { @@ -3196,8 +3196,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_storageclass_CSIDriverSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSIDriverSpec" + "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSIDriverSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverSpec" } }, "additionalProperties": true @@ -3252,8 +3252,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_TokenRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.TokenRequest" + "$ref": "#/definitions/kubernetes_storageclass_TokenRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.TokenRequest" } }, "volumeLifecycleModes": { @@ -3314,14 +3314,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1", + "default": "storage.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_storageclass_CSINode", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSINode" + "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSINode", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode" } }, "kind": { @@ -3396,7 +3396,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "capacity": { diff --git a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json index d5afe407b26..f234f8f3fae 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json @@ -12892,37 +12892,41 @@ }, "machinepoolplatform": { "properties": { - "alibabacloud": { - "$ref": "#/definitions/os_hive_alibabacloud_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.alibabacloud.v1.MachinePool" - }, - "aws": { - "$ref": "#/definitions/os_hive_aws_v1_MachinePoolPlatform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.MachinePoolPlatform" + "additionalSecurityGroupIDs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "azure": { - "$ref": "#/definitions/os_hive_azure_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.MachinePool" + "metadataService": { + "$ref": "#/definitions/os_hive_aws_v1_EC2Metadata", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.EC2Metadata" }, - "gcp": { - "$ref": "#/definitions/os_hive_gcp_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.MachinePool" + "rootVolume": { + "$ref": "#/definitions/os_hive_aws_v1_EC2RootVolume", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.EC2RootVolume" }, - "ibmcloud": { - "$ref": "#/definitions/os_hive_ibmcloud_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.MachinePool" + "spotMarketOptions": { + "$ref": "#/definitions/os_hive_aws_v1_SpotMarketOptions", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.SpotMarketOptions" }, - "openstack": { - "$ref": "#/definitions/os_hive_openstack_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.openstack.v1.MachinePool" + "subnets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "ovirt": { - "$ref": "#/definitions/os_hive_ovirt_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.MachinePool" + "type": { + "type": "string" }, - "vsphere": { - "$ref": "#/definitions/os_hive_vsphere_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.vsphere.v1.MachinePool" + "zones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true @@ -13434,8 +13438,15 @@ }, "osdisk": { "properties": { + "diskEncryptionSet": { + "$ref": "#/definitions/os_hive_azure_v1_DiskEncryptionSet", + "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.DiskEncryptionSet" + }, "diskSizeGB": { "type": "integer" + }, + "diskType": { + "type": "string" } }, "additionalProperties": true @@ -13576,6 +13587,12 @@ }, "platform": { "properties": { + "accountID": { + "type": "string" + }, + "cisInstanceCRN": { + "type": "string" + }, "credentialsSecretRef": { "$ref": "#/definitions/kubernetes_core_LocalObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java index 72ff6e83b1e..3793f6ce108 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java @@ -139,6 +139,7 @@ public void setApiVip(String apiVip) { } @JsonProperty("api_vips") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getApiVips() { return apiVips; } @@ -169,6 +170,7 @@ public void setIngressVip(String ingressVip) { } @JsonProperty("ingress_vips") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getIngressVips() { return ingressVips; } diff --git a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json index b567432ec67..ea067813b3a 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json @@ -3117,17 +3117,20 @@ }, "failuredomain": { "properties": { - "computeAvailabilityZone": { + "name": { "type": "string" }, - "portTargets": { - "type": "array", - "items": { - "$ref": "#/definitions/os_installer_openstack_v1_NamedPortTarget", - "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NamedPortTarget" - } + "region": { + "type": "string" }, - "storageAvailabilityZone": { + "server": { + "type": "string" + }, + "topology": { + "$ref": "#/definitions/os_installer_vsphere_v1_Topology", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.Topology" + }, + "zone": { "type": "string" } }, @@ -3380,6 +3383,35 @@ "additionalProperties": true }, "machinepool": { + "properties": { + "encryptionAtHost": { + "type": "boolean" + }, + "osDisk": { + "$ref": "#/definitions/os_installer_azure_v1_OSDisk", + "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.OSDisk" + }, + "osImage": { + "$ref": "#/definitions/os_installer_azure_v1_OSImage", + "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.OSImage" + }, + "type": { + "type": "string" + }, + "ultraSSDCapability": { + "type": "string" + }, + "vmNetworkingType": { + "type": "string" + }, + "zones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, "additionalProperties": true }, "machinepoolplatform": { @@ -3741,38 +3773,6 @@ "additionalProperties": true }, "platform": { - "properties": { - "defaultMachinePlatform": { - "$ref": "#/definitions/os_installer_alibabacloud_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool" - }, - "privateZoneID": { - "type": "string" - }, - "region": { - "type": "string" - }, - "resourceGroupID": { - "type": "string" - }, - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" - }, - "vpcID": { - "type": "string" - }, - "vswitchIDs": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } - } - }, "additionalProperties": true }, "porttarget": { diff --git a/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/validation-schema.json index 8134a5e5135..ab1f34071cb 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/validation-schema.json @@ -2428,13 +2428,12 @@ "message": { "type": "string" }, - "observedGeneration": { - "type": "integer", - "existingJavaType": "Long" - }, "reason": { "type": "string" }, + "severity": { + "type": "string" + }, "status": { "type": "string" }, @@ -3363,9 +3362,30 @@ }, "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, + "creationTimestamp": { + "type": "string" + }, + "deletionGracePeriodSeconds": { + "type": "integer", + "existingJavaType": "Long" + }, + "deletionTimestamp": { + "type": "string" + }, + "finalizers": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "generateName": { "type": "string" }, + "generation": { + "type": "integer", + "existingJavaType": "Long" + }, "labels": { "type": "object", "additionalProperties": { @@ -3373,6 +3393,14 @@ }, "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, + "managedFields": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apimachinery_ManagedFieldsEntry", + "existingJavaType": "io.fabric8.kubernetes.api.model.ManagedFieldsEntry" + } + }, "name": { "type": "string" }, @@ -3388,6 +3416,15 @@ "$ref": "#/definitions/kubernetes_apimachinery_OwnerReference", "existingJavaType": "io.fabric8.kubernetes.api.model.OwnerReference" } + }, + "resourceVersion": { + "type": "string" + }, + "selfLink": { + "type": "string" + }, + "uid": { + "type": "string" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Endpoint.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Endpoint.java index c06035397e7..0876f73acff 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Endpoint.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Endpoint.java @@ -103,7 +103,7 @@ public class Endpoint implements Editable , KubernetesResource private OAuth2 oauth2; @JsonProperty("params") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map> params = new LinkedHashMap<>(); + private Map> params = new LinkedHashMap<>(); @JsonProperty("path") private String path; @JsonProperty("port") @@ -131,7 +131,7 @@ public class Endpoint implements Editable , KubernetesResource public Endpoint() { } - public Endpoint(SafeAuthorization authorization, BasicAuth basicAuth, String bearerTokenFile, SecretKeySelector bearerTokenSecret, Boolean enableHttp2, Boolean filterRunning, Boolean followRedirects, Boolean honorLabels, Boolean honorTimestamps, String interval, List metricRelabelings, OAuth2 oauth2, Map> params, String path, String port, String proxyUrl, List relabelings, String scheme, String scrapeTimeout, io.fabric8.kubernetes.api.model.IntOrString targetPort, TLSConfig tlsConfig) { + public Endpoint(SafeAuthorization authorization, BasicAuth basicAuth, String bearerTokenFile, SecretKeySelector bearerTokenSecret, Boolean enableHttp2, Boolean filterRunning, Boolean followRedirects, Boolean honorLabels, Boolean honorTimestamps, String interval, List metricRelabelings, OAuth2 oauth2, Map> params, String path, String port, String proxyUrl, List relabelings, String scheme, String scrapeTimeout, io.fabric8.kubernetes.api.model.IntOrString targetPort, TLSConfig tlsConfig) { super(); this.authorization = authorization; this.basicAuth = basicAuth; @@ -279,12 +279,12 @@ public void setOauth2(OAuth2 oauth2) { @JsonProperty("params") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map> getParams() { + public Map> getParams() { return params; } @JsonProperty("params") - public void setParams(Map> params) { + public void setParams(Map> params) { this.params = params; } diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMetricsEndpoint.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMetricsEndpoint.java index bdf521ca439..9a72b879bb1 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMetricsEndpoint.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMetricsEndpoint.java @@ -100,7 +100,7 @@ public class PodMetricsEndpoint implements Editable , private OAuth2 oauth2; @JsonProperty("params") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map> params = new LinkedHashMap<>(); + private Map> params = new LinkedHashMap<>(); @JsonProperty("path") private String path; @JsonProperty("port") @@ -128,7 +128,7 @@ public class PodMetricsEndpoint implements Editable , public PodMetricsEndpoint() { } - public PodMetricsEndpoint(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, Boolean enableHttp2, Boolean filterRunning, Boolean followRedirects, Boolean honorLabels, Boolean honorTimestamps, String interval, List metricRelabelings, OAuth2 oauth2, Map> params, String path, String port, String proxyUrl, List relabelings, String scheme, String scrapeTimeout, io.fabric8.kubernetes.api.model.IntOrString targetPort, PodMetricsEndpointTLSConfig tlsConfig) { + public PodMetricsEndpoint(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, Boolean enableHttp2, Boolean filterRunning, Boolean followRedirects, Boolean honorLabels, Boolean honorTimestamps, String interval, List metricRelabelings, OAuth2 oauth2, Map> params, String path, String port, String proxyUrl, List relabelings, String scheme, String scrapeTimeout, io.fabric8.kubernetes.api.model.IntOrString targetPort, PodMetricsEndpointTLSConfig tlsConfig) { super(); this.authorization = authorization; this.basicAuth = basicAuth; @@ -265,12 +265,12 @@ public void setOauth2(OAuth2 oauth2) { @JsonProperty("params") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map> getParams() { + public Map> getParams() { return params; } @JsonProperty("params") - public void setParams(Map> params) { + public void setParams(Map> params) { this.params = params; } diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ProbeTargetStaticConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ProbeTargetStaticConfig.java index e398c6aa79d..c74764f7417 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ProbeTargetStaticConfig.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ProbeTargetStaticConfig.java @@ -107,6 +107,7 @@ public void setRelabelingConfigs(List relabelingConfigs) { } @JsonProperty("static") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getStatic() { return _static; } diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json index 0348a020901..1d56902fbcc 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json @@ -4229,7 +4229,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "path": { "type": "string" @@ -4537,7 +4537,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "path": { "type": "string" diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json index af3f6fa37fe..cbf51e7f4c6 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json @@ -4229,7 +4229,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "path": { "type": "string" @@ -4537,7 +4537,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "path": { "type": "string" @@ -9894,7 +9894,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "path": { "type": "string" @@ -11346,7 +11346,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "path": { "type": "string" diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ProxyConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ProxyConfig.java index 38a39aef6bd..644c2d332a3 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ProxyConfig.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ProxyConfig.java @@ -1,8 +1,8 @@ package io.fabric8.openshift.api.model.operator.v1; -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; @@ -63,7 +63,7 @@ public class ProxyConfig implements Editable , KubernetesRes private String iptablesSyncPeriod; @JsonProperty("proxyArguments") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map> proxyArguments = new LinkedHashMap<>(); + private Map> proxyArguments = new LinkedHashMap<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -74,7 +74,7 @@ public class ProxyConfig implements Editable , KubernetesRes public ProxyConfig() { } - public ProxyConfig(String bindAddress, String iptablesSyncPeriod, Map> proxyArguments) { + public ProxyConfig(String bindAddress, String iptablesSyncPeriod, Map> proxyArguments) { super(); this.bindAddress = bindAddress; this.iptablesSyncPeriod = iptablesSyncPeriod; @@ -103,12 +103,12 @@ public void setIptablesSyncPeriod(String iptablesSyncPeriod) { @JsonProperty("proxyArguments") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map> getProxyArguments() { + public Map> getProxyArguments() { return proxyArguments; } @JsonProperty("proxyArguments") - public void setProxyArguments(Map> proxyArguments) { + public void setProxyArguments(Map> proxyArguments) { this.proxyArguments = proxyArguments; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/kube-schema.json index 509cd1a4794..4a37dbf5f6a 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/kube-schema.json @@ -5448,7 +5448,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" } }, "additionalProperties": true, diff --git a/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/validation-schema.json index ac772cf69b8..4089a8ac541 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/validation-schema.json @@ -5448,7 +5448,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" } }, "additionalProperties": true, @@ -10948,7 +10948,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ActionDescriptor.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ActionDescriptor.java index 6ff610da7e1..b398fd80ecf 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ActionDescriptor.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ActionDescriptor.java @@ -131,6 +131,7 @@ public void setValue(String value) { } @JsonProperty("x-descriptors") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getXDescriptors() { return xDescriptors; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SpecDescriptor.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SpecDescriptor.java index d425682e16e..0744d0ff45e 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SpecDescriptor.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SpecDescriptor.java @@ -131,6 +131,7 @@ public void setValue(String value) { } @JsonProperty("x-descriptors") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getXDescriptors() { return xDescriptors; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StatusDescriptor.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StatusDescriptor.java index 9f06613c017..a3395c3678f 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StatusDescriptor.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/StatusDescriptor.java @@ -131,6 +131,7 @@ public void setValue(String value) { } @JsonProperty("x-descriptors") + @JsonInclude(JsonInclude.Include.NON_EMPTY) public List getXDescriptors() { return xDescriptors; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstanceRequester.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstanceRequester.java index 77be9bd1730..1b72dbbf9cb 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstanceRequester.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstanceRequester.java @@ -61,7 +61,7 @@ public class TemplateInstanceRequester implements Editable> extra = new LinkedHashMap<>(); + private Map> extra = new LinkedHashMap<>(); @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List groups = new ArrayList<>(); @@ -79,7 +79,7 @@ public class TemplateInstanceRequester implements Editable> extra, List groups, String uid, String username) { + public TemplateInstanceRequester(Map> extra, List groups, String uid, String username) { super(); this.extra = extra; this.groups = groups; @@ -89,12 +89,12 @@ public TemplateInstanceRequester(Map> extra, List> getExtra() { + public Map> getExtra() { return extra; } @JsonProperty("extra") - public void setExtra(Map> extra) { + public void setExtra(Map> extra) { this.extra = extra; } diff --git a/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json index b137379ac8d..f390d2a7711 100644 --- a/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json @@ -906,7 +906,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -952,7 +952,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "auth-provider": { "$ref": "#/definitions/kubernetes_config_AuthProviderConfig", @@ -11015,7 +11015,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", diff --git a/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json index e9d0593231d..e5dfc325565 100644 --- a/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json @@ -906,7 +906,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -952,7 +952,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "auth-provider": { "$ref": "#/definitions/kubernetes_config_AuthProviderConfig", @@ -11015,7 +11015,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -12006,7 +12006,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "auth-provider": { "$ref": "#/definitions/kubernetes_config_AuthProviderConfig", @@ -20252,7 +20252,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -20618,7 +20618,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.List\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", diff --git a/kubernetes-model-generator/pkg/schemagen/generate.go b/kubernetes-model-generator/pkg/schemagen/generate.go index 9f4df9d9300..249b9d96796 100644 --- a/kubernetes-model-generator/pkg/schemagen/generate.go +++ b/kubernetes-model-generator/pkg/schemagen/generate.go @@ -131,7 +131,7 @@ func (g *schemaGenerator) javaTypeArrayList(t reflect.Type) string { case "Byte": return "String" default: - return "java.util.ArrayList<" + typeName + ">" + return "java.util.List<" + typeName + ">" } }