diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BatchAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BatchAPIGroupClient.java index 15bcd154111..5c3512bb40e 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BatchAPIGroupClient.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BatchAPIGroupClient.java @@ -15,10 +15,10 @@ */ package io.fabric8.kubernetes.client; -import io.fabric8.kubernetes.api.model.batch.CronJob; -import io.fabric8.kubernetes.api.model.batch.Job; -import io.fabric8.kubernetes.api.model.batch.JobList; -import io.fabric8.kubernetes.api.model.batch.CronJobList; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob; +import io.fabric8.kubernetes.api.model.batch.v1.Job; +import io.fabric8.kubernetes.api.model.batch.v1.JobList; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.BatchAPIGroupDSL; import io.fabric8.kubernetes.client.dsl.Resource; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ExtensionsAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ExtensionsAPIGroupClient.java index 5fe1ee20dcb..bf077941325 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ExtensionsAPIGroupClient.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ExtensionsAPIGroupClient.java @@ -21,14 +21,14 @@ import io.fabric8.kubernetes.api.model.extensions.DeploymentList; import io.fabric8.kubernetes.api.model.extensions.ReplicaSet; import io.fabric8.kubernetes.api.model.extensions.ReplicaSetList; -import io.fabric8.kubernetes.api.model.batch.Job; -import io.fabric8.kubernetes.api.model.batch.JobList; +import io.fabric8.kubernetes.api.model.batch.v1.Job; +import io.fabric8.kubernetes.api.model.batch.v1.JobList; import io.fabric8.kubernetes.api.model.extensions.Ingress; import io.fabric8.kubernetes.api.model.extensions.IngressList; import io.fabric8.kubernetes.api.model.extensions.NetworkPolicy; import io.fabric8.kubernetes.api.model.extensions.NetworkPolicyList; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyList; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicyList; import io.fabric8.kubernetes.client.dsl.RollableScalableResource; import io.fabric8.kubernetes.client.dsl.ScalableResource; import io.fabric8.kubernetes.client.dsl.Resource; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/PolicyAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/PolicyAPIGroupClient.java index 9bccb4b2c0e..66301f18987 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/PolicyAPIGroupClient.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/PolicyAPIGroupClient.java @@ -15,10 +15,10 @@ */ package io.fabric8.kubernetes.client; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetList; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyList; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicyList; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.PolicyAPIGroupDSL; import io.fabric8.kubernetes.client.dsl.Resource; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/BatchAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/BatchAPIGroupDSL.java index ff6996dfdfd..420cadcdfe7 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/BatchAPIGroupDSL.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/BatchAPIGroupDSL.java @@ -15,10 +15,10 @@ */ package io.fabric8.kubernetes.client.dsl; -import io.fabric8.kubernetes.api.model.batch.CronJob; -import io.fabric8.kubernetes.api.model.batch.Job; -import io.fabric8.kubernetes.api.model.batch.JobList; -import io.fabric8.kubernetes.api.model.batch.CronJobList; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob; +import io.fabric8.kubernetes.api.model.batch.v1.Job; +import io.fabric8.kubernetes.api.model.batch.v1.JobList; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList; import io.fabric8.kubernetes.client.Client; public interface BatchAPIGroupDSL extends Client{ diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ExtensionsAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ExtensionsAPIGroupDSL.java index 7bf3953cc6b..a52953a95cd 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ExtensionsAPIGroupDSL.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ExtensionsAPIGroupDSL.java @@ -22,14 +22,14 @@ import io.fabric8.kubernetes.api.model.extensions.DeploymentList; import io.fabric8.kubernetes.api.model.extensions.ReplicaSet; import io.fabric8.kubernetes.api.model.extensions.ReplicaSetList; -import io.fabric8.kubernetes.api.model.batch.Job; -import io.fabric8.kubernetes.api.model.batch.JobList; +import io.fabric8.kubernetes.api.model.batch.v1.Job; +import io.fabric8.kubernetes.api.model.batch.v1.JobList; import io.fabric8.kubernetes.api.model.extensions.Ingress; import io.fabric8.kubernetes.api.model.extensions.IngressList; import io.fabric8.kubernetes.api.model.extensions.NetworkPolicy; import io.fabric8.kubernetes.api.model.extensions.NetworkPolicyList; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyList; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicyList; import io.fabric8.kubernetes.client.Client; public interface ExtensionsAPIGroupDSL extends Client { diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PolicyAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PolicyAPIGroupDSL.java index 52834676fd5..a93a8858441 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PolicyAPIGroupDSL.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PolicyAPIGroupDSL.java @@ -15,10 +15,10 @@ */ package io.fabric8.kubernetes.client.dsl; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetList; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyList; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicyList; import io.fabric8.kubernetes.client.Client; public interface PolicyAPIGroupDSL extends Client { diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImpl.java index 4ba307c04ef..30d3f67fd7c 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImpl.java @@ -24,9 +24,9 @@ import io.fabric8.kubernetes.client.dsl.base.OperationContext; import io.fabric8.kubernetes.client.utils.PodOperationUtil; import okhttp3.OkHttpClient; -import io.fabric8.kubernetes.api.model.batch.Job; -import io.fabric8.kubernetes.api.model.batch.JobBuilder; -import io.fabric8.kubernetes.api.model.batch.JobList; +import io.fabric8.kubernetes.api.model.batch.v1.Job; +import io.fabric8.kubernetes.api.model.batch.v1.JobBuilder; +import io.fabric8.kubernetes.api.model.batch.v1.JobList; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.dsl.ScalableResource; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1beta1/CronJobOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1beta1/CronJobOperationsImpl.java index b4834c2df31..e613e94ded4 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1beta1/CronJobOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1beta1/CronJobOperationsImpl.java @@ -16,8 +16,8 @@ package io.fabric8.kubernetes.client.dsl.internal.batch.v1beta1; -import io.fabric8.kubernetes.api.model.batch.CronJob; -import io.fabric8.kubernetes.api.model.batch.CronJobList; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.dsl.Resource; diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java index b926b88eb00..5de7fd84c60 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java @@ -39,8 +39,8 @@ import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodBuilder; import io.fabric8.kubernetes.api.model.PodList; -import io.fabric8.kubernetes.api.model.policy.Eviction; -import io.fabric8.kubernetes.api.model.policy.EvictionBuilder; +import io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction; +import io.fabric8.kubernetes.api.model.policy.v1beta1.EvictionBuilder; import io.fabric8.kubernetes.client.Callback; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.KubernetesClientException; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/base/OperationContextTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/base/OperationContextTest.java index c519861a76e..e36f7e0f854 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/base/OperationContextTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/base/OperationContextTest.java @@ -16,8 +16,8 @@ package io.fabric8.kubernetes.client.dsl.base; import io.fabric8.kubernetes.api.model.DeletionPropagation; -import io.fabric8.kubernetes.api.model.batch.Job; -import io.fabric8.kubernetes.api.model.batch.JobBuilder; +import io.fabric8.kubernetes.api.model.batch.v1.Job; +import io.fabric8.kubernetes.api.model.batch.v1.JobBuilder; import io.fabric8.kubernetes.client.Config; import okhttp3.OkHttpClient; import org.junit.jupiter.api.BeforeEach; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImplTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImplTest.java index c1ca36d432c..7ba309081b1 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImplTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImplTest.java @@ -15,8 +15,8 @@ */ package io.fabric8.kubernetes.client.dsl.internal.batch.v1; -import io.fabric8.kubernetes.api.model.batch.Job; -import io.fabric8.kubernetes.api.model.batch.JobBuilder; +import io.fabric8.kubernetes.api.model.batch.v1.Job; +import io.fabric8.kubernetes.api.model.batch.v1.JobBuilder; import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/KubernetesResourceUtilTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/KubernetesResourceUtilTest.java index 7a00dc462e0..b244e4b3154 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/KubernetesResourceUtilTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/KubernetesResourceUtilTest.java @@ -31,8 +31,8 @@ import io.fabric8.kubernetes.api.model.PodList; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder; -import io.fabric8.kubernetes.api.model.batch.CronJob; -import io.fabric8.kubernetes.api.model.batch.CronJobList; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList; import io.fabric8.kubernetes.client.CustomResourceList; import io.fabric8.kubernetes.client.Good; import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil; diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/UtilsTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/UtilsTest.java index 020081798d9..d6c38dac549 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/UtilsTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/internal/UtilsTest.java @@ -52,15 +52,15 @@ import io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview; import io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview; import io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler; -import io.fabric8.kubernetes.api.model.batch.CronJob; -import io.fabric8.kubernetes.api.model.batch.Job; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob; +import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest; import io.fabric8.kubernetes.api.model.coordination.v1.Lease; import io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice; import io.fabric8.kubernetes.api.model.extensions.Ingress; import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy; import io.fabric8.kubernetes.api.model.rbac.ClusterRole; import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding; import io.fabric8.kubernetes.api.model.rbac.Role; diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CronJobExample.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CronJobExample.java index a1835ce0565..9d0c666f03f 100644 --- a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CronJobExample.java +++ b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CronJobExample.java @@ -17,8 +17,8 @@ package io.fabric8.kubernetes.examples; import io.fabric8.kubernetes.api.model.Pod; -import io.fabric8.kubernetes.api.model.batch.CronJob; -import io.fabric8.kubernetes.api.model.batch.CronJobBuilder; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobBuilder; import io.fabric8.kubernetes.client.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/JobExample.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/JobExample.java index eb343a0cb02..604ffd4f515 100644 --- a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/JobExample.java +++ b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/JobExample.java @@ -16,8 +16,8 @@ package io.fabric8.kubernetes.examples; import io.fabric8.kubernetes.api.model.PodList; -import io.fabric8.kubernetes.api.model.batch.Job; -import io.fabric8.kubernetes.api.model.batch.JobBuilder; +import io.fabric8.kubernetes.api.model.batch.v1.Job; +import io.fabric8.kubernetes.api.model.batch.v1.JobBuilder; import io.fabric8.kubernetes.client.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/PodDisruptionBudgetExample.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/PodDisruptionBudgetExample.java index 989c27f8c25..176dfe5ac75 100644 --- a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/PodDisruptionBudgetExample.java +++ b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/PodDisruptionBudgetExample.java @@ -16,8 +16,8 @@ package io.fabric8.kubernetes.examples; import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetBuilder; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetBuilder; import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/PodSecurityPolicyExample.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/PodSecurityPolicyExample.java index 2e1f15f0a07..8295983171d 100644 --- a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/PodSecurityPolicyExample.java +++ b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/PodSecurityPolicyExample.java @@ -15,8 +15,8 @@ */ package io.fabric8.kubernetes.examples; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyBuilder; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicyBuilder; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CronJobIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CronJobIT.java index 8fab8e4bbba..dcafd5e8f89 100644 --- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CronJobIT.java +++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CronJobIT.java @@ -17,9 +17,9 @@ package io.fabric8.kubernetes; import io.fabric8.commons.ClusterEntity; -import io.fabric8.kubernetes.api.model.batch.CronJob; -import io.fabric8.kubernetes.api.model.batch.CronJobBuilder; -import io.fabric8.kubernetes.api.model.batch.CronJobList; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobBuilder; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList; import io.fabric8.kubernetes.client.KubernetesClient; import org.arquillian.cube.kubernetes.api.Session; import org.arquillian.cube.kubernetes.impl.requirement.RequiresKubernetes; diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/JobIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/JobIT.java index f7a32d335d6..02872ebb3f4 100644 --- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/JobIT.java +++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/JobIT.java @@ -15,8 +15,8 @@ */ package io.fabric8.kubernetes; -import io.fabric8.kubernetes.api.model.batch.Job; -import io.fabric8.kubernetes.api.model.batch.JobBuilder; +import io.fabric8.kubernetes.api.model.batch.v1.Job; +import io.fabric8.kubernetes.api.model.batch.v1.JobBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.dsl.LogWatch; import org.arquillian.cube.kubernetes.api.Session; diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodIT.java index 106b4227c9f..5936d2388f1 100644 --- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodIT.java +++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodIT.java @@ -23,9 +23,9 @@ import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodBuilder; import io.fabric8.kubernetes.api.model.PodList; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetBuilder; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetSpecBuilder; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetBuilder; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetSpecBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.dsl.ExecListener; import io.fabric8.kubernetes.client.dsl.ExecWatch; diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodSecurityPolicyIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodSecurityPolicyIT.java index 630489e17d6..bce3947dff0 100644 --- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodSecurityPolicyIT.java +++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodSecurityPolicyIT.java @@ -18,9 +18,9 @@ import io.fabric8.commons.ClusterEntity; import io.fabric8.commons.DeleteEntity; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyBuilder; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyList; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicyBuilder; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicyList; import io.fabric8.kubernetes.client.KubernetesClient; import org.arquillian.cube.kubernetes.impl.requirement.RequiresKubernetes; import org.arquillian.cube.requirement.ArquillianConditionalRunner; diff --git a/kubernetes-model-generator/kubernetes-model-batch/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-batch/cmd/generate/generate.go index f243cd8bf87..7b981665e4f 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/cmd/generate/generate.go +++ b/kubernetes-model-generator/kubernetes-model-batch/cmd/generate/generate.go @@ -61,6 +61,8 @@ type Schema struct { Job batchapiv1.Job JobList batchapiv1.JobList + V1CronJob batchapiv1.CronJob + V1CronJobList batchapiv1.CronJobList CronJob batchapiv1beta1.CronJob CronJobList batchapiv1beta1.CronJobList } @@ -72,8 +74,8 @@ func main() { {"k8s.io/apimachinery/pkg/version", "", "io.fabric8.kubernetes.api.model.version", "kubernetes_apimachinery_pkg_version_", false}, {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, {"k8s.io/api/core/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_core_", false}, - {"k8s.io/api/batch/v1beta1", "", "io.fabric8.kubernetes.api.model.batch", "kubernetes_batch_", true}, - {"k8s.io/api/batch/v1", "", "io.fabric8.kubernetes.api.model.batch", "kubernetes_batch_", true}, + {"k8s.io/api/batch/v1beta1", "", "io.fabric8.kubernetes.api.model.batch.v1beta1", "kubernetes_batch_v1beta1_", true}, + {"k8s.io/api/batch/v1", "", "io.fabric8.kubernetes.api.model.batch.v1", "kubernetes_batch_v1_", true}, } typeMap := map[reflect.Type]reflect.Type{ diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json index 399daa59964..90d4825399b 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json @@ -812,12 +812,12 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_batch_CronJob": { + "kubernetes_batch_v1_CronJob": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "batch/v1beta1", + "default": "batch/v1", "required": true }, "kind": { @@ -830,34 +830,34 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_batch_CronJobSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.CronJobSpec" + "$ref": "#/definitions/kubernetes_batch_v1_CronJobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobSpec" }, "status": { - "$ref": "#/definitions/kubernetes_batch_CronJobStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.CronJobStatus" + "$ref": "#/definitions/kubernetes_batch_v1_CronJobStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobStatus" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.CronJob", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJob", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_batch_CronJobList": { + "kubernetes_batch_v1_CronJobList": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "batch/v1beta1", + "default": "batch/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_batch_CronJob", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.CronJob" + "$ref": "#/definitions/kubernetes_batch_v1_CronJob", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJob" } }, "kind": { @@ -871,13 +871,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.CronJobList", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.batch.CronJob\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.batch.v1.CronJob\u003e" ] }, - "kubernetes_batch_CronJobSpec": { + "kubernetes_batch_v1_CronJobSpec": { "type": "object", "properties": { "concurrencyPolicy": { @@ -887,8 +887,8 @@ "type": "integer" }, "jobTemplate": { - "$ref": "#/definitions/kubernetes_batch_JobTemplateSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobTemplateSpec" + "$ref": "#/definitions/kubernetes_batch_v1_JobTemplateSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobTemplateSpec" }, "schedule": { "type": "string" @@ -905,12 +905,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.CronJobSpec", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_batch_CronJobStatus": { + "kubernetes_batch_v1_CronJobStatus": { "type": "object", "properties": { "active": { @@ -931,12 +931,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.CronJobStatus", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_batch_Job": { + "kubernetes_batch_v1_Job": { "type": "object", "properties": { "apiVersion": { @@ -954,22 +954,22 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_batch_JobSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobSpec" + "$ref": "#/definitions/kubernetes_batch_v1_JobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobSpec" }, "status": { - "$ref": "#/definitions/kubernetes_batch_JobStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobStatus" + "$ref": "#/definitions/kubernetes_batch_v1_JobStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobStatus" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.Job", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.Job", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_batch_JobCondition": { + "kubernetes_batch_v1_JobCondition": { "type": "object", "properties": { "lastProbeTime": { @@ -994,12 +994,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.JobCondition", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.JobCondition", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_batch_JobList": { + "kubernetes_batch_v1_JobList": { "type": "object", "properties": { "apiVersion": { @@ -1010,8 +1010,8 @@ "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_batch_Job", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.Job" + "$ref": "#/definitions/kubernetes_batch_v1_Job", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.Job" } }, "kind": { @@ -1025,13 +1025,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.JobList", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.JobList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.batch.Job\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.batch.v1.Job\u003e" ] }, - "kubernetes_batch_JobSpec": { + "kubernetes_batch_v1_JobSpec": { "type": "object", "properties": { "activeDeadlineSeconds": { @@ -1069,12 +1069,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.JobSpec", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.JobSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_batch_JobStatus": { + "kubernetes_batch_v1_JobStatus": { "type": "object", "properties": { "active": { @@ -1091,8 +1091,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_batch_JobCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobCondition" + "$ref": "#/definitions/kubernetes_batch_v1_JobCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobCondition" } }, "failed": { @@ -1107,12 +1107,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.JobStatus", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.JobStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_batch_JobTemplateSpec": { + "kubernetes_batch_v1_JobTemplateSpec": { "type": "object", "properties": { "metadata": { @@ -1120,12 +1120,154 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_batch_JobSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobSpec" + "$ref": "#/definitions/kubernetes_batch_v1_JobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobSpec" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.JobTemplateSpec", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.JobTemplateSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_batch_v1beta1_CronJob": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "batch/v1beta1", + "required": true + }, + "kind": { + "type": "string", + "default": "CronJob", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata", + "io.fabric8.kubernetes.api.model.Namespaced" + ] + }, + "kubernetes_batch_v1beta1_CronJobList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "batch/v1beta1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJob", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob" + } + }, + "kind": { + "type": "string", + "default": "CronJobList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.batch.v1beta1.CronJob\u003e" + ] + }, + "kubernetes_batch_v1beta1_CronJobSpec": { + "type": "object", + "properties": { + "concurrencyPolicy": { + "type": "string" + }, + "failedJobsHistoryLimit": { + "type": "integer" + }, + "jobTemplate": { + "$ref": "#/definitions/kubernetes_batch_v1beta1_JobTemplateSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.JobTemplateSpec" + }, + "schedule": { + "type": "string" + }, + "startingDeadlineSeconds": { + "type": "integer", + "existingJavaType": "Long" + }, + "successfulJobsHistoryLimit": { + "type": "integer" + }, + "suspend": { + "type": "boolean" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_batch_v1beta1_CronJobStatus": { + "type": "object", + "properties": { + "active": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectReference" + } + }, + "lastScheduleTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "lastSuccessfulTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_batch_v1beta1_JobTemplateSpec": { + "type": "object", + "properties": { + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_batch_v1_JobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.JobTemplateSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -3948,12 +4090,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.CreateOptions" }, "CronJob": { - "$ref": "#/definitions/kubernetes_batch_CronJob", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.CronJob" + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJob", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob" }, "CronJobList": { - "$ref": "#/definitions/kubernetes_batch_CronJobList", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.CronJobList" + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobList", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList" }, "DeleteOptions": { "$ref": "#/definitions/kubernetes_apimachinery_DeleteOptions", @@ -3968,12 +4110,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.version.Info" }, "Job": { - "$ref": "#/definitions/kubernetes_batch_Job", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.Job" + "$ref": "#/definitions/kubernetes_batch_v1_Job", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.Job" }, "JobList": { - "$ref": "#/definitions/kubernetes_batch_JobList", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobList" + "$ref": "#/definitions/kubernetes_batch_v1_JobList", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobList" }, "ListOptions": { "$ref": "#/definitions/kubernetes_apimachinery_ListOptions", @@ -4018,6 +4160,14 @@ "UpdateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_UpdateOptions", "existingJavaType": "io.fabric8.kubernetes.api.model.UpdateOptions" + }, + "V1CronJob": { + "$ref": "#/definitions/kubernetes_batch_v1_CronJob", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJob" + }, + "V1CronJobList": { + "$ref": "#/definitions/kubernetes_batch_v1_CronJobList", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobList" } }, "additionalProperties": true 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 b5d90007943..6a087f2337c 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 @@ -812,12 +812,12 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_batch_CronJob": { + "kubernetes_batch_v1_CronJob": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "batch/v1beta1", + "default": "batch/v1", "required": true }, "kind": { @@ -830,34 +830,34 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_batch_CronJobSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.CronJobSpec" + "$ref": "#/definitions/kubernetes_batch_v1_CronJobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobSpec" }, "status": { - "$ref": "#/definitions/kubernetes_batch_CronJobStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.CronJobStatus" + "$ref": "#/definitions/kubernetes_batch_v1_CronJobStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobStatus" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.CronJob", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJob", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_batch_CronJobList": { + "kubernetes_batch_v1_CronJobList": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "batch/v1beta1", + "default": "batch/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_batch_CronJob", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.CronJob" + "$ref": "#/definitions/kubernetes_batch_v1_CronJob", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJob" } }, "kind": { @@ -871,13 +871,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.CronJobList", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.batch.CronJob\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.batch.v1.CronJob\u003e" ] }, - "kubernetes_batch_CronJobSpec": { + "kubernetes_batch_v1_CronJobSpec": { "type": "object", "properties": { "concurrencyPolicy": { @@ -887,8 +887,8 @@ "type": "integer" }, "jobTemplate": { - "$ref": "#/definitions/kubernetes_batch_JobTemplateSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobTemplateSpec" + "$ref": "#/definitions/kubernetes_batch_v1_JobTemplateSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobTemplateSpec" }, "schedule": { "type": "string" @@ -905,12 +905,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.CronJobSpec", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_batch_CronJobStatus": { + "kubernetes_batch_v1_CronJobStatus": { "type": "object", "properties": { "active": { @@ -931,12 +931,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.CronJobStatus", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_batch_Job": { + "kubernetes_batch_v1_Job": { "type": "object", "properties": { "apiVersion": { @@ -954,22 +954,22 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_batch_JobSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobSpec" + "$ref": "#/definitions/kubernetes_batch_v1_JobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobSpec" }, "status": { - "$ref": "#/definitions/kubernetes_batch_JobStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobStatus" + "$ref": "#/definitions/kubernetes_batch_v1_JobStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobStatus" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.Job", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.Job", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_batch_JobCondition": { + "kubernetes_batch_v1_JobCondition": { "type": "object", "properties": { "lastProbeTime": { @@ -994,12 +994,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.JobCondition", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.JobCondition", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_batch_JobList": { + "kubernetes_batch_v1_JobList": { "type": "object", "properties": { "apiVersion": { @@ -1010,8 +1010,8 @@ "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_batch_Job", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.Job" + "$ref": "#/definitions/kubernetes_batch_v1_Job", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.Job" } }, "kind": { @@ -1025,13 +1025,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.JobList", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.JobList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.batch.Job\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.batch.v1.Job\u003e" ] }, - "kubernetes_batch_JobSpec": { + "kubernetes_batch_v1_JobSpec": { "type": "object", "properties": { "activeDeadlineSeconds": { @@ -1069,12 +1069,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.JobSpec", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.JobSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_batch_JobStatus": { + "kubernetes_batch_v1_JobStatus": { "type": "object", "properties": { "active": { @@ -1091,8 +1091,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_batch_JobCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobCondition" + "$ref": "#/definitions/kubernetes_batch_v1_JobCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobCondition" } }, "failed": { @@ -1107,12 +1107,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.JobStatus", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.JobStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_batch_JobTemplateSpec": { + "kubernetes_batch_v1_JobTemplateSpec": { "type": "object", "properties": { "metadata": { @@ -1120,12 +1120,154 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_batch_JobSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobSpec" + "$ref": "#/definitions/kubernetes_batch_v1_JobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobSpec" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.batch.JobTemplateSpec", + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.JobTemplateSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_batch_v1beta1_CronJob": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "batch/v1beta1", + "required": true + }, + "kind": { + "type": "string", + "default": "CronJob", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata", + "io.fabric8.kubernetes.api.model.Namespaced" + ] + }, + "kubernetes_batch_v1beta1_CronJobList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "batch/v1beta1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJob", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob" + } + }, + "kind": { + "type": "string", + "default": "CronJobList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.batch.v1beta1.CronJob\u003e" + ] + }, + "kubernetes_batch_v1beta1_CronJobSpec": { + "type": "object", + "properties": { + "concurrencyPolicy": { + "type": "string" + }, + "failedJobsHistoryLimit": { + "type": "integer" + }, + "jobTemplate": { + "$ref": "#/definitions/kubernetes_batch_v1beta1_JobTemplateSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.JobTemplateSpec" + }, + "schedule": { + "type": "string" + }, + "startingDeadlineSeconds": { + "type": "integer", + "existingJavaType": "Long" + }, + "successfulJobsHistoryLimit": { + "type": "integer" + }, + "suspend": { + "type": "boolean" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_batch_v1beta1_CronJobStatus": { + "type": "object", + "properties": { + "active": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectReference" + } + }, + "lastScheduleTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "lastSuccessfulTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_batch_v1beta1_JobTemplateSpec": { + "type": "object", + "properties": { + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_batch_v1_JobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.JobTemplateSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -3948,12 +4090,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.CreateOptions" }, "CronJob": { - "$ref": "#/definitions/kubernetes_batch_CronJob", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.CronJob" + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJob", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob" }, "CronJobList": { - "$ref": "#/definitions/kubernetes_batch_CronJobList", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.CronJobList" + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobList", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList" }, "DeleteOptions": { "$ref": "#/definitions/kubernetes_apimachinery_DeleteOptions", @@ -3968,12 +4110,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.version.Info" }, "Job": { - "$ref": "#/definitions/kubernetes_batch_Job", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.Job" + "$ref": "#/definitions/kubernetes_batch_v1_Job", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.Job" }, "JobList": { - "$ref": "#/definitions/kubernetes_batch_JobList", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobList" + "$ref": "#/definitions/kubernetes_batch_v1_JobList", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobList" }, "ListOptions": { "$ref": "#/definitions/kubernetes_apimachinery_ListOptions", @@ -4018,6 +4160,14 @@ "UpdateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_UpdateOptions", "existingJavaType": "io.fabric8.kubernetes.api.model.UpdateOptions" + }, + "V1CronJob": { + "$ref": "#/definitions/kubernetes_batch_v1_CronJob", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJob" + }, + "V1CronJobList": { + "$ref": "#/definitions/kubernetes_batch_v1_CronJobList", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobList" } }, "additionalProperties": true, @@ -4445,7 +4595,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "batch/v1beta1", + "default": "batch/v1", "required": true }, "kind": { @@ -4458,12 +4608,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_batch_CronJobSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.CronJobSpec" + "$ref": "#/definitions/kubernetes_batch_v1_CronJobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobSpec" }, "status": { - "$ref": "#/definitions/kubernetes_batch_CronJobStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.CronJobStatus" + "$ref": "#/definitions/kubernetes_batch_v1_CronJobStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobStatus" } }, "additionalProperties": true @@ -4478,8 +4628,8 @@ "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_batch_CronJob", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.CronJob" + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJob", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob" } }, "kind": { @@ -4503,8 +4653,8 @@ "type": "integer" }, "jobTemplate": { - "$ref": "#/definitions/kubernetes_batch_JobTemplateSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobTemplateSpec" + "$ref": "#/definitions/kubernetes_batch_v1beta1_JobTemplateSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.JobTemplateSpec" }, "schedule": { "type": "string" @@ -5292,12 +5442,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_batch_JobSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobSpec" + "$ref": "#/definitions/kubernetes_batch_v1_JobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobSpec" }, "status": { - "$ref": "#/definitions/kubernetes_batch_JobStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobStatus" + "$ref": "#/definitions/kubernetes_batch_v1_JobStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobStatus" } }, "additionalProperties": true @@ -5337,8 +5487,8 @@ "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_batch_Job", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.Job" + "$ref": "#/definitions/kubernetes_batch_v1_Job", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.Job" } }, "kind": { @@ -5407,8 +5557,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_batch_JobCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobCondition" + "$ref": "#/definitions/kubernetes_batch_v1_JobCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobCondition" } }, "failed": { @@ -5431,8 +5581,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_batch_JobSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.JobSpec" + "$ref": "#/definitions/kubernetes_batch_v1_JobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobSpec" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/test/java/io/fabric8/kubernetes/api/model/batch/JobTest.java b/kubernetes-model-generator/kubernetes-model-batch/src/test/java/io/fabric8/kubernetes/api/model/batch/v1/JobTest.java similarity index 93% rename from kubernetes-model-generator/kubernetes-model-batch/src/test/java/io/fabric8/kubernetes/api/model/batch/JobTest.java rename to kubernetes-model-generator/kubernetes-model-batch/src/test/java/io/fabric8/kubernetes/api/model/batch/v1/JobTest.java index 3d00940901c..af8b5be9e5d 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/test/java/io/fabric8/kubernetes/api/model/batch/JobTest.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/test/java/io/fabric8/kubernetes/api/model/batch/v1/JobTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.api.model.batch; +package io.fabric8.kubernetes.api.model.batch.v1; import org.junit.jupiter.api.Test; -import io.fabric8.kubernetes.api.model.batch.JobBuilder; +import io.fabric8.kubernetes.api.model.batch.v1.JobBuilder; import java.util.Collections; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/kubernetes-model-generator/kubernetes-model-discovery/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-discovery/cmd/generate/generate.go index 90ca0f6fa0f..68e5afae42c 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/cmd/generate/generate.go +++ b/kubernetes-model-generator/kubernetes-model-discovery/cmd/generate/generate.go @@ -26,6 +26,7 @@ import ( kapi "k8s.io/api/core/v1" discovery "k8s.io/api/discovery/v1beta1" + discoveryv1 "k8s.io/api/discovery/v1" "log" "reflect" @@ -60,6 +61,8 @@ type Schema struct { DiscoveryEndpointPort discovery.EndpointPort EndpointSlice discovery.EndpointSlice EndpointSliceList discovery.EndpointSliceList + V1EndpointSlice discoveryv1.EndpointSlice + V1EndpointSliceList discoveryv1.EndpointSliceList } func main() { @@ -70,6 +73,7 @@ func main() { {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, {"k8s.io/api/core/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_core_", false}, {"k8s.io/api/discovery/v1beta1", "discovery.k8s.io", "io.fabric8.kubernetes.api.model.discovery.v1beta1", "kubernetes_discovery_v1beta1_", true}, + {"k8s.io/api/discovery/v1", "discovery.k8s.io", "io.fabric8.kubernetes.api.model.discovery.v1", "kubernetes_discovery_v1_", true}, } typeMap := map[reflect.Type]reflect.Type{ diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/kube-schema.json index 45d56b86aaf..272de910e5d 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/kube-schema.json @@ -775,6 +775,198 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_discovery_v1_Endpoint": { + "type": "object", + "properties": { + "addresses": { + "type": "array", + "items": { + "type": "string" + } + }, + "conditions": { + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointConditions", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointConditions" + }, + "deprecatedTopology": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "hints": { + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointHints", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointHints" + }, + "hostname": { + "type": "string" + }, + "nodeName": { + "type": "string" + }, + "targetRef": { + "$ref": "#/definitions/kubernetes_core_ObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectReference" + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.Endpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_discovery_v1_EndpointConditions": { + "type": "object", + "properties": { + "ready": { + "type": "boolean" + }, + "serving": { + "type": "boolean" + }, + "terminating": { + "type": "boolean" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointConditions", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_discovery_v1_EndpointHints": { + "type": "object", + "properties": { + "forZones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_discovery_v1_ForZone", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.ForZone" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointHints", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_discovery_v1_EndpointPort": { + "type": "object", + "properties": { + "appProtocol": { + "type": "string" + }, + "name": { + "type": "string", + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + "port": { + "type": "integer" + }, + "protocol": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointPort", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_discovery_v1_EndpointSlice": { + "type": "object", + "properties": { + "addressType": { + "type": "string" + }, + "apiVersion": { + "type": "string", + "default": "discovery.k8s.io/v1", + "required": true + }, + "endpoints": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_discovery_v1_Endpoint", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.Endpoint" + } + }, + "kind": { + "type": "string", + "default": "EndpointSlice", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "ports": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointPort", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointPort" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata", + "io.fabric8.kubernetes.api.model.Namespaced" + ] + }, + "kubernetes_discovery_v1_EndpointSliceList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "discovery.k8s.io/v1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointSlice", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice" + } + }, + "kind": { + "type": "string", + "default": "EndpointSliceList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice\u003e" + ] + }, + "kubernetes_discovery_v1_ForZone": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.ForZone", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_discovery_v1beta1_Endpoint": { "type": "object", "properties": { @@ -1050,6 +1242,14 @@ "UpdateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_UpdateOptions", "existingJavaType": "io.fabric8.kubernetes.api.model.UpdateOptions" + }, + "V1EndpointSlice": { + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointSlice", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice" + }, + "V1EndpointSliceList": { + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointSliceList", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList" } }, "additionalProperties": true 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 7ebf602ff7a..13dedad10f9 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 @@ -775,6 +775,198 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_discovery_v1_Endpoint": { + "type": "object", + "properties": { + "addresses": { + "type": "array", + "items": { + "type": "string" + } + }, + "conditions": { + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointConditions", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointConditions" + }, + "deprecatedTopology": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "hints": { + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointHints", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointHints" + }, + "hostname": { + "type": "string" + }, + "nodeName": { + "type": "string" + }, + "targetRef": { + "$ref": "#/definitions/kubernetes_core_ObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectReference" + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.Endpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_discovery_v1_EndpointConditions": { + "type": "object", + "properties": { + "ready": { + "type": "boolean" + }, + "serving": { + "type": "boolean" + }, + "terminating": { + "type": "boolean" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointConditions", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_discovery_v1_EndpointHints": { + "type": "object", + "properties": { + "forZones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_discovery_v1_ForZone", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.ForZone" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointHints", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_discovery_v1_EndpointPort": { + "type": "object", + "properties": { + "appProtocol": { + "type": "string" + }, + "name": { + "type": "string", + "maxLength": 63, + "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" + }, + "port": { + "type": "integer" + }, + "protocol": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointPort", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_discovery_v1_EndpointSlice": { + "type": "object", + "properties": { + "addressType": { + "type": "string" + }, + "apiVersion": { + "type": "string", + "default": "discovery.k8s.io/v1", + "required": true + }, + "endpoints": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_discovery_v1_Endpoint", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.Endpoint" + } + }, + "kind": { + "type": "string", + "default": "EndpointSlice", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "ports": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointPort", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointPort" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata", + "io.fabric8.kubernetes.api.model.Namespaced" + ] + }, + "kubernetes_discovery_v1_EndpointSliceList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "discovery.k8s.io/v1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointSlice", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice" + } + }, + "kind": { + "type": "string", + "default": "EndpointSliceList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice\u003e" + ] + }, + "kubernetes_discovery_v1_ForZone": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.discovery.v1.ForZone", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_discovery_v1beta1_Endpoint": { "type": "object", "properties": { @@ -1050,6 +1242,14 @@ "UpdateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_UpdateOptions", "existingJavaType": "io.fabric8.kubernetes.api.model.UpdateOptions" + }, + "V1EndpointSlice": { + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointSlice", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice" + }, + "V1EndpointSliceList": { + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointSliceList", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList" } }, "additionalProperties": true, @@ -1230,8 +1430,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_ForZone", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.ForZone" + "$ref": "#/definitions/kubernetes_discovery_v1_ForZone", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.ForZone" } } }, @@ -1263,14 +1463,14 @@ }, "apiVersion": { "type": "string", - "default": "discovery.k8s.io/v1beta1", + "default": "discovery.k8s.io/v1", "required": true }, "endpoints": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_Endpoint", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.Endpoint" + "$ref": "#/definitions/kubernetes_discovery_v1_Endpoint", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.Endpoint" } }, "kind": { @@ -1285,8 +1485,8 @@ "ports": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointPort", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointPort" + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointPort", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointPort" } } }, diff --git a/kubernetes-model-generator/kubernetes-model-policy/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-policy/cmd/generate/generate.go index 17ab6fa02a5..eb9b4d54eab 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/cmd/generate/generate.go +++ b/kubernetes-model-generator/kubernetes-model-policy/cmd/generate/generate.go @@ -26,6 +26,7 @@ import ( kapi "k8s.io/api/core/v1" policy "k8s.io/api/policy/v1beta1" + v1policy "k8s.io/api/policy/v1" "log" "reflect" @@ -63,6 +64,8 @@ type Schema struct { PodDisruptionBudget policy.PodDisruptionBudget PodDisruptionBudgetList policy.PodDisruptionBudgetList Eviction policy.Eviction + V1PodDisruptionBudget v1policy.PodDisruptionBudget + V1PodDisruptionBudgetList v1policy.PodDisruptionBudgetList } func main() { @@ -72,7 +75,8 @@ func main() { {"k8s.io/apimachinery/pkg/version", "", "io.fabric8.kubernetes.api.model.version", "kubernetes_apimachinery_pkg_version_", false}, {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, {"k8s.io/api/core/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_core_", false}, - {"k8s.io/api/policy/v1beta1", "", "io.fabric8.kubernetes.api.model.policy", "kubernetes_policy_", true}, + {"k8s.io/api/policy/v1beta1", "", "io.fabric8.kubernetes.api.model.policy.v1beta1", "kubernetes_policy_v1beta1_", true}, + {"k8s.io/api/policy/v1", "", "io.fabric8.kubernetes.api.model.policy.v1", "kubernetes_policy_v1_", true}, } typeMap := map[reflect.Type]reflect.Type{ diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/kube-schema.json index 6fe0a7317b9..7072997fe3f 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/kube-schema.json @@ -895,7 +895,136 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_AllowedCSIDriver": { + "kubernetes_policy_v1_PodDisruptionBudget": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "policy/v1", + "required": true + }, + "kind": { + "type": "string", + "default": "PodDisruptionBudget", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata", + "io.fabric8.kubernetes.api.model.Namespaced" + ] + }, + "kubernetes_policy_v1_PodDisruptionBudgetList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "policy/v1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudget", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget" + } + }, + "kind": { + "type": "string", + "default": "PodDisruptionBudgetList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget\u003e" + ] + }, + "kubernetes_policy_v1_PodDisruptionBudgetSpec": { + "type": "object", + "properties": { + "maxUnavailable": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_util_intstr_IntOrString", + "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" + }, + "minAvailable": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_util_intstr_IntOrString", + "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_policy_v1_PodDisruptionBudgetStatus": { + "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apimachinery_Condition", + "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" + } + }, + "currentHealthy": { + "type": "integer" + }, + "desiredHealthy": { + "type": "integer" + }, + "disruptedPods": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "disruptionsAllowed": { + "type": "integer" + }, + "expectedPods": { + "type": "integer" + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_policy_v1beta1_AllowedCSIDriver": { "type": "object", "properties": { "name": { @@ -903,12 +1032,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.AllowedCSIDriver", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedCSIDriver", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_AllowedFlexVolume": { + "kubernetes_policy_v1beta1_AllowedFlexVolume": { "type": "object", "properties": { "driver": { @@ -916,12 +1045,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.AllowedFlexVolume", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedFlexVolume", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_AllowedHostPath": { + "kubernetes_policy_v1beta1_AllowedHostPath": { "type": "object", "properties": { "pathPrefix": { @@ -932,12 +1061,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.AllowedHostPath", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedHostPath", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_Eviction": { + "kubernetes_policy_v1beta1_Eviction": { "type": "object", "properties": { "apiVersion": { @@ -960,21 +1089,21 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.Eviction", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_policy_FSGroupStrategyOptions": { + "kubernetes_policy_v1beta1_FSGroupStrategyOptions": { "type": "object", "properties": { "ranges": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_IDRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.IDRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_IDRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange" } }, "rule": { @@ -982,12 +1111,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.FSGroupStrategyOptions", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.FSGroupStrategyOptions", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_HostPortRange": { + "kubernetes_policy_v1beta1_HostPortRange": { "type": "object", "properties": { "max": { @@ -998,12 +1127,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.HostPortRange", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.HostPortRange", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_IDRange": { + "kubernetes_policy_v1beta1_IDRange": { "type": "object", "properties": { "max": { @@ -1016,12 +1145,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.IDRange", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_PodDisruptionBudget": { + "kubernetes_policy_v1beta1_PodDisruptionBudget": { "type": "object", "properties": { "apiVersion": { @@ -1039,22 +1168,22 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_policy_PodDisruptionBudgetSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetSpec" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetSpec" }, "status": { - "$ref": "#/definitions/kubernetes_policy_PodDisruptionBudgetStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetStatus" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetStatus" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_policy_PodDisruptionBudgetList": { + "kubernetes_policy_v1beta1_PodDisruptionBudgetList": { "type": "object", "properties": { "apiVersion": { @@ -1065,8 +1194,8 @@ "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_policy_PodDisruptionBudget", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudget", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget" } }, "kind": { @@ -1080,13 +1209,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetList", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.policy.PodDisruptionBudget\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget\u003e" ] }, - "kubernetes_policy_PodDisruptionBudgetSpec": { + "kubernetes_policy_v1beta1_PodDisruptionBudgetSpec": { "type": "object", "properties": { "maxUnavailable": { @@ -1103,12 +1232,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetSpec", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_PodDisruptionBudgetStatus": { + "kubernetes_policy_v1beta1_PodDisruptionBudgetStatus": { "type": "object", "properties": { "conditions": { @@ -1145,12 +1274,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetStatus", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_PodSecurityPolicy": { + "kubernetes_policy_v1beta1_PodSecurityPolicy": { "type": "object", "properties": { "apiVersion": { @@ -1168,17 +1297,17 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_policy_PodSecurityPolicySpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicySpec" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodSecurityPolicySpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicySpec" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata" ] }, - "kubernetes_policy_PodSecurityPolicyList": { + "kubernetes_policy_v1beta1_PodSecurityPolicyList": { "type": "object", "properties": { "apiVersion": { @@ -1189,8 +1318,8 @@ "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_policy_PodSecurityPolicy", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodSecurityPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy" } }, "kind": { @@ -1204,13 +1333,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyList", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicyList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.policy.PodSecurityPolicy\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy\u003e" ] }, - "kubernetes_policy_PodSecurityPolicySpec": { + "kubernetes_policy_v1beta1_PodSecurityPolicySpec": { "type": "object", "properties": { "allowPrivilegeEscalation": { @@ -1220,8 +1349,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_AllowedCSIDriver", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.AllowedCSIDriver" + "$ref": "#/definitions/kubernetes_policy_v1beta1_AllowedCSIDriver", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedCSIDriver" } }, "allowedCapabilities": { @@ -1235,16 +1364,16 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_AllowedFlexVolume", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.AllowedFlexVolume" + "$ref": "#/definitions/kubernetes_policy_v1beta1_AllowedFlexVolume", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedFlexVolume" } }, "allowedHostPaths": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_AllowedHostPath", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.AllowedHostPath" + "$ref": "#/definitions/kubernetes_policy_v1beta1_AllowedHostPath", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedHostPath" } }, "allowedProcMountTypes": { @@ -1279,8 +1408,8 @@ } }, "fsGroup": { - "$ref": "#/definitions/kubernetes_policy_FSGroupStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.FSGroupStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_FSGroupStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.FSGroupStrategyOptions" }, "hostIPC": { "type": "boolean" @@ -1295,8 +1424,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_HostPortRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.HostPortRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_HostPortRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.HostPortRange" } }, "privileged": { @@ -1313,24 +1442,24 @@ } }, "runAsGroup": { - "$ref": "#/definitions/kubernetes_policy_RunAsGroupStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.RunAsGroupStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_RunAsGroupStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RunAsGroupStrategyOptions" }, "runAsUser": { - "$ref": "#/definitions/kubernetes_policy_RunAsUserStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.RunAsUserStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_RunAsUserStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RunAsUserStrategyOptions" }, "runtimeClass": { - "$ref": "#/definitions/kubernetes_policy_RuntimeClassStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.RuntimeClassStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_RuntimeClassStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RuntimeClassStrategyOptions" }, "seLinux": { - "$ref": "#/definitions/kubernetes_policy_SELinuxStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.SELinuxStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_SELinuxStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.SELinuxStrategyOptions" }, "supplementalGroups": { - "$ref": "#/definitions/kubernetes_policy_SupplementalGroupsStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.SupplementalGroupsStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_SupplementalGroupsStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.SupplementalGroupsStrategyOptions" }, "volumes": { "type": "array", @@ -1341,20 +1470,20 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicySpec", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicySpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_RunAsGroupStrategyOptions": { + "kubernetes_policy_v1beta1_RunAsGroupStrategyOptions": { "type": "object", "properties": { "ranges": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_IDRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.IDRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_IDRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange" } }, "rule": { @@ -1362,20 +1491,20 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.RunAsGroupStrategyOptions", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RunAsGroupStrategyOptions", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_RunAsUserStrategyOptions": { + "kubernetes_policy_v1beta1_RunAsUserStrategyOptions": { "type": "object", "properties": { "ranges": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_IDRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.IDRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_IDRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange" } }, "rule": { @@ -1383,12 +1512,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.RunAsUserStrategyOptions", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RunAsUserStrategyOptions", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_RuntimeClassStrategyOptions": { + "kubernetes_policy_v1beta1_RuntimeClassStrategyOptions": { "type": "object", "properties": { "allowedRuntimeClassNames": { @@ -1402,12 +1531,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.RuntimeClassStrategyOptions", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RuntimeClassStrategyOptions", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_SELinuxStrategyOptions": { + "kubernetes_policy_v1beta1_SELinuxStrategyOptions": { "type": "object", "properties": { "rule": { @@ -1419,20 +1548,20 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.SELinuxStrategyOptions", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.SELinuxStrategyOptions", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_SupplementalGroupsStrategyOptions": { + "kubernetes_policy_v1beta1_SupplementalGroupsStrategyOptions": { "type": "object", "properties": { "ranges": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_IDRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.IDRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_IDRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange" } }, "rule": { @@ -1440,7 +1569,7 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.SupplementalGroupsStrategyOptions", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.SupplementalGroupsStrategyOptions", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -1469,8 +1598,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.DeleteOptions" }, "Eviction": { - "$ref": "#/definitions/kubernetes_policy_Eviction", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.Eviction" + "$ref": "#/definitions/kubernetes_policy_v1beta1_Eviction", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction" }, "GetOptions": { "$ref": "#/definitions/kubernetes_apimachinery_GetOptions", @@ -1481,8 +1610,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.version.Info" }, "KubernetesRunAsUserStrategyOptions": { - "$ref": "#/definitions/kubernetes_policy_RunAsUserStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.RunAsUserStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_RunAsUserStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RunAsUserStrategyOptions" }, "ListOptions": { "$ref": "#/definitions/kubernetes_apimachinery_ListOptions", @@ -1505,20 +1634,20 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.PatchOptions" }, "PodDisruptionBudget": { - "$ref": "#/definitions/kubernetes_policy_PodDisruptionBudget", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudget", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget" }, "PodDisruptionBudgetList": { - "$ref": "#/definitions/kubernetes_policy_PodDisruptionBudgetList", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetList" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetList", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList" }, "PodSecurityPolicy": { - "$ref": "#/definitions/kubernetes_policy_PodSecurityPolicy", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodSecurityPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy" }, "PodSecurityPolicyList": { - "$ref": "#/definitions/kubernetes_policy_PodSecurityPolicyList", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyList" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodSecurityPolicyList", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicyList" }, "Quantity": { "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", @@ -1543,6 +1672,14 @@ "UpdateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_UpdateOptions", "existingJavaType": "io.fabric8.kubernetes.api.model.UpdateOptions" + }, + "V1PodDisruptionBudget": { + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudget", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget" + }, + "V1PodDisruptionBudgetList": { + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetList", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList" } }, "additionalProperties": true 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 b12cbb4e6d5..27f466d56c6 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 @@ -895,7 +895,136 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_AllowedCSIDriver": { + "kubernetes_policy_v1_PodDisruptionBudget": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "policy/v1", + "required": true + }, + "kind": { + "type": "string", + "default": "PodDisruptionBudget", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata", + "io.fabric8.kubernetes.api.model.Namespaced" + ] + }, + "kubernetes_policy_v1_PodDisruptionBudgetList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "policy/v1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudget", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget" + } + }, + "kind": { + "type": "string", + "default": "PodDisruptionBudgetList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget\u003e" + ] + }, + "kubernetes_policy_v1_PodDisruptionBudgetSpec": { + "type": "object", + "properties": { + "maxUnavailable": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_util_intstr_IntOrString", + "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" + }, + "minAvailable": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_util_intstr_IntOrString", + "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_policy_v1_PodDisruptionBudgetStatus": { + "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apimachinery_Condition", + "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" + } + }, + "currentHealthy": { + "type": "integer" + }, + "desiredHealthy": { + "type": "integer" + }, + "disruptedPods": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "disruptionsAllowed": { + "type": "integer" + }, + "expectedPods": { + "type": "integer" + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_policy_v1beta1_AllowedCSIDriver": { "type": "object", "properties": { "name": { @@ -903,12 +1032,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.AllowedCSIDriver", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedCSIDriver", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_AllowedFlexVolume": { + "kubernetes_policy_v1beta1_AllowedFlexVolume": { "type": "object", "properties": { "driver": { @@ -916,12 +1045,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.AllowedFlexVolume", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedFlexVolume", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_AllowedHostPath": { + "kubernetes_policy_v1beta1_AllowedHostPath": { "type": "object", "properties": { "pathPrefix": { @@ -932,12 +1061,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.AllowedHostPath", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedHostPath", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_Eviction": { + "kubernetes_policy_v1beta1_Eviction": { "type": "object", "properties": { "apiVersion": { @@ -960,21 +1089,21 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.Eviction", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_policy_FSGroupStrategyOptions": { + "kubernetes_policy_v1beta1_FSGroupStrategyOptions": { "type": "object", "properties": { "ranges": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_IDRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.IDRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_IDRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange" } }, "rule": { @@ -982,12 +1111,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.FSGroupStrategyOptions", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.FSGroupStrategyOptions", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_HostPortRange": { + "kubernetes_policy_v1beta1_HostPortRange": { "type": "object", "properties": { "max": { @@ -998,12 +1127,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.HostPortRange", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.HostPortRange", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_IDRange": { + "kubernetes_policy_v1beta1_IDRange": { "type": "object", "properties": { "max": { @@ -1016,12 +1145,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.IDRange", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_PodDisruptionBudget": { + "kubernetes_policy_v1beta1_PodDisruptionBudget": { "type": "object", "properties": { "apiVersion": { @@ -1039,22 +1168,22 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_policy_PodDisruptionBudgetSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetSpec" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetSpec" }, "status": { - "$ref": "#/definitions/kubernetes_policy_PodDisruptionBudgetStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetStatus" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetStatus" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_policy_PodDisruptionBudgetList": { + "kubernetes_policy_v1beta1_PodDisruptionBudgetList": { "type": "object", "properties": { "apiVersion": { @@ -1065,8 +1194,8 @@ "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_policy_PodDisruptionBudget", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudget", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget" } }, "kind": { @@ -1080,13 +1209,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetList", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.policy.PodDisruptionBudget\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget\u003e" ] }, - "kubernetes_policy_PodDisruptionBudgetSpec": { + "kubernetes_policy_v1beta1_PodDisruptionBudgetSpec": { "type": "object", "properties": { "maxUnavailable": { @@ -1103,12 +1232,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetSpec", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_PodDisruptionBudgetStatus": { + "kubernetes_policy_v1beta1_PodDisruptionBudgetStatus": { "type": "object", "properties": { "conditions": { @@ -1145,12 +1274,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetStatus", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_PodSecurityPolicy": { + "kubernetes_policy_v1beta1_PodSecurityPolicy": { "type": "object", "properties": { "apiVersion": { @@ -1168,17 +1297,17 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_policy_PodSecurityPolicySpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicySpec" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodSecurityPolicySpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicySpec" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata" ] }, - "kubernetes_policy_PodSecurityPolicyList": { + "kubernetes_policy_v1beta1_PodSecurityPolicyList": { "type": "object", "properties": { "apiVersion": { @@ -1189,8 +1318,8 @@ "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_policy_PodSecurityPolicy", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodSecurityPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy" } }, "kind": { @@ -1204,13 +1333,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyList", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicyList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.policy.PodSecurityPolicy\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy\u003e" ] }, - "kubernetes_policy_PodSecurityPolicySpec": { + "kubernetes_policy_v1beta1_PodSecurityPolicySpec": { "type": "object", "properties": { "allowPrivilegeEscalation": { @@ -1220,8 +1349,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_AllowedCSIDriver", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.AllowedCSIDriver" + "$ref": "#/definitions/kubernetes_policy_v1beta1_AllowedCSIDriver", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedCSIDriver" } }, "allowedCapabilities": { @@ -1235,16 +1364,16 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_AllowedFlexVolume", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.AllowedFlexVolume" + "$ref": "#/definitions/kubernetes_policy_v1beta1_AllowedFlexVolume", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedFlexVolume" } }, "allowedHostPaths": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_AllowedHostPath", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.AllowedHostPath" + "$ref": "#/definitions/kubernetes_policy_v1beta1_AllowedHostPath", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedHostPath" } }, "allowedProcMountTypes": { @@ -1279,8 +1408,8 @@ } }, "fsGroup": { - "$ref": "#/definitions/kubernetes_policy_FSGroupStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.FSGroupStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_FSGroupStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.FSGroupStrategyOptions" }, "hostIPC": { "type": "boolean" @@ -1295,8 +1424,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_HostPortRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.HostPortRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_HostPortRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.HostPortRange" } }, "privileged": { @@ -1313,24 +1442,24 @@ } }, "runAsGroup": { - "$ref": "#/definitions/kubernetes_policy_RunAsGroupStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.RunAsGroupStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_RunAsGroupStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RunAsGroupStrategyOptions" }, "runAsUser": { - "$ref": "#/definitions/kubernetes_policy_RunAsUserStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.RunAsUserStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_RunAsUserStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RunAsUserStrategyOptions" }, "runtimeClass": { - "$ref": "#/definitions/kubernetes_policy_RuntimeClassStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.RuntimeClassStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_RuntimeClassStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RuntimeClassStrategyOptions" }, "seLinux": { - "$ref": "#/definitions/kubernetes_policy_SELinuxStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.SELinuxStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_SELinuxStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.SELinuxStrategyOptions" }, "supplementalGroups": { - "$ref": "#/definitions/kubernetes_policy_SupplementalGroupsStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.SupplementalGroupsStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_SupplementalGroupsStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.SupplementalGroupsStrategyOptions" }, "volumes": { "type": "array", @@ -1341,20 +1470,20 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicySpec", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicySpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_RunAsGroupStrategyOptions": { + "kubernetes_policy_v1beta1_RunAsGroupStrategyOptions": { "type": "object", "properties": { "ranges": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_IDRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.IDRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_IDRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange" } }, "rule": { @@ -1362,20 +1491,20 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.RunAsGroupStrategyOptions", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RunAsGroupStrategyOptions", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_RunAsUserStrategyOptions": { + "kubernetes_policy_v1beta1_RunAsUserStrategyOptions": { "type": "object", "properties": { "ranges": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_IDRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.IDRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_IDRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange" } }, "rule": { @@ -1383,12 +1512,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.RunAsUserStrategyOptions", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RunAsUserStrategyOptions", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_RuntimeClassStrategyOptions": { + "kubernetes_policy_v1beta1_RuntimeClassStrategyOptions": { "type": "object", "properties": { "allowedRuntimeClassNames": { @@ -1402,12 +1531,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.RuntimeClassStrategyOptions", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RuntimeClassStrategyOptions", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_SELinuxStrategyOptions": { + "kubernetes_policy_v1beta1_SELinuxStrategyOptions": { "type": "object", "properties": { "rule": { @@ -1419,20 +1548,20 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.SELinuxStrategyOptions", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.SELinuxStrategyOptions", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_policy_SupplementalGroupsStrategyOptions": { + "kubernetes_policy_v1beta1_SupplementalGroupsStrategyOptions": { "type": "object", "properties": { "ranges": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_IDRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.IDRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_IDRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange" } }, "rule": { @@ -1440,7 +1569,7 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.policy.SupplementalGroupsStrategyOptions", + "javaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.SupplementalGroupsStrategyOptions", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -1469,8 +1598,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.DeleteOptions" }, "Eviction": { - "$ref": "#/definitions/kubernetes_policy_Eviction", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.Eviction" + "$ref": "#/definitions/kubernetes_policy_v1beta1_Eviction", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction" }, "GetOptions": { "$ref": "#/definitions/kubernetes_apimachinery_GetOptions", @@ -1481,8 +1610,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.version.Info" }, "KubernetesRunAsUserStrategyOptions": { - "$ref": "#/definitions/kubernetes_policy_RunAsUserStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.RunAsUserStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_RunAsUserStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RunAsUserStrategyOptions" }, "ListOptions": { "$ref": "#/definitions/kubernetes_apimachinery_ListOptions", @@ -1505,20 +1634,20 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.PatchOptions" }, "PodDisruptionBudget": { - "$ref": "#/definitions/kubernetes_policy_PodDisruptionBudget", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudget", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget" }, "PodDisruptionBudgetList": { - "$ref": "#/definitions/kubernetes_policy_PodDisruptionBudgetList", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetList" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetList", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList" }, "PodSecurityPolicy": { - "$ref": "#/definitions/kubernetes_policy_PodSecurityPolicy", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodSecurityPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy" }, "PodSecurityPolicyList": { - "$ref": "#/definitions/kubernetes_policy_PodSecurityPolicyList", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyList" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodSecurityPolicyList", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicyList" }, "Quantity": { "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", @@ -1543,6 +1672,14 @@ "UpdateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_UpdateOptions", "existingJavaType": "io.fabric8.kubernetes.api.model.UpdateOptions" + }, + "V1PodDisruptionBudget": { + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudget", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget" + }, + "V1PodDisruptionBudgetList": { + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetList", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList" } }, "additionalProperties": true, @@ -1751,8 +1888,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_IDRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.IDRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_IDRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange" } }, "rule": { @@ -2193,12 +2330,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_policy_PodDisruptionBudgetSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetSpec" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetSpec" }, "status": { - "$ref": "#/definitions/kubernetes_policy_PodDisruptionBudgetStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetStatus" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetStatus" } }, "additionalProperties": true @@ -2213,8 +2350,8 @@ "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_policy_PodDisruptionBudget", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudget", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget" } }, "kind": { @@ -2300,8 +2437,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_policy_PodSecurityPolicySpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicySpec" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodSecurityPolicySpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicySpec" } }, "additionalProperties": true @@ -2316,8 +2453,8 @@ "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_policy_PodSecurityPolicy", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodSecurityPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy" } }, "kind": { @@ -2341,8 +2478,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_AllowedCSIDriver", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.AllowedCSIDriver" + "$ref": "#/definitions/kubernetes_policy_v1beta1_AllowedCSIDriver", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedCSIDriver" } }, "allowedCapabilities": { @@ -2356,16 +2493,16 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_AllowedFlexVolume", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.AllowedFlexVolume" + "$ref": "#/definitions/kubernetes_policy_v1beta1_AllowedFlexVolume", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedFlexVolume" } }, "allowedHostPaths": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_AllowedHostPath", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.AllowedHostPath" + "$ref": "#/definitions/kubernetes_policy_v1beta1_AllowedHostPath", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.AllowedHostPath" } }, "allowedProcMountTypes": { @@ -2400,8 +2537,8 @@ } }, "fsGroup": { - "$ref": "#/definitions/kubernetes_policy_FSGroupStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.FSGroupStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_FSGroupStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.FSGroupStrategyOptions" }, "hostIPC": { "type": "boolean" @@ -2416,8 +2553,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_HostPortRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.HostPortRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_HostPortRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.HostPortRange" } }, "privileged": { @@ -2434,24 +2571,24 @@ } }, "runAsGroup": { - "$ref": "#/definitions/kubernetes_policy_RunAsGroupStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.RunAsGroupStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_RunAsGroupStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RunAsGroupStrategyOptions" }, "runAsUser": { - "$ref": "#/definitions/kubernetes_policy_RunAsUserStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.RunAsUserStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_RunAsUserStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RunAsUserStrategyOptions" }, "runtimeClass": { - "$ref": "#/definitions/kubernetes_policy_RuntimeClassStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.RuntimeClassStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_RuntimeClassStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.RuntimeClassStrategyOptions" }, "seLinux": { - "$ref": "#/definitions/kubernetes_policy_SELinuxStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.SELinuxStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_SELinuxStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.SELinuxStrategyOptions" }, "supplementalGroups": { - "$ref": "#/definitions/kubernetes_policy_SupplementalGroupsStrategyOptions", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.SupplementalGroupsStrategyOptions" + "$ref": "#/definitions/kubernetes_policy_v1beta1_SupplementalGroupsStrategyOptions", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.SupplementalGroupsStrategyOptions" }, "volumes": { "type": "array", @@ -2502,8 +2639,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_IDRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.IDRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_IDRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange" } }, "rule": { @@ -2518,8 +2655,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_IDRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.IDRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_IDRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange" } }, "rule": { @@ -2665,8 +2802,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_policy_IDRange", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.IDRange" + "$ref": "#/definitions/kubernetes_policy_v1beta1_IDRange", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.IDRange" } }, "rule": { diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CronJobCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CronJobCrudTest.java index 86c491dce83..bb65c0be466 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CronJobCrudTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CronJobCrudTest.java @@ -16,9 +16,9 @@ package io.fabric8.kubernetes.client.mock; -import io.fabric8.kubernetes.api.model.batch.CronJob; -import io.fabric8.kubernetes.api.model.batch.CronJobBuilder; -import io.fabric8.kubernetes.api.model.batch.CronJobList; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobBuilder; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.junit.Rule; diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CronJobTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CronJobTest.java index 01e2e66cdc0..4baad5d13d8 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CronJobTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CronJobTest.java @@ -17,7 +17,10 @@ package io.fabric8.kubernetes.client.mock; import io.fabric8.kubernetes.api.model.HasMetadata; -import io.fabric8.kubernetes.api.model.batch.*; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobListBuilder; +import io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.server.mock.KubernetesServer; diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/JobTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/JobTest.java index 936b1971a6c..c34136d5bbd 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/JobTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/JobTest.java @@ -20,10 +20,10 @@ import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodBuilder; import io.fabric8.kubernetes.api.model.PodListBuilder; -import io.fabric8.kubernetes.api.model.batch.Job; -import io.fabric8.kubernetes.api.model.batch.JobBuilder; -import io.fabric8.kubernetes.api.model.batch.JobList; -import io.fabric8.kubernetes.api.model.batch.JobListBuilder; +import io.fabric8.kubernetes.api.model.batch.v1.Job; +import io.fabric8.kubernetes.api.model.batch.v1.JobBuilder; +import io.fabric8.kubernetes.api.model.batch.v1.JobList; +import io.fabric8.kubernetes.api.model.batch.v1.JobListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.server.mock.KubernetesServer; diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodDisruptionBudgetTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodDisruptionBudgetTest.java index d5956259d39..1d3af0c7e54 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodDisruptionBudgetTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodDisruptionBudgetTest.java @@ -16,10 +16,10 @@ package io.fabric8.kubernetes.client.mock; import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetBuilder; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetList; -import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetListBuilder; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetBuilder; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.server.mock.KubernetesServer; diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSecurityPolicyCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSecurityPolicyCrudTest.java index a17d568cf63..9a5c6c3c8c4 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSecurityPolicyCrudTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSecurityPolicyCrudTest.java @@ -16,9 +16,9 @@ package io.fabric8.kubernetes.client.mock; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyBuilder; -import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyList; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicy; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicyBuilder; +import io.fabric8.kubernetes.api.model.policy.v1beta1.PodSecurityPolicyList; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.junit.Rule; diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PropagationPolicyTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PropagationPolicyTest.java index d56e3eae660..b8f640b5769 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PropagationPolicyTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PropagationPolicyTest.java @@ -28,7 +28,7 @@ import io.fabric8.kubernetes.api.model.ServiceListBuilder; import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder; import io.fabric8.kubernetes.api.model.apps.StatefulSetBuilder; -import io.fabric8.kubernetes.api.model.batch.JobBuilder; +import io.fabric8.kubernetes.api.model.batch.v1.JobBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.Resource;