From 711482cf7b75081693883d1fc538e65dd8f8043b Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Wed, 24 Aug 2022 17:45:31 +0530 Subject: [PATCH] fix (kubernetes-model-generator) : Update Kubernetes Model to v1.25.0 + Update Kubernetes Model to v1.25.0 + Add autoscaling/v2 HorizontalPodAutoscaler model and DSL + Force `containerd/containerd`, `docker/distribution` and `opencontainers/image-spec` to not use vulnerable versions (#4327) Signed-off-by: Rohan Kumar --- CHANGELOG.md | 1 + .../client/V2AutoscalingAPIGroupDSL.java | 25 + .../client/dsl/AutoscalingAPIGroupDSL.java | 5 + .../client/dsl/FlowControlAPIGroupDSL.java | 2 + .../dsl/V1beta2FlowControlAPIGroupDSL.java | 38 + .../client/AutoscalingAPIGroupClient.java | 5 + .../client/DefaultKubernetesClient.java | 3 + .../client/FlowControlAPIGroupClient.java | 6 + .../V1beta2FlowControlAPIGroupClient.java | 44 + .../client/V2AutoscalingAPIGroupClient.java | 36 + .../informers/impl/cache/CacheTest.java | 12 +- kubernetes-model-generator/go.mod | 57 +- kubernetes-model-generator/go.sum | 283 +++--- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 82 +- .../kubernetes-model-apiextensions/pom.xml | 5 + .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 98 +- .../v1/CustomResourceDefinitionTest.java | 97 +- .../valid-v1-crd-validation-expression.json | 82 ++ .../main/resources/schema/kube-schema.json | 23 +- .../resources/schema/validation-schema.json | 46 +- .../api/model/apps/DeploymentTest.java | 666 +++++++------ .../cmd/generate/generate.go | 4 + .../kubernetes/api/model/KubeSchema.java | 52 +- .../api/model/ValidationSchema.java | 52 +- .../v2/ContainerResourceMetricSource.java | 130 +++ .../v2/ContainerResourceMetricStatus.java | 130 +++ .../v2/CrossVersionObjectReference.java | 128 +++ .../autoscaling/v2/ExternalMetricSource.java | 115 +++ .../autoscaling/v2/ExternalMetricStatus.java | 115 +++ .../autoscaling/v2/HPAScalingPolicy.java | 130 +++ .../model/autoscaling/v2/HPAScalingRules.java | 133 +++ .../v2/HorizontalPodAutoscaler.java | 196 ++++ .../v2/HorizontalPodAutoscalerBehavior.java | 115 +++ .../v2/HorizontalPodAutoscalerCondition.java | 160 +++ .../v2/HorizontalPodAutoscalerList.java | 180 ++++ .../v2/HorizontalPodAutoscalerSpec.java | 163 ++++ .../v2/HorizontalPodAutoscalerStatus.java | 178 ++++ .../autoscaling/v2/MetricIdentifier.java | 114 +++ .../api/model/autoscaling/v2/MetricSpec.java | 175 ++++ .../model/autoscaling/v2/MetricStatus.java | 175 ++++ .../model/autoscaling/v2/MetricTarget.java | 146 +++ .../autoscaling/v2/MetricValueStatus.java | 131 +++ .../autoscaling/v2/ObjectMetricSource.java | 130 +++ .../autoscaling/v2/ObjectMetricStatus.java | 130 +++ .../autoscaling/v2/PodsMetricSource.java | 115 +++ .../autoscaling/v2/PodsMetricStatus.java | 115 +++ .../autoscaling/v2/ResourceMetricSource.java | 115 +++ .../autoscaling/v2/ResourceMetricStatus.java | 115 +++ .../main/resources/schema/kube-schema.json | 571 ++++++++++- .../resources/schema/validation-schema.json | 913 ++++++++++++++---- .../api/model/batch/v1/JobSpec.java | 17 +- .../api/model/batch/v1/PodFailurePolicy.java | 102 ++ ...odFailurePolicyOnExitCodesRequirement.java | 132 +++ ...odFailurePolicyOnPodConditionsPattern.java | 115 +++ .../model/batch/v1/PodFailurePolicyRule.java | 132 +++ .../main/resources/schema/kube-schema.json | 102 +- .../resources/schema/validation-schema.json | 194 +++- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 16 +- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 6 - .../api/model/CSIPersistentVolumeSource.java | 17 +- .../kubernetes/api/model/ObjectMeta.java | 17 +- .../fabric8/kubernetes/api/model/PodSpec.java | 17 +- .../api/model/TopologySpreadConstraint.java | 50 +- .../main/resources/schema/kube-schema.json | 23 +- .../resources/schema/validation-schema.json | 46 +- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 45 +- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 6 - .../main/resources/schema/kube-schema.json | 19 +- .../resources/schema/validation-schema.json | 38 +- .../cmd/generate/generate.go | 6 + .../kubernetes/api/model/KubeSchema.java | 92 +- .../api/model/ValidationSchema.java | 92 +- .../v1beta2/FlowDistinguisherMethod.java | 100 ++ .../model/flowcontrol/v1beta2/FlowSchema.java | 195 ++++ .../v1beta2/FlowSchemaCondition.java | 160 +++ .../flowcontrol/v1beta2/FlowSchemaList.java | 180 ++++ .../flowcontrol/v1beta2/FlowSchemaSpec.java | 148 +++ .../flowcontrol/v1beta2/FlowSchemaStatus.java | 103 ++ .../flowcontrol/v1beta2/GroupSubject.java | 100 ++ .../flowcontrol/v1beta2/LimitResponse.java | 115 +++ .../LimitedPriorityLevelConfiguration.java | 115 +++ .../v1beta2/NonResourcePolicyRule.java | 117 +++ .../v1beta2/PolicyRulesWithSubjects.java | 134 +++ .../v1beta2/PriorityLevelConfiguration.java | 195 ++++ .../PriorityLevelConfigurationCondition.java | 160 +++ .../PriorityLevelConfigurationList.java | 180 ++++ .../PriorityLevelConfigurationReference.java | 100 ++ .../PriorityLevelConfigurationSpec.java | 115 +++ .../PriorityLevelConfigurationStatus.java | 103 ++ .../v1beta2/QueuingConfiguration.java | 130 +++ .../v1beta2/ResourcePolicyRule.java | 162 ++++ .../v1beta2/ServiceAccountSubject.java | 115 +++ .../model/flowcontrol/v1beta2/Subject.java | 144 +++ .../flowcontrol/v1beta2/UserSubject.java | 100 ++ .../main/resources/schema/kube-schema.json | 519 +++++++++- .../resources/schema/validation-schema.json | 562 ++++++++++- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 104 +- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 6 - .../cmd/generate/generate.go | 5 +- .../kubernetes/api/model/KubeSchema.java | 34 +- .../api/model/ValidationSchema.java | 34 +- .../networking/v1alpha1/ClusterCIDR.java | 181 ++++ .../networking/v1alpha1/ClusterCIDRList.java | 180 ++++ .../networking/v1alpha1/ClusterCIDRSpec.java | 146 +++ .../main/resources/schema/kube-schema.json | 161 ++- .../resources/schema/validation-schema.json | 316 +++++- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 12 +- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 12 +- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 6 - .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 8 +- .../api/model/storage/CSIDriverSpec.java | 17 +- .../model/storage/v1beta1/CSIDriverSpec.java | 17 +- .../main/resources/schema/kube-schema.json | 13 +- .../resources/schema/validation-schema.json | 41 +- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 6 - .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 6 - .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 6 - .../main/resources/schema/kube-schema.json | 19 +- .../resources/schema/validation-schema.json | 116 +-- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 96 +- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 43 +- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 6 - .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 6 - .../main/resources/schema/kube-schema.json | 16 +- .../resources/schema/validation-schema.json | 77 +- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 6 - .../main/resources/schema/kube-schema.json | 19 +- .../resources/schema/validation-schema.json | 38 +- .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 6 - .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 6 - .../main/resources/schema/kube-schema.json | 3 - .../resources/schema/validation-schema.json | 6 - .../main/resources/schema/kube-schema.json | 19 +- .../resources/schema/validation-schema.json | 38 +- .../pkg/schemagen/generate.go | 2 + .../client/mock/V1beta2FlowSchemaTest.java | 141 +++ ...V1beta2PriorityLevelConfigurationTest.java | 139 +++ .../mock/V2HorizontalPodAutoscalerTest.java | 240 +++++ .../src/test/resources/test-v2-hpa.yml | 52 + .../src/test/resources/v1beta2-flowschema.yml | 36 + .../v1beta2-prioritylevelconfiguration.yml | 30 + 163 files changed, 12932 insertions(+), 1483 deletions(-) create mode 100644 kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/V2AutoscalingAPIGroupDSL.java create mode 100644 kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/V1beta2FlowControlAPIGroupDSL.java create mode 100644 kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta2FlowControlAPIGroupClient.java create mode 100644 kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2AutoscalingAPIGroupClient.java create mode 100644 kubernetes-model-generator/kubernetes-model-apiextensions/src/test/resources/valid-v1-crd-validation-expression.json create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ContainerResourceMetricSource.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ContainerResourceMetricStatus.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/CrossVersionObjectReference.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ExternalMetricSource.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ExternalMetricStatus.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HPAScalingPolicy.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HPAScalingRules.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscaler.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerBehavior.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerCondition.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerList.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerSpec.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerStatus.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricIdentifier.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricSpec.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricStatus.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricTarget.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricValueStatus.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ObjectMetricSource.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ObjectMetricStatus.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/PodsMetricSource.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/PodsMetricStatus.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ResourceMetricSource.java create mode 100644 kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ResourceMetricStatus.java create mode 100644 kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicy.java create mode 100644 kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicyOnExitCodesRequirement.java create mode 100644 kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicyOnPodConditionsPattern.java create mode 100644 kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicyRule.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowDistinguisherMethod.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchema.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaCondition.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaList.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaSpec.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaStatus.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/GroupSubject.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/LimitResponse.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/LimitedPriorityLevelConfiguration.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/NonResourcePolicyRule.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PolicyRulesWithSubjects.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfiguration.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationCondition.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationList.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationReference.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationSpec.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationStatus.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/QueuingConfiguration.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/ResourcePolicyRule.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/ServiceAccountSubject.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/Subject.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/UserSubject.java create mode 100644 kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDR.java create mode 100644 kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDRList.java create mode 100644 kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDRSpec.java create mode 100644 kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2FlowSchemaTest.java create mode 100644 kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2PriorityLevelConfigurationTest.java create mode 100644 kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V2HorizontalPodAutoscalerTest.java create mode 100644 kubernetes-tests/src/test/resources/test-v2-hpa.yml create mode 100644 kubernetes-tests/src/test/resources/v1beta2-flowschema.yml create mode 100644 kubernetes-tests/src/test/resources/v1beta2-prioritylevelconfiguration.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index f9a1b634a5b..768e962518d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ * Fix #4243: Update Tekton pipeline model to v0.39.0 * Fix #4243: Update Tekton triggers model to v0.20.2 * Fix #4383: bump snakeyaml from 1.30 to 1.31 +* Fix #4347: Update Kubernetes Model to v1.25.0 #### New Features * Fix #4398: add annotation @PreserveUnknownFields for marking generated field have `x-kubernetes-preserve-unknown-fields: true` defined diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/V2AutoscalingAPIGroupDSL.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/V2AutoscalingAPIGroupDSL.java new file mode 100644 index 00000000000..9f1ee9fc7b9 --- /dev/null +++ b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/V2AutoscalingAPIGroupDSL.java @@ -0,0 +1,25 @@ +/** + * Copyright (C) 2015 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.fabric8.kubernetes.client; + +import io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler; +import io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList; +import io.fabric8.kubernetes.client.dsl.MixedOperation; +import io.fabric8.kubernetes.client.dsl.Resource; + +public interface V2AutoscalingAPIGroupDSL extends Client { + MixedOperation> horizontalPodAutoscalers(); +} diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/AutoscalingAPIGroupDSL.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/AutoscalingAPIGroupDSL.java index 7807475e0f5..74aa0c96cca 100644 --- a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/AutoscalingAPIGroupDSL.java +++ b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/AutoscalingAPIGroupDSL.java @@ -18,11 +18,16 @@ import io.fabric8.kubernetes.client.Client; import io.fabric8.kubernetes.client.V1AutoscalingAPIGroupDSL; +import io.fabric8.kubernetes.client.V2AutoscalingAPIGroupDSL; import io.fabric8.kubernetes.client.V2beta1AutoscalingAPIGroupDSL; import io.fabric8.kubernetes.client.V2beta2AutoscalingAPIGroupDSL; public interface AutoscalingAPIGroupDSL extends Client { + V2AutoscalingAPIGroupDSL v2(); + V1AutoscalingAPIGroupDSL v1(); + V2beta1AutoscalingAPIGroupDSL v2beta1(); + V2beta2AutoscalingAPIGroupDSL v2beta2(); } diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/FlowControlAPIGroupDSL.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/FlowControlAPIGroupDSL.java index 433bedfdc97..2f392fba5ac 100644 --- a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/FlowControlAPIGroupDSL.java +++ b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/FlowControlAPIGroupDSL.java @@ -19,4 +19,6 @@ public interface FlowControlAPIGroupDSL extends Client { V1beta1FlowControlAPIGroupDSL v1beta1(); + + V1beta2FlowControlAPIGroupDSL v1beta2(); } diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/V1beta2FlowControlAPIGroupDSL.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/V1beta2FlowControlAPIGroupDSL.java new file mode 100644 index 00000000000..011dd6a5563 --- /dev/null +++ b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/V1beta2FlowControlAPIGroupDSL.java @@ -0,0 +1,38 @@ +/** + * Copyright (C) 2015 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.fabric8.kubernetes.client.dsl; + +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList; +import io.fabric8.kubernetes.client.Client; + +public interface V1beta2FlowControlAPIGroupDSL extends Client { + /** + * DSL entrypoint for flowcontrol.apiserver.k8s.io/v1beta2 FlowSchema + * + * @return {@link NonNamespaceOperation} for FlowSchema resource + */ + NonNamespaceOperation> flowSchema(); + + /** + * DSL entrypoint for flowcontrol.apiserver.k8s.io/v1beta2 PriorityLevelConfiguration + * + * @return {@link NonNamespaceOperation} for PriorityLevelConfiguration resource + */ + NonNamespaceOperation> priorityLevelConfigurations(); +} diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AutoscalingAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AutoscalingAPIGroupClient.java index 9f5f258e2cd..6b66c350872 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AutoscalingAPIGroupClient.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AutoscalingAPIGroupClient.java @@ -20,6 +20,11 @@ public class AutoscalingAPIGroupClient extends ClientAdapter implements AutoscalingAPIGroupDSL { + @Override + public V2AutoscalingAPIGroupDSL v2() { + return adapt(V2AutoscalingAPIGroupClient.class); + } + @Override public V1AutoscalingAPIGroupDSL v1() { return adapt(V1AutoscalingAPIGroupClient.class); diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java index 44db9ff3aa7..7c7a4630793 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java @@ -112,6 +112,7 @@ import io.fabric8.kubernetes.client.dsl.V1beta1FlowControlAPIGroupDSL; import io.fabric8.kubernetes.client.dsl.V1beta1PolicyAPIGroupDSL; import io.fabric8.kubernetes.client.dsl.V1beta1SchedulingAPIGroupDSL; +import io.fabric8.kubernetes.client.dsl.V1beta2FlowControlAPIGroupDSL; import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext; import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperation; import io.fabric8.kubernetes.client.dsl.internal.NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl; @@ -179,6 +180,7 @@ public DefaultKubernetesClient(HttpClient httpClient, Config config, ExecutorSup this.getAdapters().registerClient(ApiextensionsAPIGroupDSL.class, new ApiextensionsAPIGroupClient()); this.getAdapters().registerClient(AuthorizationAPIGroupDSL.class, new AuthorizationAPIGroupClient()); this.getAdapters().registerClient(V1AutoscalingAPIGroupDSL.class, new V1AutoscalingAPIGroupClient()); + this.getAdapters().registerClient(V2AutoscalingAPIGroupDSL.class, new V2AutoscalingAPIGroupClient()); this.getAdapters().registerClient(V2beta1AutoscalingAPIGroupDSL.class, new V2beta1AutoscalingAPIGroupClient()); this.getAdapters().registerClient(V2beta2AutoscalingAPIGroupDSL.class, new V2beta2AutoscalingAPIGroupClient()); this.getAdapters().registerClient(BatchAPIGroupDSL.class, new BatchAPIGroupClient()); @@ -190,6 +192,7 @@ public DefaultKubernetesClient(HttpClient httpClient, Config config, ExecutorSup this.getAdapters().registerClient(V1beta1EventingAPIGroupDSL.class, new V1beta1EventingAPIGroupClient()); this.getAdapters().registerClient(FlowControlAPIGroupDSL.class, new FlowControlAPIGroupClient()); this.getAdapters().registerClient(V1beta1FlowControlAPIGroupDSL.class, new V1beta1FlowControlAPIGroupClient()); + this.getAdapters().registerClient(V1beta2FlowControlAPIGroupDSL.class, new V1beta2FlowControlAPIGroupClient()); this.getAdapters().registerClient(MetricAPIGroupDSL.class, new MetricAPIGroupClient()); this.getAdapters().registerClient(NetworkAPIGroupDSL.class, new NetworkAPIGroupClient()); this.getAdapters().registerClient(PolicyAPIGroupDSL.class, new PolicyAPIGroupClient()); diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/FlowControlAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/FlowControlAPIGroupClient.java index 7b51dda2bc6..d5f2c983ee3 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/FlowControlAPIGroupClient.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/FlowControlAPIGroupClient.java @@ -17,6 +17,7 @@ import io.fabric8.kubernetes.client.dsl.FlowControlAPIGroupDSL; import io.fabric8.kubernetes.client.dsl.V1beta1FlowControlAPIGroupDSL; +import io.fabric8.kubernetes.client.dsl.V1beta2FlowControlAPIGroupDSL; import io.fabric8.kubernetes.client.extension.ClientAdapter; public class FlowControlAPIGroupClient extends ClientAdapter implements FlowControlAPIGroupDSL { @@ -26,6 +27,11 @@ public V1beta1FlowControlAPIGroupDSL v1beta1() { return adapt(V1beta1FlowControlAPIGroupClient.class); } + @Override + public V1beta2FlowControlAPIGroupDSL v1beta2() { + return adapt(V1beta2FlowControlAPIGroupClient.class); + } + @Override public FlowControlAPIGroupClient newInstance() { return new FlowControlAPIGroupClient(); diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta2FlowControlAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta2FlowControlAPIGroupClient.java new file mode 100644 index 00000000000..eff2c1c5922 --- /dev/null +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta2FlowControlAPIGroupClient.java @@ -0,0 +1,44 @@ +/** + * Copyright (C) 2015 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.fabric8.kubernetes.client; + +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList; +import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; +import io.fabric8.kubernetes.client.dsl.Resource; +import io.fabric8.kubernetes.client.dsl.V1beta2FlowControlAPIGroupDSL; +import io.fabric8.kubernetes.client.extension.ClientAdapter; + +public class V1beta2FlowControlAPIGroupClient extends ClientAdapter + implements V1beta2FlowControlAPIGroupDSL { + + @Override + public NonNamespaceOperation> flowSchema() { + return resources(FlowSchema.class, FlowSchemaList.class); + } + + @Override + public NonNamespaceOperation> priorityLevelConfigurations() { + return resources(PriorityLevelConfiguration.class, PriorityLevelConfigurationList.class); + } + + @Override + public V1beta2FlowControlAPIGroupClient newInstance() { + return new V1beta2FlowControlAPIGroupClient(); + } +} diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2AutoscalingAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2AutoscalingAPIGroupClient.java new file mode 100644 index 00000000000..67e9148d545 --- /dev/null +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2AutoscalingAPIGroupClient.java @@ -0,0 +1,36 @@ +/** + * Copyright (C) 2015 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.fabric8.kubernetes.client; + +import io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler; +import io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList; +import io.fabric8.kubernetes.client.dsl.MixedOperation; +import io.fabric8.kubernetes.client.dsl.Resource; +import io.fabric8.kubernetes.client.extension.ClientAdapter; + +public class V2AutoscalingAPIGroupClient extends ClientAdapter + implements V2AutoscalingAPIGroupDSL { + + @Override + public MixedOperation> horizontalPodAutoscalers() { + return resources(HorizontalPodAutoscaler.class, HorizontalPodAutoscalerList.class); + } + + @Override + public V2AutoscalingAPIGroupClient newInstance() { + return new V2AutoscalingAPIGroupClient(); + } +} diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/CacheTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/CacheTest.java index a269a380feb..c4e29f4e2dd 100644 --- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/CacheTest.java +++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/informers/impl/cache/CacheTest.java @@ -87,13 +87,13 @@ void testCacheStore() { cache.put(testPodObj); - // replace cached object with null value - String newClusterName = "test_cluster"; - testPodObj.getMetadata().setClusterName(newClusterName); + // replace cached object with new value + String newGenerateName = "test-cluster"; + testPodObj.getMetadata().setGenerateName(newGenerateName); cache.put(testPodObj); assertEquals(1, cache.list().size()); - assertEquals(newClusterName, testPodObj.getMetadata().getClusterName()); + assertEquals(newGenerateName, testPodObj.getMetadata().getGenerateName()); } @Test @@ -129,12 +129,12 @@ void testAddIndexers() { Map>> indexers = new HashMap<>(); indexers.put(nodeIndex, pod -> Collections.singletonList(pod.getSpec().getNodeName())); - indexers.put(clusterIndex, pod -> Collections.singletonList(pod.getMetadata().getClusterName())); + indexers.put(clusterIndex, pod -> Collections.singletonList(pod.getMetadata().getGenerateName())); podCache.addIndexers(indexers); Pod testPod = new PodBuilder() - .withNewMetadata().withNamespace("test").withName("test-pod").withClusterName("test-cluster").endMetadata() + .withNewMetadata().withNamespace("test").withName("test-pod").withGenerateName("test-cluster").endMetadata() .withNewSpec().withNodeName("test-node").endSpec() .build(); podCache.put(testPod); diff --git a/kubernetes-model-generator/go.mod b/kubernetes-model-generator/go.mod index 931cc843f56..bb5936a98ea 100644 --- a/kubernetes-model-generator/go.mod +++ b/kubernetes-model-generator/go.mod @@ -3,7 +3,6 @@ module github.com/fabric8io/kubernetes-client/kubernetes-model-generator go 1.17 require ( - github.com/docker/docker v20.10.2+incompatible // indirect github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.2.0 github.com/k8snetworkplumbingwg/whereabouts v0.4.3-0.20211129155010-abd29e856f36 github.com/metal3-io/baremetal-operator/apis v0.0.0 @@ -19,28 +18,29 @@ require ( github.com/operator-framework/api v0.10.7 github.com/operator-framework/operator-lifecycle-manager v0.19.1 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.52.1 - k8s.io/api v0.24.1 - k8s.io/apiextensions-apiserver v0.24.1 - k8s.io/apimachinery v0.24.1 + k8s.io/api v0.25.0 + k8s.io/apiextensions-apiserver v0.25.0 + k8s.io/apimachinery v0.25.0 k8s.io/client-go v12.0.0+incompatible - k8s.io/kube-aggregator v0.24.0 - k8s.io/metrics v0.24.0 - sigs.k8s.io/gateway-api v0.5.0 + k8s.io/kube-aggregator v0.25.0 + k8s.io/metrics v0.25.0 sigs.k8s.io/kube-storage-version-migrator v0.0.5 ) require ( github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/emicklei/go-restful v2.14.2+incompatible // indirect + github.com/docker/docker v20.10.2+incompatible // indirect + github.com/emicklei/go-restful/v3 v3.8.0 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect - github.com/go-logr/logr v1.2.0 // indirect + github.com/go-logr/logr v1.2.3 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.19.5 // indirect github.com/go-openapi/swag v0.19.14 // indirect @@ -61,7 +61,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/onsi/gomega v1.17.0 // indirect + github.com/onsi/gomega v1.19.0 // indirect github.com/operator-framework/operator-registry v1.17.5 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.12.1 // indirect @@ -71,44 +71,49 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/vmware/govmomi v0.24.0 // indirect - golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect + golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect - golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect + golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect - google.golang.org/grpc v1.40.0 // indirect - google.golang.org/protobuf v1.27.1 // indirect + google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect + google.golang.org/grpc v1.47.0 // indirect + google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect - k8s.io/component-base v0.24.1 // indirect - k8s.io/klog/v2 v2.60.1 // indirect - k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect - k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/component-base v0.25.0 // indirect + k8s.io/klog/v2 v2.70.1 // indirect + k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect + k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect sigs.k8s.io/controller-runtime v0.12.1 // indirect - sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect + sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect + sigs.k8s.io/gateway-api v0.5.0 ) replace ( bitbucket.org/ww/goautoneg => github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d github.com/IBM-Cloud/terraform-provider-ibm => github.com/openshift/terraform-provider-ibm v1.26.2-openshift-2 + github.com/containerd/containerd => github.com/containerd/containerd v1.5.13 + github.com/docker/distribution => github.com/docker/distribution v2.8.0+incompatible + github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2 github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20211201170610-92ffa60c683d github.com/metal3-io/baremetal-operator/apis => github.com/openshift/baremetal-operator/apis v0.0.0-20211201170610-92ffa60c683d github.com/mikefarah/yaml/v2 => gopkg.in/yaml.v2 v2.4.0 + github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2 github.com/openshift/api => github.com/openshift/api v0.0.0-20211201215911-5a82bae32e46 github.com/terraform-providers/terraform-provider-aws => github.com/openshift/terraform-provider-aws v1.60.1-0.20211215220004-24df6d73af46 github.com/terraform-providers/terraform-provider-ignition/v2 => github.com/community-terraform-providers/terraform-provider-ignition/v2 v2.1.0 - k8s.io/client-go => k8s.io/client-go v0.24.0 - k8s.io/component-helpers => k8s.io/component-helpers v0.24.0 - k8s.io/controller-manager => k8s.io/controller-manager v0.24.0 - k8s.io/mount-utils => k8s.io/mount-utils v0.24.0 + k8s.io/client-go => k8s.io/client-go v0.25.0 + k8s.io/component-helpers => k8s.io/component-helpers v0.25.0 + k8s.io/controller-manager => k8s.io/controller-manager v0.25.0 + k8s.io/mount-utils => k8s.io/mount-utils v0.25.0 sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20201125052318-b85a18cbf338 sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.0.0-20210209143830-3442c7a36c1e sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.0.0-20211111204942-611d320170af diff --git a/kubernetes-model-generator/go.sum b/kubernetes-model-generator/go.sum index 395b9c255f9..3b3ca7f0bb3 100644 --- a/kubernetes-model-generator/go.sum +++ b/kubernetes-model-generator/go.sum @@ -35,6 +35,7 @@ cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWc cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -73,7 +74,6 @@ git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqbl github.com/14rcole/gopopulate v0.0.0-20180821133914-b175b219e774/go.mod h1:6/0dYRLLXyJjbkIPeeGyoJ/eKOSI0eU6eTlCBYibgd0= github.com/AlecAivazis/survey/v2 v2.2.12/go.mod h1:6d4saEvBsfSHXeN1a5OA5m2+HJ2LuVokllnC77pAIKI= github.com/AlecAivazis/survey/v2 v2.3.2/go.mod h1:TH2kPCDU3Kqq7pLbnCWwZXDBjnhZtmsCle5EiYDJ2fg= -github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v31.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -91,7 +91,6 @@ github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v10.15.4+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v11.7.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v13.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= @@ -105,6 +104,7 @@ github.com/Azure/go-autorest/autorest v0.11.3/go.mod h1:JFgpikqFJ/MleTTxwepExTKn github.com/Azure/go-autorest/autorest v0.11.6/go.mod h1:V6p3pKZx1KKkJubbxnDWrzNhEIfOy/pTGasLqzHIPHs= github.com/Azure/go-autorest/autorest v0.11.10/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= +github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/adal v0.6.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= @@ -116,6 +116,8 @@ github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQW github.com/Azure/go-autorest/autorest/adal v0.9.4/go.mod h1:/3SMAM86bP6wC9Ev35peQDUeqFZBMH07vvUOmg4z/fE= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= +github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= +github.com/Azure/go-autorest/autorest/adal v0.9.20/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/azure/auth v0.3.0/go.mod h1:CI4BQYBct8NS7BXNBBX+RchsFsUu5+oz+OSyR/ZIi7U= github.com/Azure/go-autorest/autorest/azure/auth v0.4.1/go.mod h1:5TgH20II424SXIV9YDBsO4rBCKsh39Vbx9DvhJZZ8rU= github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod h1:90gmfKdlmKgfjUpnCEpOJzsUEjrWDSLwHIG73tSXddM= @@ -133,6 +135,7 @@ github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxB github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= @@ -218,16 +221,13 @@ github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOp github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= -github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= -github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg= github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00= github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600= -github.com/Microsoft/hcsshim v0.8.20 h1:ZTwcx3NS8n07kPf/JZ1qwU6vnjhVPMUWlXBF8r9UxrE= github.com/Microsoft/hcsshim v0.8.20/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= -github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU= -github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= +github.com/Microsoft/hcsshim v0.8.24 h1:jP+GMeRXIR1sH1kG4lJr9ShmSjVrua5jmFZDtfYGkn4= +github.com/Microsoft/hcsshim v0.8.24/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc= @@ -327,6 +327,7 @@ github.com/antchfx/xpath v1.1.2/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNY github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod h1:LzD22aAzDP8/dyiCKFp31He4m2GPjl0AFyzDtZzUu9M= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= +github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= github.com/apache/openwhisk-client-go v0.0.0-20200201143223-a804fb82d105/go.mod h1:jLLKYP7+1+LFlIJW1n9U1gqeveLM1HIwa4ZHNOFxjPw= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= @@ -362,7 +363,6 @@ github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:W github.com/ashcrow/osrelease v0.0.0-20180626175927-9b292693c55c/go.mod h1:BRljTyotlu+6N+Qlu5MhjxpdmccCnp9lDvZjNNV8qr4= github.com/awalterschulze/gographviz v0.0.0-20190522210029-fa59802746ab/go.mod h1:GEV5wmg4YquNw7v1kkyoX9etIk8yVmXj+AkDHuuETHs= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.19.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= @@ -386,7 +386,6 @@ github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -398,11 +397,9 @@ github.com/bflad/tfproviderlint v0.18.0/go.mod h1:0fdh7JywihC58Io8AZ+gpcmQtJggse github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= -github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= @@ -417,22 +414,19 @@ github.com/bombsimon/wsl/v3 v3.1.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f/go.mod h1:HQhVmdUf7dBNwIIdBTivnCDxcf6IZY3/zrb+uKSJz6Y= -github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70= github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/bsm/go-vlq v0.0.0-20150828105119-ec6e8d4f5f4e/go.mod h1:N+BjUcTjSxc2mtRGSCPsat1kze3CUtvJN3/jTXlp29k= github.com/btubbs/datetime v0.1.0/go.mod h1:n2BZ/2ltnRzNiz27aE3wUb2onNttQdC+WFxAoks5jJM= github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/bugsnag-go v1.5.3 h1:yeRUT3mUE13jL1tGwvoQsKdVbAsQx9AJ+fqahKveP04= github.com/bugsnag/bugsnag-go v1.5.3/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= -github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= -github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA= github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/c4milo/gotoolkit v0.0.0-20170704181456-e37eeabad07e/go.mod h1:txokOny9wavBtq2PWuHmj1P+eFwpCsj+gQeNNANChfU= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f/go.mod h1:C0rtzmGXgN78pYR0tGJFhtHgkbAs0lIbHwkB81VxDQE= @@ -457,6 +451,7 @@ github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLI github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/cilium/ebpf v0.6.1/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= +github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/clarketm/json v1.14.1/go.mod h1:ynr2LRfb0fQU34l07csRNBTcivjySLLiY1YzQqKVfdo= @@ -468,7 +463,11 @@ github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= @@ -478,86 +477,45 @@ github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u9 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/community-terraform-providers/terraform-provider-ignition/v2 v2.1.0/go.mod h1:0reAZvVLhna+mtZ5RcHH4W8iGwM7ZEAK3Y8TCgn9+ZQ= -github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= -github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= -github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= -github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod h1:jg2QkJcsabfHugurUvvPhS3E08Oxiuh5W/g1ybB4e0E= -github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= github.com/containerd/btrfs v1.0.0/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= -github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI= github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM= -github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= -github.com/containerd/cgroups v1.0.1 h1:iJnMvco9XGvKUvNQkv88bE4uJXxRQH18efbKo9w5vHQ= github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= +github.com/containerd/cgroups v1.0.3 h1:ADZftAkglvCiD44c77s5YmMqaP2pzVCFZvBmAlBdAP4= +github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8= github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= -github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= -github.com/containerd/containerd v1.2.7/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ= -github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU= -github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI= -github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s= -github.com/containerd/containerd v1.5.1 h1:xWHPAoe6VkUiI9GAvndJM7s/0MTrmwX3AQiYTr3olf0= -github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= +github.com/containerd/containerd v1.5.13 h1:XqvKw9i4P7/mFrC3TSM7yV5cwFZ9avXe6M3YANKnzEE= +github.com/containerd/containerd v1.5.13/go.mod h1:3AlCrzKROjIuP3JALsY14n8YtntaUDBu7vek+rPN5Vc= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY= -github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo= github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y= github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= github.com/containerd/continuity v0.1.0 h1:UFRRY5JemiAhPZrr/uE0n8fMTLcZsUvySPr1+D7pgr8= github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= -github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= -github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= -github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= -github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= -github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU= github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk= github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= -github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g= github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= -github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak9TYCG3juvb0= -github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6TNsg0ctmizkrOgXRNQjAPFWpMYRWuiB6dSF4Pfa5SA= -github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow= github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms= -github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= -github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= -github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= -github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8= github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= -github.com/containerd/ttrpc v1.0.2 h1:2/O3oTZN36q2xRolk0a2WWGgh7/Vf/liElg5hFYLX9U= github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= +github.com/containerd/ttrpc v1.1.0 h1:GbtyLRxb0gOLR0TYQWt3O6B0NvT8tMdorEHqIQo/lWI= +github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ= github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= -github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk= github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod h1:8IgZOBdv8fAgXddBT4dBXJPtxyRsejFIpXoklgxgEjw= -github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQwE+/is6hi0Xw8ktpL+6glmqZYtevJgaB8Y= -github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= -github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= github.com/containerd/zfs v1.0.0/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= github.com/containernetworking/cni v0.7.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= @@ -565,14 +523,12 @@ github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= github.com/containernetworking/cni v1.0.1/go.mod h1:AKuhXbN5EzmD4yTNtfSsX3tPcmtrBI6QcRV0NiNt15Y= github.com/containernetworking/plugins v0.8.2/go.mod h1:TxALKWZpWL79BC3GOYKJzzXr7U8R23PdhwaLp6F3adc= -github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM= github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= github.com/containers/image v3.0.2+incompatible/go.mod h1:8Vtij257IWSanUQKe1tAeNOm2sRVkSqQTVQ1IlwI3+M= github.com/containers/image/v5 v5.5.1/go.mod h1:4PyNYR0nwlGq/ybVJD9hWlhmIsNra4Q8uOQX2s6E2uM= github.com/containers/image/v5 v5.11.0/go.mod h1:dCbUB4w6gmxIEOCsE0tZQppr8iBoXb4Evr74ZKlmwoI= github.com/containers/image/v5 v5.14.0/go.mod h1:SxiBKOcKuT+4yTjD0AskjO+UwFvNcVOJ9qlAw1HNSPU= github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY= -github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= github.com/containers/ocicrypt v1.0.2/go.mod h1:nsOhbP19flrX6rE7ieGFvBlr7modwmNjsqWarIUce4M= github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4= github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= @@ -590,7 +546,6 @@ github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/fcct v0.5.0/go.mod h1:cbE+j77YSQwFB2fozWVB3qsI2Pi3YiVEbDz/b6Yywdo= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-iptables v0.4.2/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= -github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-json v0.0.0-20170920214419-6a2fe990e083/go.mod h1:FmxyHfvrCFfCsXRylD4QQRlQmvzl+DG6iTHyEEykPfU= github.com/coreos/go-json v0.0.0-20200220154158-5ae607161559/go.mod h1:FmxyHfvrCFfCsXRylD4QQRlQmvzl+DG6iTHyEEykPfU= @@ -598,7 +553,6 @@ github.com/coreos/go-oidc v2.0.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHo github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -666,9 +620,7 @@ github.com/denis-tingajkin/go-header v0.3.1/go.mod h1:sq/2IxMhaZX+RRcgHfCRx/m0M5 github.com/denisenkom/go-mssqldb v0.0.0-20190412130859-3b1d194e553a/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= -github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/denverdino/aliyungo v0.0.0-20210518071019-eb3bbb144d8a/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dhui/dktest v0.3.0/go.mod h1:cyzIUfGsBEbZ6BT7tnXqAShHSXCZhSNmFl70sZ7c1yc= @@ -682,13 +634,8 @@ github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyG github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v20.10.5+incompatible h1:bjflayQbWg+xOkF2WPEAOi4Y7zWhR7ptoPhV/VqLVDE= github.com/docker/cli v20.10.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/distribution v0.0.0-20180920194744-16128bbac47f/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= -github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= -github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= -github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.8.0+incompatible h1:l9EaZDICImO1ngI+uTifW+ZYvvz7fKISBAKpg+MbWbY= +github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v0.7.3-0.20190103212154-2b7e084dc98b/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v0.7.3-0.20190817195342-4760db040282/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= @@ -703,16 +650,13 @@ github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= -github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/libnetwork v0.0.0-20190731215715-7f13a5c99f4b/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= -github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4= github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= @@ -746,6 +690,8 @@ github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT github.com/emicklei/go-restful v2.10.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.14.2+incompatible h1:uyx8VgUCryEkh7qbr8rEtrA0rGDEJ73F5lOJdB5m3V8= github.com/emicklei/go-restful v2.14.2+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= +github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -755,6 +701,7 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= @@ -800,7 +747,6 @@ github.com/gammazero/deque v0.0.0-20180920172122-f6adf94963e4/go.mod h1:GeIq9qoE github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7/go.mod h1:GeIq9qoE43YdGnDXURnmKTnGg15pQz4mYkXSTChbneI= github.com/gammazero/workerpool v0.0.0-20181230203049-86a96b5d5d92/go.mod h1:w9RqFVO2BM3xwWEcAB8Fwp0OviTBBEiRmSBDfbXnd3w= github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56/go.mod h1:w9RqFVO2BM3xwWEcAB8Fwp0OviTBBEiRmSBDfbXnd3w= -github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc= github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= @@ -836,7 +782,6 @@ github.com/go-git/go-git/v5 v5.3.0/go.mod h1:xdX4bWJ48aOrdhnl2XqHYstHbbp6+LFS4r4 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -853,10 +798,13 @@ github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTg github.com/go-logr/logr v0.2.1/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/zapr v1.2.0 h1:n4JnPI1T3Qq1SFEi/F8rwLrZERp2bso19PJZDB9dayk= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= +github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A= +github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= @@ -1020,7 +968,6 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA github.com/goccy/go-yaml v1.8.1/go.mod h1:wS4gNoLalDSJxo/SpngzPQ2BN4uuZVLCmbM4S3vd4+Y= github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0= github.com/gocql/gocql v0.0.0-20190402132108-0e1d5de854df/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0= -github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= @@ -1036,20 +983,13 @@ github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx github.com/gogap/errors v0.0.0-20160523102334-149c546090d0/go.mod h1:tbRYYYC7g/H7QlCeX0Z2zaThWKowF4QQCFIsGgAsqRo= github.com/gogap/stack v0.0.0-20150131034635-fef68dddd4f8/go.mod h1:6q1WEv2BiAO4FSdwLQTJbWQYAn1/qDNJHUGJNXCj9kM= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= -github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= -github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-migrate/migrate/v4 v4.6.2 h1:LDDOHo/q1W5UDj6PbkxdCv7lv9yunyZHXvxuwDkGo3k= github.com/golang-migrate/migrate/v4 v4.6.2/go.mod h1:JYi6reN3+Z734VZ0akNuyOJNcrg45ZL7LDBMW3WGJL0= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= @@ -1139,6 +1079,7 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cel-go v0.9.0/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= github.com/google/cel-go v0.10.1/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= +github.com/google/cel-go v0.12.4/go.mod h1:Av7CU6r6X3YmcHR9GXqVDaEJYfEtSxl6wvIjUQTriCw= github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA= github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= @@ -1184,6 +1125,7 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= @@ -1231,13 +1173,11 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg= github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/mux v0.0.0-20191024121256-f395758b854c/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= @@ -1283,7 +1223,6 @@ github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBt github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-azure-helpers v0.4.1/go.mod h1:lu62V//auUow6k0IykxLK2DCNW8qTmpm8KqhYVWattA= @@ -1319,7 +1258,6 @@ github.com/hashicorp/go-memdb v1.0.2/go.mod h1:I6dKdmYhZqU0RJSheVEWgTNWdVQH5QvTg github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-msgpack v0.5.4/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v0.0.0-20180717150148-3d5d8f294aa0/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= @@ -1482,6 +1420,7 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.0.0-20171009183408-7fe0c75c13ab/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= @@ -1518,7 +1457,6 @@ github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8 github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -1576,7 +1514,6 @@ github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod h1:ghbZsc github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M= github.com/keybase/go-crypto v0.0.0-20190416182011-b785b22cc757/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M= github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v0.0.0-20161130080628-0de1eaf82fa3/go.mod h1:jxZFDH7ILpTPQTk+E2s+z4CUas9lVNjIuKR4c5/zKgM= @@ -1591,7 +1528,6 @@ github.com/klauspost/compress v1.10.8/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.8/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.12/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= @@ -1674,7 +1610,6 @@ github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpAp github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= -github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod h1:Ah2dBMoxZEqk118as2T4u4fjfXarE0pPnMJaArZQZsI= github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod h1:kCEbxUJlNDEBNbdQMkPSp6yaKcRXVI6f4ddk8Riv4bc= github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod h1:kCEbxUJlNDEBNbdQMkPSp6yaKcRXVI6f4ddk8Riv4bc= @@ -1767,7 +1702,6 @@ github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/mitchellh/panicwrap v1.0.0/go.mod h1:pKvZHwWrZowLUzftuFq7coarnxbBXU4aQh3N0BJOeeA= github.com/mitchellh/pointerstructure v0.0.0-20190430161007-f252a8fd71c8/go.mod h1:k4XwG94++jLVsSiTxo7qdIfXA9pj9EAeo0QsNNJOLZ8= github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod h1:kB1naBgV9ORnkiTVeyJOI1DavaJkG4oNIq0Af6ZVKUo= @@ -1863,6 +1797,9 @@ github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvw github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= +github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -1880,36 +1817,29 @@ github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuK github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.14.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= -github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 h1:yN8BPXVwMBAm3Cuvh1L5XE8XpvYRMdsVLd82ILprhUU= -github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= +github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v0.0.0-20191031171055-b133feaeeb2e/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc90/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= github.com/opencontainers/runc v1.0.0/go.mod h1:MU2S3KEB2ZExnhnAQYbwjdYV6HwKtDlNbA2Z2OeNDeA= +github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= github.com/opencontainers/selinux v1.5.2/go.mod h1:yTcKuYAh6R95iDpefGLQaPaRwJFwyzAJufJyiTt7s0g= -github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/openshift-metal3/terraform-provider-ironic v0.2.7/go.mod h1:r0k8OSQ0VsL2xrVhojdgfQET6/Z7/AY5exHWG5pWE1E= @@ -2077,6 +2007,7 @@ github.com/posener/complete v1.2.1/go.mod h1:6gapUrK/U1TAN7ciCoNRIdVC5sbdBTUh1DK github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= +github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= github.com/pquerna/ffjson v0.0.0-20181028064349-e517b90714f7/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= github.com/pquerna/ffjson v0.0.0-20190813045741-dac163c6c0a9/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= github.com/pquerna/otp v1.2.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= @@ -2084,7 +2015,6 @@ github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d/go.mod h1:dkJfzwRKNi github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.49.0/go.mod h1:3WYi4xqXxGGXWDdQIITnLNmuDzO5n6wYva9spVhR4fg= github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.52.1 h1:sAQ0rZCj/PJOVxllCP6alH4a7P5TjHuqywBaHx7uZTo= github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.52.1/go.mod h1:f7HML3SGY4Bf10YMdSWKUf2BdIIzQqlAvYh84px05BQ= -github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= @@ -2096,10 +2026,10 @@ github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeD github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -2107,7 +2037,6 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20180518154759-7600349dcfe1/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= @@ -2135,7 +2064,6 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -2296,13 +2224,11 @@ github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= -github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -2315,7 +2241,6 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod h1:BSTlc8jOjh0niykqEGVXOLXdi9o0r0kR8tCYiMvjFgw= -github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= @@ -2410,7 +2335,6 @@ github.com/vmware/govmomi v0.24.0 h1:G7YFF6unMTG3OY25Dh278fsomVTKs46m2ENlEFSbmbs github.com/vmware/govmomi v0.24.0/go.mod h1:Y+Wq4lst78L85Ge/F8+ORXIWiKYqaro1vhAulACy9Lc= github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk= github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI= -github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs= github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= @@ -2425,7 +2349,6 @@ github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2 github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= @@ -2443,13 +2366,11 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 h1:p7OofyZ509h8DmPLh8Hn+EIIZm/xYhdZHJ9GnXHdr6U= github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= -github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/gorelic v0.0.7 h1:4DTF1WOM2ZZS/xMOkTFBOcb6XiHu/PKn3rVo6dbewQE= github.com/yvasiyarov/gorelic v0.0.7/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= -github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 h1:AsFN8kXcCVkUFHyuzp1FtYbzp1nCO/H6+1uPSGEyPzM= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= @@ -2478,14 +2399,21 @@ go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod h1:skWido08r go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU= go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= go.etcd.io/etcd/client/v3 v3.5.1/go.mod h1:OnjH4M8OnAotwaB2l9bVgZzRFKru7/ZMoS46OtKyd3Q= +go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= +go.etcd.io/etcd/pkg/v3 v3.5.4/go.mod h1:OI+TtO+Aa3nhQSppMbwE4ld3uF1/fqqwbpfndbbrEe0= go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= +go.etcd.io/etcd/raft/v3 v3.5.4/go.mod h1:SCuunjYvZFC0fBX0vxMSPjuZmpcSk+XaAcMrD6Do03w= go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= +go.etcd.io/etcd/server/v3 v3.5.4/go.mod h1:S5/YTU15KxymM5l3T6b09sNOHPXqGYIZStpuuGbb65c= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= @@ -2605,7 +2533,10 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2649,8 +2580,9 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20170915142106-8351a756f30f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2683,7 +2615,6 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -2740,8 +2671,10 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -2779,8 +2712,9 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20171026204733-164713f0dfce/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2814,11 +2748,9 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2829,7 +2761,6 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190730183949-1393eb018365/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2894,7 +2825,6 @@ golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2921,13 +2851,18 @@ golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -3090,6 +3025,8 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM= golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -3101,7 +3038,6 @@ gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCY gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= -google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= @@ -3148,6 +3084,7 @@ google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00 google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.58.0/go.mod h1:cAbP2FsxoGVNwtgNAmmn3y5G1TWAiVYRmg4yku3lv+E= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -3160,7 +3097,6 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180608181217-32ee49c4dd80/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -3176,7 +3112,6 @@ google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190513181449-d00d292a067c/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= @@ -3248,11 +3183,13 @@ google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwy google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 h1:Et6SkiuvnBn+SgrSYXs/BrUpGB4mbdwt4R3vaPIlicA= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 h1:hrbNEivu7Zn1pxvHk6MBrq9iE22woVILTHqexqBxe6I= +google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= @@ -3290,8 +3227,10 @@ google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc/cmd/protoc-gen-go-grpc v0.0.0-20200709232328-d8193ee9cc3e/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -3306,13 +3245,13 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -3376,8 +3315,9 @@ gopkg.in/yaml.v3 v3.0.0-20191010095647-fc94e3f71652/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= @@ -3411,7 +3351,6 @@ k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= k8s.io/api v0.20.0/go.mod h1:HyLC5l5eoS/ygQYl1BXBgFzWNlkHiAuyNAbevIn+FKg= k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8= -k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.21.0-rc.0/go.mod h1:Dkc/ZauWJrgZhjOjeBgW89xZQiTBJA2RaBKYHXPsi2Y= k8s.io/api v0.21.0/go.mod h1:+YbrhBBGgsxbF6o6Kj4KJPJnBmAKuXDeS3E18bgHNVU= @@ -3425,9 +3364,9 @@ k8s.io/api v0.22.1/go.mod h1:bh13rkTp3F1XEaLGykbyRD2QaTTzPm0e/BMd8ptFONY= k8s.io/api v0.22.2/go.mod h1:y3ydYpLJAaDI+BbSe2xmGcqxiWHmWjkEeIbiwHvnPR8= k8s.io/api v0.22.3/go.mod h1:azgiXFiXqiWyLCfI62/eYBOu19rj2LKmIhFPP4+33fs= k8s.io/api v0.23.0/go.mod h1:8wmDdLBHBNxtOIytwLstXt5E9PddnZb0GaMcqsvDBpg= -k8s.io/api v0.24.0/go.mod h1:5Jl90IUrJHUJYEMANRURMiVvJ0g7Ax7r3R1bqO8zx8I= -k8s.io/api v0.24.1 h1:BjCMRDcyEYz03joa3K1+rbshwh1Ay6oB53+iUx2H8UY= k8s.io/api v0.24.1/go.mod h1:JhoOvNiLXKTPQ60zh2g0ewpA+bnEYf5q44Flhquh4vQ= +k8s.io/api v0.25.0 h1:H+Q4ma2U/ww0iGB78ijZx6DRByPz6/733jIuFpX70e0= +k8s.io/api v0.25.0/go.mod h1:ttceV1GyV1i1rnmvzT3BST08N6nGt+dudGrquzVQWPk= k8s.io/apiextensions-apiserver v0.17.0/go.mod h1:XiIFUakZywkUl54fVXa7QTEHcqQz9HG55nHd1DCoHj8= k8s.io/apiextensions-apiserver v0.18.0-beta.2/go.mod h1:Hnrg5jx8/PbxRbUoqDGxtQkULjwx8FDW4WYJaKNK+fk= k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY= @@ -3448,8 +3387,9 @@ k8s.io/apiextensions-apiserver v0.22.1/go.mod h1:HeGmorjtRmRLE+Q8dJu6AYRoZccvCMs k8s.io/apiextensions-apiserver v0.22.2/go.mod h1:2E0Ve/isxNl7tWLSUDgi6+cmwHi5fQRdwGVCxbC+KFA= k8s.io/apiextensions-apiserver v0.22.3/go.mod h1:f4plF+CXeqI89jAXL0Ml4LI/kSAZ54JS94+XOX1sae8= k8s.io/apiextensions-apiserver v0.23.0/go.mod h1:xIFAEEDlAZgpVBl/1VSjGDmLoXAWRG40+GsWhKhAxY4= -k8s.io/apiextensions-apiserver v0.24.1 h1:5yBh9+ueTq/kfnHQZa0MAo6uNcPrtxPMpNQgorBaKS0= k8s.io/apiextensions-apiserver v0.24.1/go.mod h1:A6MHfaLDGfjOc/We2nM7uewD5Oa/FnEbZ6cD7g2ca4Q= +k8s.io/apiextensions-apiserver v0.25.0 h1:CJ9zlyXAbq0FIW8CD7HHyozCMBpDSiH7EdrSTCZcZFY= +k8s.io/apiextensions-apiserver v0.25.0/go.mod h1:3pAjZiN4zw7R8aZC5gR0y3/vCkGlAjCazcg1me8iB/E= k8s.io/apimachinery v0.0.0-20181110190943-2a7c93004028/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b/go.mod h1:FW86P8YXVLsbuplGMZeb20J3jYHscrDqw4jELaFJvRU= @@ -3467,7 +3407,6 @@ k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlm k8s.io/apimachinery v0.20.0/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.21.0-rc.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= k8s.io/apimachinery v0.21.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= @@ -3481,9 +3420,9 @@ k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ k8s.io/apimachinery v0.22.2/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= k8s.io/apimachinery v0.22.3/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= k8s.io/apimachinery v0.23.0/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc= -k8s.io/apimachinery v0.24.0/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= -k8s.io/apimachinery v0.24.1 h1:ShD4aDxTQKN5zNf8K1RQ2u98ELLdIW7jEnlO9uAMX/I= k8s.io/apimachinery v0.24.1/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apimachinery v0.25.0 h1:MlP0r6+3XbkUG2itd6vp3oxbtdQLQI94fD5gCS+gnoU= +k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= k8s.io/apiserver v0.17.0/go.mod h1:ABM+9x/prjINN6iiffRVNCBR2Wk7uY4z+EtEGZD48cg= k8s.io/apiserver v0.18.0-beta.2/go.mod h1:bnblMkMoCFnIfVnVftd0SXJPzyvrk3RtaqSbblphF/A= k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw= @@ -3493,7 +3432,6 @@ k8s.io/apiserver v0.19.1/go.mod h1:iRxYIjA0X2XEyoW8KslN4gDhasfH4bWcjj6ckVeZX28= k8s.io/apiserver v0.19.2/go.mod h1:FreAq0bJ2vtZFj9Ago/X0oNGC51GfubKK/ViOKfVAOA= k8s.io/apiserver v0.20.0/go.mod h1:6gRIWiOkvGvQt12WTYmsiYoUyYW0FXSiMdNl4m+sxY8= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= -k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= k8s.io/apiserver v0.21.0-rc.0/go.mod h1:QlW7+1CZTZtAcKvJ34/n4DIb8sC93FeQpkd1KSU+Sok= k8s.io/apiserver v0.21.0/go.mod h1:w2YSn4/WIwYuxG5zJmcqtRdtqgW/J2JRgFAqps3bBpg= @@ -3506,8 +3444,8 @@ k8s.io/apiserver v0.22.1/go.mod h1:2mcM6dzSt+XndzVQJX21Gx0/Klo7Aen7i0Ai6tIa400= k8s.io/apiserver v0.22.2/go.mod h1:vrpMmbyjWrgdyOvZTSpsusQq5iigKNWv9o9KlDAbBHI= k8s.io/apiserver v0.22.3/go.mod h1:oam7lH/F1Kto/WTamyQYrD68fS0mGUBORAFf6x/9Mxs= k8s.io/apiserver v0.23.0/go.mod h1:Cec35u/9zAepDPPFyT+UMrgqOCjgJ5qtfVJDxjZYmt4= -k8s.io/apiserver v0.24.0/go.mod h1:WFx2yiOMawnogNToVvUYT9nn1jaIkMKj41ZYCVycsBA= k8s.io/apiserver v0.24.1/go.mod h1:dQWNMx15S8NqJMp0gpYfssyvhYnkilc1LpExd/dkLh0= +k8s.io/apiserver v0.25.0/go.mod h1:BKwsE+PTC+aZK+6OJQDPr0v6uS91/HWxX7evElAH6xo= k8s.io/cli-runtime v0.18.0-rc.1/go.mod h1:yuKZYDG8raONmwjwIkT77lCfIuPwX+Bsp88MKYf1TlU= k8s.io/cli-runtime v0.19.0/go.mod h1:tun9l0eUklT8IHIM0jors17KmUjcrAxn0myoBYwuNuo= k8s.io/cli-runtime v0.19.1/go.mod h1:X6g8e4NBiG8GMsKewXsRpo36MO6xrvXa+0wCg7zO4aU= @@ -3517,8 +3455,8 @@ k8s.io/cli-runtime v0.21.0-rc.0/go.mod h1:Gp9Njd5Z9IayPHKL8AKVVMrdzHrMHN+WnGMHYC k8s.io/cli-runtime v0.21.0/go.mod h1:XoaHP93mGPF37MkLbjGVYqg3S1MnsFdKtiA/RZzzxOo= k8s.io/cli-runtime v0.22.0/go.mod h1:An6zELQ7udUI0GaXvkuMqyopPA14dIgNqpH8cZu1vig= k8s.io/cli-runtime v0.22.1/go.mod h1:YqwGrlXeEk15Yn3em2xzr435UGwbrCw5x+COQoTYfoo= -k8s.io/client-go v0.24.0 h1:lbE4aB1gTHvYFSwm6eD3OF14NhFDKCejlnsGYlSJe5U= -k8s.io/client-go v0.24.0/go.mod h1:VFPQET+cAFpYxh6Bq6f4xyMY80G6jKKktU6G0m00VDw= +k8s.io/client-go v0.25.0 h1:CVWIaCETLMBNiTUta3d5nzRbXvY5Hy9Dpl+VvREpu5E= +k8s.io/client-go v0.25.0/go.mod h1:lxykvypVfKilxhTklov0wz1FoaUZ8X4EwbhS6rpRfN8= k8s.io/cluster-bootstrap v0.0.0-20190202014938-c9acc0c1bea2/go.mod h1:iBSm2nwo3OaiuW8VDvc3ySDXK5SKfUrxwPvBloKG7zg= k8s.io/code-generator v0.0.0-20181114232248-ae218e241252/go.mod h1:IPqxl/YHk05nodzupwjke6ctMjyNRdV2zZ5/j3/F204= k8s.io/code-generator v0.0.0-20191003035328-700b1226c0bd/go.mod h1:HC9p4y3SBN+txSs8x57qmNPXFZ/CxdCHiDTNnocCSEw= @@ -3545,8 +3483,8 @@ k8s.io/code-generator v0.22.1/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpx k8s.io/code-generator v0.22.2/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= k8s.io/code-generator v0.22.3/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= k8s.io/code-generator v0.23.0/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE= -k8s.io/code-generator v0.24.0/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= k8s.io/code-generator v0.24.1/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= +k8s.io/code-generator v0.25.0/go.mod h1:B6jZgI3DvDFAualltPitbYMQ74NjaCFxum3YeKZZ+3w= k8s.io/component-base v0.17.0/go.mod h1:rKuRAokNMY2nn2A6LP/MiwpoaMRHpfRnrPaUJJj1Yoc= k8s.io/component-base v0.18.0-beta.2/go.mod h1:HVk5FpRnyzQ/MjBr9//e/yEBjTVa2qjGXCTuUzcD7ks= k8s.io/component-base v0.18.0-rc.1/go.mod h1:NNlRaxZEdLqTs2+6yXiU2SHl8gKsbcy19Ii+Sfq53RM= @@ -3557,7 +3495,6 @@ k8s.io/component-base v0.19.1/go.mod h1:b0vDKYa8EdJJ8dHUA6fGPj4z8taqGks5mfZvp3p/ k8s.io/component-base v0.19.2/go.mod h1:g5LrsiTiabMLZ40AR6Hl45f088DevyGY+cCE2agEIVo= k8s.io/component-base v0.20.0/go.mod h1:wKPj+RHnAr8LW2EIBIK7AxOHPde4gme2lzXwVSoRXeA= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= -k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= k8s.io/component-base v0.21.0-rc.0/go.mod h1:XlP0bM7QJFWRGZYPc5NmphkvsYQ+o7804HWH3GTGjDY= k8s.io/component-base v0.21.0/go.mod h1:qvtjz6X0USWXbgmbfXR+Agik4RZ3jv2Bgr5QnZzdPYw= @@ -3570,13 +3507,10 @@ k8s.io/component-base v0.22.1/go.mod h1:0D+Bl8rrnsPN9v0dyYvkqFfBeAd4u7n77ze+p8CM k8s.io/component-base v0.22.2/go.mod h1:5Br2QhI9OTe79p+TzPe9JKNQYvEKbq9rTJDWllunGug= k8s.io/component-base v0.22.3/go.mod h1:kuybv1miLCMoOk3ebrqF93GbQHQx6W2287FC0YEQY6s= k8s.io/component-base v0.23.0/go.mod h1:DHH5uiFvLC1edCpvcTDV++NKULdYYU6pR9Tt3HIKMKI= -k8s.io/component-base v0.24.0/go.mod h1:Dgazgon0i7KYUsS8krG8muGiMVtUZxG037l1MKyXgrA= -k8s.io/component-base v0.24.1 h1:APv6W/YmfOWZfo+XJ1mZwep/f7g7Tpwvdbo9CQLDuts= k8s.io/component-base v0.24.1/go.mod h1:DW5vQGYVCog8WYpNob3PMmmsY8A3L9QZNg4j/dV3s38= -k8s.io/component-helpers v0.24.0/go.mod h1:Q2SlLm4h6g6lPTC9GMMfzdywfLSvJT2f1hOnnjaWD8c= -k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= -k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= -k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= +k8s.io/component-base v0.25.0 h1:haVKlLkPCFZhkcqB6WCvpVxftrg6+FK5x1ZuaIDaQ5Y= +k8s.io/component-base v0.25.0/go.mod h1:F2Sumv9CnbBlqrpdf7rKZTmmd2meJq0HizeyY/yAFxk= +k8s.io/component-helpers v0.25.0/go.mod h1:auaFj2bvb5Zmy0mLk4WJNmwP0w4e7Zk+/Tu9FFBGA20= k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= k8s.io/gengo v0.0.0-20181106084056-51747d6e00da/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= @@ -3606,8 +3540,9 @@ k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.10.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= +k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-aggregator v0.18.0-beta.2/go.mod h1:O3Td9mheraINbLHH4pzoFP2gRzG0Wk1COqzdSL4rBPk= k8s.io/kube-aggregator v0.18.2/go.mod h1:ijq6FnNUoKinA6kKbkN6svdTacSoQVNtKqmQ1+XJEYQ= k8s.io/kube-aggregator v0.19.0/go.mod h1:1Ln45PQggFAG8xOqWPIYMxUq8WNtpPnYsbUJ39DpF/A= @@ -3620,8 +3555,8 @@ k8s.io/kube-aggregator v0.21.1/go.mod h1:cAZ0n02IiSl57sQSHz4vvrz3upQRMbytOiZnpPJ k8s.io/kube-aggregator v0.22.0-rc.0/go.mod h1:g0xtiBSsbMKvewN7xR/Icib4TrHxtvrJcHtYvFsgw7k= k8s.io/kube-aggregator v0.22.0/go.mod h1:zHTepg0Q4tKzru7Pwg1QYHWrU/wrvIXM8hUdDAH66qg= k8s.io/kube-aggregator v0.22.1/go.mod h1:VbmI+8fUeCPkzSvarWTrlIGEgUGEGI/66SFajDQ0Pdc= -k8s.io/kube-aggregator v0.24.0 h1:ax2B6v5y+sLISgal5COnlDRKOSr97uXpwif6nnK3a/M= -k8s.io/kube-aggregator v0.24.0/go.mod h1:ftfs6Fi46z3cKzeF2kvNBPLbMlSKuqZbesJGNp/cQnw= +k8s.io/kube-aggregator v0.25.0 h1:T0AZZh5nkEcXJnK1o87IghRCZf/KDtzJQWIPulQQlHU= +k8s.io/kube-aggregator v0.25.0/go.mod h1:dfdl4aQkleiWK/U++UDLdDC8g2rsonhkB23zzUeBCgM= k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= @@ -3635,8 +3570,9 @@ k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iL k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20210527164424-3c818078ee3d/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= -k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= +k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= +k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= k8s.io/kube-proxy v0.22.1/go.mod h1:Rj3/mSZuSKfDY7XVbDgb12UwiQHy265LOwpK/yR2rtc= k8s.io/kubectl v0.18.0-rc.1/go.mod h1:UpG1w7klD633nyMS73/29cNl2tMdEbXU0nWupttyha4= k8s.io/kubectl v0.19.0/go.mod h1:gPCjjsmE6unJzgaUNXIFGZGafiUp5jh0If3F/x7/rRg= @@ -3649,7 +3585,6 @@ k8s.io/kubectl v0.22.0/go.mod h1:eeuP92uZbVL2UnOaf0nj9OjtI0hi/nekHU+0isURer0= k8s.io/kubectl v0.22.1/go.mod h1:mjAOgEbMNMtZWxnfM6jd+nPjPsaoLqO5xanc78WcSbw= k8s.io/kubelet v0.21.0-rc.0/go.mod h1:wNcXzTVpecPLZq0/4Ns21YMDI8ni9Sr+ifCaQom+z+8= k8s.io/kubelet v0.22.1/go.mod h1:rZuP1msr5NH7IGApW60DYFR3Cs3On4ftWLMJRfg+iU4= -k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/metrics v0.18.0-rc.1/go.mod h1:ME3EkXCyiZ7mVFEiAYKBfuo3JkpgggeATG+DBUQby5o= k8s.io/metrics v0.19.0/go.mod h1:WykpW8B60OeAJx1imdwUgyOID2kDljr/Q+1zrPJ98Wo= k8s.io/metrics v0.19.1/go.mod h1:O/ONCgXDITtJuMveKEDwZSfiqHOiMZTWmyLe/p1BoAA= @@ -3660,8 +3595,8 @@ k8s.io/metrics v0.21.0/go.mod h1:L3Ji9EGPP1YBbfm9sPfEXSpnj8i24bfQbAFAsW0NueQ= k8s.io/metrics v0.22.0/go.mod h1:eYnwafAUNLLpVmY/msoq0RKIKH5C4TzfjKnMZ0Xrt3A= k8s.io/metrics v0.22.1/go.mod h1:i/ZNap89UkV1gLa26dn7fhKAdheJaKy+moOqJbiif7E= k8s.io/metrics v0.22.1/go.mod h1:i/ZNap89UkV1gLa26dn7fhKAdheJaKy+moOqJbiif7E= -k8s.io/metrics v0.24.0 h1:nsFLJBDgj+B8mXvVBWFxTZBRRDJ8uTdf4C/Gedjy9BA= -k8s.io/metrics v0.24.0/go.mod h1:jrLlFGdKl3X+szubOXPG0Lf2aVxuV3QJcbsgVRAM6fI= +k8s.io/metrics v0.25.0 h1:z/tyqXUCxvmFsKIO7GH6ulvogYvGp+pDmlz5ANSQVPE= +k8s.io/metrics v0.25.0/go.mod h1:HZZrbhuRX+fsDcRc3u59o2FbrKhqD67IGnoFECNmovc= k8s.io/utils v0.0.0-20190529001817-6999998975a7/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= @@ -3679,8 +3614,9 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= +k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= layeh.com/radius v0.0.0-20190322222518-890bc1058917/go.mod h1:fywZKyu//X7iRzaxLgPWsvc0L26IUpVvE/aeIL2JtIQ= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= @@ -3708,6 +3644,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.21/go.mod h1:LEScyz sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= sigs.k8s.io/controller-runtime v0.11.0 h1:DqO+c8mywcZLFJWILq4iktoECTyn30Bkj0CwgqMpZWQ= sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/controller-tools v0.2.8/go.mod h1:9VKHPszmf2DHz/QmHkcfZoewO6BL7pPs9uAiBVsaJSE= @@ -3722,8 +3659,9 @@ sigs.k8s.io/controller-tools v0.7.0/go.mod h1:bpBAo0VcSDDLuWt47evLhMLPxRPxMDInTE sigs.k8s.io/gateway-api v0.5.0 h1:ze+k9fJqvmL8s1t3e4q1ST8RnN+f09dEv+gfacahlAE= sigs.k8s.io/gateway-api v0.5.0/go.mod h1:x0AP6gugkFV8fC/oTlnOMU0pnmuzIR8LfIPRVUjxSqA= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= -sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= +sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= +sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kind v0.11.1/go.mod h1:fRpgVhtqAWrtLB9ED7zQahUimpUXuG/iHT88xYqEGIA= sigs.k8s.io/kube-storage-version-migrator v0.0.3/go.mod h1:mXfSLkx9xbJHQsgNDDUZK/iQTs2tMbx/hsJlWe6Fthw= sigs.k8s.io/kube-storage-version-migrator v0.0.4/go.mod h1:mXfSLkx9xbJHQsgNDDUZK/iQTs2tMbx/hsJlWe6Fthw= @@ -3751,8 +3689,9 @@ sigs.k8s.io/structured-merge-diff/v4 v4.1.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.2.0/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json index db63e7b9daa..b34e4289643 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json @@ -1403,9 +1403,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json index 44fd6bd6259..d982ad944e5 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json @@ -1403,9 +1403,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -3359,14 +3356,13 @@ "properties": { "admissionReviewVersions": { "type": "array", - "javaOmitEmpty": true, "items": { "type": "string" } }, "clientConfig": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_WebhookClientConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.WebhookClientConfig" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_WebhookClientConfig", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.WebhookClientConfig" }, "failurePolicy": { "type": "string" @@ -3392,8 +3388,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_RuleWithOperations", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.RuleWithOperations" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_RuleWithOperations", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations" } }, "sideEffects": { @@ -3436,14 +3432,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhookConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MutatingWebhookConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration" } }, "kind": { @@ -3496,9 +3492,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -3811,12 +3804,12 @@ "selfsubjectaccessreviewspec": { "properties": { "nonResourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1_NonResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceAttributes" }, "resourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" } }, "additionalProperties": true @@ -3965,7 +3958,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1beta1", + "default": "authorization.k8s.io/v1", "required": true }, "kind": { @@ -3978,12 +3971,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -4000,7 +3993,7 @@ }, "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" }, - "groups": { + "group": { "type": "array", "javaOmitEmpty": true, "items": { @@ -4008,12 +4001,12 @@ } }, "nonResourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_NonResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceAttributes" }, "resourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_ResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceAttributes" }, "uid": { "type": "string" @@ -4052,15 +4045,15 @@ "nonResourceRules": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_authorization_v1_NonResourceRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceRule" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceRule" } }, "resourceRules": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_authorization_v1_ResourceRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceRule" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceRule" } } }, @@ -4209,14 +4202,13 @@ "properties": { "admissionReviewVersions": { "type": "array", - "javaOmitEmpty": true, "items": { "type": "string" } }, "clientConfig": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_WebhookClientConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.WebhookClientConfig" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_WebhookClientConfig", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.WebhookClientConfig" }, "failurePolicy": { "type": "string" @@ -4239,8 +4231,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_RuleWithOperations", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.RuleWithOperations" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_RuleWithOperations", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations" } }, "sideEffects": { @@ -4256,7 +4248,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -4272,8 +4264,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhook", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhook" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhook", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhook" } } }, @@ -4283,14 +4275,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhookConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhookConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration" } }, "kind": { @@ -4311,8 +4303,8 @@ "type": "string" }, "service": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ServiceReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_ServiceReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference" }, "url": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml b/kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml index 7121eec597b..1c89a5ae52f 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml @@ -49,6 +49,11 @@ io.fabric8 kubernetes-model-common + + org.assertj + assertj-core + test + diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/kube-schema.json index 7f95e489565..4cc4075c990 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/kube-schema.json @@ -1857,9 +1857,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json index 9bb44ee951f..a559d5164d6 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json @@ -1857,9 +1857,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2615,7 +2612,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "apiextensions.k8s.io/v1beta1", + "default": "apiextensions.k8s.io/v1", "required": true }, "kind": { @@ -2628,12 +2625,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec" }, "status": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus" } }, "additionalProperties": true @@ -2663,14 +2660,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "apiextensions.k8s.io/v1", + "default": "apiextensions.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition" } }, "kind": { @@ -2718,24 +2715,16 @@ }, "customresourcedefinitionspec": { "properties": { - "additionalPrinterColumns": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceColumnDefinition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceColumnDefinition" - } - }, "conversion": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceConversion", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceConversion" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceConversion", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceConversion" }, "group": { "type": "string" }, "names": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionNames", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionNames", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames" }, "preserveUnknownFields": { "type": "boolean" @@ -2743,23 +2732,11 @@ "scope": { "type": "string" }, - "subresources": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresources", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresources" - }, - "validation": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceValidation", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceValidation" - }, - "version": { - "type": "string" - }, "versions": { "type": "array", - "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionVersion", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionVersion" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionVersion", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionVersion" } } }, @@ -2768,14 +2745,14 @@ "customresourcedefinitionstatus": { "properties": { "acceptedNames": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionNames", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionNames", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames" }, "conditions": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition" } }, "storedVersions": { @@ -2793,8 +2770,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceColumnDefinition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceColumnDefinition" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceColumnDefinition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceColumnDefinition" } }, "deprecated": { @@ -2807,8 +2784,8 @@ "type": "string" }, "schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceValidation", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceValidation" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceValidation", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceValidation" }, "served": { "type": "boolean" @@ -2817,8 +2794,8 @@ "type": "boolean" }, "subresources": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresources", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresources" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresources", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresources" } }, "additionalProperties": true @@ -2826,12 +2803,12 @@ "customresourcesubresources": { "properties": { "scale": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceScale", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceScale" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceScale", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceScale" }, "status": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceStatus" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceStatus" } }, "additionalProperties": true @@ -3192,13 +3169,13 @@ "JSONSchemas": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "Schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "additionalProperties": true @@ -3224,8 +3201,8 @@ } }, "Schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "additionalProperties": true @@ -3355,9 +3332,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -3712,8 +3686,8 @@ "type": "string" }, "service": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ServiceReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ServiceReference" + "$ref": "#/definitions/kubernetes_apiextensions_v1_ServiceReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ServiceReference" }, "url": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/test/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinitionTest.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/test/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinitionTest.java index 19dcc2946a9..85719fdfbf3 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/test/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinitionTest.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/test/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinitionTest.java @@ -18,41 +18,46 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.fabric8.kubernetes.model.util.Helper; +import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.Test; +import java.util.Map; + import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; import static net.javacrumbs.jsonunit.core.Option.IGNORING_EXTRA_FIELDS; import static net.javacrumbs.jsonunit.core.Option.TREATING_NULL_AS_ABSENT; import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; +import static org.assertj.core.api.Assertions.as; +import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class CustomResourceDefinitionTest { +class CustomResourceDefinitionTest { private final ObjectMapper objectMapper = new ObjectMapper(); @Test - public void testBuilder() { + void testBuilder() { CustomResourceDefinition crd = new io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionBuilder() - .withApiVersion("apiextensions.k8s.io/v1") - .withNewMetadata() - .withName("itests.examples.fabric8.io") - .endMetadata() - .withNewSpec() - .withGroup("examples.fabric8.io") - .addNewVersion() - .withName("v1") - .withServed(true) - .withStorage(true) - .endVersion() - .withScope("Namespaced") - .withNewNames() - .withPlural("itests") - .withSingular("itest") - .withKind("Itest") - .withShortNames("it") - .endNames() - .endSpec() - .build(); + .withApiVersion("apiextensions.k8s.io/v1") + .withNewMetadata() + .withName("itests.examples.fabric8.io") + .endMetadata() + .withNewSpec() + .withGroup("examples.fabric8.io") + .addNewVersion() + .withName("v1") + .withServed(true) + .withStorage(true) + .endVersion() + .withScope("Namespaced") + .withNewNames() + .withPlural("itests") + .withSingular("itest") + .withKind("Itest") + .withShortNames("it") + .endNames() + .endSpec() + .build(); assertEquals("itests.examples.fabric8.io", crd.getMetadata().getName()); assertEquals("examples.fabric8.io", crd.getSpec().getGroup()); @@ -66,12 +71,13 @@ void testLoadFromJsonSchemaPropsOrBool() throws JsonProcessingException { final String originalJson = Helper.loadJson("/valid-v1-crd.json"); // when - final CustomResourceDefinition customResourceDefinition = objectMapper.readValue(originalJson, CustomResourceDefinition.class); + final CustomResourceDefinition customResourceDefinition = objectMapper.readValue(originalJson, + CustomResourceDefinition.class); final String serializedJson = objectMapper.writeValueAsString(customResourceDefinition); // then assertThatJson(serializedJson).when(IGNORING_ARRAY_ORDER, TREATING_NULL_AS_ABSENT, IGNORING_EXTRA_FIELDS) - .isEqualTo(originalJson); + .isEqualTo(originalJson); } @Test @@ -88,7 +94,7 @@ void testLoadFromJsonSchemaPropsOrArray() throws JsonProcessingException { // then assertThatJson(serializedJson).when(IGNORING_ARRAY_ORDER, TREATING_NULL_AS_ABSENT, IGNORING_EXTRA_FIELDS) - .isEqualTo(jsonString); + .isEqualTo(jsonString); } @Test @@ -105,6 +111,45 @@ void testLoadFromJsonSchemaPropsOrStringArray() throws JsonProcessingException { // then assertThatJson(serializedJson).when(IGNORING_ARRAY_ORDER, TREATING_NULL_AS_ABSENT, IGNORING_EXTRA_FIELDS) - .isEqualTo(jsonString); + .isEqualTo(jsonString); + } + + @Test + void testLoadFromCrdWithValidationExpressionLanguage() throws JsonProcessingException { + // Given + String jsonString = Helper.loadJson("/valid-v1-crd-validation-expression.json"); + + // When + CustomResourceDefinition result = objectMapper.readValue(jsonString, CustomResourceDefinition.class); + + // Then + assertThat(result) + .extracting(CustomResourceDefinition::getSpec) + .extracting(CustomResourceDefinitionSpec::getVersions) + .asList() + .singleElement(InstanceOfAssertFactories.type(CustomResourceDefinitionVersion.class)) + .extracting(CustomResourceDefinitionVersion::getSchema) + .extracting(CustomResourceValidation::getOpenAPIV3Schema) + .extracting(JSONSchemaProps::getProperties, as(InstanceOfAssertFactories.type(Map.class))) + .extracting("spec", as(InstanceOfAssertFactories.type(JSONSchemaProps.class))) + .extracting(JSONSchemaProps::getXKubernetesValidations) + .asList() + .contains( + new ValidationRuleBuilder() + .withRule("self.minReplicas <= self.maxReplicas") + .withMessage("minReplicas cannot be larger than maxReplicas") + .build(), + new ValidationRuleBuilder() + .withRule("self.health.startsWith('ok')") + .withMessage("Validate a 'health' string field has the prefix 'ok'") + .build(), + new ValidationRuleBuilder() + .withRule("self.metadata.name.startsWith(self.prefix)") + .withMessage("Validate that an object's name has the prefix of another field value") + .build(), + new ValidationRuleBuilder() + .withRule("has(self.expired) && self.created + self.ttl < self.expired") + .withMessage("Validate that 'expired' date is after a 'create' date plus a 'ttl' duration") + .build()); } } diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/test/resources/valid-v1-crd-validation-expression.json b/kubernetes-model-generator/kubernetes-model-apiextensions/src/test/resources/valid-v1-crd-validation-expression.json new file mode 100644 index 00000000000..589aa4dc6ef --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/test/resources/valid-v1-crd-validation-expression.json @@ -0,0 +1,82 @@ +{ + "apiVersion": "apiextensions.k8s.io/v1", + "kind": "CustomResourceDefinition", + "metadata": { + "name": "toys.test.fabric8.io" + }, + "spec": { + "group": "test.fabric8.io", + "versions": [ + { + "name": "v1", + "served": true, + "storage": true, + "schema": { + "openAPIV3Schema": { + "type": "object", + "properties": { + "spec": { + "x-kubernetes-validations": [ + { + "rule": "self.minReplicas <= self.maxReplicas", + "message": "minReplicas cannot be larger than maxReplicas" + }, + { + "rule": "self.health.startsWith('ok')", + "message": "Validate a 'health' string field has the prefix 'ok'" + }, + { + "rule": "self.metadata.name.startsWith(self.prefix)", + "message": "Validate that an object's name has the prefix of another field value" + }, + { + "rule": "has(self.expired) && self.created + self.ttl < self.expired", + "message": "Validate that 'expired' date is after a 'create' date plus a 'ttl' duration" + } + ], + "type": "object", + "properties": { + "metadata": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + } + }, + "health": { + "type": "string" + }, + "minReplicas": { + "type": "integer" + }, + "maxReplicas": { + "type": "integer" + }, + "created": { + "type": "integer" + }, + "expired": { + "type": "integer" + }, + "ttl": { + "type": "integer" + }, + "prefix": { + "type": "string" + } + } + } + } + } + } + } + ], + "scope": "Namespaced", + "names": { + "plural": "toys", + "singular": "toy", + "kind": "Toy" + } + } +} diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/kube-schema.json index 1bb219025f7..041f278bcff 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/kube-schema.json @@ -431,9 +431,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1886,6 +1883,10 @@ "fsType": { "type": "string" }, + "nodeExpandSecretRef": { + "$ref": "#/definitions/kubernetes_core_SecretReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" + }, "nodePublishSecretRef": { "$ref": "#/definitions/kubernetes_core_SecretReference", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" @@ -5402,6 +5403,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -7096,12 +7100,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/validation-schema.json index 185ade4c60a..3a4e4b59ccf 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/validation-schema.json @@ -431,9 +431,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1886,6 +1883,10 @@ "fsType": { "type": "string" }, + "nodeExpandSecretRef": { + "$ref": "#/definitions/kubernetes_core_SecretReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" + }, "nodePublishSecretRef": { "$ref": "#/definitions/kubernetes_core_SecretReference", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" @@ -5402,6 +5403,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -7096,12 +7100,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, @@ -8654,6 +8671,10 @@ "fsType": { "type": "string" }, + "nodeExpandSecretRef": { + "$ref": "#/definitions/kubernetes_core_SecretReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" + }, "nodePublishSecretRef": { "$ref": "#/definitions/kubernetes_core_SecretReference", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" @@ -10758,9 +10779,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -11708,6 +11726,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -13591,12 +13612,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/test/java/io/fabric8/kubernetes/api/model/apps/DeploymentTest.java b/kubernetes-model-generator/kubernetes-model-apps/src/test/java/io/fabric8/kubernetes/api/model/apps/DeploymentTest.java index 05649b6e650..c87b4dbaaec 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/test/java/io/fabric8/kubernetes/api/model/apps/DeploymentTest.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/test/java/io/fabric8/kubernetes/api/model/apps/DeploymentTest.java @@ -16,9 +16,12 @@ package io.fabric8.kubernetes.api.model.apps; import com.fasterxml.jackson.databind.ObjectMapper; -import io.fabric8.kubernetes.api.model.apps.Deployment; -import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder; - +import io.fabric8.kubernetes.api.model.HostAlias; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.Quantity; +import io.fabric8.kubernetes.api.model.VolumeMount; +import io.fabric8.kubernetes.model.util.Helper; import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -28,335 +31,362 @@ import static net.javacrumbs.jsonunit.core.Option.IGNORING_EXTRA_FIELDS; import static net.javacrumbs.jsonunit.core.Option.TREATING_NULL_AS_ABSENT; import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import io.fabric8.kubernetes.api.model.Quantity; -import io.fabric8.kubernetes.model.util.Helper; -import io.fabric8.kubernetes.api.model.HostAlias; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.VolumeMount; -import io.fabric8.kubernetes.api.model.IntOrString; - -public class DeploymentTest { +class DeploymentTest { - private final ObjectMapper mapper = new ObjectMapper(); + private final ObjectMapper mapper = new ObjectMapper(); - @Test - public void kubernetesDeploymentTest() throws Exception { - // given - final String originalJson = Helper.loadJson("/valid-deployment.json"); + @Test + void kubernetesDeploymentTest() throws Exception { + // given + final String originalJson = Helper.loadJson("/valid-deployment.json"); - // when - final Deployment deployment = mapper.readValue(originalJson, Deployment.class); - final String serializedJson = mapper.writeValueAsString(deployment); + // when + final Deployment deployment = mapper.readValue(originalJson, Deployment.class); + final String serializedJson = mapper.writeValueAsString(deployment); - // then - assertThatJson(serializedJson).when(IGNORING_ARRAY_ORDER, TREATING_NULL_AS_ABSENT, IGNORING_EXTRA_FIELDS) - .isEqualTo(originalJson); - } + // then + assertThatJson(serializedJson).when(IGNORING_ARRAY_ORDER, TREATING_NULL_AS_ABSENT, IGNORING_EXTRA_FIELDS) + .isEqualTo(originalJson); + } - @Test - public void kubernetesDeploymentBuilderTest() throws Exception { - // Making a deployment using Builder classes. - Deployment deployment = new DeploymentBuilder() - .withNewMetadata() - .addToAnnotations("fabric8.io/iconUrl", "img/icons/spring-boot.svg") - .addToAnnotations("fabric8.io/metrics-path", "dashboard/file/kubernetes-pods.json/?var-project=fabric8-maven-sample-zero-config&var-version=3.5-SNAPSHOT") - .addToAnnotations("fabric8.io/scm-url", "https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/fabric8-maven-sample-zero-config") - .addToLabels("app", "fabric8-maven-sample-zero-config") - .addToLabels("provider", "fabric8") - .addToLabels("version", "3.5-SNAPSHOT") - .addToLabels("group", "io.fabric8") - .withName("fabric8-maven-sample-zero-config") - .withClusterName("kubernetes") - .withCreationTimestamp("2017-11-01 13:21:22 UTC") - .withDeletionTimestamp("2017-11-02 13:21:22 UTC") - .withNamespace("myproject") - .withGenerateName("zero-config-test") - .withOwnerReferences() - .endMetadata() - .withNewSpec() - .withMinReadySeconds(5) - .withPaused(false) - .withReplicas(5) - .withRevisionHistoryLimit(3) - .withNewSelector() - .addToMatchLabels("app", "fabric8-maven-sample-zero-config") - .addToMatchLabels("provider", "fabric8") - .addToMatchLabels("group", "io.fabric8") - .endSelector() - .withNewStrategy() - .withType("Rolling") - .withNewRollingUpdate() - .withMaxSurge(new IntOrString(20)) - .withMaxUnavailable(new IntOrString(20)) - .endRollingUpdate() - .endStrategy() - .withNewTemplate() - .withNewMetadata() - .addToAnnotations("fabric8.io/metrics-path", "dashboard/file/kubernetes-pods.json/?var-project=fabric8-maven-sample-zero-config&var-version=3.5-SNAPSHOT") - .addToAnnotations("fabric8.io/scm-url", "https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/fabric8-maven-sample-zero-config") - .addToAnnotations("fabric8.io/iconUrl", "img/icons/spring-boot.svg") - .addToLabels("app", "fabric8-maven-sample-zero-config") - .addToLabels("provider", "fabric8") - .addToLabels("version", "3.5-SNAPSHOT") - .addToLabels("group", "io.fabric8") - .endMetadata() - .withNewSpec() - .withActiveDeadlineSeconds(new Long(10)) - .addNewContainer() - .addToCommand("printenv") - .addToArgs("HOSTNAME", "KUBERNETES_PORT") - .addNewEnv() - .withName("KUBERNETES_NAMESPACE") - .withNewValueFrom() - .withNewFieldRef() - .endFieldRef() - .endValueFrom() - .endEnv() + @Test + void kubernetesDeploymentBuilderTest() { + // Making a deployment using Builder classes. + Deployment deployment = new DeploymentBuilder() + .withNewMetadata() + .addToAnnotations("fabric8.io/iconUrl", "img/icons/spring-boot.svg") + .addToAnnotations("fabric8.io/metrics-path", + "dashboard/file/kubernetes-pods.json/?var-project=fabric8-maven-sample-zero-config&var-version=3.5-SNAPSHOT") + .addToAnnotations("fabric8.io/scm-url", + "https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/fabric8-maven-sample-zero-config") + .addToLabels("app", "fabric8-maven-sample-zero-config") + .addToLabels("provider", "fabric8") + .addToLabels("version", "3.5-SNAPSHOT") + .addToLabels("group", "io.fabric8") + .withName("fabric8-maven-sample-zero-config") + .withCreationTimestamp("2017-11-01 13:21:22 UTC") + .withDeletionTimestamp("2017-11-02 13:21:22 UTC") + .withNamespace("myproject") + .withGenerateName("zero-config-test") + .withOwnerReferences() + .endMetadata() + .withNewSpec() + .withMinReadySeconds(5) + .withPaused(false) + .withReplicas(5) + .withRevisionHistoryLimit(3) + .withNewSelector() + .addToMatchLabels("app", "fabric8-maven-sample-zero-config") + .addToMatchLabels("provider", "fabric8") + .addToMatchLabels("group", "io.fabric8") + .endSelector() + .withNewStrategy() + .withType("Rolling") + .withNewRollingUpdate() + .withMaxSurge(new IntOrString(20)) + .withMaxUnavailable(new IntOrString(20)) + .endRollingUpdate() + .endStrategy() + .withNewTemplate() + .withNewMetadata() + .addToAnnotations("fabric8.io/metrics-path", + "dashboard/file/kubernetes-pods.json/?var-project=fabric8-maven-sample-zero-config&var-version=3.5-SNAPSHOT") + .addToAnnotations("fabric8.io/scm-url", + "https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/fabric8-maven-sample-zero-config") + .addToAnnotations("fabric8.io/iconUrl", "img/icons/spring-boot.svg") + .addToLabels("app", "fabric8-maven-sample-zero-config") + .addToLabels("provider", "fabric8") + .addToLabels("version", "3.5-SNAPSHOT") + .addToLabels("group", "io.fabric8") + .endMetadata() + .withNewSpec() + .withActiveDeadlineSeconds(10L) + .addNewContainer() + .addToCommand("printenv") + .addToArgs("HOSTNAME", "KUBERNETES_PORT") + .addNewEnv() + .withName("KUBERNETES_NAMESPACE") + .withNewValueFrom() + .withNewFieldRef() + .endFieldRef() + .endValueFrom() + .endEnv() - // test env name pattern "[-._a-zA-Z][-._a-zA-Z0-9]*" - .addNewEnv() - .withName("KUBERNETES-NAME") - .withNewValueFrom() - .withNewFieldRef() - .endFieldRef() - .endValueFrom() - .endEnv() - .addNewEnv() - .withName("KUBERNETES.CLUSTERNAME") - .withNewValueFrom() - .withNewFieldRef() - .endFieldRef() - .endValueFrom() - .endEnv() + // test env name pattern "[-._a-zA-Z][-._a-zA-Z0-9]*" + .addNewEnv() + .withName("KUBERNETES-NAME") + .withNewValueFrom() + .withNewFieldRef() + .endFieldRef() + .endValueFrom() + .endEnv() + .addNewEnv() + .withName("KUBERNETES.CLUSTERNAME") + .withNewValueFrom() + .withNewFieldRef() + .endFieldRef() + .endValueFrom() + .endEnv() - .withImage("fabric8/fabric8-maven-sample-zero-config:snapshot-171129-120114-0102") - .withImagePullPolicy("IfNotPresent") - .withName("spring-boot") - .addNewEnvFrom() - .withNewSecretRef() - .withName("my-app-secret") - .endSecretRef() - .endEnvFrom() - .withNewLivenessProbe() - .withNewHttpGet() - .withPath("/healthz") - .withPort(new IntOrString("8080")) - .addNewHttpHeader("X-Custom-Header", "Awesome") - .endHttpGet() - .withInitialDelaySeconds(5) - .withPeriodSeconds(5) - .withTimeoutSeconds(5) - .withFailureThreshold(5) - .withSuccessThreshold(5) - .endLivenessProbe() - .withNewReadinessProbe() - .withNewExec() - .addToCommand("cat") - .addToCommand("/temp/healthy") - .endExec() - .withInitialDelaySeconds(5) - .withPeriodSeconds(5) - .withTimeoutSeconds(5) - .withFailureThreshold(5) - .withSuccessThreshold(5) - .endReadinessProbe() - .addNewPort() - .withContainerPort(8080) - .withName("http") - .withProtocol("TCP") - .withHostIP("127.0.0.1") - .withHostPort(50) - .endPort() - .addNewPort() - .withContainerPort(9779) - .withName("prometheus") - .withProtocol("TCP") - .endPort() - .addNewPort() - .withContainerPort(8778) - .withName("jolokia") - .withProtocol("TCP") - .endPort() - .withStdin(false) - .withStdinOnce(false) - .withNewResources() - .addToRequests(Collections.singletonMap("memory", new Quantity("64Mi"))) - .addToRequests(Collections.singletonMap("cpu", new Quantity("250m"))) - .addToLimits(Collections.singletonMap("memory", new Quantity("128Mi"))) - .addToLimits(Collections.singletonMap("cpu", new Quantity("500m"))) - .endResources() - .withTerminationMessagePath("/tmp/my-log") - .withTerminationMessagePolicy("FallbackToLogsOnError") - .withTty(false) - .addToVolumeMounts(new VolumeMount("/cache","", "cache-volume", true, null, null)) - .withWorkingDir("/workdir") - .endContainer() - .withDnsPolicy("ClusterFirst") - .addToHostAliases(new HostAlias(Arrays.asList("foo.local", "bar.local"), "127.0.0.1")) - .addToHostAliases(new HostAlias(Arrays.asList("foo.remote", "bar.remote"), "10.0.2.3")) - .withHostIPC(false) - .withHostNetwork(false) - .withHostname("localhost") - .withHostPID(false) - .addToImagePullSecrets(new LocalObjectReference("regsecret")) - .addToInitContainers(new io.fabric8.kubernetes.api.model.ContainerBuilder() - .withName("init-mydb") - .withImage("busybox") - .addToCommand("sh") - .addToCommand("-c") - .addToCommand("until nslookup mydb; do echo waiting for mydb; sleep 2; done;") - .build()) - .withNodeName("node1") - .withNodeSelector(Collections.singletonMap("disktype", "ssd")) - .withServiceAccount("robot") - .withServiceAccountName("robot") - .withSubdomain("test") - .withRestartPolicy("Always") - .withSchedulerName("default") - .withTerminationGracePeriodSeconds(new Long(30)) - .addToVolumes(new io.fabric8.kubernetes.api.model.VolumeBuilder() - .withName("test-volume") - .withNewAwsElasticBlockStore() - .withVolumeID("") - .withFsType("ext4") - .endAwsElasticBlockStore() - .build()) - .endSpec() - .endTemplate() - .endSpec() - .build(); + .withImage("fabric8/fabric8-maven-sample-zero-config:snapshot-171129-120114-0102") + .withImagePullPolicy("IfNotPresent") + .withName("spring-boot") + .addNewEnvFrom() + .withNewSecretRef() + .withName("my-app-secret") + .endSecretRef() + .endEnvFrom() + .withNewLivenessProbe() + .withNewHttpGet() + .withPath("/healthz") + .withPort(new IntOrString("8080")) + .addNewHttpHeader("X-Custom-Header", "Awesome") + .endHttpGet() + .withInitialDelaySeconds(5) + .withPeriodSeconds(5) + .withTimeoutSeconds(5) + .withFailureThreshold(5) + .withSuccessThreshold(5) + .endLivenessProbe() + .withNewReadinessProbe() + .withNewExec() + .addToCommand("cat") + .addToCommand("/temp/healthy") + .endExec() + .withInitialDelaySeconds(5) + .withPeriodSeconds(5) + .withTimeoutSeconds(5) + .withFailureThreshold(5) + .withSuccessThreshold(5) + .endReadinessProbe() + .addNewPort() + .withContainerPort(8080) + .withName("http") + .withProtocol("TCP") + .withHostIP("127.0.0.1") + .withHostPort(50) + .endPort() + .addNewPort() + .withContainerPort(9779) + .withName("prometheus") + .withProtocol("TCP") + .endPort() + .addNewPort() + .withContainerPort(8778) + .withName("jolokia") + .withProtocol("TCP") + .endPort() + .withStdin(false) + .withStdinOnce(false) + .withNewResources() + .addToRequests(Collections.singletonMap("memory", new Quantity("64Mi"))) + .addToRequests(Collections.singletonMap("cpu", new Quantity("250m"))) + .addToLimits(Collections.singletonMap("memory", new Quantity("128Mi"))) + .addToLimits(Collections.singletonMap("cpu", new Quantity("500m"))) + .endResources() + .withTerminationMessagePath("/tmp/my-log") + .withTerminationMessagePolicy("FallbackToLogsOnError") + .withTty(false) + .addToVolumeMounts(new VolumeMount("/cache", "", "cache-volume", true, null, null)) + .withWorkingDir("/workdir") + .endContainer() + .withDnsPolicy("ClusterFirst") + .addToHostAliases(new HostAlias(Arrays.asList("foo.local", "bar.local"), "127.0.0.1")) + .addToHostAliases(new HostAlias(Arrays.asList("foo.remote", "bar.remote"), "10.0.2.3")) + .withHostIPC(false) + .withHostNetwork(false) + .withHostname("localhost") + .withHostPID(false) + .addToImagePullSecrets(new LocalObjectReference("regsecret")) + .addToInitContainers(new io.fabric8.kubernetes.api.model.ContainerBuilder() + .withName("init-mydb") + .withImage("busybox") + .addToCommand("sh") + .addToCommand("-c") + .addToCommand("until nslookup mydb; do echo waiting for mydb; sleep 2; done;") + .build()) + .withNodeName("node1") + .withNodeSelector(Collections.singletonMap("disktype", "ssd")) + .withServiceAccount("robot") + .withServiceAccountName("robot") + .withSubdomain("test") + .withRestartPolicy("Always") + .withSchedulerName("default") + .withTerminationGracePeriodSeconds(30L) + .addToVolumes(new io.fabric8.kubernetes.api.model.VolumeBuilder() + .withName("test-volume") + .withNewAwsElasticBlockStore() + .withVolumeID("") + .withFsType("ext4") + .endAwsElasticBlockStore() + .build()) + .endSpec() + .endTemplate() + .endSpec() + .build(); - // Assert that we serve as Expected - assertEquals("fabric8-maven-sample-zero-config", deployment.getMetadata().getName()); - assertEquals("apps/v1", deployment.getApiVersion()); + // Assert that we serve as Expected + assertEquals("fabric8-maven-sample-zero-config", deployment.getMetadata().getName()); + assertEquals("apps/v1", deployment.getApiVersion()); - // Assert Metadata - assertArrayEquals(new Object[] {"fabric8.io/iconUrl", "fabric8.io/metrics-path", "fabric8.io/scm-url"} - , deployment.getMetadata().getAnnotations().keySet().toArray()); - assertArrayEquals( - new Object[] {"img/icons/spring-boot.svg", - "dashboard/file/kubernetes-pods.json/?var-project=fabric8-maven-sample-zero-config&var-version=3.5-SNAPSHOT", - "https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/fabric8-maven-sample-zero-config"}, - deployment.getMetadata().getAnnotations().values().toArray()); - assertArrayEquals( - new Object[] {"app", "provider", "version", "group"}, deployment.getMetadata().getLabels().keySet().toArray()); - assertArrayEquals( - new Object[] {"fabric8-maven-sample-zero-config", "fabric8", "3.5-SNAPSHOT", "io.fabric8", }, - deployment.getMetadata().getLabels().values().toArray()); - assertEquals("fabric8-maven-sample-zero-config", deployment.getMetadata().getName()); - assertEquals("kubernetes", deployment.getMetadata().getClusterName()); - assertEquals("myproject", deployment.getMetadata().getNamespace()); - assertEquals("zero-config-test", deployment.getMetadata().getGenerateName()); - assertTrue(deployment.getMetadata().getOwnerReferences().isEmpty()); + // Assert Metadata + assertArrayEquals(new Object[] { "fabric8.io/iconUrl", "fabric8.io/metrics-path", "fabric8.io/scm-url" }, + deployment.getMetadata().getAnnotations().keySet().toArray()); + assertArrayEquals( + new Object[] { "img/icons/spring-boot.svg", + "dashboard/file/kubernetes-pods.json/?var-project=fabric8-maven-sample-zero-config&var-version=3.5-SNAPSHOT", + "https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/fabric8-maven-sample-zero-config" }, + deployment.getMetadata().getAnnotations().values().toArray()); + assertArrayEquals( + new Object[] { "app", "provider", "version", "group" }, deployment.getMetadata().getLabels().keySet().toArray()); + assertArrayEquals( + new Object[] { "fabric8-maven-sample-zero-config", "fabric8", "3.5-SNAPSHOT", "io.fabric8", }, + deployment.getMetadata().getLabels().values().toArray()); + assertEquals("fabric8-maven-sample-zero-config", deployment.getMetadata().getName()); + assertEquals("myproject", deployment.getMetadata().getNamespace()); + assertEquals("zero-config-test", deployment.getMetadata().getGenerateName()); + assertTrue(deployment.getMetadata().getOwnerReferences().isEmpty()); - // Assert Spec - assertEquals(5, deployment.getSpec().getMinReadySeconds().intValue()); - assertFalse(deployment.getSpec().getPaused()); - assertEquals(5, deployment.getSpec().getReplicas().intValue()); - assertEquals(3, deployment.getSpec().getRevisionHistoryLimit().intValue()); - assertArrayEquals( - new Object[] {"app", "provider", "group"}, deployment.getSpec().getSelector().getMatchLabels().keySet().toArray()); - assertArrayEquals( - new Object[] {"fabric8-maven-sample-zero-config", "fabric8", "io.fabric8"}, - deployment.getSpec().getSelector().getMatchLabels().values().toArray()); - assertEquals("Rolling", deployment.getSpec().getStrategy().getType()); - assertEquals(20, deployment.getSpec().getStrategy().getRollingUpdate().getMaxSurge().getIntVal().intValue()); - assertEquals(20, deployment.getSpec().getStrategy().getRollingUpdate().getMaxUnavailable().getIntVal().intValue()); + // Assert Spec + assertEquals(5, deployment.getSpec().getMinReadySeconds().intValue()); + assertFalse(deployment.getSpec().getPaused()); + assertEquals(5, deployment.getSpec().getReplicas().intValue()); + assertEquals(3, deployment.getSpec().getRevisionHistoryLimit().intValue()); + assertArrayEquals( + new Object[] { "app", "provider", "group" }, deployment.getSpec().getSelector().getMatchLabels().keySet().toArray()); + assertArrayEquals( + new Object[] { "fabric8-maven-sample-zero-config", "fabric8", "io.fabric8" }, + deployment.getSpec().getSelector().getMatchLabels().values().toArray()); + assertEquals("Rolling", deployment.getSpec().getStrategy().getType()); + assertEquals(20, deployment.getSpec().getStrategy().getRollingUpdate().getMaxSurge().getIntVal().intValue()); + assertEquals(20, deployment.getSpec().getStrategy().getRollingUpdate().getMaxUnavailable().getIntVal().intValue()); - // Assert Spec's template - assertArrayEquals( - new Object[] {"fabric8.io/metrics-path", "fabric8.io/scm-url", "fabric8.io/iconUrl"}, - deployment.getSpec().getTemplate().getMetadata().getAnnotations().keySet().toArray()); - assertArrayEquals( - new Object[]{ - "dashboard/file/kubernetes-pods.json/?var-project=fabric8-maven-sample-zero-config&var-version=3.5-SNAPSHOT", - "https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/fabric8-maven-sample-zero-config", - "img/icons/spring-boot.svg" - }, deployment.getSpec().getTemplate().getMetadata().getAnnotations().values().toArray()); - assertArrayEquals( - new Object[] {"app", "provider", "version", "group"}, deployment.getSpec().getTemplate().getMetadata().getLabels().keySet().toArray()); - assertArrayEquals( - new Object[] {"fabric8-maven-sample-zero-config", "fabric8", "3.5-SNAPSHOT", "io.fabric8"}, - deployment.getSpec().getTemplate().getMetadata().getLabels().values().toArray()); - assertEquals(10, deployment.getSpec().getTemplate().getSpec().getActiveDeadlineSeconds().intValue()); + // Assert Spec's template + assertArrayEquals( + new Object[] { "fabric8.io/metrics-path", "fabric8.io/scm-url", "fabric8.io/iconUrl" }, + deployment.getSpec().getTemplate().getMetadata().getAnnotations().keySet().toArray()); + assertArrayEquals( + new Object[] { + "dashboard/file/kubernetes-pods.json/?var-project=fabric8-maven-sample-zero-config&var-version=3.5-SNAPSHOT", + "https://github.com/spring-projects/spring-boot/spring-boot-starter-parent/fabric8-maven-sample-zero-config", + "img/icons/spring-boot.svg" + }, deployment.getSpec().getTemplate().getMetadata().getAnnotations().values().toArray()); + assertArrayEquals( + new Object[] { "app", "provider", "version", "group" }, + deployment.getSpec().getTemplate().getMetadata().getLabels().keySet().toArray()); + assertArrayEquals( + new Object[] { "fabric8-maven-sample-zero-config", "fabric8", "3.5-SNAPSHOT", "io.fabric8" }, + deployment.getSpec().getTemplate().getMetadata().getLabels().values().toArray()); + assertEquals(10, deployment.getSpec().getTemplate().getSpec().getActiveDeadlineSeconds().intValue()); - // Assert Spec's template's container - assertEquals(1, deployment.getSpec().getTemplate().getSpec().getContainers().size()); - assertArrayEquals(new Object[] {"printenv"}, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getCommand().toArray()); - assertArrayEquals(new Object[] {"HOSTNAME", "KUBERNETES_PORT"}, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getArgs().toArray()); - assertEquals(3, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv().size()); - assertEquals("KUBERNETES_NAMESPACE", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv().get(0).getName()); - assertEquals("KUBERNETES-NAME", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv().get(1).getName()); - assertEquals("KUBERNETES.CLUSTERNAME", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv().get(2).getName()); - assertEquals("fabric8/fabric8-maven-sample-zero-config:snapshot-171129-120114-0102", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage()); - assertEquals("IfNotPresent", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImagePullPolicy()); - assertEquals("spring-boot", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getName()); - assertEquals(1, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnvFrom().size()); - assertEquals("my-app-secret", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnvFrom().get(0).getSecretRef().getName()); - assertEquals("/healthz", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getHttpGet().getPath()); - assertEquals("8080", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getHttpGet().getPort().getStrVal()); - assertEquals("X-Custom-Header", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getHttpGet().getHttpHeaders().get(0).getName()); - assertEquals("Awesome", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getHttpGet().getHttpHeaders().get(0).getValue()); - assertEquals(5, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getInitialDelaySeconds().intValue()); - assertEquals(5, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getPeriodSeconds().intValue()); - assertEquals(5, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getFailureThreshold().intValue()); - assertEquals(5, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getSuccessThreshold().intValue()); - assertEquals(3, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().size()); - assertEquals(8080, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getContainerPort().intValue()); - assertEquals("http", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getName()); - assertEquals("TCP", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getProtocol()); - assertEquals("127.0.0.1", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getHostIP()); - assertEquals(50, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getHostPort().intValue()); - assertEquals(9779, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(1).getContainerPort().intValue()); - assertEquals("prometheus", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(1).getName()); - assertEquals("TCP", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(1).getProtocol()); - assertEquals(8778, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(2).getContainerPort().intValue()); - assertEquals("jolokia", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(2).getName()); - assertEquals("TCP", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(2).getProtocol()); - assertFalse(deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getStdin()); - assertFalse(deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getStdinOnce()); - assertArrayEquals(new Object[] {"memory", "cpu"}, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getResources().getRequests().keySet().toArray()); - assertArrayEquals(new Object[] {"memory", "cpu"}, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getResources().getLimits().keySet().toArray()); - assertEquals("/tmp/my-log", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getTerminationMessagePath()); - assertEquals("FallbackToLogsOnError", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getTerminationMessagePolicy()); - assertFalse(deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getTty()); - assertEquals(1, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getVolumeMounts().size()); - assertEquals("/cache", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getVolumeMounts().get(0).getMountPath()); - assertEquals("cache-volume", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getVolumeMounts().get(0).getName()); - assertEquals("/workdir", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getWorkingDir()); + // Assert Spec's template's container + assertEquals(1, deployment.getSpec().getTemplate().getSpec().getContainers().size()); + assertArrayEquals(new Object[] { "printenv" }, + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getCommand().toArray()); + assertArrayEquals(new Object[] { "HOSTNAME", "KUBERNETES_PORT" }, + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getArgs().toArray()); + assertEquals(3, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv().size()); + assertEquals("KUBERNETES_NAMESPACE", + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv().get(0).getName()); + assertEquals("KUBERNETES-NAME", + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv().get(1).getName()); + assertEquals("KUBERNETES.CLUSTERNAME", + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv().get(2).getName()); + assertEquals("fabric8/fabric8-maven-sample-zero-config:snapshot-171129-120114-0102", + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage()); + assertEquals("IfNotPresent", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImagePullPolicy()); + assertEquals("spring-boot", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getName()); + assertEquals(1, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnvFrom().size()); + assertEquals("my-app-secret", + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnvFrom().get(0).getSecretRef().getName()); + assertEquals("/healthz", + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getHttpGet().getPath()); + assertEquals("8080", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getHttpGet() + .getPort().getStrVal()); + assertEquals("X-Custom-Header", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe() + .getHttpGet().getHttpHeaders().get(0).getName()); + assertEquals("Awesome", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getHttpGet() + .getHttpHeaders().get(0).getValue()); + assertEquals(5, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe() + .getInitialDelaySeconds().intValue()); + assertEquals(5, + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getPeriodSeconds().intValue()); + assertEquals(5, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getFailureThreshold() + .intValue()); + assertEquals(5, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getSuccessThreshold() + .intValue()); + assertEquals(3, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().size()); + assertEquals(8080, + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getContainerPort().intValue()); + assertEquals("http", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getName()); + assertEquals("TCP", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getProtocol()); + assertEquals("127.0.0.1", + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getHostIP()); + assertEquals(50, + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getHostPort().intValue()); + assertEquals(9779, + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(1).getContainerPort().intValue()); + assertEquals("prometheus", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(1).getName()); + assertEquals("TCP", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(1).getProtocol()); + assertEquals(8778, + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(2).getContainerPort().intValue()); + assertEquals("jolokia", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(2).getName()); + assertEquals("TCP", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(2).getProtocol()); + assertFalse(deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getStdin()); + assertFalse(deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getStdinOnce()); + assertArrayEquals(new Object[] { "memory", "cpu" }, + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getResources().getRequests().keySet().toArray()); + assertArrayEquals(new Object[] { "memory", "cpu" }, + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getResources().getLimits().keySet().toArray()); + assertEquals("/tmp/my-log", + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getTerminationMessagePath()); + assertEquals("FallbackToLogsOnError", + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getTerminationMessagePolicy()); + assertFalse(deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getTty()); + assertEquals(1, deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getVolumeMounts().size()); + assertEquals("/cache", + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getVolumeMounts().get(0).getMountPath()); + assertEquals("cache-volume", + deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getVolumeMounts().get(0).getName()); + assertEquals("/workdir", deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getWorkingDir()); - assertEquals("ClusterFirst", deployment.getSpec().getTemplate().getSpec().getDnsPolicy()); - assertEquals(2, deployment.getSpec().getTemplate().getSpec().getHostAliases().size()); - assertEquals("127.0.0.1", deployment.getSpec().getTemplate().getSpec().getHostAliases().get(0).getIp()); - assertArrayEquals(new Object[] {"foo.local", "bar.local"}, deployment.getSpec().getTemplate().getSpec().getHostAliases().get(0).getHostnames().toArray()); - assertEquals("10.0.2.3", deployment.getSpec().getTemplate().getSpec().getHostAliases().get(1).getIp()); - assertArrayEquals(new Object[] {"foo.remote", "bar.remote"}, deployment.getSpec().getTemplate().getSpec().getHostAliases().get(1).getHostnames().toArray()); - assertFalse(deployment.getSpec().getTemplate().getSpec().getHostIPC()); - assertFalse(deployment.getSpec().getTemplate().getSpec().getHostNetwork()); - assertFalse(deployment.getSpec().getTemplate().getSpec().getHostPID()); - assertEquals("localhost", deployment.getSpec().getTemplate().getSpec().getHostname()); - assertEquals(1, deployment.getSpec().getTemplate().getSpec().getImagePullSecrets().size()); - assertEquals("regsecret", deployment.getSpec().getTemplate().getSpec().getImagePullSecrets().get(0).getName()); - assertEquals(1, deployment.getSpec().getTemplate().getSpec().getInitContainers().size()); - assertEquals("init-mydb", deployment.getSpec().getTemplate().getSpec().getInitContainers().get(0).getName()); - assertEquals("busybox", deployment.getSpec().getTemplate().getSpec().getInitContainers().get(0).getImage()); - assertArrayEquals(new Object[] {"sh", "-c", "until nslookup mydb; do echo waiting for mydb; sleep 2; done;"}, deployment.getSpec().getTemplate().getSpec().getInitContainers().get(0).getCommand().toArray()); - assertEquals("node1", deployment.getSpec().getTemplate().getSpec().getNodeName()); - assertEquals("ssd", deployment.getSpec().getTemplate().getSpec().getNodeSelector().get("disktype")); - assertEquals("robot", deployment.getSpec().getTemplate().getSpec().getServiceAccount()); - assertEquals("robot", deployment.getSpec().getTemplate().getSpec().getServiceAccountName()); - assertEquals("test", deployment.getSpec().getTemplate().getSpec().getSubdomain()); - assertEquals("Always", deployment.getSpec().getTemplate().getSpec().getRestartPolicy()); - assertEquals("default", deployment.getSpec().getTemplate().getSpec().getSchedulerName()); - assertEquals(30, deployment.getSpec().getTemplate().getSpec().getTerminationGracePeriodSeconds().intValue()); - assertEquals(1, deployment.getSpec().getTemplate().getSpec().getVolumes().size()); - assertEquals("test-volume", deployment.getSpec().getTemplate().getSpec().getVolumes().get(0).getName()); - assertEquals("", deployment.getSpec().getTemplate().getSpec().getVolumes().get(0).getAwsElasticBlockStore().getVolumeID()); - assertEquals("ext4", deployment.getSpec().getTemplate().getSpec().getVolumes().get(0).getAwsElasticBlockStore().getFsType()); - } + assertEquals("ClusterFirst", deployment.getSpec().getTemplate().getSpec().getDnsPolicy()); + assertEquals(2, deployment.getSpec().getTemplate().getSpec().getHostAliases().size()); + assertEquals("127.0.0.1", deployment.getSpec().getTemplate().getSpec().getHostAliases().get(0).getIp()); + assertArrayEquals(new Object[] { "foo.local", "bar.local" }, + deployment.getSpec().getTemplate().getSpec().getHostAliases().get(0).getHostnames().toArray()); + assertEquals("10.0.2.3", deployment.getSpec().getTemplate().getSpec().getHostAliases().get(1).getIp()); + assertArrayEquals(new Object[] { "foo.remote", "bar.remote" }, + deployment.getSpec().getTemplate().getSpec().getHostAliases().get(1).getHostnames().toArray()); + assertFalse(deployment.getSpec().getTemplate().getSpec().getHostIPC()); + assertFalse(deployment.getSpec().getTemplate().getSpec().getHostNetwork()); + assertFalse(deployment.getSpec().getTemplate().getSpec().getHostPID()); + assertEquals("localhost", deployment.getSpec().getTemplate().getSpec().getHostname()); + assertEquals(1, deployment.getSpec().getTemplate().getSpec().getImagePullSecrets().size()); + assertEquals("regsecret", deployment.getSpec().getTemplate().getSpec().getImagePullSecrets().get(0).getName()); + assertEquals(1, deployment.getSpec().getTemplate().getSpec().getInitContainers().size()); + assertEquals("init-mydb", deployment.getSpec().getTemplate().getSpec().getInitContainers().get(0).getName()); + assertEquals("busybox", deployment.getSpec().getTemplate().getSpec().getInitContainers().get(0).getImage()); + assertArrayEquals(new Object[] { "sh", "-c", "until nslookup mydb; do echo waiting for mydb; sleep 2; done;" }, + deployment.getSpec().getTemplate().getSpec().getInitContainers().get(0).getCommand().toArray()); + assertEquals("node1", deployment.getSpec().getTemplate().getSpec().getNodeName()); + assertEquals("ssd", deployment.getSpec().getTemplate().getSpec().getNodeSelector().get("disktype")); + assertEquals("robot", deployment.getSpec().getTemplate().getSpec().getServiceAccount()); + assertEquals("robot", deployment.getSpec().getTemplate().getSpec().getServiceAccountName()); + assertEquals("test", deployment.getSpec().getTemplate().getSpec().getSubdomain()); + assertEquals("Always", deployment.getSpec().getTemplate().getSpec().getRestartPolicy()); + assertEquals("default", deployment.getSpec().getTemplate().getSpec().getSchedulerName()); + assertEquals(30, deployment.getSpec().getTemplate().getSpec().getTerminationGracePeriodSeconds().intValue()); + assertEquals(1, deployment.getSpec().getTemplate().getSpec().getVolumes().size()); + assertEquals("test-volume", deployment.getSpec().getTemplate().getSpec().getVolumes().get(0).getName()); + assertEquals("", + deployment.getSpec().getTemplate().getSpec().getVolumes().get(0).getAwsElasticBlockStore().getVolumeID()); + assertEquals("ext4", + deployment.getSpec().getTemplate().getSpec().getVolumes().get(0).getAwsElasticBlockStore().getFsType()); + } } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-autoscaling/cmd/generate/generate.go index 8169b13ce94..53ec28c7904 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/cmd/generate/generate.go +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/cmd/generate/generate.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" apimachineryversion "k8s.io/apimachinery/pkg/version" + autoscalingapiv2 "k8s.io/api/autoscaling/v2" autoscalingapiv1 "k8s.io/api/autoscaling/v1" autoscalingapiv2beta1 "k8s.io/api/autoscaling/v2beta1" autoscalingapiv2beta2 "k8s.io/api/autoscaling/v2beta2" @@ -58,6 +59,8 @@ type Schema struct { Quantity resource.Quantity Scale autoscalingapiv1.Scale + V2HorizontalPodAutoscaler autoscalingapiv2.HorizontalPodAutoscaler + V2HorizontalPodAutoscalerList autoscalingapiv2.HorizontalPodAutoscalerList V1HorizontalPodAutoscaler autoscalingapiv1.HorizontalPodAutoscaler V1HorizontalPodAutoscalerList autoscalingapiv1.HorizontalPodAutoscalerList V2beta1HorizontalPodAutoscaler autoscalingapiv2beta1.HorizontalPodAutoscaler @@ -76,6 +79,7 @@ func main() { {"k8s.io/api/autoscaling/v2beta2", "autoscaling", "io.fabric8.kubernetes.api.model.autoscaling.v2beta2", "kubernetes_autoscaling_v2beta2_", true}, {"k8s.io/api/autoscaling/v2beta1", "autoscaling", "io.fabric8.kubernetes.api.model.autoscaling.v2beta1", "kubernetes_autoscaling_v2beta1_", true}, {"k8s.io/api/autoscaling/v1", "autoscaling", "io.fabric8.kubernetes.api.model.autoscaling.v1", "kubernetes_autoscaling_v1_", true}, + {"k8s.io/api/autoscaling/v2", "autoscaling", "io.fabric8.kubernetes.api.model.autoscaling.v2", "kubernetes_autoscaling_v2_", true}, } typeMap := map[reflect.Type]reflect.Type{ diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 6185d5b8ba2..1178997af40 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -53,6 +53,8 @@ "UpdateOptions", "V1HorizontalPodAutoscaler", "V1HorizontalPodAutoscalerList", + "V2HorizontalPodAutoscaler", + "V2HorizontalPodAutoscalerList", "V2beta1HorizontalPodAutoscaler", "V2beta1HorizontalPodAutoscalerList", "V2beta2HorizontalPodAutoscaler", @@ -118,6 +120,10 @@ public class KubeSchema { private io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler; @JsonProperty("V1HorizontalPodAutoscalerList") private io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList; + @JsonProperty("V2HorizontalPodAutoscaler") + private io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler; + @JsonProperty("V2HorizontalPodAutoscalerList") + private io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList; @JsonProperty("V2beta1HorizontalPodAutoscaler") private io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler; @JsonProperty("V2beta1HorizontalPodAutoscalerList") @@ -139,31 +145,33 @@ public KubeSchema() { /** * * @param listOptions - * @param v1HorizontalPodAutoscalerList * @param aPIGroupList - * @param patchOptions - * @param deleteOptions - * @param quantity - * @param v2beta2HorizontalPodAutoscalerList * @param baseKubernetesList * @param scale * @param updateOptions * @param v1HorizontalPodAutoscaler - * @param createOptions * @param patch + * @param v2beta1HorizontalPodAutoscalerList + * @param v2beta1HorizontalPodAutoscaler + * @param rootPaths + * @param info + * @param v1HorizontalPodAutoscalerList + * @param patchOptions + * @param deleteOptions + * @param quantity + * @param v2beta2HorizontalPodAutoscalerList + * @param v2HorizontalPodAutoscaler + * @param createOptions * @param aPIGroup * @param typeMeta - * @param v2beta1HorizontalPodAutoscalerList * @param v2beta2HorizontalPodAutoscaler - * @param v2beta1HorizontalPodAutoscaler + * @param v2HorizontalPodAutoscalerList * @param objectMeta - * @param rootPaths * @param getOptions * @param time - * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -185,6 +193,8 @@ public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesLi this.updateOptions = updateOptions; this.v1HorizontalPodAutoscaler = v1HorizontalPodAutoscaler; this.v1HorizontalPodAutoscalerList = v1HorizontalPodAutoscalerList; + this.v2HorizontalPodAutoscaler = v2HorizontalPodAutoscaler; + this.v2HorizontalPodAutoscalerList = v2HorizontalPodAutoscalerList; this.v2beta1HorizontalPodAutoscaler = v2beta1HorizontalPodAutoscaler; this.v2beta1HorizontalPodAutoscalerList = v2beta1HorizontalPodAutoscalerList; this.v2beta2HorizontalPodAutoscaler = v2beta2HorizontalPodAutoscaler; @@ -391,6 +401,26 @@ public void setV1HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.model.aut this.v1HorizontalPodAutoscalerList = v1HorizontalPodAutoscalerList; } + @JsonProperty("V2HorizontalPodAutoscaler") + public io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler getV2HorizontalPodAutoscaler() { + return v2HorizontalPodAutoscaler; + } + + @JsonProperty("V2HorizontalPodAutoscaler") + public void setV2HorizontalPodAutoscaler(io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler) { + this.v2HorizontalPodAutoscaler = v2HorizontalPodAutoscaler; + } + + @JsonProperty("V2HorizontalPodAutoscalerList") + public io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList getV2HorizontalPodAutoscalerList() { + return v2HorizontalPodAutoscalerList; + } + + @JsonProperty("V2HorizontalPodAutoscalerList") + public void setV2HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList) { + this.v2HorizontalPodAutoscalerList = v2HorizontalPodAutoscalerList; + } + @JsonProperty("V2beta1HorizontalPodAutoscaler") public io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler getV2beta1HorizontalPodAutoscaler() { return v2beta1HorizontalPodAutoscaler; diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 999011e1e64..de4f5b70d3a 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -53,6 +53,8 @@ "UpdateOptions", "V1HorizontalPodAutoscaler", "V1HorizontalPodAutoscalerList", + "V2HorizontalPodAutoscaler", + "V2HorizontalPodAutoscalerList", "V2beta1HorizontalPodAutoscaler", "V2beta1HorizontalPodAutoscalerList", "V2beta2HorizontalPodAutoscaler", @@ -118,6 +120,10 @@ public class ValidationSchema { private io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler; @JsonProperty("V1HorizontalPodAutoscalerList") private io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList; + @JsonProperty("V2HorizontalPodAutoscaler") + private io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler; + @JsonProperty("V2HorizontalPodAutoscalerList") + private io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList; @JsonProperty("V2beta1HorizontalPodAutoscaler") private io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler; @JsonProperty("V2beta1HorizontalPodAutoscalerList") @@ -139,31 +145,33 @@ public ValidationSchema() { /** * * @param listOptions - * @param v1HorizontalPodAutoscalerList * @param aPIGroupList - * @param patchOptions - * @param deleteOptions - * @param quantity - * @param v2beta2HorizontalPodAutoscalerList * @param baseKubernetesList * @param scale * @param updateOptions * @param v1HorizontalPodAutoscaler - * @param createOptions * @param patch + * @param v2beta1HorizontalPodAutoscalerList + * @param v2beta1HorizontalPodAutoscaler + * @param rootPaths + * @param info + * @param v1HorizontalPodAutoscalerList + * @param patchOptions + * @param deleteOptions + * @param quantity + * @param v2beta2HorizontalPodAutoscalerList + * @param v2HorizontalPodAutoscaler + * @param createOptions * @param aPIGroup * @param typeMeta - * @param v2beta1HorizontalPodAutoscalerList * @param v2beta2HorizontalPodAutoscaler - * @param v2beta1HorizontalPodAutoscaler + * @param v2HorizontalPodAutoscalerList * @param objectMeta - * @param rootPaths * @param getOptions * @param time - * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -185,6 +193,8 @@ public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubern this.updateOptions = updateOptions; this.v1HorizontalPodAutoscaler = v1HorizontalPodAutoscaler; this.v1HorizontalPodAutoscalerList = v1HorizontalPodAutoscalerList; + this.v2HorizontalPodAutoscaler = v2HorizontalPodAutoscaler; + this.v2HorizontalPodAutoscalerList = v2HorizontalPodAutoscalerList; this.v2beta1HorizontalPodAutoscaler = v2beta1HorizontalPodAutoscaler; this.v2beta1HorizontalPodAutoscalerList = v2beta1HorizontalPodAutoscalerList; this.v2beta2HorizontalPodAutoscaler = v2beta2HorizontalPodAutoscaler; @@ -391,6 +401,26 @@ public void setV1HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.model.aut this.v1HorizontalPodAutoscalerList = v1HorizontalPodAutoscalerList; } + @JsonProperty("V2HorizontalPodAutoscaler") + public io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler getV2HorizontalPodAutoscaler() { + return v2HorizontalPodAutoscaler; + } + + @JsonProperty("V2HorizontalPodAutoscaler") + public void setV2HorizontalPodAutoscaler(io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler) { + this.v2HorizontalPodAutoscaler = v2HorizontalPodAutoscaler; + } + + @JsonProperty("V2HorizontalPodAutoscalerList") + public io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList getV2HorizontalPodAutoscalerList() { + return v2HorizontalPodAutoscalerList; + } + + @JsonProperty("V2HorizontalPodAutoscalerList") + public void setV2HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList) { + this.v2HorizontalPodAutoscalerList = v2HorizontalPodAutoscalerList; + } + @JsonProperty("V2beta1HorizontalPodAutoscaler") public io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler getV2beta1HorizontalPodAutoscaler() { return v2beta1HorizontalPodAutoscaler; diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ContainerResourceMetricSource.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ContainerResourceMetricSource.java new file mode 100644 index 00000000000..666a67783e6 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ContainerResourceMetricSource.java @@ -0,0 +1,130 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "container", + "name", + "target" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class ContainerResourceMetricSource implements KubernetesResource +{ + + @JsonProperty("container") + private String container; + @JsonProperty("name") + private String name; + @JsonProperty("target") + private MetricTarget target; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ContainerResourceMetricSource() { + } + + /** + * + * @param container + * @param name + * @param target + */ + public ContainerResourceMetricSource(String container, String name, MetricTarget target) { + super(); + this.container = container; + this.name = name; + this.target = target; + } + + @JsonProperty("container") + public String getContainer() { + return container; + } + + @JsonProperty("container") + public void setContainer(String container) { + this.container = container; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("target") + public MetricTarget getTarget() { + return target; + } + + @JsonProperty("target") + public void setTarget(MetricTarget target) { + this.target = target; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ContainerResourceMetricStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ContainerResourceMetricStatus.java new file mode 100644 index 00000000000..5e2369fbbe8 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ContainerResourceMetricStatus.java @@ -0,0 +1,130 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "container", + "current", + "name" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class ContainerResourceMetricStatus implements KubernetesResource +{ + + @JsonProperty("container") + private String container; + @JsonProperty("current") + private MetricValueStatus current; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ContainerResourceMetricStatus() { + } + + /** + * + * @param container + * @param current + * @param name + */ + public ContainerResourceMetricStatus(String container, MetricValueStatus current, String name) { + super(); + this.container = container; + this.current = current; + this.name = name; + } + + @JsonProperty("container") + public String getContainer() { + return container; + } + + @JsonProperty("container") + public void setContainer(String container) { + this.container = container; + } + + @JsonProperty("current") + public MetricValueStatus getCurrent() { + return current; + } + + @JsonProperty("current") + public void setCurrent(MetricValueStatus current) { + this.current = current; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/CrossVersionObjectReference.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/CrossVersionObjectReference.java new file mode 100644 index 00000000000..5edc5814523 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/CrossVersionObjectReference.java @@ -0,0 +1,128 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "name" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class CrossVersionObjectReference implements KubernetesResource +{ + + @JsonProperty("apiVersion") + private String apiVersion; + @JsonProperty("kind") + private String kind; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CrossVersionObjectReference() { + } + + /** + * + * @param apiVersion + * @param kind + * @param name + */ + public CrossVersionObjectReference(String apiVersion, String kind, String name) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + this.name = name; + } + + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("kind") + public String getKind() { + return kind; + } + + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ExternalMetricSource.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ExternalMetricSource.java new file mode 100644 index 00000000000..79182e8769d --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ExternalMetricSource.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "metric", + "target" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class ExternalMetricSource implements KubernetesResource +{ + + @JsonProperty("metric") + private MetricIdentifier metric; + @JsonProperty("target") + private MetricTarget target; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ExternalMetricSource() { + } + + /** + * + * @param metric + * @param target + */ + public ExternalMetricSource(MetricIdentifier metric, MetricTarget target) { + super(); + this.metric = metric; + this.target = target; + } + + @JsonProperty("metric") + public MetricIdentifier getMetric() { + return metric; + } + + @JsonProperty("metric") + public void setMetric(MetricIdentifier metric) { + this.metric = metric; + } + + @JsonProperty("target") + public MetricTarget getTarget() { + return target; + } + + @JsonProperty("target") + public void setTarget(MetricTarget target) { + this.target = target; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ExternalMetricStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ExternalMetricStatus.java new file mode 100644 index 00000000000..35a21b9ff1f --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ExternalMetricStatus.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "current", + "metric" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class ExternalMetricStatus implements KubernetesResource +{ + + @JsonProperty("current") + private MetricValueStatus current; + @JsonProperty("metric") + private MetricIdentifier metric; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ExternalMetricStatus() { + } + + /** + * + * @param current + * @param metric + */ + public ExternalMetricStatus(MetricValueStatus current, MetricIdentifier metric) { + super(); + this.current = current; + this.metric = metric; + } + + @JsonProperty("current") + public MetricValueStatus getCurrent() { + return current; + } + + @JsonProperty("current") + public void setCurrent(MetricValueStatus current) { + this.current = current; + } + + @JsonProperty("metric") + public MetricIdentifier getMetric() { + return metric; + } + + @JsonProperty("metric") + public void setMetric(MetricIdentifier metric) { + this.metric = metric; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HPAScalingPolicy.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HPAScalingPolicy.java new file mode 100644 index 00000000000..66c8ce6f296 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HPAScalingPolicy.java @@ -0,0 +1,130 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "periodSeconds", + "type", + "value" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class HPAScalingPolicy implements KubernetesResource +{ + + @JsonProperty("periodSeconds") + private Integer periodSeconds; + @JsonProperty("type") + private String type; + @JsonProperty("value") + private Integer value; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HPAScalingPolicy() { + } + + /** + * + * @param periodSeconds + * @param type + * @param value + */ + public HPAScalingPolicy(Integer periodSeconds, String type, Integer value) { + super(); + this.periodSeconds = periodSeconds; + this.type = type; + this.value = value; + } + + @JsonProperty("periodSeconds") + public Integer getPeriodSeconds() { + return periodSeconds; + } + + @JsonProperty("periodSeconds") + public void setPeriodSeconds(Integer periodSeconds) { + this.periodSeconds = periodSeconds; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonProperty("value") + public Integer getValue() { + return value; + } + + @JsonProperty("value") + public void setValue(Integer value) { + this.value = value; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HPAScalingRules.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HPAScalingRules.java new file mode 100644 index 00000000000..228f49708da --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HPAScalingRules.java @@ -0,0 +1,133 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "policies", + "selectPolicy", + "stabilizationWindowSeconds" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class HPAScalingRules implements KubernetesResource +{ + + @JsonProperty("policies") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List policies = new ArrayList(); + @JsonProperty("selectPolicy") + private String selectPolicy; + @JsonProperty("stabilizationWindowSeconds") + private Integer stabilizationWindowSeconds; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HPAScalingRules() { + } + + /** + * + * @param selectPolicy + * @param stabilizationWindowSeconds + * @param policies + */ + public HPAScalingRules(List policies, String selectPolicy, Integer stabilizationWindowSeconds) { + super(); + this.policies = policies; + this.selectPolicy = selectPolicy; + this.stabilizationWindowSeconds = stabilizationWindowSeconds; + } + + @JsonProperty("policies") + public List getPolicies() { + return policies; + } + + @JsonProperty("policies") + public void setPolicies(List policies) { + this.policies = policies; + } + + @JsonProperty("selectPolicy") + public String getSelectPolicy() { + return selectPolicy; + } + + @JsonProperty("selectPolicy") + public void setSelectPolicy(String selectPolicy) { + this.selectPolicy = selectPolicy; + } + + @JsonProperty("stabilizationWindowSeconds") + public Integer getStabilizationWindowSeconds() { + return stabilizationWindowSeconds; + } + + @JsonProperty("stabilizationWindowSeconds") + public void setStabilizationWindowSeconds(Integer stabilizationWindowSeconds) { + this.stabilizationWindowSeconds = stabilizationWindowSeconds; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscaler.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscaler.java new file mode 100644 index 00000000000..f83e89c66c4 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscaler.java @@ -0,0 +1,196 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.Group; +import io.fabric8.kubernetes.model.annotation.Version; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "spec", + "status" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Version("v2") +@Group("autoscaling") +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "autoscaling.properties", gather = true) +}) +public class HorizontalPodAutoscaler implements HasMetadata, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "autoscaling/v2"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "HorizontalPodAutoscaler"; + @JsonProperty("metadata") + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + @JsonProperty("spec") + private HorizontalPodAutoscalerSpec spec; + @JsonProperty("status") + private HorizontalPodAutoscalerStatus status; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HorizontalPodAutoscaler() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param spec + * @param status + */ + public HorizontalPodAutoscaler(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, HorizontalPodAutoscalerSpec spec, HorizontalPodAutoscalerStatus status) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + this.metadata = metadata; + this.spec = spec; + this.status = status; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("spec") + public HorizontalPodAutoscalerSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(HorizontalPodAutoscalerSpec spec) { + this.spec = spec; + } + + @JsonProperty("status") + public HorizontalPodAutoscalerStatus getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(HorizontalPodAutoscalerStatus status) { + this.status = status; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerBehavior.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerBehavior.java new file mode 100644 index 00000000000..34a888c3d88 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerBehavior.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "scaleDown", + "scaleUp" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class HorizontalPodAutoscalerBehavior implements KubernetesResource +{ + + @JsonProperty("scaleDown") + private HPAScalingRules scaleDown; + @JsonProperty("scaleUp") + private HPAScalingRules scaleUp; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HorizontalPodAutoscalerBehavior() { + } + + /** + * + * @param scaleUp + * @param scaleDown + */ + public HorizontalPodAutoscalerBehavior(HPAScalingRules scaleDown, HPAScalingRules scaleUp) { + super(); + this.scaleDown = scaleDown; + this.scaleUp = scaleUp; + } + + @JsonProperty("scaleDown") + public HPAScalingRules getScaleDown() { + return scaleDown; + } + + @JsonProperty("scaleDown") + public void setScaleDown(HPAScalingRules scaleDown) { + this.scaleDown = scaleDown; + } + + @JsonProperty("scaleUp") + public HPAScalingRules getScaleUp() { + return scaleUp; + } + + @JsonProperty("scaleUp") + public void setScaleUp(HPAScalingRules scaleUp) { + this.scaleUp = scaleUp; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerCondition.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerCondition.java new file mode 100644 index 00000000000..05e28687953 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerCondition.java @@ -0,0 +1,160 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "lastTransitionTime", + "message", + "reason", + "status", + "type" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class HorizontalPodAutoscalerCondition implements KubernetesResource +{ + + @JsonProperty("lastTransitionTime") + private String lastTransitionTime; + @JsonProperty("message") + private java.lang.String message; + @JsonProperty("reason") + private java.lang.String reason; + @JsonProperty("status") + private java.lang.String status; + @JsonProperty("type") + private java.lang.String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HorizontalPodAutoscalerCondition() { + } + + /** + * + * @param reason + * @param lastTransitionTime + * @param message + * @param type + * @param status + */ + public HorizontalPodAutoscalerCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + super(); + this.lastTransitionTime = lastTransitionTime; + this.message = message; + this.reason = reason; + this.status = status; + this.type = type; + } + + @JsonProperty("lastTransitionTime") + public String getLastTransitionTime() { + return lastTransitionTime; + } + + @JsonProperty("lastTransitionTime") + public void setLastTransitionTime(String lastTransitionTime) { + this.lastTransitionTime = lastTransitionTime; + } + + @JsonProperty("message") + public java.lang.String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(java.lang.String message) { + this.message = message; + } + + @JsonProperty("reason") + public java.lang.String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(java.lang.String reason) { + this.reason = reason; + } + + @JsonProperty("status") + public java.lang.String getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(java.lang.String status) { + this.status = status; + } + + @JsonProperty("type") + public java.lang.String getType() { + return type; + } + + @JsonProperty("type") + public void setType(java.lang.String type) { + this.type = type; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(java.lang.String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerList.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerList.java new file mode 100644 index 00000000000..65486e7bdb3 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerList.java @@ -0,0 +1,180 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.KubernetesResourceList; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.ListMeta; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.Group; +import io.fabric8.kubernetes.model.annotation.Version; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "items" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Version("v2") +@Group("autoscaling") +public class HorizontalPodAutoscalerList implements KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "autoscaling/v2"; + @JsonProperty("items") + private List items = new ArrayList(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "HorizontalPodAutoscalerList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HorizontalPodAutoscalerList() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param items + */ + public HorizontalPodAutoscalerList(String apiVersion, List items, String kind, ListMeta metadata) { + super(); + this.apiVersion = apiVersion; + this.items = items; + this.kind = kind; + this.metadata = metadata; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("items") + public List getItems() { + return items; + } + + @JsonProperty("items") + public void setItems(List items) { + this.items = items; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public ListMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ListMeta metadata) { + this.metadata = metadata; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerSpec.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerSpec.java new file mode 100644 index 00000000000..bab9a02be99 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerSpec.java @@ -0,0 +1,163 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "behavior", + "maxReplicas", + "metrics", + "minReplicas", + "scaleTargetRef" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class HorizontalPodAutoscalerSpec implements KubernetesResource +{ + + @JsonProperty("behavior") + private HorizontalPodAutoscalerBehavior behavior; + @JsonProperty("maxReplicas") + private Integer maxReplicas; + @JsonProperty("metrics") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List metrics = new ArrayList(); + @JsonProperty("minReplicas") + private Integer minReplicas; + @JsonProperty("scaleTargetRef") + private CrossVersionObjectReference scaleTargetRef; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HorizontalPodAutoscalerSpec() { + } + + /** + * + * @param maxReplicas + * @param minReplicas + * @param metrics + * @param behavior + * @param scaleTargetRef + */ + public HorizontalPodAutoscalerSpec(HorizontalPodAutoscalerBehavior behavior, Integer maxReplicas, List metrics, Integer minReplicas, CrossVersionObjectReference scaleTargetRef) { + super(); + this.behavior = behavior; + this.maxReplicas = maxReplicas; + this.metrics = metrics; + this.minReplicas = minReplicas; + this.scaleTargetRef = scaleTargetRef; + } + + @JsonProperty("behavior") + public HorizontalPodAutoscalerBehavior getBehavior() { + return behavior; + } + + @JsonProperty("behavior") + public void setBehavior(HorizontalPodAutoscalerBehavior behavior) { + this.behavior = behavior; + } + + @JsonProperty("maxReplicas") + public Integer getMaxReplicas() { + return maxReplicas; + } + + @JsonProperty("maxReplicas") + public void setMaxReplicas(Integer maxReplicas) { + this.maxReplicas = maxReplicas; + } + + @JsonProperty("metrics") + public List getMetrics() { + return metrics; + } + + @JsonProperty("metrics") + public void setMetrics(List metrics) { + this.metrics = metrics; + } + + @JsonProperty("minReplicas") + public Integer getMinReplicas() { + return minReplicas; + } + + @JsonProperty("minReplicas") + public void setMinReplicas(Integer minReplicas) { + this.minReplicas = minReplicas; + } + + @JsonProperty("scaleTargetRef") + public CrossVersionObjectReference getScaleTargetRef() { + return scaleTargetRef; + } + + @JsonProperty("scaleTargetRef") + public void setScaleTargetRef(CrossVersionObjectReference scaleTargetRef) { + this.scaleTargetRef = scaleTargetRef; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerStatus.java new file mode 100644 index 00000000000..63f7b16552e --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerStatus.java @@ -0,0 +1,178 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "conditions", + "currentMetrics", + "currentReplicas", + "desiredReplicas", + "lastScaleTime", + "observedGeneration" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class HorizontalPodAutoscalerStatus implements KubernetesResource +{ + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList(); + @JsonProperty("currentMetrics") + private List currentMetrics = new ArrayList(); + @JsonProperty("currentReplicas") + private Integer currentReplicas; + @JsonProperty("desiredReplicas") + private Integer desiredReplicas; + @JsonProperty("lastScaleTime") + private String lastScaleTime; + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HorizontalPodAutoscalerStatus() { + } + + /** + * + * @param desiredReplicas + * @param currentReplicas + * @param conditions + * @param lastScaleTime + * @param observedGeneration + * @param currentMetrics + */ + public HorizontalPodAutoscalerStatus(List conditions, List currentMetrics, Integer currentReplicas, Integer desiredReplicas, String lastScaleTime, Long observedGeneration) { + super(); + this.conditions = conditions; + this.currentMetrics = currentMetrics; + this.currentReplicas = currentReplicas; + this.desiredReplicas = desiredReplicas; + this.lastScaleTime = lastScaleTime; + this.observedGeneration = observedGeneration; + } + + @JsonProperty("conditions") + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("currentMetrics") + public List getCurrentMetrics() { + return currentMetrics; + } + + @JsonProperty("currentMetrics") + public void setCurrentMetrics(List currentMetrics) { + this.currentMetrics = currentMetrics; + } + + @JsonProperty("currentReplicas") + public Integer getCurrentReplicas() { + return currentReplicas; + } + + @JsonProperty("currentReplicas") + public void setCurrentReplicas(Integer currentReplicas) { + this.currentReplicas = currentReplicas; + } + + @JsonProperty("desiredReplicas") + public Integer getDesiredReplicas() { + return desiredReplicas; + } + + @JsonProperty("desiredReplicas") + public void setDesiredReplicas(Integer desiredReplicas) { + this.desiredReplicas = desiredReplicas; + } + + @JsonProperty("lastScaleTime") + public String getLastScaleTime() { + return lastScaleTime; + } + + @JsonProperty("lastScaleTime") + public void setLastScaleTime(String lastScaleTime) { + this.lastScaleTime = lastScaleTime; + } + + @JsonProperty("observedGeneration") + public Long getObservedGeneration() { + return observedGeneration; + } + + @JsonProperty("observedGeneration") + public void setObservedGeneration(Long observedGeneration) { + this.observedGeneration = observedGeneration; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(java.lang.String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricIdentifier.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricIdentifier.java new file mode 100644 index 00000000000..ad56dd97127 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricIdentifier.java @@ -0,0 +1,114 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "name", + "selector" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class MetricIdentifier implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("selector") + private io.fabric8.kubernetes.api.model.LabelSelector selector; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MetricIdentifier() { + } + + /** + * + * @param name + * @param selector + */ + public MetricIdentifier(String name, io.fabric8.kubernetes.api.model.LabelSelector selector) { + super(); + this.name = name; + this.selector = selector; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("selector") + public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + return selector; + } + + @JsonProperty("selector") + public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + this.selector = selector; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricSpec.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricSpec.java new file mode 100644 index 00000000000..9c7aee1ea76 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricSpec.java @@ -0,0 +1,175 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "containerResource", + "external", + "object", + "pods", + "resource", + "type" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class MetricSpec implements KubernetesResource +{ + + @JsonProperty("containerResource") + private ContainerResourceMetricSource containerResource; + @JsonProperty("external") + private ExternalMetricSource external; + @JsonProperty("object") + private ObjectMetricSource object; + @JsonProperty("pods") + private PodsMetricSource pods; + @JsonProperty("resource") + private ResourceMetricSource resource; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MetricSpec() { + } + + /** + * + * @param external + * @param resource + * @param containerResource + * @param pods + * @param type + * @param object + */ + public MetricSpec(ContainerResourceMetricSource containerResource, ExternalMetricSource external, ObjectMetricSource object, PodsMetricSource pods, ResourceMetricSource resource, String type) { + super(); + this.containerResource = containerResource; + this.external = external; + this.object = object; + this.pods = pods; + this.resource = resource; + this.type = type; + } + + @JsonProperty("containerResource") + public ContainerResourceMetricSource getContainerResource() { + return containerResource; + } + + @JsonProperty("containerResource") + public void setContainerResource(ContainerResourceMetricSource containerResource) { + this.containerResource = containerResource; + } + + @JsonProperty("external") + public ExternalMetricSource getExternal() { + return external; + } + + @JsonProperty("external") + public void setExternal(ExternalMetricSource external) { + this.external = external; + } + + @JsonProperty("object") + public ObjectMetricSource getObject() { + return object; + } + + @JsonProperty("object") + public void setObject(ObjectMetricSource object) { + this.object = object; + } + + @JsonProperty("pods") + public PodsMetricSource getPods() { + return pods; + } + + @JsonProperty("pods") + public void setPods(PodsMetricSource pods) { + this.pods = pods; + } + + @JsonProperty("resource") + public ResourceMetricSource getResource() { + return resource; + } + + @JsonProperty("resource") + public void setResource(ResourceMetricSource resource) { + this.resource = resource; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricStatus.java new file mode 100644 index 00000000000..a3ad9ba34dd --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricStatus.java @@ -0,0 +1,175 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "containerResource", + "external", + "object", + "pods", + "resource", + "type" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class MetricStatus implements KubernetesResource +{ + + @JsonProperty("containerResource") + private ContainerResourceMetricStatus containerResource; + @JsonProperty("external") + private ExternalMetricStatus external; + @JsonProperty("object") + private ObjectMetricStatus object; + @JsonProperty("pods") + private PodsMetricStatus pods; + @JsonProperty("resource") + private ResourceMetricStatus resource; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MetricStatus() { + } + + /** + * + * @param external + * @param resource + * @param containerResource + * @param pods + * @param type + * @param object + */ + public MetricStatus(ContainerResourceMetricStatus containerResource, ExternalMetricStatus external, ObjectMetricStatus object, PodsMetricStatus pods, ResourceMetricStatus resource, String type) { + super(); + this.containerResource = containerResource; + this.external = external; + this.object = object; + this.pods = pods; + this.resource = resource; + this.type = type; + } + + @JsonProperty("containerResource") + public ContainerResourceMetricStatus getContainerResource() { + return containerResource; + } + + @JsonProperty("containerResource") + public void setContainerResource(ContainerResourceMetricStatus containerResource) { + this.containerResource = containerResource; + } + + @JsonProperty("external") + public ExternalMetricStatus getExternal() { + return external; + } + + @JsonProperty("external") + public void setExternal(ExternalMetricStatus external) { + this.external = external; + } + + @JsonProperty("object") + public ObjectMetricStatus getObject() { + return object; + } + + @JsonProperty("object") + public void setObject(ObjectMetricStatus object) { + this.object = object; + } + + @JsonProperty("pods") + public PodsMetricStatus getPods() { + return pods; + } + + @JsonProperty("pods") + public void setPods(PodsMetricStatus pods) { + this.pods = pods; + } + + @JsonProperty("resource") + public ResourceMetricStatus getResource() { + return resource; + } + + @JsonProperty("resource") + public void setResource(ResourceMetricStatus resource) { + this.resource = resource; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricTarget.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricTarget.java new file mode 100644 index 00000000000..aadf517b96c --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricTarget.java @@ -0,0 +1,146 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.Quantity; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "averageUtilization", + "averageValue", + "type", + "value" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class MetricTarget implements KubernetesResource +{ + + @JsonProperty("averageUtilization") + private Integer averageUtilization; + @JsonProperty("averageValue") + private Quantity averageValue; + @JsonProperty("type") + private String type; + @JsonProperty("value") + private Quantity value; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MetricTarget() { + } + + /** + * + * @param averageValue + * @param averageUtilization + * @param type + * @param value + */ + public MetricTarget(Integer averageUtilization, Quantity averageValue, String type, Quantity value) { + super(); + this.averageUtilization = averageUtilization; + this.averageValue = averageValue; + this.type = type; + this.value = value; + } + + @JsonProperty("averageUtilization") + public Integer getAverageUtilization() { + return averageUtilization; + } + + @JsonProperty("averageUtilization") + public void setAverageUtilization(Integer averageUtilization) { + this.averageUtilization = averageUtilization; + } + + @JsonProperty("averageValue") + public Quantity getAverageValue() { + return averageValue; + } + + @JsonProperty("averageValue") + public void setAverageValue(Quantity averageValue) { + this.averageValue = averageValue; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonProperty("value") + public Quantity getValue() { + return value; + } + + @JsonProperty("value") + public void setValue(Quantity value) { + this.value = value; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricValueStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricValueStatus.java new file mode 100644 index 00000000000..d2d6911ab20 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/MetricValueStatus.java @@ -0,0 +1,131 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.Quantity; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "averageUtilization", + "averageValue", + "value" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class MetricValueStatus implements KubernetesResource +{ + + @JsonProperty("averageUtilization") + private Integer averageUtilization; + @JsonProperty("averageValue") + private Quantity averageValue; + @JsonProperty("value") + private Quantity value; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MetricValueStatus() { + } + + /** + * + * @param averageValue + * @param averageUtilization + * @param value + */ + public MetricValueStatus(Integer averageUtilization, Quantity averageValue, Quantity value) { + super(); + this.averageUtilization = averageUtilization; + this.averageValue = averageValue; + this.value = value; + } + + @JsonProperty("averageUtilization") + public Integer getAverageUtilization() { + return averageUtilization; + } + + @JsonProperty("averageUtilization") + public void setAverageUtilization(Integer averageUtilization) { + this.averageUtilization = averageUtilization; + } + + @JsonProperty("averageValue") + public Quantity getAverageValue() { + return averageValue; + } + + @JsonProperty("averageValue") + public void setAverageValue(Quantity averageValue) { + this.averageValue = averageValue; + } + + @JsonProperty("value") + public Quantity getValue() { + return value; + } + + @JsonProperty("value") + public void setValue(Quantity value) { + this.value = value; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ObjectMetricSource.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ObjectMetricSource.java new file mode 100644 index 00000000000..7e4bc552722 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ObjectMetricSource.java @@ -0,0 +1,130 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "describedObject", + "metric", + "target" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class ObjectMetricSource implements KubernetesResource +{ + + @JsonProperty("describedObject") + private CrossVersionObjectReference describedObject; + @JsonProperty("metric") + private MetricIdentifier metric; + @JsonProperty("target") + private MetricTarget target; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ObjectMetricSource() { + } + + /** + * + * @param describedObject + * @param metric + * @param target + */ + public ObjectMetricSource(CrossVersionObjectReference describedObject, MetricIdentifier metric, MetricTarget target) { + super(); + this.describedObject = describedObject; + this.metric = metric; + this.target = target; + } + + @JsonProperty("describedObject") + public CrossVersionObjectReference getDescribedObject() { + return describedObject; + } + + @JsonProperty("describedObject") + public void setDescribedObject(CrossVersionObjectReference describedObject) { + this.describedObject = describedObject; + } + + @JsonProperty("metric") + public MetricIdentifier getMetric() { + return metric; + } + + @JsonProperty("metric") + public void setMetric(MetricIdentifier metric) { + this.metric = metric; + } + + @JsonProperty("target") + public MetricTarget getTarget() { + return target; + } + + @JsonProperty("target") + public void setTarget(MetricTarget target) { + this.target = target; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ObjectMetricStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ObjectMetricStatus.java new file mode 100644 index 00000000000..7de937dd0d1 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ObjectMetricStatus.java @@ -0,0 +1,130 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "current", + "describedObject", + "metric" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class ObjectMetricStatus implements KubernetesResource +{ + + @JsonProperty("current") + private MetricValueStatus current; + @JsonProperty("describedObject") + private CrossVersionObjectReference describedObject; + @JsonProperty("metric") + private MetricIdentifier metric; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ObjectMetricStatus() { + } + + /** + * + * @param describedObject + * @param current + * @param metric + */ + public ObjectMetricStatus(MetricValueStatus current, CrossVersionObjectReference describedObject, MetricIdentifier metric) { + super(); + this.current = current; + this.describedObject = describedObject; + this.metric = metric; + } + + @JsonProperty("current") + public MetricValueStatus getCurrent() { + return current; + } + + @JsonProperty("current") + public void setCurrent(MetricValueStatus current) { + this.current = current; + } + + @JsonProperty("describedObject") + public CrossVersionObjectReference getDescribedObject() { + return describedObject; + } + + @JsonProperty("describedObject") + public void setDescribedObject(CrossVersionObjectReference describedObject) { + this.describedObject = describedObject; + } + + @JsonProperty("metric") + public MetricIdentifier getMetric() { + return metric; + } + + @JsonProperty("metric") + public void setMetric(MetricIdentifier metric) { + this.metric = metric; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/PodsMetricSource.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/PodsMetricSource.java new file mode 100644 index 00000000000..37a1122b661 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/PodsMetricSource.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "metric", + "target" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class PodsMetricSource implements KubernetesResource +{ + + @JsonProperty("metric") + private MetricIdentifier metric; + @JsonProperty("target") + private MetricTarget target; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PodsMetricSource() { + } + + /** + * + * @param metric + * @param target + */ + public PodsMetricSource(MetricIdentifier metric, MetricTarget target) { + super(); + this.metric = metric; + this.target = target; + } + + @JsonProperty("metric") + public MetricIdentifier getMetric() { + return metric; + } + + @JsonProperty("metric") + public void setMetric(MetricIdentifier metric) { + this.metric = metric; + } + + @JsonProperty("target") + public MetricTarget getTarget() { + return target; + } + + @JsonProperty("target") + public void setTarget(MetricTarget target) { + this.target = target; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/PodsMetricStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/PodsMetricStatus.java new file mode 100644 index 00000000000..bbdd0e0bee9 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/PodsMetricStatus.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "current", + "metric" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class PodsMetricStatus implements KubernetesResource +{ + + @JsonProperty("current") + private MetricValueStatus current; + @JsonProperty("metric") + private MetricIdentifier metric; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PodsMetricStatus() { + } + + /** + * + * @param current + * @param metric + */ + public PodsMetricStatus(MetricValueStatus current, MetricIdentifier metric) { + super(); + this.current = current; + this.metric = metric; + } + + @JsonProperty("current") + public MetricValueStatus getCurrent() { + return current; + } + + @JsonProperty("current") + public void setCurrent(MetricValueStatus current) { + this.current = current; + } + + @JsonProperty("metric") + public MetricIdentifier getMetric() { + return metric; + } + + @JsonProperty("metric") + public void setMetric(MetricIdentifier metric) { + this.metric = metric; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ResourceMetricSource.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ResourceMetricSource.java new file mode 100644 index 00000000000..da9a56d38c7 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ResourceMetricSource.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "name", + "target" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class ResourceMetricSource implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("target") + private MetricTarget target; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ResourceMetricSource() { + } + + /** + * + * @param name + * @param target + */ + public ResourceMetricSource(String name, MetricTarget target) { + super(); + this.name = name; + this.target = target; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("target") + public MetricTarget getTarget() { + return target; + } + + @JsonProperty("target") + public void setTarget(MetricTarget target) { + this.target = target; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ResourceMetricStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ResourceMetricStatus.java new file mode 100644 index 00000000000..d2a82e5ef0f --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/ResourceMetricStatus.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.autoscaling.v2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "current", + "name" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class ResourceMetricStatus implements KubernetesResource +{ + + @JsonProperty("current") + private MetricValueStatus current; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ResourceMetricStatus() { + } + + /** + * + * @param current + * @param name + */ + public ResourceMetricStatus(MetricValueStatus current, String name) { + super(); + this.current = current; + this.name = name; + } + + @JsonProperty("current") + public MetricValueStatus getCurrent() { + return current; + } + + @JsonProperty("current") + public void setCurrent(MetricValueStatus current) { + this.current = current; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/kube-schema.json index b3cd2f270a7..60743811774 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/kube-schema.json @@ -388,9 +388,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -987,6 +984,566 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_autoscaling_v2_ContainerResourceMetricSource": { + "type": "object", + "properties": { + "container": { + "type": "string" + }, + "name": { + "type": "string" + }, + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricSource", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_ContainerResourceMetricStatus": { + "type": "object", + "properties": { + "container": { + "type": "string" + }, + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_CrossVersionObjectReference": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_ExternalMetricSource": { + "type": "object", + "properties": { + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + }, + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricSource", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_ExternalMetricStatus": { + "type": "object", + "properties": { + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + }, + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_HPAScalingPolicy": { + "type": "object", + "properties": { + "periodSeconds": { + "type": "integer" + }, + "type": { + "type": "string" + }, + "value": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingPolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_HPAScalingRules": { + "type": "object", + "properties": { + "policies": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingPolicy" + } + }, + "selectPolicy": { + "type": "string" + }, + "stabilizationWindowSeconds": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_HorizontalPodAutoscaler": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "autoscaling/v2", + "required": true + }, + "kind": { + "type": "string", + "default": "HorizontalPodAutoscaler", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata", + "io.fabric8.kubernetes.api.model.Namespaced" + ] + }, + "kubernetes_autoscaling_v2_HorizontalPodAutoscalerBehavior": { + "type": "object", + "properties": { + "scaleDown": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" + }, + "scaleUp": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerBehavior", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_HorizontalPodAutoscalerCondition": { + "type": "object", + "properties": { + "lastTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "message": { + "type": "string" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_HorizontalPodAutoscalerList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "autoscaling/v2", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscaler", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler" + } + }, + "kind": { + "type": "string", + "default": "HorizontalPodAutoscalerList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler\u003e" + ] + }, + "kubernetes_autoscaling_v2_HorizontalPodAutoscalerSpec": { + "type": "object", + "properties": { + "behavior": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerBehavior", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerBehavior" + }, + "maxReplicas": { + "type": "integer" + }, + "metrics": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricSpec" + } + }, + "minReplicas": { + "type": "integer" + }, + "scaleTargetRef": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_HorizontalPodAutoscalerStatus": { + "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerCondition" + } + }, + "currentMetrics": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricStatus" + } + }, + "currentReplicas": { + "type": "integer" + }, + "desiredReplicas": { + "type": "integer" + }, + "lastScaleTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_MetricIdentifier": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_MetricSpec": { + "type": "object", + "properties": { + "containerResource": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ContainerResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricSource" + }, + "external": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ExternalMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricSource" + }, + "object": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ObjectMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricSource" + }, + "pods": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_PodsMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricSource" + }, + "resource": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricSource" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_MetricStatus": { + "type": "object", + "properties": { + "containerResource": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ContainerResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricStatus" + }, + "external": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ExternalMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricStatus" + }, + "object": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ObjectMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricStatus" + }, + "pods": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_PodsMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricStatus" + }, + "resource": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricStatus" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_MetricTarget": { + "type": "object", + "properties": { + "averageUtilization": { + "type": "integer" + }, + "averageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + }, + "type": { + "type": "string" + }, + "value": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_MetricValueStatus": { + "type": "object", + "properties": { + "averageUtilization": { + "type": "integer" + }, + "averageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + }, + "value": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_ObjectMetricSource": { + "type": "object", + "properties": { + "describedObject": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference" + }, + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + }, + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricSource", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_ObjectMetricStatus": { + "type": "object", + "properties": { + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + }, + "describedObject": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference" + }, + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_PodsMetricSource": { + "type": "object", + "properties": { + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + }, + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricSource", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_PodsMetricStatus": { + "type": "object", + "properties": { + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + }, + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_ResourceMetricSource": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricSource", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_ResourceMetricStatus": { + "type": "object", + "properties": { + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_autoscaling_v2beta1_ContainerResourceMetricSource": { "type": "object", "properties": { @@ -2120,6 +2677,14 @@ "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscalerList", "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList" }, + "V2HorizontalPodAutoscaler": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscaler", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler" + }, + "V2HorizontalPodAutoscalerList": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerList", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList" + }, "V2beta1HorizontalPodAutoscaler": { "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscaler", "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler" diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json index 0ee340c76cb..965c8a4acd9 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json @@ -388,9 +388,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -837,152 +834,712 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler", + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata", + "io.fabric8.kubernetes.api.model.Namespaced" + ] + }, + "kubernetes_autoscaling_v1_HorizontalPodAutoscalerList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "autoscaling/v1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscaler", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler" + } + }, + "kind": { + "type": "string", + "default": "HorizontalPodAutoscalerList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler\u003e" + ] + }, + "kubernetes_autoscaling_v1_HorizontalPodAutoscalerSpec": { + "type": "object", + "properties": { + "maxReplicas": { + "type": "integer" + }, + "minReplicas": { + "type": "integer" + }, + "scaleTargetRef": { + "$ref": "#/definitions/kubernetes_autoscaling_v1_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.CrossVersionObjectReference" + }, + "targetCPUUtilizationPercentage": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v1_HorizontalPodAutoscalerStatus": { + "type": "object", + "properties": { + "currentCPUUtilizationPercentage": { + "type": "integer" + }, + "currentReplicas": { + "type": "integer" + }, + "desiredReplicas": { + "type": "integer" + }, + "lastScaleTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v1_Scale": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "autoscaling/v1", + "required": true + }, + "kind": { + "type": "string", + "default": "Scale", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_autoscaling_v1_ScaleSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.ScaleSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_autoscaling_v1_ScaleStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.ScaleStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.Scale", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata", + "io.fabric8.kubernetes.api.model.Namespaced" + ] + }, + "kubernetes_autoscaling_v1_ScaleSpec": { + "type": "object", + "properties": { + "replicas": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.ScaleSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v1_ScaleStatus": { + "type": "object", + "properties": { + "replicas": { + "type": "integer" + }, + "selector": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.ScaleStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_ContainerResourceMetricSource": { + "type": "object", + "properties": { + "container": { + "type": "string" + }, + "name": { + "type": "string" + }, + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricSource", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_ContainerResourceMetricStatus": { + "type": "object", + "properties": { + "container": { + "type": "string" + }, + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_CrossVersionObjectReference": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_ExternalMetricSource": { + "type": "object", + "properties": { + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + }, + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricSource", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_ExternalMetricStatus": { + "type": "object", + "properties": { + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + }, + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_HPAScalingPolicy": { + "type": "object", + "properties": { + "periodSeconds": { + "type": "integer" + }, + "type": { + "type": "string" + }, + "value": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingPolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_HPAScalingRules": { + "type": "object", + "properties": { + "policies": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingPolicy" + } + }, + "selectPolicy": { + "type": "string" + }, + "stabilizationWindowSeconds": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_HorizontalPodAutoscaler": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "autoscaling/v2", + "required": true + }, + "kind": { + "type": "string", + "default": "HorizontalPodAutoscaler", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata", + "io.fabric8.kubernetes.api.model.Namespaced" + ] + }, + "kubernetes_autoscaling_v2_HorizontalPodAutoscalerBehavior": { + "type": "object", + "properties": { + "scaleDown": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" + }, + "scaleUp": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerBehavior", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_HorizontalPodAutoscalerCondition": { + "type": "object", + "properties": { + "lastTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "message": { + "type": "string" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_HorizontalPodAutoscalerList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "autoscaling/v2", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscaler", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler" + } + }, + "kind": { + "type": "string", + "default": "HorizontalPodAutoscalerList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler\u003e" + ] + }, + "kubernetes_autoscaling_v2_HorizontalPodAutoscalerSpec": { + "type": "object", + "properties": { + "behavior": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerBehavior", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerBehavior" + }, + "maxReplicas": { + "type": "integer" + }, + "metrics": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricSpec" + } + }, + "minReplicas": { + "type": "integer" + }, + "scaleTargetRef": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_HorizontalPodAutoscalerStatus": { + "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerCondition" + } + }, + "currentMetrics": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricStatus" + } + }, + "currentReplicas": { + "type": "integer" + }, + "desiredReplicas": { + "type": "integer" + }, + "lastScaleTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_MetricIdentifier": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_MetricSpec": { + "type": "object", + "properties": { + "containerResource": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ContainerResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricSource" + }, + "external": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ExternalMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricSource" + }, + "object": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ObjectMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricSource" + }, + "pods": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_PodsMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricSource" + }, + "resource": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricSource" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_MetricStatus": { + "type": "object", + "properties": { + "containerResource": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ContainerResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricStatus" + }, + "external": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ExternalMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricStatus" + }, + "object": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ObjectMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricStatus" + }, + "pods": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_PodsMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricStatus" + }, + "resource": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_ResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricStatus" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_MetricTarget": { + "type": "object", + "properties": { + "averageUtilization": { + "type": "integer" + }, + "averageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + }, + "type": { + "type": "string" + }, + "value": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_autoscaling_v2_MetricValueStatus": { + "type": "object", + "properties": { + "averageUtilization": { + "type": "integer" + }, + "averageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + }, + "value": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus", "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.HasMetadata", - "io.fabric8.kubernetes.api.model.Namespaced" + "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_autoscaling_v1_HorizontalPodAutoscalerList": { + "kubernetes_autoscaling_v2_ObjectMetricSource": { "type": "object", "properties": { - "apiVersion": { - "type": "string", - "default": "autoscaling/v1", - "required": true - }, - "items": { - "type": "array", - "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscaler", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler" - } + "describedObject": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference" }, - "kind": { - "type": "string", - "default": "HorizontalPodAutoscalerList", - "required": true + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" }, - "metadata": { - "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", - "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList", + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricSource", "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_autoscaling_v1_HorizontalPodAutoscalerSpec": { + "kubernetes_autoscaling_v2_ObjectMetricStatus": { "type": "object", "properties": { - "maxReplicas": { - "type": "integer" - }, - "minReplicas": { - "type": "integer" + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" }, - "scaleTargetRef": { - "$ref": "#/definitions/kubernetes_autoscaling_v1_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.CrossVersionObjectReference" + "describedObject": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference" }, - "targetCPUUtilizationPercentage": { - "type": "integer" + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerSpec", + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_autoscaling_v1_HorizontalPodAutoscalerStatus": { + "kubernetes_autoscaling_v2_PodsMetricSource": { "type": "object", "properties": { - "currentCPUUtilizationPercentage": { - "type": "integer" - }, - "currentReplicas": { - "type": "integer" - }, - "desiredReplicas": { - "type": "integer" - }, - "lastScaleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" }, - "observedGeneration": { - "type": "integer", - "existingJavaType": "Long" + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerStatus", + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricSource", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_autoscaling_v1_Scale": { + "kubernetes_autoscaling_v2_PodsMetricStatus": { "type": "object", "properties": { - "apiVersion": { - "type": "string", - "default": "autoscaling/v1", - "required": true - }, - "kind": { - "type": "string", - "default": "Scale", - "required": true - }, - "metadata": { - "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", - "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" - }, - "spec": { - "$ref": "#/definitions/kubernetes_autoscaling_v1_ScaleSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.ScaleSpec" + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" }, - "status": { - "$ref": "#/definitions/kubernetes_autoscaling_v1_ScaleStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.ScaleStatus" + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.Scale", + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricStatus", "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.HasMetadata", - "io.fabric8.kubernetes.api.model.Namespaced" + "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_autoscaling_v1_ScaleSpec": { + "kubernetes_autoscaling_v2_ResourceMetricSource": { "type": "object", "properties": { - "replicas": { - "type": "integer" + "name": { + "type": "string" + }, + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.ScaleSpec", + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricSource", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_autoscaling_v1_ScaleStatus": { + "kubernetes_autoscaling_v2_ResourceMetricStatus": { "type": "object", "properties": { - "replicas": { - "type": "integer" + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" }, - "selector": { + "name": { "type": "string" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.ScaleStatus", + "javaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -2120,6 +2677,14 @@ "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscalerList", "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList" }, + "V2HorizontalPodAutoscaler": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscaler", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler" + }, + "V2HorizontalPodAutoscalerList": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerList", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList" + }, "V2beta1HorizontalPodAutoscaler": { "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscaler", "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler" @@ -2206,12 +2771,9 @@ "name": { "type": "string" }, - "targetAverageUtilization": { - "type": "integer" - }, - "targetAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" } }, "additionalProperties": true @@ -2221,9 +2783,12 @@ "container": { "type": "string" }, - "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" + "currentAverageUtilization": { + "type": "integer" + }, + "currentAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, "name": { "type": "string" @@ -2371,7 +2936,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v2beta2", + "default": "autoscaling/v2beta1", "required": true }, "kind": { @@ -2384,12 +2949,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerSpec" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscalerSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerSpec" }, "status": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscalerStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerStatus" } }, "additionalProperties": true @@ -2397,12 +2962,12 @@ "horizontalpodautoscalerbehavior": { "properties": { "scaleDown": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" }, "scaleUp": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" } }, "additionalProperties": true @@ -2432,14 +2997,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v1", + "default": "autoscaling/v2beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscaler", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscaler", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler" } }, "kind": { @@ -2456,27 +3021,18 @@ }, "horizontalpodautoscalerspec": { "properties": { - "behavior": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerBehavior", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerBehavior" - }, "maxReplicas": { "type": "integer" }, - "metrics": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricSpec" - } - }, "minReplicas": { "type": "integer" }, "scaleTargetRef": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.CrossVersionObjectReference" + "$ref": "#/definitions/kubernetes_autoscaling_v1_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.CrossVersionObjectReference" + }, + "targetCPUUtilizationPercentage": { + "type": "integer" } }, "additionalProperties": true @@ -2485,16 +3041,17 @@ "properties": { "conditions": { "type": "array", + "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscalerCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerCondition" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerCondition" } }, "currentMetrics": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_MetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.MetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricStatus" } }, "currentReplicas": { @@ -2751,24 +3308,24 @@ "metricspec": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ContainerResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ContainerResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ContainerResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ContainerResourceMetricSource" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ExternalMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ExternalMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ExternalMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ExternalMetricSource" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ObjectMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ObjectMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ObjectMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ObjectMetricSource" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_PodsMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.PodsMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_PodsMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.PodsMetricSource" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ResourceMetricSource" }, "type": { "type": "string" @@ -2779,24 +3336,24 @@ "metricstatus": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ContainerResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ContainerResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ContainerResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ContainerResourceMetricStatus" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ExternalMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ExternalMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ExternalMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ExternalMetricStatus" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ObjectMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ObjectMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ObjectMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ObjectMetricStatus" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_PodsMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.PodsMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_PodsMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.PodsMetricStatus" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ResourceMetricStatus" }, "type": { "type": "string" @@ -2848,9 +3405,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2922,24 +3476,17 @@ }, "objectmetricsource": { "properties": { - "averageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" - }, - "metricName": { - "type": "string" + "describedObject": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference" }, - "selector": { - "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" }, "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" - }, - "targetValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" } }, "additionalProperties": true @@ -3021,28 +3568,25 @@ "podsmetricsource": { "properties": { "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" }, "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" } }, "additionalProperties": true }, "podsmetricstatus": { "properties": { - "currentAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" - }, - "metricName": { - "type": "string" + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" }, - "selector": { - "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" } }, "additionalProperties": true @@ -3086,12 +3630,9 @@ }, "resourcemetricstatus": { "properties": { - "currentAverageUtilization": { - "type": "integer" - }, - "currentAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" }, "name": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobSpec.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobSpec.java index d733bf0b357..20e0e2e2822 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobSpec.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobSpec.java @@ -37,6 +37,7 @@ "completions", "manualSelector", "parallelism", + "podFailurePolicy", "selector", "suspend", "template", @@ -75,6 +76,8 @@ public class JobSpec implements KubernetesResource private Boolean manualSelector; @JsonProperty("parallelism") private Integer parallelism; + @JsonProperty("podFailurePolicy") + private PodFailurePolicy podFailurePolicy; @JsonProperty("selector") private io.fabric8.kubernetes.api.model.LabelSelector selector; @JsonProperty("suspend") @@ -104,9 +107,10 @@ public JobSpec() { * @param completionMode * @param selector * @param activeDeadlineSeconds + * @param podFailurePolicy * @param ttlSecondsAfterFinished */ - public JobSpec(Long activeDeadlineSeconds, Integer backoffLimit, String completionMode, Integer completions, Boolean manualSelector, Integer parallelism, io.fabric8.kubernetes.api.model.LabelSelector selector, Boolean suspend, io.fabric8.kubernetes.api.model.PodTemplateSpec template, Integer ttlSecondsAfterFinished) { + public JobSpec(Long activeDeadlineSeconds, Integer backoffLimit, String completionMode, Integer completions, Boolean manualSelector, Integer parallelism, PodFailurePolicy podFailurePolicy, io.fabric8.kubernetes.api.model.LabelSelector selector, Boolean suspend, io.fabric8.kubernetes.api.model.PodTemplateSpec template, Integer ttlSecondsAfterFinished) { super(); this.activeDeadlineSeconds = activeDeadlineSeconds; this.backoffLimit = backoffLimit; @@ -114,6 +118,7 @@ public JobSpec(Long activeDeadlineSeconds, Integer backoffLimit, String completi this.completions = completions; this.manualSelector = manualSelector; this.parallelism = parallelism; + this.podFailurePolicy = podFailurePolicy; this.selector = selector; this.suspend = suspend; this.template = template; @@ -180,6 +185,16 @@ public void setParallelism(Integer parallelism) { this.parallelism = parallelism; } + @JsonProperty("podFailurePolicy") + public PodFailurePolicy getPodFailurePolicy() { + return podFailurePolicy; + } + + @JsonProperty("podFailurePolicy") + public void setPodFailurePolicy(PodFailurePolicy podFailurePolicy) { + this.podFailurePolicy = podFailurePolicy; + } + @JsonProperty("selector") public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { return selector; diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicy.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicy.java new file mode 100644 index 00000000000..ae5d23c037c --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicy.java @@ -0,0 +1,102 @@ + +package io.fabric8.kubernetes.api.model.batch.v1; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "rules" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class PodFailurePolicy implements KubernetesResource +{ + + @JsonProperty("rules") + private List rules = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PodFailurePolicy() { + } + + /** + * + * @param rules + */ + public PodFailurePolicy(List rules) { + super(); + this.rules = rules; + } + + @JsonProperty("rules") + public List getRules() { + return rules; + } + + @JsonProperty("rules") + public void setRules(List rules) { + this.rules = rules; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicyOnExitCodesRequirement.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicyOnExitCodesRequirement.java new file mode 100644 index 00000000000..e703a0646e2 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicyOnExitCodesRequirement.java @@ -0,0 +1,132 @@ + +package io.fabric8.kubernetes.api.model.batch.v1; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "containerName", + "operator", + "values" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class PodFailurePolicyOnExitCodesRequirement implements KubernetesResource +{ + + @JsonProperty("containerName") + private String containerName; + @JsonProperty("operator") + private String operator; + @JsonProperty("values") + private List values = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PodFailurePolicyOnExitCodesRequirement() { + } + + /** + * + * @param containerName + * @param values + * @param operator + */ + public PodFailurePolicyOnExitCodesRequirement(String containerName, String operator, List values) { + super(); + this.containerName = containerName; + this.operator = operator; + this.values = values; + } + + @JsonProperty("containerName") + public String getContainerName() { + return containerName; + } + + @JsonProperty("containerName") + public void setContainerName(String containerName) { + this.containerName = containerName; + } + + @JsonProperty("operator") + public String getOperator() { + return operator; + } + + @JsonProperty("operator") + public void setOperator(String operator) { + this.operator = operator; + } + + @JsonProperty("values") + public List getValues() { + return values; + } + + @JsonProperty("values") + public void setValues(List values) { + this.values = values; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicyOnPodConditionsPattern.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicyOnPodConditionsPattern.java new file mode 100644 index 00000000000..f381d8069d8 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicyOnPodConditionsPattern.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.batch.v1; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "status", + "type" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class PodFailurePolicyOnPodConditionsPattern implements KubernetesResource +{ + + @JsonProperty("status") + private String status; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PodFailurePolicyOnPodConditionsPattern() { + } + + /** + * + * @param type + * @param status + */ + public PodFailurePolicyOnPodConditionsPattern(String status, String type) { + super(); + this.status = status; + this.type = type; + } + + @JsonProperty("status") + public String getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(String status) { + this.status = status; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicyRule.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicyRule.java new file mode 100644 index 00000000000..90a8929ac70 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/PodFailurePolicyRule.java @@ -0,0 +1,132 @@ + +package io.fabric8.kubernetes.api.model.batch.v1; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "action", + "onExitCodes", + "onPodConditions" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class PodFailurePolicyRule implements KubernetesResource +{ + + @JsonProperty("action") + private String action; + @JsonProperty("onExitCodes") + private PodFailurePolicyOnExitCodesRequirement onExitCodes; + @JsonProperty("onPodConditions") + private List onPodConditions = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PodFailurePolicyRule() { + } + + /** + * + * @param onExitCodes + * @param action + * @param onPodConditions + */ + public PodFailurePolicyRule(String action, PodFailurePolicyOnExitCodesRequirement onExitCodes, List onPodConditions) { + super(); + this.action = action; + this.onExitCodes = onExitCodes; + this.onPodConditions = onPodConditions; + } + + @JsonProperty("action") + public String getAction() { + return action; + } + + @JsonProperty("action") + public void setAction(String action) { + this.action = action; + } + + @JsonProperty("onExitCodes") + public PodFailurePolicyOnExitCodesRequirement getOnExitCodes() { + return onExitCodes; + } + + @JsonProperty("onExitCodes") + public void setOnExitCodes(PodFailurePolicyOnExitCodesRequirement onExitCodes) { + this.onExitCodes = onExitCodes; + } + + @JsonProperty("onPodConditions") + public List getOnPodConditions() { + return onPodConditions; + } + + @JsonProperty("onPodConditions") + public void setOnPodConditions(List onPodConditions) { + this.onPodConditions = onPodConditions; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} 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 747f5a88260..1bfba2ecdbb 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 @@ -401,9 +401,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1068,6 +1065,10 @@ "parallelism": { "type": "integer" }, + "podFailurePolicy": { + "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicy" + }, "selector": { "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" @@ -1152,6 +1153,85 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_batch_v1_PodFailurePolicy": { + "type": "object", + "properties": { + "rules": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyRule" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_batch_v1_PodFailurePolicyOnExitCodesRequirement": { + "type": "object", + "properties": { + "containerName": { + "type": "string" + }, + "operator": { + "type": "string" + }, + "values": { + "type": "array", + "items": { + "type": "integer" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyOnExitCodesRequirement", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_batch_v1_PodFailurePolicyOnPodConditionsPattern": { + "type": "object", + "properties": { + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyOnPodConditionsPattern", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_batch_v1_PodFailurePolicyRule": { + "type": "object", + "properties": { + "action": { + "type": "string" + }, + "onExitCodes": { + "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicyOnExitCodesRequirement", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyOnExitCodesRequirement" + }, + "onPodConditions": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicyOnPodConditionsPattern", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyOnPodConditionsPattern" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyRule", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_batch_v1_UncountedTerminatedPods": { "type": "object", "properties": { @@ -3033,6 +3113,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -3766,12 +3849,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json index 4586d5eb9fd..f0e3ee971ed 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 @@ -401,9 +401,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1068,6 +1065,10 @@ "parallelism": { "type": "integer" }, + "podFailurePolicy": { + "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicy" + }, "selector": { "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" @@ -1152,6 +1153,85 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_batch_v1_PodFailurePolicy": { + "type": "object", + "properties": { + "rules": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyRule" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_batch_v1_PodFailurePolicyOnExitCodesRequirement": { + "type": "object", + "properties": { + "containerName": { + "type": "string" + }, + "operator": { + "type": "string" + }, + "values": { + "type": "array", + "items": { + "type": "integer" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyOnExitCodesRequirement", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_batch_v1_PodFailurePolicyOnPodConditionsPattern": { + "type": "object", + "properties": { + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyOnPodConditionsPattern", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_batch_v1_PodFailurePolicyRule": { + "type": "object", + "properties": { + "action": { + "type": "string" + }, + "onExitCodes": { + "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicyOnExitCodesRequirement", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyOnExitCodesRequirement" + }, + "onPodConditions": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicyOnPodConditionsPattern", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyOnPodConditionsPattern" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyRule", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_batch_v1_UncountedTerminatedPods": { "type": "object", "properties": { @@ -3033,6 +3113,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -3766,12 +3849,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, @@ -4747,14 +4843,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "batch/v1beta1", + "default": "batch/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJob", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob" + "$ref": "#/definitions/kubernetes_batch_v1_CronJob", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJob" } }, "kind": { @@ -4778,8 +4874,8 @@ "type": "integer" }, "jobTemplate": { - "$ref": "#/definitions/kubernetes_batch_v1beta1_JobTemplateSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.JobTemplateSpec" + "$ref": "#/definitions/kubernetes_batch_v1_JobTemplateSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobTemplateSpec" }, "schedule": { "type": "string" @@ -5646,6 +5742,10 @@ "parallelism": { "type": "integer" }, + "podFailurePolicy": { + "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicy" + }, "selector": { "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" @@ -6024,9 +6124,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -6354,6 +6451,65 @@ }, "additionalProperties": true }, + "podfailurepolicy": { + "properties": { + "rules": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyRule" + } + } + }, + "additionalProperties": true + }, + "podfailurepolicyonexitcodesrequirement": { + "properties": { + "containerName": { + "type": "string" + }, + "operator": { + "type": "string" + }, + "values": { + "type": "array", + "items": { + "type": "integer" + } + } + }, + "additionalProperties": true + }, + "podfailurepolicyonpodconditionspattern": { + "properties": { + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, + "podfailurepolicyrule": { + "properties": { + "action": { + "type": "string" + }, + "onExitCodes": { + "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicyOnExitCodesRequirement", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyOnExitCodesRequirement" + }, + "onPodConditions": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicyOnPodConditionsPattern", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicyOnPodConditionsPattern" + } + } + }, + "additionalProperties": true + }, "podos": { "properties": { "name": { @@ -6476,6 +6632,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -7212,12 +7371,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/kube-schema.json index 65adcbad6ac..3223dee52b2 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/kube-schema.json @@ -353,9 +353,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json index c580f885cda..db62d287d5e 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json @@ -353,9 +353,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1313,14 +1310,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "certificates.k8s.io/v1", + "default": "certificates.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest" + "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest" } }, "kind": { @@ -1388,8 +1385,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition" + "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition" } } }, @@ -1651,9 +1648,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/kube-schema.json index 3e2d8b72e5c..7fb714c44aa 100644 --- a/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/kube-schema.json @@ -366,9 +366,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/validation-schema.json index abd596c53aa..d51a4906f7e 100644 --- a/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/validation-schema.json @@ -366,9 +366,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1333,9 +1330,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/CSIPersistentVolumeSource.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/CSIPersistentVolumeSource.java index e45e183fc95..c91cfd37e9a 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/CSIPersistentVolumeSource.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/CSIPersistentVolumeSource.java @@ -27,6 +27,7 @@ "controllerPublishSecretRef", "driver", "fsType", + "nodeExpandSecretRef", "nodePublishSecretRef", "nodeStageSecretRef", "readOnly", @@ -52,6 +53,8 @@ public class CSIPersistentVolumeSource implements KubernetesResource private java.lang.String driver; @JsonProperty("fsType") private java.lang.String fsType; + @JsonProperty("nodeExpandSecretRef") + private SecretReference nodeExpandSecretRef; @JsonProperty("nodePublishSecretRef") private SecretReference nodePublishSecretRef; @JsonProperty("nodeStageSecretRef") @@ -80,17 +83,19 @@ public CSIPersistentVolumeSource() { * @param nodePublishSecretRef * @param nodeStageSecretRef * @param volumeHandle + * @param nodeExpandSecretRef * @param readOnly * @param controllerExpandSecretRef * @param fsType * @param volumeAttributes */ - public CSIPersistentVolumeSource(SecretReference controllerExpandSecretRef, SecretReference controllerPublishSecretRef, java.lang.String driver, java.lang.String fsType, SecretReference nodePublishSecretRef, SecretReference nodeStageSecretRef, Boolean readOnly, Map volumeAttributes, java.lang.String volumeHandle) { + public CSIPersistentVolumeSource(SecretReference controllerExpandSecretRef, SecretReference controllerPublishSecretRef, java.lang.String driver, java.lang.String fsType, SecretReference nodeExpandSecretRef, SecretReference nodePublishSecretRef, SecretReference nodeStageSecretRef, Boolean readOnly, Map volumeAttributes, java.lang.String volumeHandle) { super(); this.controllerExpandSecretRef = controllerExpandSecretRef; this.controllerPublishSecretRef = controllerPublishSecretRef; this.driver = driver; this.fsType = fsType; + this.nodeExpandSecretRef = nodeExpandSecretRef; this.nodePublishSecretRef = nodePublishSecretRef; this.nodeStageSecretRef = nodeStageSecretRef; this.readOnly = readOnly; @@ -138,6 +143,16 @@ public void setFsType(java.lang.String fsType) { this.fsType = fsType; } + @JsonProperty("nodeExpandSecretRef") + public SecretReference getNodeExpandSecretRef() { + return nodeExpandSecretRef; + } + + @JsonProperty("nodeExpandSecretRef") + public void setNodeExpandSecretRef(SecretReference nodeExpandSecretRef) { + this.nodeExpandSecretRef = nodeExpandSecretRef; + } + @JsonProperty("nodePublishSecretRef") public SecretReference getNodePublishSecretRef() { return nodePublishSecretRef; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ObjectMeta.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ObjectMeta.java index 8ed902c4424..0be8d019653 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ObjectMeta.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ObjectMeta.java @@ -26,7 +26,6 @@ "kind", "metadata", "annotations", - "clusterName", "creationTimestamp", "deletionGracePeriodSeconds", "deletionTimestamp", @@ -56,8 +55,6 @@ public class ObjectMeta implements KubernetesResource @JsonProperty("annotations") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map annotations = new LinkedHashMap(); - @JsonProperty("clusterName") - private java.lang.String clusterName; @JsonProperty("creationTimestamp") private String creationTimestamp; @JsonProperty("deletionGracePeriodSeconds") @@ -114,15 +111,13 @@ public ObjectMeta() { * @param deletionGracePeriodSeconds * @param uid * @param managedFields - * @param clusterName * @param creationTimestamp * @param name * @param namespace */ - public ObjectMeta(Map annotations, java.lang.String clusterName, String creationTimestamp, Long deletionGracePeriodSeconds, String deletionTimestamp, List finalizers, java.lang.String generateName, Long generation, Map labels, List managedFields, java.lang.String name, java.lang.String namespace, List ownerReferences, java.lang.String resourceVersion, java.lang.String selfLink, java.lang.String uid) { + public ObjectMeta(Map annotations, String creationTimestamp, Long deletionGracePeriodSeconds, String deletionTimestamp, List finalizers, java.lang.String generateName, Long generation, Map labels, List managedFields, java.lang.String name, java.lang.String namespace, List ownerReferences, java.lang.String resourceVersion, java.lang.String selfLink, java.lang.String uid) { super(); this.annotations = annotations; - this.clusterName = clusterName; this.creationTimestamp = creationTimestamp; this.deletionGracePeriodSeconds = deletionGracePeriodSeconds; this.deletionTimestamp = deletionTimestamp; @@ -149,16 +144,6 @@ public void setAnnotations(Map annotations) { this.annotations = annotations; } - @JsonProperty("clusterName") - public java.lang.String getClusterName() { - return clusterName; - } - - @JsonProperty("clusterName") - public void setClusterName(java.lang.String clusterName) { - this.clusterName = clusterName; - } - @JsonProperty("creationTimestamp") public String getCreationTimestamp() { return creationTimestamp; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodSpec.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodSpec.java index 9f6314bc7f3..d1546b70ad6 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodSpec.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodSpec.java @@ -37,6 +37,7 @@ "hostIPC", "hostNetwork", "hostPID", + "hostUsers", "hostname", "imagePullSecrets", "initContainers", @@ -99,6 +100,8 @@ public class PodSpec implements KubernetesResource private Boolean hostNetwork; @JsonProperty("hostPID") private Boolean hostPID; + @JsonProperty("hostUsers") + private Boolean hostUsers; @JsonProperty("hostname") private java.lang.String hostname; @JsonProperty("imagePullSecrets") @@ -198,13 +201,14 @@ public PodSpec() { * @param priority * @param restartPolicy * @param shareProcessNamespace + * @param hostUsers * @param subdomain * @param containers * @param initContainers * @param affinity * @param hostPID */ - public PodSpec(Long activeDeadlineSeconds, Affinity affinity, Boolean automountServiceAccountToken, List containers, PodDNSConfig dnsConfig, java.lang.String dnsPolicy, Boolean enableServiceLinks, List ephemeralContainers, List hostAliases, Boolean hostIPC, Boolean hostNetwork, Boolean hostPID, java.lang.String hostname, List imagePullSecrets, List initContainers, java.lang.String nodeName, Map nodeSelector, PodOS os, Map overhead, java.lang.String preemptionPolicy, Integer priority, java.lang.String priorityClassName, List readinessGates, java.lang.String restartPolicy, java.lang.String runtimeClassName, java.lang.String schedulerName, PodSecurityContext securityContext, java.lang.String serviceAccount, java.lang.String serviceAccountName, Boolean setHostnameAsFQDN, Boolean shareProcessNamespace, java.lang.String subdomain, Long terminationGracePeriodSeconds, List tolerations, List topologySpreadConstraints, List volumes) { + public PodSpec(Long activeDeadlineSeconds, Affinity affinity, Boolean automountServiceAccountToken, List containers, PodDNSConfig dnsConfig, java.lang.String dnsPolicy, Boolean enableServiceLinks, List ephemeralContainers, List hostAliases, Boolean hostIPC, Boolean hostNetwork, Boolean hostPID, Boolean hostUsers, java.lang.String hostname, List imagePullSecrets, List initContainers, java.lang.String nodeName, Map nodeSelector, PodOS os, Map overhead, java.lang.String preemptionPolicy, Integer priority, java.lang.String priorityClassName, List readinessGates, java.lang.String restartPolicy, java.lang.String runtimeClassName, java.lang.String schedulerName, PodSecurityContext securityContext, java.lang.String serviceAccount, java.lang.String serviceAccountName, Boolean setHostnameAsFQDN, Boolean shareProcessNamespace, java.lang.String subdomain, Long terminationGracePeriodSeconds, List tolerations, List topologySpreadConstraints, List volumes) { super(); this.activeDeadlineSeconds = activeDeadlineSeconds; this.affinity = affinity; @@ -218,6 +222,7 @@ public PodSpec(Long activeDeadlineSeconds, Affinity affinity, Boolean automountS this.hostIPC = hostIPC; this.hostNetwork = hostNetwork; this.hostPID = hostPID; + this.hostUsers = hostUsers; this.hostname = hostname; this.imagePullSecrets = imagePullSecrets; this.initContainers = initContainers; @@ -364,6 +369,16 @@ public void setHostPID(Boolean hostPID) { this.hostPID = hostPID; } + @JsonProperty("hostUsers") + public Boolean getHostUsers() { + return hostUsers; + } + + @JsonProperty("hostUsers") + public void setHostUsers(Boolean hostUsers) { + this.hostUsers = hostUsers; + } + @JsonProperty("hostname") public java.lang.String getHostname() { return hostname; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/TopologySpreadConstraint.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/TopologySpreadConstraint.java index a1381810041..7b784aeaac7 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/TopologySpreadConstraint.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/TopologySpreadConstraint.java @@ -1,7 +1,9 @@ package io.fabric8.kubernetes.api.model; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -23,8 +25,11 @@ "kind", "metadata", "labelSelector", + "matchLabelKeys", "maxSkew", "minDomains", + "nodeAffinityPolicy", + "nodeTaintsPolicy", "topologyKey", "whenUnsatisfiable" }) @@ -41,10 +46,17 @@ public class TopologySpreadConstraint implements KubernetesResource @JsonProperty("labelSelector") private LabelSelector labelSelector; + @JsonProperty("matchLabelKeys") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchLabelKeys = new ArrayList(); @JsonProperty("maxSkew") private Integer maxSkew; @JsonProperty("minDomains") private Integer minDomains; + @JsonProperty("nodeAffinityPolicy") + private String nodeAffinityPolicy; + @JsonProperty("nodeTaintsPolicy") + private String nodeTaintsPolicy; @JsonProperty("topologyKey") private String topologyKey; @JsonProperty("whenUnsatisfiable") @@ -61,17 +73,23 @@ public TopologySpreadConstraint() { /** * + * @param nodeTaintsPolicy * @param whenUnsatisfiable * @param maxSkew + * @param nodeAffinityPolicy * @param labelSelector * @param minDomains * @param topologyKey + * @param matchLabelKeys */ - public TopologySpreadConstraint(LabelSelector labelSelector, Integer maxSkew, Integer minDomains, String topologyKey, String whenUnsatisfiable) { + public TopologySpreadConstraint(LabelSelector labelSelector, List matchLabelKeys, Integer maxSkew, Integer minDomains, String nodeAffinityPolicy, String nodeTaintsPolicy, String topologyKey, String whenUnsatisfiable) { super(); this.labelSelector = labelSelector; + this.matchLabelKeys = matchLabelKeys; this.maxSkew = maxSkew; this.minDomains = minDomains; + this.nodeAffinityPolicy = nodeAffinityPolicy; + this.nodeTaintsPolicy = nodeTaintsPolicy; this.topologyKey = topologyKey; this.whenUnsatisfiable = whenUnsatisfiable; } @@ -86,6 +104,16 @@ public void setLabelSelector(LabelSelector labelSelector) { this.labelSelector = labelSelector; } + @JsonProperty("matchLabelKeys") + public List getMatchLabelKeys() { + return matchLabelKeys; + } + + @JsonProperty("matchLabelKeys") + public void setMatchLabelKeys(List matchLabelKeys) { + this.matchLabelKeys = matchLabelKeys; + } + @JsonProperty("maxSkew") public Integer getMaxSkew() { return maxSkew; @@ -106,6 +134,26 @@ public void setMinDomains(Integer minDomains) { this.minDomains = minDomains; } + @JsonProperty("nodeAffinityPolicy") + public String getNodeAffinityPolicy() { + return nodeAffinityPolicy; + } + + @JsonProperty("nodeAffinityPolicy") + public void setNodeAffinityPolicy(String nodeAffinityPolicy) { + this.nodeAffinityPolicy = nodeAffinityPolicy; + } + + @JsonProperty("nodeTaintsPolicy") + public String getNodeTaintsPolicy() { + return nodeTaintsPolicy; + } + + @JsonProperty("nodeTaintsPolicy") + public void setNodeTaintsPolicy(String nodeTaintsPolicy) { + this.nodeTaintsPolicy = nodeTaintsPolicy; + } + @JsonProperty("topologyKey") public String getTopologyKey() { return topologyKey; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json index d571f3e3820..9a572c4bedf 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json @@ -727,9 +727,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", "existingJavaType": "String" @@ -1693,6 +1690,10 @@ "fsType": { "type": "string" }, + "nodeExpandSecretRef": { + "$ref": "#/definitions/kubernetes_core_SecretReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" + }, "nodePublishSecretRef": { "$ref": "#/definitions/kubernetes_core_SecretReference", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" @@ -5389,6 +5390,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -7120,12 +7124,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json index 4b4a64f1f54..e30235a98cb 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json @@ -727,9 +727,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", "existingJavaType": "String" @@ -1693,6 +1690,10 @@ "fsType": { "type": "string" }, + "nodeExpandSecretRef": { + "$ref": "#/definitions/kubernetes_core_SecretReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" + }, "nodePublishSecretRef": { "$ref": "#/definitions/kubernetes_core_SecretReference", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" @@ -5389,6 +5390,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -7120,12 +7124,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, @@ -9038,6 +9055,10 @@ "fsType": { "type": "string" }, + "nodeExpandSecretRef": { + "$ref": "#/definitions/kubernetes_core_SecretReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" + }, "nodePublishSecretRef": { "$ref": "#/definitions/kubernetes_core_SecretReference", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" @@ -11091,9 +11112,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", "existingJavaType": "String" @@ -12077,6 +12095,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -13675,12 +13696,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, 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 b6de894f64d..bd218a9ff85 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 @@ -353,9 +353,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" 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 5c7a4ba958e..7a3d3602ba7 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 @@ -353,9 +353,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1398,19 +1395,12 @@ } }, "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" + "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointConditions", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointConditions" }, "hints": { - "$ref": "#/definitions/kubernetes_discovery_v1_EndpointHints", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointHints" + "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointHints", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointHints" }, "hostname": { "type": "string" @@ -1422,8 +1412,12 @@ "$ref": "#/definitions/kubernetes_core_ObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectReference" }, - "zone": { - "type": "string" + "topology": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" } }, "additionalProperties": true @@ -1481,14 +1475,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": { @@ -1503,8 +1497,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" } } }, @@ -1514,14 +1508,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "discovery.k8s.io/v1", + "default": "discovery.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1_EndpointSlice", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice" + "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointSlice", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice" } }, "kind": { @@ -1736,9 +1730,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/kube-schema.json index 192630d08d8..6145b881e78 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/kube-schema.json @@ -366,9 +366,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json index a028271455f..cddb1802aae 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json @@ -366,9 +366,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1604,9 +1601,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/kube-schema.json index 5f08fe4aab9..a137b32f722 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/kube-schema.json @@ -431,9 +431,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2608,6 +2605,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -3331,12 +3331,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/validation-schema.json index cf281bf4aec..400cac92723 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/validation-schema.json @@ -431,9 +431,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2608,6 +2605,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -3331,12 +3331,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, @@ -7159,9 +7172,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -7611,6 +7621,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -8495,12 +8508,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-flowcontrol/cmd/generate/generate.go index 7429f93f744..b4156d4fff8 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/cmd/generate/generate.go +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/cmd/generate/generate.go @@ -21,6 +21,7 @@ import ( "fmt" flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" + flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" "log" @@ -38,6 +39,10 @@ type Schema struct { V1beta1FlowSchemaList flowcontrolv1beta1.FlowSchemaList V1beta1PriorityLevelConfiguration flowcontrolv1beta1.PriorityLevelConfiguration V1beta1PriorityLevelConfigurationList flowcontrolv1beta1.PriorityLevelConfigurationList + V1beta2FlowSchema flowcontrolv1beta2.FlowSchema + V1beta2FlowSchemaList flowcontrolv1beta2.FlowSchemaList + V1beta2PriorityLevelConfiguration flowcontrolv1beta2.PriorityLevelConfiguration + V1beta2PriorityLevelConfigurationList flowcontrolv1beta2.PriorityLevelConfigurationList } func main() { @@ -48,6 +53,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/flowcontrol/v1beta1", "flowcontrol.apiserver.k8s.io", "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1", "kubernetes_flowcontrol_v1beta1_", true}, + {"k8s.io/api/flowcontrol/v1beta2", "flowcontrol.apiserver.k8s.io", "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2", "kubernetes_flowcontrol_v1beta2_", true}, } typeMap := map[reflect.Type]reflect.Type{ diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index e8191bc95bf..a2dde9b1401 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -19,10 +19,6 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema; -import io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList; -import io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration; -import io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -39,7 +35,11 @@ "V1beta1FlowSchema", "V1beta1FlowSchemaList", "V1beta1PriorityLevelConfiguration", - "V1beta1PriorityLevelConfigurationList" + "V1beta1PriorityLevelConfigurationList", + "V1beta2FlowSchema", + "V1beta2FlowSchemaList", + "V1beta2PriorityLevelConfiguration", + "V1beta2PriorityLevelConfigurationList" }) @ToString @EqualsAndHashCode @@ -62,13 +62,21 @@ public class KubeSchema { @JsonProperty("V1beta1FlowSchema") - private FlowSchema v1beta1FlowSchema; + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema; @JsonProperty("V1beta1FlowSchemaList") - private FlowSchemaList v1beta1FlowSchemaList; + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList; @JsonProperty("V1beta1PriorityLevelConfiguration") - private PriorityLevelConfiguration v1beta1PriorityLevelConfiguration; + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration; @JsonProperty("V1beta1PriorityLevelConfigurationList") - private PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList; + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList; + @JsonProperty("V1beta2FlowSchema") + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema; + @JsonProperty("V1beta2FlowSchemaList") + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList; + @JsonProperty("V1beta2PriorityLevelConfiguration") + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration; + @JsonProperty("V1beta2PriorityLevelConfigurationList") + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -82,58 +90,106 @@ public KubeSchema() { /** * * @param v1beta1FlowSchemaList + * @param v1beta2FlowSchema * @param v1beta1PriorityLevelConfigurationList * @param v1beta1FlowSchema + * @param v1beta2FlowSchemaList * @param v1beta1PriorityLevelConfiguration + * @param v1beta2PriorityLevelConfigurationList + * @param v1beta2PriorityLevelConfiguration */ - public KubeSchema(FlowSchema v1beta1FlowSchema, FlowSchemaList v1beta1FlowSchemaList, PriorityLevelConfiguration v1beta1PriorityLevelConfiguration, PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList) { + public KubeSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList) { super(); this.v1beta1FlowSchema = v1beta1FlowSchema; this.v1beta1FlowSchemaList = v1beta1FlowSchemaList; this.v1beta1PriorityLevelConfiguration = v1beta1PriorityLevelConfiguration; this.v1beta1PriorityLevelConfigurationList = v1beta1PriorityLevelConfigurationList; + this.v1beta2FlowSchema = v1beta2FlowSchema; + this.v1beta2FlowSchemaList = v1beta2FlowSchemaList; + this.v1beta2PriorityLevelConfiguration = v1beta2PriorityLevelConfiguration; + this.v1beta2PriorityLevelConfigurationList = v1beta2PriorityLevelConfigurationList; } @JsonProperty("V1beta1FlowSchema") - public FlowSchema getV1beta1FlowSchema() { + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema getV1beta1FlowSchema() { return v1beta1FlowSchema; } @JsonProperty("V1beta1FlowSchema") - public void setV1beta1FlowSchema(FlowSchema v1beta1FlowSchema) { + public void setV1beta1FlowSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema) { this.v1beta1FlowSchema = v1beta1FlowSchema; } @JsonProperty("V1beta1FlowSchemaList") - public FlowSchemaList getV1beta1FlowSchemaList() { + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList getV1beta1FlowSchemaList() { return v1beta1FlowSchemaList; } @JsonProperty("V1beta1FlowSchemaList") - public void setV1beta1FlowSchemaList(FlowSchemaList v1beta1FlowSchemaList) { + public void setV1beta1FlowSchemaList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList) { this.v1beta1FlowSchemaList = v1beta1FlowSchemaList; } @JsonProperty("V1beta1PriorityLevelConfiguration") - public PriorityLevelConfiguration getV1beta1PriorityLevelConfiguration() { + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration getV1beta1PriorityLevelConfiguration() { return v1beta1PriorityLevelConfiguration; } @JsonProperty("V1beta1PriorityLevelConfiguration") - public void setV1beta1PriorityLevelConfiguration(PriorityLevelConfiguration v1beta1PriorityLevelConfiguration) { + public void setV1beta1PriorityLevelConfiguration(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration) { this.v1beta1PriorityLevelConfiguration = v1beta1PriorityLevelConfiguration; } @JsonProperty("V1beta1PriorityLevelConfigurationList") - public PriorityLevelConfigurationList getV1beta1PriorityLevelConfigurationList() { + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList getV1beta1PriorityLevelConfigurationList() { return v1beta1PriorityLevelConfigurationList; } @JsonProperty("V1beta1PriorityLevelConfigurationList") - public void setV1beta1PriorityLevelConfigurationList(PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList) { + public void setV1beta1PriorityLevelConfigurationList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList) { this.v1beta1PriorityLevelConfigurationList = v1beta1PriorityLevelConfigurationList; } + @JsonProperty("V1beta2FlowSchema") + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema getV1beta2FlowSchema() { + return v1beta2FlowSchema; + } + + @JsonProperty("V1beta2FlowSchema") + public void setV1beta2FlowSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema) { + this.v1beta2FlowSchema = v1beta2FlowSchema; + } + + @JsonProperty("V1beta2FlowSchemaList") + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList getV1beta2FlowSchemaList() { + return v1beta2FlowSchemaList; + } + + @JsonProperty("V1beta2FlowSchemaList") + public void setV1beta2FlowSchemaList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList) { + this.v1beta2FlowSchemaList = v1beta2FlowSchemaList; + } + + @JsonProperty("V1beta2PriorityLevelConfiguration") + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration getV1beta2PriorityLevelConfiguration() { + return v1beta2PriorityLevelConfiguration; + } + + @JsonProperty("V1beta2PriorityLevelConfiguration") + public void setV1beta2PriorityLevelConfiguration(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration) { + this.v1beta2PriorityLevelConfiguration = v1beta2PriorityLevelConfiguration; + } + + @JsonProperty("V1beta2PriorityLevelConfigurationList") + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList getV1beta2PriorityLevelConfigurationList() { + return v1beta2PriorityLevelConfigurationList; + } + + @JsonProperty("V1beta2PriorityLevelConfigurationList") + public void setV1beta2PriorityLevelConfigurationList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList) { + this.v1beta2PriorityLevelConfigurationList = v1beta2PriorityLevelConfigurationList; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 01f69316503..2a9ed47e237 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -19,10 +19,6 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema; -import io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList; -import io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration; -import io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -39,7 +35,11 @@ "V1beta1FlowSchema", "V1beta1FlowSchemaList", "V1beta1PriorityLevelConfiguration", - "V1beta1PriorityLevelConfigurationList" + "V1beta1PriorityLevelConfigurationList", + "V1beta2FlowSchema", + "V1beta2FlowSchemaList", + "V1beta2PriorityLevelConfiguration", + "V1beta2PriorityLevelConfigurationList" }) @ToString @EqualsAndHashCode @@ -62,13 +62,21 @@ public class ValidationSchema { @JsonProperty("V1beta1FlowSchema") - private FlowSchema v1beta1FlowSchema; + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema; @JsonProperty("V1beta1FlowSchemaList") - private FlowSchemaList v1beta1FlowSchemaList; + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList; @JsonProperty("V1beta1PriorityLevelConfiguration") - private PriorityLevelConfiguration v1beta1PriorityLevelConfiguration; + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration; @JsonProperty("V1beta1PriorityLevelConfigurationList") - private PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList; + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList; + @JsonProperty("V1beta2FlowSchema") + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema; + @JsonProperty("V1beta2FlowSchemaList") + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList; + @JsonProperty("V1beta2PriorityLevelConfiguration") + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration; + @JsonProperty("V1beta2PriorityLevelConfigurationList") + private io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -82,58 +90,106 @@ public ValidationSchema() { /** * * @param v1beta1FlowSchemaList + * @param v1beta2FlowSchema * @param v1beta1PriorityLevelConfigurationList * @param v1beta1FlowSchema + * @param v1beta2FlowSchemaList * @param v1beta1PriorityLevelConfiguration + * @param v1beta2PriorityLevelConfigurationList + * @param v1beta2PriorityLevelConfiguration */ - public ValidationSchema(FlowSchema v1beta1FlowSchema, FlowSchemaList v1beta1FlowSchemaList, PriorityLevelConfiguration v1beta1PriorityLevelConfiguration, PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList) { + public ValidationSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList) { super(); this.v1beta1FlowSchema = v1beta1FlowSchema; this.v1beta1FlowSchemaList = v1beta1FlowSchemaList; this.v1beta1PriorityLevelConfiguration = v1beta1PriorityLevelConfiguration; this.v1beta1PriorityLevelConfigurationList = v1beta1PriorityLevelConfigurationList; + this.v1beta2FlowSchema = v1beta2FlowSchema; + this.v1beta2FlowSchemaList = v1beta2FlowSchemaList; + this.v1beta2PriorityLevelConfiguration = v1beta2PriorityLevelConfiguration; + this.v1beta2PriorityLevelConfigurationList = v1beta2PriorityLevelConfigurationList; } @JsonProperty("V1beta1FlowSchema") - public FlowSchema getV1beta1FlowSchema() { + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema getV1beta1FlowSchema() { return v1beta1FlowSchema; } @JsonProperty("V1beta1FlowSchema") - public void setV1beta1FlowSchema(FlowSchema v1beta1FlowSchema) { + public void setV1beta1FlowSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema v1beta1FlowSchema) { this.v1beta1FlowSchema = v1beta1FlowSchema; } @JsonProperty("V1beta1FlowSchemaList") - public FlowSchemaList getV1beta1FlowSchemaList() { + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList getV1beta1FlowSchemaList() { return v1beta1FlowSchemaList; } @JsonProperty("V1beta1FlowSchemaList") - public void setV1beta1FlowSchemaList(FlowSchemaList v1beta1FlowSchemaList) { + public void setV1beta1FlowSchemaList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaList v1beta1FlowSchemaList) { this.v1beta1FlowSchemaList = v1beta1FlowSchemaList; } @JsonProperty("V1beta1PriorityLevelConfiguration") - public PriorityLevelConfiguration getV1beta1PriorityLevelConfiguration() { + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration getV1beta1PriorityLevelConfiguration() { return v1beta1PriorityLevelConfiguration; } @JsonProperty("V1beta1PriorityLevelConfiguration") - public void setV1beta1PriorityLevelConfiguration(PriorityLevelConfiguration v1beta1PriorityLevelConfiguration) { + public void setV1beta1PriorityLevelConfiguration(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration v1beta1PriorityLevelConfiguration) { this.v1beta1PriorityLevelConfiguration = v1beta1PriorityLevelConfiguration; } @JsonProperty("V1beta1PriorityLevelConfigurationList") - public PriorityLevelConfigurationList getV1beta1PriorityLevelConfigurationList() { + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList getV1beta1PriorityLevelConfigurationList() { return v1beta1PriorityLevelConfigurationList; } @JsonProperty("V1beta1PriorityLevelConfigurationList") - public void setV1beta1PriorityLevelConfigurationList(PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList) { + public void setV1beta1PriorityLevelConfigurationList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList v1beta1PriorityLevelConfigurationList) { this.v1beta1PriorityLevelConfigurationList = v1beta1PriorityLevelConfigurationList; } + @JsonProperty("V1beta2FlowSchema") + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema getV1beta2FlowSchema() { + return v1beta2FlowSchema; + } + + @JsonProperty("V1beta2FlowSchema") + public void setV1beta2FlowSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema v1beta2FlowSchema) { + this.v1beta2FlowSchema = v1beta2FlowSchema; + } + + @JsonProperty("V1beta2FlowSchemaList") + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList getV1beta2FlowSchemaList() { + return v1beta2FlowSchemaList; + } + + @JsonProperty("V1beta2FlowSchemaList") + public void setV1beta2FlowSchemaList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList v1beta2FlowSchemaList) { + this.v1beta2FlowSchemaList = v1beta2FlowSchemaList; + } + + @JsonProperty("V1beta2PriorityLevelConfiguration") + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration getV1beta2PriorityLevelConfiguration() { + return v1beta2PriorityLevelConfiguration; + } + + @JsonProperty("V1beta2PriorityLevelConfiguration") + public void setV1beta2PriorityLevelConfiguration(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration v1beta2PriorityLevelConfiguration) { + this.v1beta2PriorityLevelConfiguration = v1beta2PriorityLevelConfiguration; + } + + @JsonProperty("V1beta2PriorityLevelConfigurationList") + public io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList getV1beta2PriorityLevelConfigurationList() { + return v1beta2PriorityLevelConfigurationList; + } + + @JsonProperty("V1beta2PriorityLevelConfigurationList") + public void setV1beta2PriorityLevelConfigurationList(io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList v1beta2PriorityLevelConfigurationList) { + this.v1beta2PriorityLevelConfigurationList = v1beta2PriorityLevelConfigurationList; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowDistinguisherMethod.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowDistinguisherMethod.java new file mode 100644 index 00000000000..bee962ee338 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowDistinguisherMethod.java @@ -0,0 +1,100 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "type" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class FlowDistinguisherMethod implements KubernetesResource +{ + + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FlowDistinguisherMethod() { + } + + /** + * + * @param type + */ + public FlowDistinguisherMethod(String type) { + super(); + this.type = type; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchema.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchema.java new file mode 100644 index 00000000000..760e705f2f0 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchema.java @@ -0,0 +1,195 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.Group; +import io.fabric8.kubernetes.model.annotation.Version; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "spec", + "status" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Version("v1beta2") +@Group("flowcontrol.apiserver.k8s.io") +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "flowcontrol.properties", gather = true) +}) +public class FlowSchema implements HasMetadata +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "flowcontrol.apiserver.k8s.io/v1beta2"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "FlowSchema"; + @JsonProperty("metadata") + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + @JsonProperty("spec") + private FlowSchemaSpec spec; + @JsonProperty("status") + private FlowSchemaStatus status; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FlowSchema() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param spec + * @param status + */ + public FlowSchema(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, FlowSchemaSpec spec, FlowSchemaStatus status) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + this.metadata = metadata; + this.spec = spec; + this.status = status; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("spec") + public FlowSchemaSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(FlowSchemaSpec spec) { + this.spec = spec; + } + + @JsonProperty("status") + public FlowSchemaStatus getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(FlowSchemaStatus status) { + this.status = status; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaCondition.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaCondition.java new file mode 100644 index 00000000000..472d72c3a41 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaCondition.java @@ -0,0 +1,160 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "lastTransitionTime", + "message", + "reason", + "status", + "type" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class FlowSchemaCondition implements KubernetesResource +{ + + @JsonProperty("lastTransitionTime") + private String lastTransitionTime; + @JsonProperty("message") + private java.lang.String message; + @JsonProperty("reason") + private java.lang.String reason; + @JsonProperty("status") + private java.lang.String status; + @JsonProperty("type") + private java.lang.String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FlowSchemaCondition() { + } + + /** + * + * @param reason + * @param lastTransitionTime + * @param message + * @param type + * @param status + */ + public FlowSchemaCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + super(); + this.lastTransitionTime = lastTransitionTime; + this.message = message; + this.reason = reason; + this.status = status; + this.type = type; + } + + @JsonProperty("lastTransitionTime") + public String getLastTransitionTime() { + return lastTransitionTime; + } + + @JsonProperty("lastTransitionTime") + public void setLastTransitionTime(String lastTransitionTime) { + this.lastTransitionTime = lastTransitionTime; + } + + @JsonProperty("message") + public java.lang.String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(java.lang.String message) { + this.message = message; + } + + @JsonProperty("reason") + public java.lang.String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(java.lang.String reason) { + this.reason = reason; + } + + @JsonProperty("status") + public java.lang.String getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(java.lang.String status) { + this.status = status; + } + + @JsonProperty("type") + public java.lang.String getType() { + return type; + } + + @JsonProperty("type") + public void setType(java.lang.String type) { + this.type = type; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(java.lang.String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaList.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaList.java new file mode 100644 index 00000000000..f55a00cd698 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaList.java @@ -0,0 +1,180 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.KubernetesResourceList; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.ListMeta; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.Group; +import io.fabric8.kubernetes.model.annotation.Version; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "items" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Version("v1beta2") +@Group("flowcontrol.apiserver.k8s.io") +public class FlowSchemaList implements KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "flowcontrol.apiserver.k8s.io/v1beta2"; + @JsonProperty("items") + private List items = new ArrayList(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "FlowSchemaList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FlowSchemaList() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param items + */ + public FlowSchemaList(String apiVersion, List items, String kind, ListMeta metadata) { + super(); + this.apiVersion = apiVersion; + this.items = items; + this.kind = kind; + this.metadata = metadata; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("items") + public List getItems() { + return items; + } + + @JsonProperty("items") + public void setItems(List items) { + this.items = items; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public ListMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ListMeta metadata) { + this.metadata = metadata; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaSpec.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaSpec.java new file mode 100644 index 00000000000..f2993afcc39 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaSpec.java @@ -0,0 +1,148 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "distinguisherMethod", + "matchingPrecedence", + "priorityLevelConfiguration", + "rules" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class FlowSchemaSpec implements KubernetesResource +{ + + @JsonProperty("distinguisherMethod") + private FlowDistinguisherMethod distinguisherMethod; + @JsonProperty("matchingPrecedence") + private Integer matchingPrecedence; + @JsonProperty("priorityLevelConfiguration") + private PriorityLevelConfigurationReference priorityLevelConfiguration; + @JsonProperty("rules") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List rules = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FlowSchemaSpec() { + } + + /** + * + * @param priorityLevelConfiguration + * @param matchingPrecedence + * @param rules + * @param distinguisherMethod + */ + public FlowSchemaSpec(FlowDistinguisherMethod distinguisherMethod, Integer matchingPrecedence, PriorityLevelConfigurationReference priorityLevelConfiguration, List rules) { + super(); + this.distinguisherMethod = distinguisherMethod; + this.matchingPrecedence = matchingPrecedence; + this.priorityLevelConfiguration = priorityLevelConfiguration; + this.rules = rules; + } + + @JsonProperty("distinguisherMethod") + public FlowDistinguisherMethod getDistinguisherMethod() { + return distinguisherMethod; + } + + @JsonProperty("distinguisherMethod") + public void setDistinguisherMethod(FlowDistinguisherMethod distinguisherMethod) { + this.distinguisherMethod = distinguisherMethod; + } + + @JsonProperty("matchingPrecedence") + public Integer getMatchingPrecedence() { + return matchingPrecedence; + } + + @JsonProperty("matchingPrecedence") + public void setMatchingPrecedence(Integer matchingPrecedence) { + this.matchingPrecedence = matchingPrecedence; + } + + @JsonProperty("priorityLevelConfiguration") + public PriorityLevelConfigurationReference getPriorityLevelConfiguration() { + return priorityLevelConfiguration; + } + + @JsonProperty("priorityLevelConfiguration") + public void setPriorityLevelConfiguration(PriorityLevelConfigurationReference priorityLevelConfiguration) { + this.priorityLevelConfiguration = priorityLevelConfiguration; + } + + @JsonProperty("rules") + public List getRules() { + return rules; + } + + @JsonProperty("rules") + public void setRules(List rules) { + this.rules = rules; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaStatus.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaStatus.java new file mode 100644 index 00000000000..3db6d1945fb --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaStatus.java @@ -0,0 +1,103 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "conditions" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class FlowSchemaStatus implements KubernetesResource +{ + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FlowSchemaStatus() { + } + + /** + * + * @param conditions + */ + public FlowSchemaStatus(List conditions) { + super(); + this.conditions = conditions; + } + + @JsonProperty("conditions") + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/GroupSubject.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/GroupSubject.java new file mode 100644 index 00000000000..4845c972963 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/GroupSubject.java @@ -0,0 +1,100 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "name" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class GroupSubject implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public GroupSubject() { + } + + /** + * + * @param name + */ + public GroupSubject(String name) { + super(); + this.name = name; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/LimitResponse.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/LimitResponse.java new file mode 100644 index 00000000000..5da38ef3454 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/LimitResponse.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "queuing", + "type" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class LimitResponse implements KubernetesResource +{ + + @JsonProperty("queuing") + private QueuingConfiguration queuing; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public LimitResponse() { + } + + /** + * + * @param queuing + * @param type + */ + public LimitResponse(QueuingConfiguration queuing, String type) { + super(); + this.queuing = queuing; + this.type = type; + } + + @JsonProperty("queuing") + public QueuingConfiguration getQueuing() { + return queuing; + } + + @JsonProperty("queuing") + public void setQueuing(QueuingConfiguration queuing) { + this.queuing = queuing; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/LimitedPriorityLevelConfiguration.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/LimitedPriorityLevelConfiguration.java new file mode 100644 index 00000000000..a106d076389 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/LimitedPriorityLevelConfiguration.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "assuredConcurrencyShares", + "limitResponse" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class LimitedPriorityLevelConfiguration implements KubernetesResource +{ + + @JsonProperty("assuredConcurrencyShares") + private Integer assuredConcurrencyShares; + @JsonProperty("limitResponse") + private LimitResponse limitResponse; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public LimitedPriorityLevelConfiguration() { + } + + /** + * + * @param limitResponse + * @param assuredConcurrencyShares + */ + public LimitedPriorityLevelConfiguration(Integer assuredConcurrencyShares, LimitResponse limitResponse) { + super(); + this.assuredConcurrencyShares = assuredConcurrencyShares; + this.limitResponse = limitResponse; + } + + @JsonProperty("assuredConcurrencyShares") + public Integer getAssuredConcurrencyShares() { + return assuredConcurrencyShares; + } + + @JsonProperty("assuredConcurrencyShares") + public void setAssuredConcurrencyShares(Integer assuredConcurrencyShares) { + this.assuredConcurrencyShares = assuredConcurrencyShares; + } + + @JsonProperty("limitResponse") + public LimitResponse getLimitResponse() { + return limitResponse; + } + + @JsonProperty("limitResponse") + public void setLimitResponse(LimitResponse limitResponse) { + this.limitResponse = limitResponse; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/NonResourcePolicyRule.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/NonResourcePolicyRule.java new file mode 100644 index 00000000000..6de11c57e8d --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/NonResourcePolicyRule.java @@ -0,0 +1,117 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "nonResourceURLs", + "verbs" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class NonResourcePolicyRule implements KubernetesResource +{ + + @JsonProperty("nonResourceURLs") + private List nonResourceURLs = new ArrayList(); + @JsonProperty("verbs") + private List verbs = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NonResourcePolicyRule() { + } + + /** + * + * @param verbs + * @param nonResourceURLs + */ + public NonResourcePolicyRule(List nonResourceURLs, List verbs) { + super(); + this.nonResourceURLs = nonResourceURLs; + this.verbs = verbs; + } + + @JsonProperty("nonResourceURLs") + public List getNonResourceURLs() { + return nonResourceURLs; + } + + @JsonProperty("nonResourceURLs") + public void setNonResourceURLs(List nonResourceURLs) { + this.nonResourceURLs = nonResourceURLs; + } + + @JsonProperty("verbs") + public List getVerbs() { + return verbs; + } + + @JsonProperty("verbs") + public void setVerbs(List verbs) { + this.verbs = verbs; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PolicyRulesWithSubjects.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PolicyRulesWithSubjects.java new file mode 100644 index 00000000000..1a739fbebe8 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PolicyRulesWithSubjects.java @@ -0,0 +1,134 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "nonResourceRules", + "resourceRules", + "subjects" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class PolicyRulesWithSubjects implements KubernetesResource +{ + + @JsonProperty("nonResourceRules") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List nonResourceRules = new ArrayList(); + @JsonProperty("resourceRules") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List resourceRules = new ArrayList(); + @JsonProperty("subjects") + private List subjects = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PolicyRulesWithSubjects() { + } + + /** + * + * @param nonResourceRules + * @param resourceRules + * @param subjects + */ + public PolicyRulesWithSubjects(List nonResourceRules, List resourceRules, List subjects) { + super(); + this.nonResourceRules = nonResourceRules; + this.resourceRules = resourceRules; + this.subjects = subjects; + } + + @JsonProperty("nonResourceRules") + public List getNonResourceRules() { + return nonResourceRules; + } + + @JsonProperty("nonResourceRules") + public void setNonResourceRules(List nonResourceRules) { + this.nonResourceRules = nonResourceRules; + } + + @JsonProperty("resourceRules") + public List getResourceRules() { + return resourceRules; + } + + @JsonProperty("resourceRules") + public void setResourceRules(List resourceRules) { + this.resourceRules = resourceRules; + } + + @JsonProperty("subjects") + public List getSubjects() { + return subjects; + } + + @JsonProperty("subjects") + public void setSubjects(List subjects) { + this.subjects = subjects; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfiguration.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfiguration.java new file mode 100644 index 00000000000..66f93b19f09 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfiguration.java @@ -0,0 +1,195 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.Group; +import io.fabric8.kubernetes.model.annotation.Version; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "spec", + "status" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Version("v1beta2") +@Group("flowcontrol.apiserver.k8s.io") +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "flowcontrol.properties", gather = true) +}) +public class PriorityLevelConfiguration implements HasMetadata +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "flowcontrol.apiserver.k8s.io/v1beta2"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "PriorityLevelConfiguration"; + @JsonProperty("metadata") + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + @JsonProperty("spec") + private PriorityLevelConfigurationSpec spec; + @JsonProperty("status") + private PriorityLevelConfigurationStatus status; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PriorityLevelConfiguration() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param spec + * @param status + */ + public PriorityLevelConfiguration(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, PriorityLevelConfigurationSpec spec, PriorityLevelConfigurationStatus status) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + this.metadata = metadata; + this.spec = spec; + this.status = status; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("spec") + public PriorityLevelConfigurationSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(PriorityLevelConfigurationSpec spec) { + this.spec = spec; + } + + @JsonProperty("status") + public PriorityLevelConfigurationStatus getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(PriorityLevelConfigurationStatus status) { + this.status = status; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationCondition.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationCondition.java new file mode 100644 index 00000000000..ac111473edc --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationCondition.java @@ -0,0 +1,160 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "lastTransitionTime", + "message", + "reason", + "status", + "type" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class PriorityLevelConfigurationCondition implements KubernetesResource +{ + + @JsonProperty("lastTransitionTime") + private String lastTransitionTime; + @JsonProperty("message") + private java.lang.String message; + @JsonProperty("reason") + private java.lang.String reason; + @JsonProperty("status") + private java.lang.String status; + @JsonProperty("type") + private java.lang.String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PriorityLevelConfigurationCondition() { + } + + /** + * + * @param reason + * @param lastTransitionTime + * @param message + * @param type + * @param status + */ + public PriorityLevelConfigurationCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + super(); + this.lastTransitionTime = lastTransitionTime; + this.message = message; + this.reason = reason; + this.status = status; + this.type = type; + } + + @JsonProperty("lastTransitionTime") + public String getLastTransitionTime() { + return lastTransitionTime; + } + + @JsonProperty("lastTransitionTime") + public void setLastTransitionTime(String lastTransitionTime) { + this.lastTransitionTime = lastTransitionTime; + } + + @JsonProperty("message") + public java.lang.String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(java.lang.String message) { + this.message = message; + } + + @JsonProperty("reason") + public java.lang.String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(java.lang.String reason) { + this.reason = reason; + } + + @JsonProperty("status") + public java.lang.String getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(java.lang.String status) { + this.status = status; + } + + @JsonProperty("type") + public java.lang.String getType() { + return type; + } + + @JsonProperty("type") + public void setType(java.lang.String type) { + this.type = type; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(java.lang.String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationList.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationList.java new file mode 100644 index 00000000000..91ac0e1553d --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationList.java @@ -0,0 +1,180 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.KubernetesResourceList; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.ListMeta; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.Group; +import io.fabric8.kubernetes.model.annotation.Version; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "items" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Version("v1beta2") +@Group("flowcontrol.apiserver.k8s.io") +public class PriorityLevelConfigurationList implements KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "flowcontrol.apiserver.k8s.io/v1beta2"; + @JsonProperty("items") + private List items = new ArrayList(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "PriorityLevelConfigurationList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PriorityLevelConfigurationList() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param items + */ + public PriorityLevelConfigurationList(String apiVersion, List items, String kind, ListMeta metadata) { + super(); + this.apiVersion = apiVersion; + this.items = items; + this.kind = kind; + this.metadata = metadata; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("items") + public List getItems() { + return items; + } + + @JsonProperty("items") + public void setItems(List items) { + this.items = items; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public ListMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ListMeta metadata) { + this.metadata = metadata; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationReference.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationReference.java new file mode 100644 index 00000000000..b621fcf7b96 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationReference.java @@ -0,0 +1,100 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "name" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class PriorityLevelConfigurationReference implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PriorityLevelConfigurationReference() { + } + + /** + * + * @param name + */ + public PriorityLevelConfigurationReference(String name) { + super(); + this.name = name; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationSpec.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationSpec.java new file mode 100644 index 00000000000..57564ebb7ce --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationSpec.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "limited", + "type" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class PriorityLevelConfigurationSpec implements KubernetesResource +{ + + @JsonProperty("limited") + private LimitedPriorityLevelConfiguration limited; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PriorityLevelConfigurationSpec() { + } + + /** + * + * @param limited + * @param type + */ + public PriorityLevelConfigurationSpec(LimitedPriorityLevelConfiguration limited, String type) { + super(); + this.limited = limited; + this.type = type; + } + + @JsonProperty("limited") + public LimitedPriorityLevelConfiguration getLimited() { + return limited; + } + + @JsonProperty("limited") + public void setLimited(LimitedPriorityLevelConfiguration limited) { + this.limited = limited; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationStatus.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationStatus.java new file mode 100644 index 00000000000..92172cad1d4 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationStatus.java @@ -0,0 +1,103 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "conditions" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class PriorityLevelConfigurationStatus implements KubernetesResource +{ + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PriorityLevelConfigurationStatus() { + } + + /** + * + * @param conditions + */ + public PriorityLevelConfigurationStatus(List conditions) { + super(); + this.conditions = conditions; + } + + @JsonProperty("conditions") + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/QueuingConfiguration.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/QueuingConfiguration.java new file mode 100644 index 00000000000..0eb20d3c718 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/QueuingConfiguration.java @@ -0,0 +1,130 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "handSize", + "queueLengthLimit", + "queues" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class QueuingConfiguration implements KubernetesResource +{ + + @JsonProperty("handSize") + private Integer handSize; + @JsonProperty("queueLengthLimit") + private Integer queueLengthLimit; + @JsonProperty("queues") + private Integer queues; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public QueuingConfiguration() { + } + + /** + * + * @param handSize + * @param queues + * @param queueLengthLimit + */ + public QueuingConfiguration(Integer handSize, Integer queueLengthLimit, Integer queues) { + super(); + this.handSize = handSize; + this.queueLengthLimit = queueLengthLimit; + this.queues = queues; + } + + @JsonProperty("handSize") + public Integer getHandSize() { + return handSize; + } + + @JsonProperty("handSize") + public void setHandSize(Integer handSize) { + this.handSize = handSize; + } + + @JsonProperty("queueLengthLimit") + public Integer getQueueLengthLimit() { + return queueLengthLimit; + } + + @JsonProperty("queueLengthLimit") + public void setQueueLengthLimit(Integer queueLengthLimit) { + this.queueLengthLimit = queueLengthLimit; + } + + @JsonProperty("queues") + public Integer getQueues() { + return queues; + } + + @JsonProperty("queues") + public void setQueues(Integer queues) { + this.queues = queues; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/ResourcePolicyRule.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/ResourcePolicyRule.java new file mode 100644 index 00000000000..14139ea0eb8 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/ResourcePolicyRule.java @@ -0,0 +1,162 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "apiGroups", + "clusterScope", + "namespaces", + "resources", + "verbs" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class ResourcePolicyRule implements KubernetesResource +{ + + @JsonProperty("apiGroups") + private List apiGroups = new ArrayList(); + @JsonProperty("clusterScope") + private Boolean clusterScope; + @JsonProperty("namespaces") + private List namespaces = new ArrayList(); + @JsonProperty("resources") + private List resources = new ArrayList(); + @JsonProperty("verbs") + private List verbs = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ResourcePolicyRule() { + } + + /** + * + * @param clusterScope + * @param resources + * @param verbs + * @param apiGroups + * @param namespaces + */ + public ResourcePolicyRule(List apiGroups, Boolean clusterScope, List namespaces, List resources, List verbs) { + super(); + this.apiGroups = apiGroups; + this.clusterScope = clusterScope; + this.namespaces = namespaces; + this.resources = resources; + this.verbs = verbs; + } + + @JsonProperty("apiGroups") + public List getApiGroups() { + return apiGroups; + } + + @JsonProperty("apiGroups") + public void setApiGroups(List apiGroups) { + this.apiGroups = apiGroups; + } + + @JsonProperty("clusterScope") + public Boolean getClusterScope() { + return clusterScope; + } + + @JsonProperty("clusterScope") + public void setClusterScope(Boolean clusterScope) { + this.clusterScope = clusterScope; + } + + @JsonProperty("namespaces") + public List getNamespaces() { + return namespaces; + } + + @JsonProperty("namespaces") + public void setNamespaces(List namespaces) { + this.namespaces = namespaces; + } + + @JsonProperty("resources") + public List getResources() { + return resources; + } + + @JsonProperty("resources") + public void setResources(List resources) { + this.resources = resources; + } + + @JsonProperty("verbs") + public List getVerbs() { + return verbs; + } + + @JsonProperty("verbs") + public void setVerbs(List verbs) { + this.verbs = verbs; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/ServiceAccountSubject.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/ServiceAccountSubject.java new file mode 100644 index 00000000000..7b942fbb21c --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/ServiceAccountSubject.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "name", + "namespace" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class ServiceAccountSubject implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ServiceAccountSubject() { + } + + /** + * + * @param name + * @param namespace + */ + public ServiceAccountSubject(String name, String namespace) { + super(); + this.name = name; + this.namespace = namespace; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("namespace") + public String getNamespace() { + return namespace; + } + + @JsonProperty("namespace") + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/Subject.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/Subject.java new file mode 100644 index 00000000000..96d1eed83d6 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/Subject.java @@ -0,0 +1,144 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "group", + "serviceAccount", + "user" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class Subject implements KubernetesResource +{ + + @JsonProperty("group") + private GroupSubject group; + @JsonProperty("kind") + private String kind; + @JsonProperty("serviceAccount") + private ServiceAccountSubject serviceAccount; + @JsonProperty("user") + private UserSubject user; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Subject() { + } + + /** + * + * @param kind + * @param serviceAccount + * @param user + * @param group + */ + public Subject(GroupSubject group, String kind, ServiceAccountSubject serviceAccount, UserSubject user) { + super(); + this.group = group; + this.kind = kind; + this.serviceAccount = serviceAccount; + this.user = user; + } + + @JsonProperty("group") + public GroupSubject getGroup() { + return group; + } + + @JsonProperty("group") + public void setGroup(GroupSubject group) { + this.group = group; + } + + @JsonProperty("kind") + public String getKind() { + return kind; + } + + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("serviceAccount") + public ServiceAccountSubject getServiceAccount() { + return serviceAccount; + } + + @JsonProperty("serviceAccount") + public void setServiceAccount(ServiceAccountSubject serviceAccount) { + this.serviceAccount = serviceAccount; + } + + @JsonProperty("user") + public UserSubject getUser() { + return user; + } + + @JsonProperty("user") + public void setUser(UserSubject user) { + this.user = user; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/UserSubject.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/UserSubject.java new file mode 100644 index 00000000000..a4761efabdf --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/UserSubject.java @@ -0,0 +1,100 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1beta2; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "name" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class UserSubject implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public UserSubject() { + } + + /** + * + * @param name + */ + public UserSubject(String name) { + super(); + this.name = name; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json index a63aa804ed1..9eacde060a7 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json @@ -77,9 +77,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -709,6 +706,506 @@ "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] + }, + "kubernetes_flowcontrol_v1beta2_FlowDistinguisherMethod": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowDistinguisherMethod", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_FlowSchema": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", + "required": true + }, + "kind": { + "type": "string", + "default": "FlowSchema", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_flowcontrol_v1beta2_FlowSchemaCondition": { + "type": "object", + "properties": { + "lastTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "message": { + "type": "string" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_FlowSchemaList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchema", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema" + } + }, + "kind": { + "type": "string", + "default": "FlowSchemaList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema\u003e" + ] + }, + "kubernetes_flowcontrol_v1beta2_FlowSchemaSpec": { + "type": "object", + "properties": { + "distinguisherMethod": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowDistinguisherMethod", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowDistinguisherMethod" + }, + "matchingPrecedence": { + "type": "integer" + }, + "priorityLevelConfiguration": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationReference" + }, + "rules": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PolicyRulesWithSubjects", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PolicyRulesWithSubjects" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_FlowSchemaStatus": { + "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaCondition" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_GroupSubject": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.GroupSubject", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_LimitResponse": { + "type": "object", + "properties": { + "queuing": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_QueuingConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.QueuingConfiguration" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitResponse", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_LimitedPriorityLevelConfiguration": { + "type": "object", + "properties": { + "assuredConcurrencyShares": { + "type": "integer" + }, + "limitResponse": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitResponse" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitedPriorityLevelConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_NonResourcePolicyRule": { + "type": "object", + "properties": { + "nonResourceURLs": { + "type": "array", + "items": { + "type": "string" + } + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.NonResourcePolicyRule", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_PolicyRulesWithSubjects": { + "type": "object", + "properties": { + "nonResourceRules": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_NonResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.NonResourcePolicyRule" + } + }, + "resourceRules": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ResourcePolicyRule" + } + }, + "subjects": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_Subject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.Subject" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PolicyRulesWithSubjects", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_PriorityLevelConfiguration": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", + "required": true + }, + "kind": { + "type": "string", + "default": "PriorityLevelConfiguration", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationCondition": { + "type": "object", + "properties": { + "lastTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "message": { + "type": "string" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration" + } + }, + "kind": { + "type": "string", + "default": "PriorityLevelConfigurationList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration\u003e" + ] + }, + "kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationReference": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationSpec": { + "type": "object", + "properties": { + "limited": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitedPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitedPriorityLevelConfiguration" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationStatus": { + "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationCondition" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_QueuingConfiguration": { + "type": "object", + "properties": { + "handSize": { + "type": "integer" + }, + "queueLengthLimit": { + "type": "integer" + }, + "queues": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.QueuingConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_ResourcePolicyRule": { + "type": "object", + "properties": { + "apiGroups": { + "type": "array", + "items": { + "type": "string" + } + }, + "clusterScope": { + "type": "boolean" + }, + "namespaces": { + "type": "array", + "items": { + "type": "string" + } + }, + "resources": { + "type": "array", + "items": { + "type": "string" + } + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ResourcePolicyRule", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_ServiceAccountSubject": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ServiceAccountSubject", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_Subject": { + "type": "object", + "properties": { + "group": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_GroupSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.GroupSubject" + }, + "kind": { + "type": "string" + }, + "serviceAccount": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ServiceAccountSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ServiceAccountSubject" + }, + "user": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_UserSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.UserSubject" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.Subject", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_UserSubject": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.UserSubject", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] } }, "type": "object", @@ -728,6 +1225,22 @@ "V1beta1PriorityLevelConfigurationList": { "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationList", "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList" + }, + "V1beta2FlowSchema": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchema", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema" + }, + "V1beta2FlowSchemaList": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaList", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList" + }, + "V1beta2PriorityLevelConfiguration": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration" + }, + "V1beta2PriorityLevelConfigurationList": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationList", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json index 6ae69f4a996..28b416afd2b 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json @@ -77,9 +77,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -709,6 +706,506 @@ "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] + }, + "kubernetes_flowcontrol_v1beta2_FlowDistinguisherMethod": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowDistinguisherMethod", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_FlowSchema": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", + "required": true + }, + "kind": { + "type": "string", + "default": "FlowSchema", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_flowcontrol_v1beta2_FlowSchemaCondition": { + "type": "object", + "properties": { + "lastTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "message": { + "type": "string" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_FlowSchemaList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchema", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema" + } + }, + "kind": { + "type": "string", + "default": "FlowSchemaList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema\u003e" + ] + }, + "kubernetes_flowcontrol_v1beta2_FlowSchemaSpec": { + "type": "object", + "properties": { + "distinguisherMethod": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowDistinguisherMethod", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowDistinguisherMethod" + }, + "matchingPrecedence": { + "type": "integer" + }, + "priorityLevelConfiguration": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationReference" + }, + "rules": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PolicyRulesWithSubjects", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PolicyRulesWithSubjects" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_FlowSchemaStatus": { + "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaCondition" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_GroupSubject": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.GroupSubject", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_LimitResponse": { + "type": "object", + "properties": { + "queuing": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_QueuingConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.QueuingConfiguration" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitResponse", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_LimitedPriorityLevelConfiguration": { + "type": "object", + "properties": { + "assuredConcurrencyShares": { + "type": "integer" + }, + "limitResponse": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitResponse" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitedPriorityLevelConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_NonResourcePolicyRule": { + "type": "object", + "properties": { + "nonResourceURLs": { + "type": "array", + "items": { + "type": "string" + } + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.NonResourcePolicyRule", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_PolicyRulesWithSubjects": { + "type": "object", + "properties": { + "nonResourceRules": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_NonResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.NonResourcePolicyRule" + } + }, + "resourceRules": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ResourcePolicyRule" + } + }, + "subjects": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_Subject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.Subject" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PolicyRulesWithSubjects", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_PriorityLevelConfiguration": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", + "required": true + }, + "kind": { + "type": "string", + "default": "PriorityLevelConfiguration", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationCondition": { + "type": "object", + "properties": { + "lastTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "message": { + "type": "string" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration" + } + }, + "kind": { + "type": "string", + "default": "PriorityLevelConfigurationList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration\u003e" + ] + }, + "kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationReference": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationSpec": { + "type": "object", + "properties": { + "limited": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitedPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitedPriorityLevelConfiguration" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationStatus": { + "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationCondition" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_QueuingConfiguration": { + "type": "object", + "properties": { + "handSize": { + "type": "integer" + }, + "queueLengthLimit": { + "type": "integer" + }, + "queues": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.QueuingConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_ResourcePolicyRule": { + "type": "object", + "properties": { + "apiGroups": { + "type": "array", + "items": { + "type": "string" + } + }, + "clusterScope": { + "type": "boolean" + }, + "namespaces": { + "type": "array", + "items": { + "type": "string" + } + }, + "resources": { + "type": "array", + "items": { + "type": "string" + } + }, + "verbs": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ResourcePolicyRule", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_ServiceAccountSubject": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ServiceAccountSubject", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_Subject": { + "type": "object", + "properties": { + "group": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_GroupSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.GroupSubject" + }, + "kind": { + "type": "string" + }, + "serviceAccount": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ServiceAccountSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ServiceAccountSubject" + }, + "user": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_UserSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.UserSubject" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.Subject", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_flowcontrol_v1beta2_UserSubject": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.UserSubject", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] } }, "type": "object", @@ -728,6 +1225,22 @@ "V1beta1PriorityLevelConfigurationList": { "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationList", "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationList" + }, + "V1beta2FlowSchema": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchema", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema" + }, + "V1beta2FlowSchemaList": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaList", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList" + }, + "V1beta2PriorityLevelConfiguration": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration" + }, + "V1beta2PriorityLevelConfigurationList": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationList", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList" } }, "additionalProperties": true, @@ -747,7 +1260,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta1", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", "required": true }, "kind": { @@ -760,12 +1273,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchemaSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaSpec" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaSpec" }, "status": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchemaStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaStatus" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaStatus" } }, "additionalProperties": true @@ -795,14 +1308,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta1", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchema", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchema", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema" } }, "kind": { @@ -847,8 +1360,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchemaCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaCondition" } } }, @@ -958,9 +1471,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1059,23 +1569,23 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_NonResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.NonResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_NonResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.NonResourcePolicyRule" } }, "resourceRules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_ResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ResourcePolicyRule" } }, "subjects": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_Subject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.Subject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_Subject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.Subject" } } }, @@ -1166,8 +1676,8 @@ "prioritylevelconfigurationspec": { "properties": { "limited": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_LimitedPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.LimitedPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitedPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitedPriorityLevelConfiguration" }, "type": { "type": "string" @@ -1181,8 +1691,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationCondition" } } }, diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/kube-schema.json index 4ebf7dd2739..6e695f72e09 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/kube-schema.json @@ -155,9 +155,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json index 0372ad24916..7d292823a19 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json @@ -155,9 +155,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -3008,13 +3005,13 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_RouteGroupKind", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.RouteGroupKind" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_RouteGroupKind", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.RouteGroupKind" } }, "namespaces": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_RouteNamespaces", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.RouteNamespaces" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_RouteNamespaces", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.RouteNamespaces" } }, "additionalProperties": true @@ -3070,8 +3067,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_ParentReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ParentReference" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_ParentReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ParentReference" } } }, @@ -3109,7 +3106,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "kind": { @@ -3122,12 +3119,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewaySpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewaySpec" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewaySpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewaySpec" }, "status": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayStatus" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewayStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayStatus" } }, "additionalProperties": true @@ -3147,7 +3144,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "kind": { @@ -3160,12 +3157,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewayClassSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassSpec" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayClassSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassSpec" }, "status": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewayClassStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassStatus" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayClassStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassStatus" } }, "additionalProperties": true @@ -3205,8 +3202,8 @@ "type": "string" }, "parametersRef": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_ParametersReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ParametersReference" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_ParametersReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ParametersReference" } }, "additionalProperties": true @@ -3228,14 +3225,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_Gateway", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_Gateway", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway" } }, "kind": { @@ -3279,8 +3276,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayAddress", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayAddress" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewayAddress", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayAddress" } }, "conditions": { @@ -3295,8 +3292,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_ListenerStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ListenerStatus" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_ListenerStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ListenerStatus" } } }, @@ -3308,8 +3305,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_SecretObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.SecretObjectReference" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_SecretObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.SecretObjectReference" } }, "mode": { @@ -3428,8 +3425,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPHeader", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPHeader" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPHeader", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPHeader" } }, "remove": { @@ -3443,8 +3440,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPHeader", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPHeader" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPHeader", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPHeader" } } }, @@ -3453,8 +3450,8 @@ "httprequestmirrorfilter": { "properties": { "backendRef": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_BackendObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.BackendObjectReference" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_BackendObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.BackendObjectReference" } }, "additionalProperties": true @@ -3484,7 +3481,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "kind": { @@ -3497,12 +3494,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRouteSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteSpec" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPRouteSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteSpec" }, "status": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRouteStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteStatus" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPRouteStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteStatus" } }, "additionalProperties": true @@ -3539,14 +3536,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPRoute", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRoute", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute" } }, "kind": { @@ -3567,23 +3564,23 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPHeaderMatch", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPHeaderMatch" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPHeaderMatch", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPHeaderMatch" } }, "method": { "type": "string" }, "path": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPPathMatch", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPPathMatch" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPPathMatch", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPPathMatch" }, "queryParams": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPQueryParamMatch", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPQueryParamMatch" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPQueryParamMatch", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPQueryParamMatch" } } }, @@ -3751,8 +3748,8 @@ "supportedKinds": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_RouteGroupKind", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.RouteGroupKind" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_RouteGroupKind", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.RouteGroupKind" } } }, @@ -3827,9 +3824,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/kube-schema.json index ebc4d563aa8..b9b6c662ade 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/kube-schema.json @@ -354,9 +354,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/validation-schema.json index ad31422329c..14fe5d845b8 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/validation-schema.json @@ -354,9 +354,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1461,9 +1458,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-networking/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-networking/cmd/generate/generate.go index 5cdc4cf421c..6591317e1b6 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/cmd/generate/generate.go +++ b/kubernetes-model-generator/kubernetes-model-networking/cmd/generate/generate.go @@ -27,6 +27,7 @@ import ( networking "k8s.io/api/networking/v1" networkingv1beta1 "k8s.io/api/networking/v1beta1" + networkingv1alpha1 "k8s.io/api/networking/v1alpha1" "log" "reflect" @@ -68,7 +69,8 @@ type Schema struct { IngressList networkingv1beta1.IngressList IngressClass networkingv1beta1.IngressClass IngressClassList networkingv1beta1.IngressClassList - + V1Alpha1ClusterCIDR networkingv1alpha1.ClusterCIDR + V1Alpha1ClusterCIDRList networkingv1alpha1.ClusterCIDRList } func main() { @@ -80,6 +82,7 @@ func main() { {"k8s.io/api/core/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_core_", false}, {"k8s.io/api/networking/v1", "networking.k8s.io", "io.fabric8.kubernetes.api.model.networking.v1", "kubernetes_networking_v1_", true}, {"k8s.io/api/networking/v1beta1", "networking.k8s.io", "io.fabric8.kubernetes.api.model.networking.v1beta1", "kubernetes_networking_v1beta1_", true}, + {"k8s.io/api/networking/v1alpha1", "networking.k8s.io", "io.fabric8.kubernetes.api.model.networking.v1alpha1", "kubernetes_networking_v1alpha1_", true}, } typeMap := map[reflect.Type]reflect.Type{ diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index e37961ee2b1..f6de734b604 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -19,6 +19,8 @@ import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy; import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyList; +import io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDR; +import io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDRList; import io.fabric8.kubernetes.api.model.version.Info; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -57,6 +59,8 @@ "Time", "TypeMeta", "UpdateOptions", + "V1Alpha1ClusterCIDR", + "V1Alpha1ClusterCIDRList", "V1Ingress", "V1IngressClass", "V1IngressClassList", @@ -130,6 +134,10 @@ public class KubeSchema { private TypeMeta typeMeta; @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; + @JsonProperty("V1Alpha1ClusterCIDR") + private ClusterCIDR v1Alpha1ClusterCIDR; + @JsonProperty("V1Alpha1ClusterCIDRList") + private ClusterCIDRList v1Alpha1ClusterCIDRList; @JsonProperty("V1Ingress") private io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress; @JsonProperty("V1IngressClass") @@ -157,6 +165,7 @@ public KubeSchema() { * @param ingressClass * @param updateOptions * @param patch + * @param v1Alpha1ClusterCIDR * @param ingressClassList * @param rootPaths * @param v1Ingress @@ -168,6 +177,7 @@ public KubeSchema() { * @param networkPolicy * @param objectReference * @param createOptions + * @param v1Alpha1ClusterCIDRList * @param aPIGroup * @param ingress * @param typeMeta @@ -179,7 +189,7 @@ public KubeSchema() { * @param v1IngressList * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ClusterCIDR v1Alpha1ClusterCIDR, ClusterCIDRList v1Alpha1ClusterCIDRList, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -205,6 +215,8 @@ public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesLi this.time = time; this.typeMeta = typeMeta; this.updateOptions = updateOptions; + this.v1Alpha1ClusterCIDR = v1Alpha1ClusterCIDR; + this.v1Alpha1ClusterCIDRList = v1Alpha1ClusterCIDRList; this.v1Ingress = v1Ingress; this.v1IngressClass = v1IngressClass; this.v1IngressClassList = v1IngressClassList; @@ -451,6 +463,26 @@ public void setUpdateOptions(UpdateOptions updateOptions) { this.updateOptions = updateOptions; } + @JsonProperty("V1Alpha1ClusterCIDR") + public ClusterCIDR getV1Alpha1ClusterCIDR() { + return v1Alpha1ClusterCIDR; + } + + @JsonProperty("V1Alpha1ClusterCIDR") + public void setV1Alpha1ClusterCIDR(ClusterCIDR v1Alpha1ClusterCIDR) { + this.v1Alpha1ClusterCIDR = v1Alpha1ClusterCIDR; + } + + @JsonProperty("V1Alpha1ClusterCIDRList") + public ClusterCIDRList getV1Alpha1ClusterCIDRList() { + return v1Alpha1ClusterCIDRList; + } + + @JsonProperty("V1Alpha1ClusterCIDRList") + public void setV1Alpha1ClusterCIDRList(ClusterCIDRList v1Alpha1ClusterCIDRList) { + this.v1Alpha1ClusterCIDRList = v1Alpha1ClusterCIDRList; + } + @JsonProperty("V1Ingress") public io.fabric8.kubernetes.api.model.networking.v1.Ingress getV1Ingress() { return v1Ingress; diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index afa841219cb..5ea5fbd911c 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -19,6 +19,8 @@ import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy; import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyList; +import io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDR; +import io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDRList; import io.fabric8.kubernetes.api.model.version.Info; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -57,6 +59,8 @@ "Time", "TypeMeta", "UpdateOptions", + "V1Alpha1ClusterCIDR", + "V1Alpha1ClusterCIDRList", "V1Ingress", "V1IngressClass", "V1IngressClassList", @@ -130,6 +134,10 @@ public class ValidationSchema { private TypeMeta typeMeta; @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; + @JsonProperty("V1Alpha1ClusterCIDR") + private ClusterCIDR v1Alpha1ClusterCIDR; + @JsonProperty("V1Alpha1ClusterCIDRList") + private ClusterCIDRList v1Alpha1ClusterCIDRList; @JsonProperty("V1Ingress") private io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress; @JsonProperty("V1IngressClass") @@ -157,6 +165,7 @@ public ValidationSchema() { * @param ingressClass * @param updateOptions * @param patch + * @param v1Alpha1ClusterCIDR * @param ingressClassList * @param rootPaths * @param v1Ingress @@ -168,6 +177,7 @@ public ValidationSchema() { * @param networkPolicy * @param objectReference * @param createOptions + * @param v1Alpha1ClusterCIDRList * @param aPIGroup * @param ingress * @param typeMeta @@ -179,7 +189,7 @@ public ValidationSchema() { * @param v1IngressList * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ClusterCIDR v1Alpha1ClusterCIDR, ClusterCIDRList v1Alpha1ClusterCIDRList, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -205,6 +215,8 @@ public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubern this.time = time; this.typeMeta = typeMeta; this.updateOptions = updateOptions; + this.v1Alpha1ClusterCIDR = v1Alpha1ClusterCIDR; + this.v1Alpha1ClusterCIDRList = v1Alpha1ClusterCIDRList; this.v1Ingress = v1Ingress; this.v1IngressClass = v1IngressClass; this.v1IngressClassList = v1IngressClassList; @@ -451,6 +463,26 @@ public void setUpdateOptions(UpdateOptions updateOptions) { this.updateOptions = updateOptions; } + @JsonProperty("V1Alpha1ClusterCIDR") + public ClusterCIDR getV1Alpha1ClusterCIDR() { + return v1Alpha1ClusterCIDR; + } + + @JsonProperty("V1Alpha1ClusterCIDR") + public void setV1Alpha1ClusterCIDR(ClusterCIDR v1Alpha1ClusterCIDR) { + this.v1Alpha1ClusterCIDR = v1Alpha1ClusterCIDR; + } + + @JsonProperty("V1Alpha1ClusterCIDRList") + public ClusterCIDRList getV1Alpha1ClusterCIDRList() { + return v1Alpha1ClusterCIDRList; + } + + @JsonProperty("V1Alpha1ClusterCIDRList") + public void setV1Alpha1ClusterCIDRList(ClusterCIDRList v1Alpha1ClusterCIDRList) { + this.v1Alpha1ClusterCIDRList = v1Alpha1ClusterCIDRList; + } + @JsonProperty("V1Ingress") public io.fabric8.kubernetes.api.model.networking.v1.Ingress getV1Ingress() { return v1Ingress; diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDR.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDR.java new file mode 100644 index 00000000000..78328172cdf --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDR.java @@ -0,0 +1,181 @@ + +package io.fabric8.kubernetes.api.model.networking.v1alpha1; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.Group; +import io.fabric8.kubernetes.model.annotation.Version; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "spec" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Version("v1alpha1") +@Group("networking.k8s.io") +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "networking.properties", gather = true) +}) +public class ClusterCIDR implements HasMetadata, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "networking.k8s.io/v1alpha1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "ClusterCIDR"; + @JsonProperty("metadata") + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + @JsonProperty("spec") + private ClusterCIDRSpec spec; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ClusterCIDR() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param spec + */ + public ClusterCIDR(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ClusterCIDRSpec spec) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + this.metadata = metadata; + this.spec = spec; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("spec") + public ClusterCIDRSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(ClusterCIDRSpec spec) { + this.spec = spec; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDRList.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDRList.java new file mode 100644 index 00000000000..2a52a94ec87 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDRList.java @@ -0,0 +1,180 @@ + +package io.fabric8.kubernetes.api.model.networking.v1alpha1; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.KubernetesResourceList; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.ListMeta; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.Group; +import io.fabric8.kubernetes.model.annotation.Version; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "items" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Version("v1alpha1") +@Group("networking.k8s.io") +public class ClusterCIDRList implements KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "networking.k8s.io/v1alpha1"; + @JsonProperty("items") + private List items = new ArrayList(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "ClusterCIDRList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ClusterCIDRList() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param items + */ + public ClusterCIDRList(String apiVersion, List items, String kind, ListMeta metadata) { + super(); + this.apiVersion = apiVersion; + this.items = items; + this.kind = kind; + this.metadata = metadata; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("items") + public List getItems() { + return items; + } + + @JsonProperty("items") + public void setItems(List items) { + this.items = items; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public ListMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ListMeta metadata) { + this.metadata = metadata; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDRSpec.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDRSpec.java new file mode 100644 index 00000000000..1ba9bec043f --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDRSpec.java @@ -0,0 +1,146 @@ + +package io.fabric8.kubernetes.api.model.networking.v1alpha1; + +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.NodeSelector; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "ipv4", + "ipv6", + "nodeSelector", + "perNodeHostBits" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class ClusterCIDRSpec implements KubernetesResource +{ + + @JsonProperty("ipv4") + private String ipv4; + @JsonProperty("ipv6") + private String ipv6; + @JsonProperty("nodeSelector") + private NodeSelector nodeSelector; + @JsonProperty("perNodeHostBits") + private Integer perNodeHostBits; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ClusterCIDRSpec() { + } + + /** + * + * @param ipv4 + * @param perNodeHostBits + * @param ipv6 + * @param nodeSelector + */ + public ClusterCIDRSpec(String ipv4, String ipv6, NodeSelector nodeSelector, Integer perNodeHostBits) { + super(); + this.ipv4 = ipv4; + this.ipv6 = ipv6; + this.nodeSelector = nodeSelector; + this.perNodeHostBits = perNodeHostBits; + } + + @JsonProperty("ipv4") + public String getIpv4() { + return ipv4; + } + + @JsonProperty("ipv4") + public void setIpv4(String ipv4) { + this.ipv4 = ipv4; + } + + @JsonProperty("ipv6") + public String getIpv6() { + return ipv6; + } + + @JsonProperty("ipv6") + public void setIpv6(String ipv6) { + this.ipv6 = ipv6; + } + + @JsonProperty("nodeSelector") + public NodeSelector getNodeSelector() { + return nodeSelector; + } + + @JsonProperty("nodeSelector") + public void setNodeSelector(NodeSelector nodeSelector) { + this.nodeSelector = nodeSelector; + } + + @JsonProperty("perNodeHostBits") + public Integer getPerNodeHostBits() { + return perNodeHostBits; + } + + @JsonProperty("perNodeHostBits") + public void setPerNodeHostBits(Integer perNodeHostBits) { + this.perNodeHostBits = perNodeHostBits; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/kube-schema.json index ff0f6468470..5cffffc01a8 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/kube-schema.json @@ -431,9 +431,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -896,6 +893,72 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_NodeSelector": { + "type": "object", + "properties": { + "nodeSelectorTerms": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_core_NodeSelectorTerm", + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelectorTerm" + } + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelector", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_core_NodeSelectorRequirement": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "operator": { + "type": "string" + }, + "values": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelectorRequirement", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_core_NodeSelectorTerm": { + "type": "object", + "properties": { + "matchExpressions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_NodeSelectorRequirement", + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelectorRequirement" + } + }, + "matchFields": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_NodeSelectorRequirement", + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelectorRequirement" + } + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelectorTerm", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_ObjectReference": { "type": "object", "properties": { @@ -1552,6 +1615,90 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_networking_v1alpha1_ClusterCIDR": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "networking.k8s.io/v1alpha1", + "required": true + }, + "kind": { + "type": "string", + "default": "ClusterCIDR", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_ClusterCIDRSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDRSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDR", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata", + "io.fabric8.kubernetes.api.model.Namespaced" + ] + }, + "kubernetes_networking_v1alpha1_ClusterCIDRList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "networking.k8s.io/v1alpha1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_ClusterCIDR", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDR" + } + }, + "kind": { + "type": "string", + "default": "ClusterCIDRList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDRList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDR\u003e" + ] + }, + "kubernetes_networking_v1alpha1_ClusterCIDRSpec": { + "type": "object", + "properties": { + "ipv4": { + "type": "string" + }, + "ipv6": { + "type": "string" + }, + "nodeSelector": { + "$ref": "#/definitions/kubernetes_core_NodeSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelector" + }, + "perNodeHostBits": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDRSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_networking_v1beta1_HTTPIngressPath": { "type": "object", "properties": { @@ -1974,6 +2121,14 @@ "$ref": "#/definitions/kubernetes_apimachinery_UpdateOptions", "existingJavaType": "io.fabric8.kubernetes.api.model.UpdateOptions" }, + "V1Alpha1ClusterCIDR": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_ClusterCIDR", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDR" + }, + "V1Alpha1ClusterCIDRList": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_ClusterCIDRList", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDRList" + }, "V1Ingress": { "$ref": "#/definitions/kubernetes_networking_v1_Ingress", "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.Ingress" diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json index ffb08d33216..437fb11eaab 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json @@ -431,9 +431,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -896,6 +893,72 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_NodeSelector": { + "type": "object", + "properties": { + "nodeSelectorTerms": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_core_NodeSelectorTerm", + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelectorTerm" + } + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelector", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_core_NodeSelectorRequirement": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "operator": { + "type": "string" + }, + "values": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelectorRequirement", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_core_NodeSelectorTerm": { + "type": "object", + "properties": { + "matchExpressions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_NodeSelectorRequirement", + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelectorRequirement" + } + }, + "matchFields": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_NodeSelectorRequirement", + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelectorRequirement" + } + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelectorTerm", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_ObjectReference": { "type": "object", "properties": { @@ -1552,6 +1615,90 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_networking_v1alpha1_ClusterCIDR": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "networking.k8s.io/v1alpha1", + "required": true + }, + "kind": { + "type": "string", + "default": "ClusterCIDR", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_ClusterCIDRSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDRSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDR", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata", + "io.fabric8.kubernetes.api.model.Namespaced" + ] + }, + "kubernetes_networking_v1alpha1_ClusterCIDRList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "networking.k8s.io/v1alpha1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_ClusterCIDR", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDR" + } + }, + "kind": { + "type": "string", + "default": "ClusterCIDRList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDRList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDR\u003e" + ] + }, + "kubernetes_networking_v1alpha1_ClusterCIDRSpec": { + "type": "object", + "properties": { + "ipv4": { + "type": "string" + }, + "ipv6": { + "type": "string" + }, + "nodeSelector": { + "$ref": "#/definitions/kubernetes_core_NodeSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelector" + }, + "perNodeHostBits": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDRSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_networking_v1beta1_HTTPIngressPath": { "type": "object", "properties": { @@ -1974,6 +2121,14 @@ "$ref": "#/definitions/kubernetes_apimachinery_UpdateOptions", "existingJavaType": "io.fabric8.kubernetes.api.model.UpdateOptions" }, + "V1Alpha1ClusterCIDR": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_ClusterCIDR", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDR" + }, + "V1Alpha1ClusterCIDRList": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_ClusterCIDRList", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDRList" + }, "V1Ingress": { "$ref": "#/definitions/kubernetes_networking_v1_Ingress", "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.Ingress" @@ -2052,6 +2207,73 @@ }, "additionalProperties": true }, + "clustercidr": { + "properties": { + "apiVersion": { + "type": "string", + "default": "networking.k8s.io/v1alpha1", + "required": true + }, + "kind": { + "type": "string", + "default": "ClusterCIDR", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_ClusterCIDRSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDRSpec" + } + }, + "additionalProperties": true + }, + "clustercidrlist": { + "properties": { + "apiVersion": { + "type": "string", + "default": "networking.k8s.io/v1alpha1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_ClusterCIDR", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDR" + } + }, + "kind": { + "type": "string", + "default": "ClusterCIDRList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true + }, + "clustercidrspec": { + "properties": { + "ipv4": { + "type": "string" + }, + "ipv6": { + "type": "string" + }, + "nodeSelector": { + "$ref": "#/definitions/kubernetes_core_NodeSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelector" + }, + "perNodeHostBits": { + "type": "integer" + } + }, + "additionalProperties": true + }, "condition": { "properties": { "lastTransitionTime": { @@ -2176,8 +2398,8 @@ "httpingresspath": { "properties": { "backend": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressBackend", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressBackend" + "$ref": "#/definitions/kubernetes_networking_v1_IngressBackend", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressBackend" }, "path": { "type": "string" @@ -2193,8 +2415,8 @@ "paths": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_HTTPIngressPath", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.HTTPIngressPath" + "$ref": "#/definitions/kubernetes_networking_v1_HTTPIngressPath", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.HTTPIngressPath" } } }, @@ -2239,7 +2461,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1beta1", + "default": "networking.k8s.io/v1", "required": true }, "kind": { @@ -2252,12 +2474,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressSpec" + "$ref": "#/definitions/kubernetes_networking_v1_IngressSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressSpec" }, "status": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressStatus" + "$ref": "#/definitions/kubernetes_networking_v1_IngressStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressStatus" } }, "additionalProperties": true @@ -2282,7 +2504,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1", + "default": "networking.k8s.io/v1beta1", "required": true }, "kind": { @@ -2295,8 +2517,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressClassSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressClassSpec" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressClassSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassSpec" } }, "additionalProperties": true @@ -2305,14 +2527,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1beta1", + "default": "networking.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass" + "$ref": "#/definitions/kubernetes_networking_v1_IngressClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressClass" } }, "kind": { @@ -2391,8 +2613,8 @@ "type": "string" }, "http": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_HTTPIngressRuleValue", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.HTTPIngressRuleValue" + "$ref": "#/definitions/kubernetes_networking_v1_HTTPIngressRuleValue", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.HTTPIngressRuleValue" } }, "additionalProperties": true @@ -2858,6 +3080,57 @@ }, "additionalProperties": true }, + "nodeselector": { + "properties": { + "nodeSelectorTerms": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_core_NodeSelectorTerm", + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelectorTerm" + } + } + }, + "additionalProperties": true + }, + "nodeselectorrequirement": { + "properties": { + "key": { + "type": "string" + }, + "operator": { + "type": "string" + }, + "values": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true + }, + "nodeselectorterm": { + "properties": { + "matchExpressions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_NodeSelectorRequirement", + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelectorRequirement" + } + }, + "matchFields": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_NodeSelectorRequirement", + "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelectorRequirement" + } + } + }, + "additionalProperties": true + }, "objectmeta": { "properties": { "annotations": { @@ -2867,9 +3140,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/kube-schema.json index ced61c967d1..3b5f02184c8 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/kube-schema.json @@ -117,9 +117,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json index 7d8ed40987b..01b9215715e 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json @@ -117,9 +117,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -967,9 +964,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1139,14 +1133,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "node.k8s.io/v1alpha1", + "default": "node.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_node_v1alpha_RuntimeClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass" + "$ref": "#/definitions/kubernetes_node_v1beta1_RuntimeClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass" } }, "kind": { 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 6ea0d0c69ae..3f9a9e81031 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 @@ -431,9 +431,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" 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 42504953eb1..59e6bf0d11b 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 @@ -431,9 +431,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2212,9 +2209,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2398,14 +2392,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "policy/v1beta1", + "default": "policy/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudget", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget" + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudget", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/kube-schema.json index 6f716259482..abfe6594348 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/kube-schema.json @@ -125,9 +125,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/validation-schema.json index f3acd758983..0032e06ae05 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/validation-schema.json @@ -125,9 +125,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -893,9 +890,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/kube-schema.json index be114b8aa36..61dd918ec52 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/kube-schema.json @@ -353,9 +353,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json index 68432b2cf5c..08f5fe3b253 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json @@ -353,9 +353,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1332,9 +1329,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1502,7 +1496,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "scheduling.k8s.io/v1beta1", + "default": "scheduling.k8s.io/v1", "required": true }, "description": { diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIDriverSpec.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIDriverSpec.java index 41ba817dabf..641e02229ad 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIDriverSpec.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIDriverSpec.java @@ -39,6 +39,7 @@ "fsGroupPolicy", "podInfoOnMount", "requiresRepublish", + "seLinuxMount", "storageCapacity", "tokenRequests", "volumeLifecycleModes" @@ -72,6 +73,8 @@ public class CSIDriverSpec implements KubernetesResource private Boolean podInfoOnMount; @JsonProperty("requiresRepublish") private Boolean requiresRepublish; + @JsonProperty("seLinuxMount") + private Boolean seLinuxMount; @JsonProperty("storageCapacity") private Boolean storageCapacity; @JsonProperty("tokenRequests") @@ -99,13 +102,15 @@ public CSIDriverSpec() { * @param tokenRequests * @param volumeLifecycleModes * @param podInfoOnMount + * @param seLinuxMount */ - public CSIDriverSpec(Boolean attachRequired, String fsGroupPolicy, Boolean podInfoOnMount, Boolean requiresRepublish, Boolean storageCapacity, List tokenRequests, List volumeLifecycleModes) { + public CSIDriverSpec(Boolean attachRequired, String fsGroupPolicy, Boolean podInfoOnMount, Boolean requiresRepublish, Boolean seLinuxMount, Boolean storageCapacity, List tokenRequests, List volumeLifecycleModes) { super(); this.attachRequired = attachRequired; this.fsGroupPolicy = fsGroupPolicy; this.podInfoOnMount = podInfoOnMount; this.requiresRepublish = requiresRepublish; + this.seLinuxMount = seLinuxMount; this.storageCapacity = storageCapacity; this.tokenRequests = tokenRequests; this.volumeLifecycleModes = volumeLifecycleModes; @@ -151,6 +156,16 @@ public void setRequiresRepublish(Boolean requiresRepublish) { this.requiresRepublish = requiresRepublish; } + @JsonProperty("seLinuxMount") + public Boolean getSeLinuxMount() { + return seLinuxMount; + } + + @JsonProperty("seLinuxMount") + public void setSeLinuxMount(Boolean seLinuxMount) { + this.seLinuxMount = seLinuxMount; + } + @JsonProperty("storageCapacity") public Boolean getStorageCapacity() { return storageCapacity; diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIDriverSpec.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIDriverSpec.java index fadcc462d97..2845df9064b 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIDriverSpec.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIDriverSpec.java @@ -39,6 +39,7 @@ "fsGroupPolicy", "podInfoOnMount", "requiresRepublish", + "seLinuxMount", "storageCapacity", "tokenRequests", "volumeLifecycleModes" @@ -72,6 +73,8 @@ public class CSIDriverSpec implements KubernetesResource private Boolean podInfoOnMount; @JsonProperty("requiresRepublish") private Boolean requiresRepublish; + @JsonProperty("seLinuxMount") + private Boolean seLinuxMount; @JsonProperty("storageCapacity") private Boolean storageCapacity; @JsonProperty("tokenRequests") @@ -99,13 +102,15 @@ public CSIDriverSpec() { * @param tokenRequests * @param volumeLifecycleModes * @param podInfoOnMount + * @param seLinuxMount */ - public CSIDriverSpec(Boolean attachRequired, String fsGroupPolicy, Boolean podInfoOnMount, Boolean requiresRepublish, Boolean storageCapacity, List tokenRequests, List volumeLifecycleModes) { + public CSIDriverSpec(Boolean attachRequired, String fsGroupPolicy, Boolean podInfoOnMount, Boolean requiresRepublish, Boolean seLinuxMount, Boolean storageCapacity, List tokenRequests, List volumeLifecycleModes) { super(); this.attachRequired = attachRequired; this.fsGroupPolicy = fsGroupPolicy; this.podInfoOnMount = podInfoOnMount; this.requiresRepublish = requiresRepublish; + this.seLinuxMount = seLinuxMount; this.storageCapacity = storageCapacity; this.tokenRequests = tokenRequests; this.volumeLifecycleModes = volumeLifecycleModes; @@ -151,6 +156,16 @@ public void setRequiresRepublish(Boolean requiresRepublish) { this.requiresRepublish = requiresRepublish; } + @JsonProperty("seLinuxMount") + public Boolean getSeLinuxMount() { + return seLinuxMount; + } + + @JsonProperty("seLinuxMount") + public void setSeLinuxMount(Boolean seLinuxMount) { + this.seLinuxMount = seLinuxMount; + } + @JsonProperty("storageCapacity") public Boolean getStorageCapacity() { return storageCapacity; diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/kube-schema.json index a9e1b44e262..121532a0549 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/kube-schema.json @@ -388,9 +388,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -880,6 +877,10 @@ "fsType": { "type": "string" }, + "nodeExpandSecretRef": { + "$ref": "#/definitions/kubernetes_core_SecretReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" + }, "nodePublishSecretRef": { "$ref": "#/definitions/kubernetes_core_SecretReference", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" @@ -1862,6 +1863,9 @@ "requiresRepublish": { "type": "boolean" }, + "seLinuxMount": { + "type": "boolean" + }, "storageCapacity": { "type": "boolean" }, @@ -2403,6 +2407,9 @@ "requiresRepublish": { "type": "boolean" }, + "seLinuxMount": { + "type": "boolean" + }, "storageCapacity": { "type": "boolean" }, diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json index 4e977ad8c93..25ed2be0a0d 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json @@ -388,9 +388,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -880,6 +877,10 @@ "fsType": { "type": "string" }, + "nodeExpandSecretRef": { + "$ref": "#/definitions/kubernetes_core_SecretReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" + }, "nodePublishSecretRef": { "$ref": "#/definitions/kubernetes_core_SecretReference", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" @@ -1862,6 +1863,9 @@ "requiresRepublish": { "type": "boolean" }, + "seLinuxMount": { + "type": "boolean" + }, "storageCapacity": { "type": "boolean" }, @@ -2403,6 +2407,9 @@ "requiresRepublish": { "type": "boolean" }, + "seLinuxMount": { + "type": "boolean" + }, "storageCapacity": { "type": "boolean" }, @@ -3027,6 +3034,9 @@ "requiresRepublish": { "type": "boolean" }, + "seLinuxMount": { + "type": "boolean" + }, "storageCapacity": { "type": "boolean" }, @@ -3052,7 +3062,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "kind": { @@ -3065,8 +3075,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSINodeSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeSpec" + "$ref": "#/definitions/kubernetes_storageclass_CSINodeSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSINodeSpec" } }, "additionalProperties": true @@ -3074,8 +3084,8 @@ "csinodedriver": { "properties": { "allocatable": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_VolumeNodeResources", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.VolumeNodeResources" + "$ref": "#/definitions/kubernetes_storageclass_VolumeNodeResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.VolumeNodeResources" }, "name": { "type": "string" @@ -3096,14 +3106,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSINode", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode" + "$ref": "#/definitions/kubernetes_storageclass_CSINode", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSINode" } }, "kind": { @@ -3146,6 +3156,10 @@ "fsType": { "type": "string" }, + "nodeExpandSecretRef": { + "$ref": "#/definitions/kubernetes_core_SecretReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" + }, "nodePublishSecretRef": { "$ref": "#/definitions/kubernetes_core_SecretReference", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretReference" @@ -3174,7 +3188,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "capacity": { @@ -3724,9 +3738,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/kube-schema.json index 5e0b4f7389c..362e280c9f3 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/kube-schema.json @@ -194,9 +194,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/validation-schema.json index 2057cbd6b39..d0b38849d70 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/validation-schema.json @@ -194,9 +194,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1250,9 +1247,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/kube-schema.json index 78594e5f9d6..ca6d3149b5d 100644 --- a/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/kube-schema.json @@ -286,9 +286,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/validation-schema.json index 90cb22dbbb0..55184292dbd 100644 --- a/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/validation-schema.json @@ -286,9 +286,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -7492,9 +7489,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/kube-schema.json index 398fce1495f..ca410971a30 100644 --- a/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/kube-schema.json @@ -242,9 +242,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/validation-schema.json index 84f4d6a3728..9d2b43dd128 100644 --- a/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/validation-schema.json @@ -242,9 +242,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2372,9 +2369,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json index 50d98326ec1..91012377d64 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json @@ -297,9 +297,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2227,6 +2224,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -2936,12 +2936,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json index 924d12cb83a..c944540d24d 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json @@ -297,9 +297,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2227,6 +2224,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -2936,12 +2936,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, @@ -11726,19 +11739,19 @@ }, "machinepool": { "properties": { - "coresPerSocket": { - "type": "integer" - }, - "cpus": { - "type": "integer" + "cpu": { + "$ref": "#/definitions/os_hive_ovirt_v1_CPU", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.CPU" }, "memoryMB": { - "type": "integer", - "existingJavaType": "Long" + "type": "integer" }, "osDisk": { - "$ref": "#/definitions/os_hive_vsphere_v1_OSDisk", - "existingJavaType": "io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk" + "$ref": "#/definitions/os_hive_ovirt_v1_Disk", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.Disk" + }, + "vmType": { + "type": "string" } }, "additionalProperties": true @@ -12191,9 +12204,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -12352,15 +12362,7 @@ "osdisk": { "properties": { "diskSizeGB": { - "type": "integer", - "existingJavaType": "Long" - }, - "diskType": { - "type": "string" - }, - "encryptionKey": { - "$ref": "#/definitions/os_hive_gcp_v1_EncryptionKeyReference", - "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.EncryptionKeyReference" + "type": "integer" } }, "additionalProperties": true @@ -12481,46 +12483,36 @@ }, "platform": { "properties": { - "agentBareMetal": { - "$ref": "#/definitions/os_hive_agent_v1_BareMetalPlatform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.agent.v1.BareMetalPlatform" - }, - "aws": { - "$ref": "#/definitions/os_hive_aws_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.Platform" - }, - "azure": { - "$ref": "#/definitions/os_hive_azure_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.Platform" - }, - "baremetal": { - "$ref": "#/definitions/os_hive_baremetal_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.baremetal.v1.Platform" + "credentialsAssumeRole": { + "$ref": "#/definitions/os_hive_aws_v1_AssumeRole", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.AssumeRole" }, - "gcp": { - "$ref": "#/definitions/os_hive_gcp_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.Platform" + "credentialsSecretRef": { + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" }, - "openstack": { - "$ref": "#/definitions/os_hive_openstack_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.openstack.v1.Platform" + "privateLink": { + "$ref": "#/definitions/os_hive_aws_v1_PrivateLinkAccess", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.PrivateLinkAccess" }, - "ovirt": { - "$ref": "#/definitions/os_hive_ovirt_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.Platform" + "region": { + "type": "string" }, - "vsphere": { - "$ref": "#/definitions/os_hive_vsphere_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.vsphere.v1.Platform" + "userTags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" } }, "additionalProperties": true }, "platformstatus": { "properties": { - "privateLink": { - "$ref": "#/definitions/os_hive_aws_v1_PrivateLinkAccessStatus", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.PrivateLinkAccessStatus" + "aws": { + "$ref": "#/definitions/os_hive_aws_v1_PlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.PlatformStatus" } }, "additionalProperties": true @@ -12750,6 +12742,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -14061,12 +14056,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/kube-schema.json index 2d7f775a6b0..71f72ae49b9 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/kube-schema.json @@ -202,9 +202,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json index 09c507d01fe..08d3ec6ab1c 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json @@ -202,9 +202,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2372,25 +2369,22 @@ }, "machinepool": { "properties": { - "amiID": { + "architecture": { "type": "string" }, - "iamRole": { + "hyperthreading": { "type": "string" }, - "rootVolume": { - "$ref": "#/definitions/os_installer_aws_v1_EC2RootVolume", - "existingJavaType": "io.fabric8.openshift.api.model.installer.aws.v1.EC2RootVolume" - }, - "type": { + "name": { "type": "string" }, - "zones": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "platform": { + "$ref": "#/definitions/os_installer_v1_MachinePoolPlatform", + "existingJavaType": "io.fabric8.openshift.api.model.installer.v1.MachinePoolPlatform" + }, + "replicas": { + "type": "integer", + "existingJavaType": "Long" } }, "additionalProperties": true @@ -2541,9 +2535,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2615,8 +2606,16 @@ }, "osdisk": { "properties": { - "diskSizeGB": { - "type": "integer" + "DiskSizeGB": { + "type": "integer", + "existingJavaType": "Long" + }, + "DiskType": { + "type": "string" + }, + "encryptionKey": { + "$ref": "#/definitions/os_installer_gcp_v1_EncryptionKeyReference", + "existingJavaType": "io.fabric8.openshift.api.model.installer.gcp.v1.EncryptionKeyReference" } }, "additionalProperties": true @@ -2649,49 +2648,28 @@ }, "platform": { "properties": { - "alibabacloud": { - "$ref": "#/definitions/os_installer_alibabacloud_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.installer.alibabacloud.v1.Platform" - }, - "aws": { - "$ref": "#/definitions/os_installer_aws_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.installer.aws.v1.Platform" - }, - "azure": { - "$ref": "#/definitions/os_installer_azure_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.Platform" - }, - "baremetal": { - "$ref": "#/definitions/os_installer_baremetal_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.installer.baremetal.v1.Platform" - }, - "gcp": { - "$ref": "#/definitions/os_installer_gcp_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.installer.gcp.v1.Platform" - }, - "ibmcloud": { - "$ref": "#/definitions/os_installer_ibmcloud_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.installer.ibmcloud.v1.Platform" + "defaultMachinePlatform": { + "$ref": "#/definitions/os_installer_ibmcloud_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool" }, - "libvirt": { - "$ref": "#/definitions/os_installer_libvirt_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.installer.libvirt.v1.Platform" + "region": { + "type": "string" }, - "none": { - "$ref": "#/definitions/os_installer_none_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.installer.none.v1.Platform" + "resourceGroupName": { + "type": "string" }, - "openstack": { - "$ref": "#/definitions/os_installer_openstack_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.Platform" + "subnets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "ovirt": { - "$ref": "#/definitions/os_installer_ovirt_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.Platform" + "vpc": { + "type": "string" }, - "vsphere": { - "$ref": "#/definitions/os_installer_vsphere_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.Platform" + "vpcResourceGroupName": { + "type": "string" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/kube-schema.json index 3c28a949c10..fbff88b48b1 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/kube-schema.json @@ -256,9 +256,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/validation-schema.json index 71490bf4ee1..2126ed40dfb 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/validation-schema.json @@ -256,9 +256,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1982,9 +1979,32 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, + "creationTimestamp": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "deletionGracePeriodSeconds": { + "type": "integer", + "existingJavaType": "Long" + }, + "deletionTimestamp": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "finalizers": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "generateName": { "type": "string" }, + "generation": { + "type": "integer", + "existingJavaType": "Long" + }, "labels": { "type": "object", "additionalProperties": { @@ -1992,6 +2012,14 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, + "managedFields": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apimachinery_ManagedFieldsEntry", + "existingJavaType": "io.fabric8.kubernetes.api.model.ManagedFieldsEntry" + } + }, "name": { "type": "string" }, @@ -2007,6 +2035,15 @@ "$ref": "#/definitions/kubernetes_apimachinery_OwnerReference", "existingJavaType": "io.fabric8.kubernetes.api.model.OwnerReference" } + }, + "resourceVersion": { + "type": "string" + }, + "selfLink": { + "type": "string" + }, + "uid": { + "type": "string" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/kube-schema.json index 7cfc08b4c9e..bddf9e86d3f 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/kube-schema.json @@ -242,9 +242,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/validation-schema.json index b492123621c..ea0bf1044b3 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/validation-schema.json @@ -242,9 +242,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -3540,9 +3537,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/kube-schema.json index 5d5ee6dde37..47912ad6f4a 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/kube-schema.json @@ -404,9 +404,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/validation-schema.json index 248793918e1..7804465c511 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/validation-schema.json @@ -404,9 +404,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -4780,9 +4777,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json index 5f3c8d60e59..e0d68efc537 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json @@ -255,9 +255,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2517,12 +2514,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json index 347bebd2373..ee9ecabee1c 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json @@ -255,9 +255,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2517,12 +2514,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, @@ -8450,9 +8460,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -9154,40 +9161,23 @@ }, "probe": { "properties": { - "exec": { - "$ref": "#/definitions/kubernetes_core_ExecAction", - "existingJavaType": "io.fabric8.kubernetes.api.model.ExecAction" - }, - "failureThreshold": { - "type": "integer" - }, - "grpc": { - "$ref": "#/definitions/kubernetes_core_GRPCAction", - "existingJavaType": "io.fabric8.kubernetes.api.model.GRPCAction" - }, - "httpGet": { - "$ref": "#/definitions/kubernetes_core_HTTPGetAction", - "existingJavaType": "io.fabric8.kubernetes.api.model.HTTPGetAction" - }, - "initialDelaySeconds": { - "type": "integer" - }, - "periodSeconds": { - "type": "integer" - }, - "successThreshold": { - "type": "integer" + "apiVersion": { + "type": "string", + "default": "monitoring.coreos.com/v1", + "required": true }, - "tcpSocket": { - "$ref": "#/definitions/kubernetes_core_TCPSocketAction", - "existingJavaType": "io.fabric8.kubernetes.api.model.TCPSocketAction" + "kind": { + "type": "string", + "default": "Probe", + "required": true }, - "terminationGracePeriodSeconds": { - "type": "integer", - "existingJavaType": "Long" + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, - "timeoutSeconds": { - "type": "integer" + "spec": { + "$ref": "#/definitions/os_monitoring_v1_ProbeSpec", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ProbeSpec" } }, "additionalProperties": true @@ -11513,12 +11503,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/kube-schema.json index 9362f49465f..1153a3dad26 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/kube-schema.json @@ -256,9 +256,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/validation-schema.json index 60a28980f7a..edf5fc60e3c 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/validation-schema.json @@ -256,9 +256,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -9277,9 +9274,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/kube-schema.json index ea6ebfde5cb..2357a3230f7 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/kube-schema.json @@ -380,9 +380,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2589,6 +2586,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -3293,12 +3293,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/validation-schema.json index f629551c7be..895e37beb34 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/validation-schema.json @@ -380,9 +380,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -2589,6 +2586,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -3293,12 +3293,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, @@ -8921,9 +8934,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -9708,6 +9718,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -11021,12 +11034,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/kube-schema.json index afc9ef27b46..c7f9962f3ca 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/kube-schema.json @@ -194,9 +194,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/validation-schema.json index abb2b1e5c15..5cc776e0abd 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/validation-schema.json @@ -194,9 +194,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1051,9 +1048,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/kube-schema.json index c33c7d552fb..945ca4960bb 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/kube-schema.json @@ -194,9 +194,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/validation-schema.json index 393a549163a..3e4f59c1191 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/validation-schema.json @@ -194,9 +194,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -1083,9 +1080,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/kube-schema.json index f62a32c7cba..64f6536dca9 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/kube-schema.json @@ -194,9 +194,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/validation-schema.json index 9cc48aa2f81..502133319c1 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/validation-schema.json @@ -194,9 +194,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -998,9 +995,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json index 0bf302e120a..e6301450001 100644 --- a/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json @@ -418,9 +418,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -3042,6 +3039,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -3842,12 +3842,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json index fa638f9ee69..53f4ceece93 100644 --- a/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json @@ -418,9 +418,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -3042,6 +3039,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -3842,12 +3842,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, @@ -16373,9 +16386,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "clusterName": { - "type": "string" - }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -16992,6 +17002,9 @@ "hostPID": { "type": "boolean" }, + "hostUsers": { + "type": "boolean" + }, "hostname": { "type": "string" }, @@ -19624,12 +19637,25 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "matchLabelKeys": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "maxSkew": { "type": "integer" }, "minDomains": { "type": "integer" }, + "nodeAffinityPolicy": { + "type": "string" + }, + "nodeTaintsPolicy": { + "type": "string" + }, "topologyKey": { "type": "string" }, diff --git a/kubernetes-model-generator/pkg/schemagen/generate.go b/kubernetes-model-generator/pkg/schemagen/generate.go index 7a020499dc7..9ab67fc7ba9 100644 --- a/kubernetes-model-generator/pkg/schemagen/generate.go +++ b/kubernetes-model-generator/pkg/schemagen/generate.go @@ -649,6 +649,8 @@ func (g *schemaGenerator) isClusterScopedResource(t reflect.Type) bool { "k8s.io/api/storage/v1beta1/StorageClass", "k8s.io/api/flowcontrol/v1beta1/FlowSchema", "k8s.io/api/flowcontrol/v1beta1/PriorityLevelConfiguration", + "k8s.io/api/flowcontrol/v1beta2/FlowSchema", + "k8s.io/api/flowcontrol/v1beta2/PriorityLevelConfiguration", "github.com/openshift/api/authorization/v1/ClusterRole", "github.com/openshift/api/authorization/v1/ClusterRoleBinding", "github.com/openshift/api/authorization/v1/ResourceAccessReview", diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2FlowSchemaTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2FlowSchemaTest.java new file mode 100644 index 00000000000..7fe6ebb1699 --- /dev/null +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2FlowSchemaTest.java @@ -0,0 +1,141 @@ +/** + * Copyright (C) 2015 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.fabric8.kubernetes.client.mock; + +import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaBuilder; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaList; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaListBuilder; +import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; +import org.assertj.core.api.AssertionsForClassTypes; +import org.junit.jupiter.api.Test; + +import java.net.HttpURLConnection; +import java.util.List; + +import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; + +@EnableKubernetesMockClient +class V1beta2FlowSchemaTest { + private KubernetesMockServer server; + private KubernetesClient client; + + @Test + void load() { + List items = client.load(getClass().getResourceAsStream("/v1beta2-flowschema.yml")).get(); + assertThat(items).isNotNull().hasSize(1); + AssertionsForClassTypes.assertThat(items.get(0)) + .isInstanceOf(FlowSchema.class) + .hasFieldOrPropertyWithValue("metadata.name", "health-for-strangers"); + } + + @Test + void get() { + // Given + server.expect().get().withPath("/apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/exempt") + .andReturn(HttpURLConnection.HTTP_OK, createFlowSchema("exempt")) + .once(); + + // When + FlowSchema flowSchema = client.flowControl().v1beta2().flowSchema().withName("exempt").get(); + + // Then + AssertionsForClassTypes.assertThat(flowSchema) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "exempt"); + } + + @Test + void list() { + // Given + server.expect().get().withPath("/apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas") + .andReturn(HttpURLConnection.HTTP_OK, new FlowSchemaListBuilder() + .addToItems(createFlowSchema("exempt")) + .build()) + .once(); + + // When + FlowSchemaList flowSchemas = client.flowControl().v1beta2().flowSchema().list(); + + // Then + AssertionsForClassTypes.assertThat(flowSchemas).isNotNull(); + assertThat(flowSchemas.getItems()).hasSize(1); + AssertionsForClassTypes.assertThat(flowSchemas.getItems().get(0)) + .hasFieldOrPropertyWithValue("metadata.name", "exempt"); + } + + @Test + void create() { + // Given + FlowSchema flowSchema = createFlowSchema("flowschema1"); + server.expect().post().withPath("/apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas") + .andReturn(HttpURLConnection.HTTP_OK, flowSchema) + .once(); + + // When + FlowSchema createdFlowSchema = client.flowControl().v1beta2().flowSchema().create(flowSchema); + + // Then + AssertionsForClassTypes.assertThat(createdFlowSchema).isNotNull(); + AssertionsForClassTypes.assertThat(createdFlowSchema) + .hasFieldOrPropertyWithValue("metadata.name", "flowschema1"); + } + + @Test + void delete() { + // Given + FlowSchema flowSchema = createFlowSchema("flowschema1"); + server.expect().delete().withPath("/apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/flowschema1") + .andReturn(HttpURLConnection.HTTP_OK, flowSchema) + .once(); + + // When + boolean isDeleted = client.flowControl().v1beta2().flowSchema().withName("flowschema1").delete().size() == 1; + + // Then + AssertionsForClassTypes.assertThat(isDeleted).isTrue(); + } + + private FlowSchema createFlowSchema(String name) { + return new FlowSchemaBuilder() + .withNewMetadata().withName(name).endMetadata() + .withNewSpec() + .withMatchingPrecedence(1) + .withNewPriorityLevelConfiguration() + .withName(name) + .endPriorityLevelConfiguration() + .addNewRule() + .addNewNonResourceRule() + .addToNonResourceURLs("*") + .addToVerbs("*") + .endNonResourceRule() + .addNewResourceRule() + .addToApiGroups("*") + .endResourceRule() + .addNewSubject() + .withNewGroup() + .withName("system:masters") + .endGroup() + .withKind("Group") + .endSubject() + .endRule() + .endSpec() + .build(); + } +} diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2PriorityLevelConfigurationTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2PriorityLevelConfigurationTest.java new file mode 100644 index 00000000000..34aab50cc02 --- /dev/null +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2PriorityLevelConfigurationTest.java @@ -0,0 +1,139 @@ +/** + * Copyright (C) 2015 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.fabric8.kubernetes.client.mock; + +import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationBuilder; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationList; +import io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationListBuilder; +import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; +import org.assertj.core.api.AssertionsForClassTypes; +import org.junit.jupiter.api.Test; + +import java.net.HttpURLConnection; +import java.util.List; + +import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; + +@EnableKubernetesMockClient +class V1beta2PriorityLevelConfigurationTest { + private KubernetesMockServer server; + private KubernetesClient client; + + @Test + void load() { + List items = client.load(getClass().getResourceAsStream("/v1beta2-prioritylevelconfiguration.yml")).get(); + assertThat(items).isNotNull().hasSize(1); + AssertionsForClassTypes.assertThat(items.get(0)) + .isInstanceOf(PriorityLevelConfiguration.class) + .hasFieldOrPropertyWithValue("metadata.name", "my-priority-level-configuration"); + } + + @Test + void get() { + // Given + server.expect().get().withPath("/apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/plc1") + .andReturn(HttpURLConnection.HTTP_OK, createPriorityLevelConfiguration("plc1")) + .once(); + + // When + PriorityLevelConfiguration priorityLevelConfiguration = client.flowControl().v1beta2().priorityLevelConfigurations() + .withName("plc1").get(); + + // Then + AssertionsForClassTypes.assertThat(priorityLevelConfiguration) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "plc1"); + } + + @Test + void list() { + // Given + server.expect().get().withPath("/apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations") + .andReturn(HttpURLConnection.HTTP_OK, new PriorityLevelConfigurationListBuilder() + .addToItems(createPriorityLevelConfiguration("exempt")) + .build()) + .once(); + + // When + PriorityLevelConfigurationList priorityLevelConfigurations = client.flowControl().v1beta2().priorityLevelConfigurations() + .list(); + + // Then + AssertionsForClassTypes.assertThat(priorityLevelConfigurations).isNotNull(); + assertThat(priorityLevelConfigurations.getItems()).hasSize(1); + AssertionsForClassTypes.assertThat(priorityLevelConfigurations.getItems().get(0)) + .hasFieldOrPropertyWithValue("metadata.name", "exempt"); + } + + @Test + void create() { + // Given + PriorityLevelConfiguration priorityLevelConfiguration = createPriorityLevelConfiguration("prioritylevelconfiguration1"); + server.expect().post().withPath("/apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations") + .andReturn(HttpURLConnection.HTTP_OK, priorityLevelConfiguration) + .once(); + + // When + PriorityLevelConfiguration createdPriorityLevelConfiguration = client.flowControl().v1beta2().priorityLevelConfigurations() + .create(priorityLevelConfiguration); + + // Then + AssertionsForClassTypes.assertThat(createdPriorityLevelConfiguration).isNotNull(); + AssertionsForClassTypes.assertThat(createdPriorityLevelConfiguration) + .hasFieldOrPropertyWithValue("metadata.name", "prioritylevelconfiguration1"); + } + + @Test + void delete() { + // Given + PriorityLevelConfiguration priorityLevelConfiguration = createPriorityLevelConfiguration("prioritylevelconfiguration1"); + server.expect().delete() + .withPath("/apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/prioritylevelconfiguration1") + .andReturn(HttpURLConnection.HTTP_OK, priorityLevelConfiguration) + .once(); + + // When + boolean isDeleted = client.flowControl().v1beta2().priorityLevelConfigurations().withName("prioritylevelconfiguration1") + .delete().size() == 1; + + // Then + AssertionsForClassTypes.assertThat(isDeleted).isTrue(); + } + + private PriorityLevelConfiguration createPriorityLevelConfiguration(String name) { + return new PriorityLevelConfigurationBuilder() + .withNewMetadata().withName(name).endMetadata() + .withNewSpec() + .withNewLimited() + .withAssuredConcurrencyShares(20) + .withNewLimitResponse() + .withNewQueuing() + .withHandSize(3) + .withQueueLengthLimit(50) + .withQueues(16) + .endQueuing() + .withType("Queue") + .endLimitResponse() + .endLimited() + .withType("Limited") + .endSpec() + .build(); + } +} diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V2HorizontalPodAutoscalerTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V2HorizontalPodAutoscalerTest.java new file mode 100644 index 00000000000..da4450be1bd --- /dev/null +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V2HorizontalPodAutoscalerTest.java @@ -0,0 +1,240 @@ +/** + * Copyright (C) 2015 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.fabric8.kubernetes.client.mock; + +import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.api.model.StatusDetails; +import io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler; +import io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerBuilder; +import io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList; +import io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerListBuilder; +import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.dsl.Resource; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; +import io.fabric8.kubernetes.client.utils.Utils; +import org.assertj.core.api.InstanceOfAssertFactories; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; + +@EnableKubernetesMockClient +class V2HorizontalPodAutoscalerTest { + + KubernetesMockServer server; + KubernetesClient client; + + @Test + void load() { + List itemsList = client.load(getClass().getResourceAsStream("/test-v2-hpa.yml")).get(); + + assertThat(itemsList) + .hasSize(1) + .singleElement(InstanceOfAssertFactories.type(HorizontalPodAutoscaler.class)) + .hasFieldOrPropertyWithValue("metadata.name", "php-apache") + .hasFieldOrPropertyWithValue("spec.maxReplicas", 10) + .hasFieldOrPropertyWithValue("spec.minReplicas", 1); + } + + @Test + void list() { + server.expect().withPath("/apis/autoscaling/v2/namespaces/test/horizontalpodautoscalers") + .andReturn(200, new HorizontalPodAutoscalerListBuilder().build()).once(); + server.expect().withPath("/apis/autoscaling/v2/namespaces/ns1/horizontalpodautoscalers") + .andReturn(200, new HorizontalPodAutoscalerListBuilder() + .addNewItem().and() + .addNewItem().and() + .build()) + .once(); + + HorizontalPodAutoscalerList horizontalPodAutoscalerList = client.autoscaling().v2().horizontalPodAutoscalers() + .inNamespace("test").list(); + assertThat(horizontalPodAutoscalerList) + .extracting(HorizontalPodAutoscalerList::getItems) + .asList() + .isEmpty(); + + horizontalPodAutoscalerList = client.autoscaling().v2().horizontalPodAutoscalers().inNamespace("ns1").list(); + assertThat(horizontalPodAutoscalerList) + .extracting(HorizontalPodAutoscalerList::getItems) + .asList() + .hasSize(2); + } + + @Test + void listWithLabels() { + server.expect() + .withPath("/apis/autoscaling/v2/namespaces/test/horizontalpodautoscalers?labelSelector=" + + Utils.toUrlEncoded("key1=value1,key2=value2,key3=value3")) + .andReturn(200, new HorizontalPodAutoscalerListBuilder().build()).once(); + server.expect() + .withPath("/apis/autoscaling/v2/namespaces/ns1/horizontalpodautoscalers?labelSelector=" + + Utils.toUrlEncoded("key1=value1,key2=value2")) + .andReturn(200, new HorizontalPodAutoscalerListBuilder() + .addNewItem().and() + .addNewItem().and() + .addNewItem().and() + .build()) + .once(); + + HorizontalPodAutoscalerList horizontalPodAutoscalerList = client.autoscaling().v2().horizontalPodAutoscalers() + .withLabel("key1", "value1") + .withLabel("key2", "value2") + .withLabel("key3", "value3") + .list(); + assertThat(horizontalPodAutoscalerList) + .extracting(HorizontalPodAutoscalerList::getItems) + .asList() + .isEmpty(); + + horizontalPodAutoscalerList = client.autoscaling().v2().horizontalPodAutoscalers().inNamespace("ns1") + .withLabel("key1", "value1") + .withLabel("key2", "value2") + .list(); + assertThat(horizontalPodAutoscalerList) + .extracting(HorizontalPodAutoscalerList::getItems) + .asList() + .hasSize(3); + } + + @Test + void get() { + server.expect().withPath("/apis/autoscaling/v2/namespaces/test/horizontalpodautoscalers/horizontalpodautoscaler1") + .andReturn(200, new HorizontalPodAutoscalerBuilder().build()).once(); + server.expect().withPath("/apis/autoscaling/v2/namespaces/ns1/horizontalpodautoscalers/horizontalpodautoscaler2") + .andReturn(200, new HorizontalPodAutoscalerBuilder().build()).once(); + + HorizontalPodAutoscaler horizontalPodAutoscaler = client.autoscaling().v2().horizontalPodAutoscalers().inNamespace("test") + .withName("horizontalpodautoscaler1").get(); + assertThat(horizontalPodAutoscaler).isNotNull(); + + horizontalPodAutoscaler = client.autoscaling().v2().horizontalPodAutoscalers().withName("horizontalpodautoscaler2").get(); + assertThat(horizontalPodAutoscaler).isNull(); + + horizontalPodAutoscaler = client.autoscaling().v2().horizontalPodAutoscalers().inNamespace("ns1") + .withName("horizontalpodautoscaler2").get(); + assertThat(horizontalPodAutoscaler).isNotNull(); + } + + @Test + void editMissing() { + // Given + server.expect().withPath("/apis/autoscaling/v2/namespaces/test/horizontalpodautoscalers/horizontalpodautoscaler") + .andReturn(404, "error message from kubernetes").always(); + Resource hpaResource = client.autoscaling() + .v2() + .horizontalPodAutoscalers() + .inNamespace("test") + .withName("horizontalpodautoscaler"); + // When + Then + assertThatThrownBy(() -> hpaResource.edit(h -> h)) + .isInstanceOf(KubernetesClientException.class); + } + + @Test + void delete() { + server.expect().withPath("/apis/autoscaling/v2/namespaces/test/horizontalpodautoscalers/horizontalpodautoscaler1") + .andReturn(200, new HorizontalPodAutoscalerBuilder().build()).once(); + server.expect().withPath("/apis/autoscaling/v2/namespaces/ns1/horizontalpodautoscalers/horizontalpodautoscaler2") + .andReturn(200, new HorizontalPodAutoscalerBuilder().build()).once(); + + Boolean deleted = client.autoscaling().v2().horizontalPodAutoscalers().inNamespace("test") + .withName("horizontalpodautoscaler1").delete().size() == 1; + assertThat(deleted).isTrue(); + + deleted = client.autoscaling().v2().horizontalPodAutoscalers().withName("horizontalpodautoscaler2").delete().size() == 1; + assertThat(deleted).isFalse(); + + deleted = client.autoscaling().v2().horizontalPodAutoscalers().inNamespace("ns1").withName("horizontalpodautoscaler2") + .delete().size() == 1; + assertThat(deleted).isTrue(); + } + + @Test + void deleteMulti() { + HorizontalPodAutoscaler horizontalPodAutoscaler1 = new HorizontalPodAutoscalerBuilder().withNewMetadata() + .withName("horizontalpodautoscaler1").withNamespace("test").endMetadata().build(); + HorizontalPodAutoscaler horizontalPodAutoscaler2 = new HorizontalPodAutoscalerBuilder().withNewMetadata() + .withName("horizontalpodautoscaler2").withNamespace("ns1").endMetadata().build(); + HorizontalPodAutoscaler horizontalPodAutoscaler3 = new HorizontalPodAutoscalerBuilder().withNewMetadata() + .withName("horizontalpodautoscaler3").withNamespace("any").endMetadata().build(); + + server.expect().withPath("/apis/autoscaling/v2/namespaces/test/horizontalpodautoscalers/horizontalpodautoscaler1") + .andReturn(200, horizontalPodAutoscaler1).once(); + server.expect().withPath("/apis/autoscaling/v2/namespaces/ns1/horizontalpodautoscalers/horizontalpodautoscaler2") + .andReturn(200, horizontalPodAutoscaler2).once(); + + List deleteStatusDetails = client.resourceList(horizontalPodAutoscaler1, horizontalPodAutoscaler2) + .inAnyNamespace() + .delete(); + assertThat(deleteStatusDetails).hasSize(2); + + Boolean deleted = client.autoscaling().v2().horizontalPodAutoscalers().inAnyNamespace().resource(horizontalPodAutoscaler3) + .delete() + .size() == 1; + assertThat(deleted).isFalse(); + } + + @Test + void createWithNameMismatch() { + // Given + HorizontalPodAutoscaler horizontalPodAutoscaler1 = new HorizontalPodAutoscalerBuilder().withNewMetadata() + .withName("horizontalpodautoscaler1").withNamespace("test").endMetadata().build(); + Resource hpaResource = client.autoscaling().v2() + .horizontalPodAutoscalers() + .inNamespace("test") + .resource(horizontalPodAutoscaler1); + // When + Then + assertThatThrownBy(hpaResource::create) + .isInstanceOf(KubernetesClientException.class); + } + + @Test + void loadFromFile() { + HorizontalPodAutoscaler horizontalPodAutoscaler = client.autoscaling().v2().horizontalPodAutoscalers() + .load(getClass().getResourceAsStream("/test-v2-hpa.yml")).get(); + assertThat(horizontalPodAutoscaler) + .hasFieldOrPropertyWithValue("metadata.name", "php-apache"); + } + + @Test + void builder() { + HorizontalPodAutoscaler horizontalPodAutoscaler = new HorizontalPodAutoscalerBuilder() + .withNewMetadata().withName("test-hpa").withNamespace("test").endMetadata() + .withNewSpec() + .withNewScaleTargetRef() + .withApiVersion("apps/v2") + .withKind("Deployment") + .withName("the-deployment") + .endScaleTargetRef() + .withMinReplicas(1) + .withMaxReplicas(10) + .endSpec() + .build(); + + server.expect().withPath("/apis/autoscaling/v2/namespaces/test/horizontalpodautoscalers/test-hpa") + .andReturn(200, horizontalPodAutoscaler).once(); + + horizontalPodAutoscaler = client.autoscaling().v2().horizontalPodAutoscalers().inNamespace("test").withName("test-hpa") + .get(); + assertThat(horizontalPodAutoscaler).isNotNull(); + } + +} diff --git a/kubernetes-tests/src/test/resources/test-v2-hpa.yml b/kubernetes-tests/src/test/resources/test-v2-hpa.yml new file mode 100644 index 00000000000..14b1b35ec8f --- /dev/null +++ b/kubernetes-tests/src/test/resources/test-v2-hpa.yml @@ -0,0 +1,52 @@ +# +# Copyright (C) 2015 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: php-apache +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: php-apache + minReplicas: 1 + maxReplicas: 10 + metrics: + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: 50 + - type: Pods + pods: + metric: + name: packets-per-second + target: + type: AverageValue + averageValue: 1k + - type: Object + object: + metric: + name: requests-per-second + describedObject: + apiVersion: networking.k8s.io/v1 + kind: Ingress + name: main-route + target: + type: Value + value: 10k diff --git a/kubernetes-tests/src/test/resources/v1beta2-flowschema.yml b/kubernetes-tests/src/test/resources/v1beta2-flowschema.yml new file mode 100644 index 00000000000..7c6c835a986 --- /dev/null +++ b/kubernetes-tests/src/test/resources/v1beta2-flowschema.yml @@ -0,0 +1,36 @@ +# +# Copyright (C) 2015 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apiVersion: flowcontrol.apiserver.k8s.io/v1beta2 +kind: FlowSchema +metadata: + name: health-for-strangers +spec: + matchingPrecedence: 1000 + priorityLevelConfiguration: + name: exempt + rules: + - nonResourceRules: + - nonResourceURLs: + - "/healthz" + - "/livez" + - "/readyz" + verbs: + - "*" + subjects: + - kind: Group + group: + name: system:unauthenticated diff --git a/kubernetes-tests/src/test/resources/v1beta2-prioritylevelconfiguration.yml b/kubernetes-tests/src/test/resources/v1beta2-prioritylevelconfiguration.yml new file mode 100644 index 00000000000..ce29eccc240 --- /dev/null +++ b/kubernetes-tests/src/test/resources/v1beta2-prioritylevelconfiguration.yml @@ -0,0 +1,30 @@ +# +# Copyright (C) 2015 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +apiVersion: flowcontrol.apiserver.k8s.io/v1beta2 +kind: PriorityLevelConfiguration +metadata: + name: my-priority-level-configuration +spec: + limited: + assuredConcurrencyShares: 10 + limitResponse: + queuing: + handSize: 4 + queueLengthLimit: 50 + queues: 16 + type: Queue + type: Limited