From f1568972cae100e7c31cce8a42552579f4e582dc Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Fri, 16 Jun 2023 23:52:32 +0530 Subject: [PATCH] chore (kubernetes-model-generator) : Update Kubernetes Model to v1.27.3 (#5056) + Update Kubernetes Model related go packages to v0.27.3 + Upgrading Kubernetes go packages also started breaking builds for openshift model modules, therefore openshift model has also been updated Signed-off-by: Rohan Kumar --- CHANGELOG.md | 8 +- ...DynamicResourceAllocationAPIGroupDSL.java} | 20 +- .../DynamicResourceAllocationAPIGroupDSL.java | 4 +- ...namicResourceAllocationAPIGroupClient.java | 6 +- .../client/impl/KubernetesClientImpl.java | 6 +- ...amicResourceAllocationAPIGroupClient.java} | 30 +- kubernetes-model-generator/go.mod | 109 +- kubernetes-model-generator/go.sum | 2143 +++++++++------- .../cmd/generate/generate.go | 3 + .../kubernetes/api/model/KubeSchema.java | 24 +- .../api/model/ValidationSchema.java | 24 +- .../v1/MatchCondition.java | 115 + .../v1/MutatingWebhook.java | 18 +- .../v1/ValidatingWebhook.java | 18 +- .../v1alpha1/AuditAnnotation.java | 115 + .../v1alpha1/ExpressionWarning.java | 115 + .../v1alpha1/MatchCondition.java | 115 + .../v1alpha1/TypeChecking.java | 103 + .../v1alpha1/ValidatingAdmissionPolicy.java | 19 +- .../ValidatingAdmissionPolicyBindingSpec.java | 22 +- .../ValidatingAdmissionPolicySpec.java | 35 +- .../ValidatingAdmissionPolicyStatus.java | 134 + .../v1alpha1/Validation.java | 17 +- .../v1beta1/MatchCondition.java | 115 + .../v1beta1/MutatingWebhook.java | 18 +- .../v1beta1/ValidatingWebhook.java | 18 +- .../v1beta1/SelfSubjectReview.java | 180 ++ .../v1beta1/SelfSubjectReviewStatus.java | 101 + .../main/resources/schema/kube-schema.json | 266 ++ .../resources/schema/validation-schema.json | 472 +++- .../v1beta1/SelfSubjectReviewTest.java | 82 + .../resources/valid-selfsubjectreview.json | 21 + .../apiextensions/v1/ValidationRule.java | 17 +- .../apiextensions/v1beta1/ValidationRule.java | 17 +- .../main/resources/schema/kube-schema.json | 19 +- .../resources/schema/validation-schema.json | 166 +- .../main/resources/schema/kube-schema.json | 58 + .../resources/schema/validation-schema.json | 111 + .../main/resources/schema/kube-schema.json | 3 + .../resources/schema/validation-schema.json | 178 +- .../main/resources/schema/kube-schema.json | 43 + .../resources/schema/validation-schema.json | 101 +- .../cmd/generate/generate.go | 4 + .../kubernetes-model-certificates/pom.xml | 5 + .../kubernetes/api/model/KubeSchema.java | 34 +- .../api/model/ValidationSchema.java | 34 +- .../v1alpha1/ClusterTrustBundle.java | 180 ++ .../v1alpha1/ClusterTrustBundleList.java | 185 ++ .../v1alpha1/ClusterTrustBundleSpec.java | 115 + .../main/resources/schema/kube-schema.json | 87 + .../resources/schema/validation-schema.json | 170 +- .../v1alpha1/ClusterTrustBundleTest.java | 77 + .../resources/valid-clustertrustbundle.json | 11 + .../main/resources/schema/kube-schema.json | 3 + .../resources/schema/validation-schema.json | 6 + .../kubernetes/api/model/Container.java | 18 +- .../api/model/ContainerResizePolicy.java | 94 + .../kubernetes/api/model/ContainerStatus.java | 64 +- .../api/model/EphemeralContainer.java | 18 +- .../kubernetes/api/model/ListOptions.java | 17 +- .../kubernetes/api/model/PodStatus.java | 17 +- .../main/resources/schema/kube-schema.json | 58 + .../resources/schema/validation-schema.json | 111 + .../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 | 12 +- .../main/resources/schema/kube-schema.json | 43 + .../resources/schema/validation-schema.json | 81 + .../cmd/generate/generate.go | 4 + .../kubernetes-model-flowcontrol/pom.xml | 8 +- .../kubernetes/api/model/KubeSchema.java | 34 +- .../api/model/ValidationSchema.java | 34 +- .../v1alpha1/ServerStorageVersion.java | 133 + .../apiserver/v1alpha1/StorageVersion.java} | 27 +- .../v1alpha1/StorageVersionCondition.java | 175 ++ .../v1alpha1/StorageVersionList.java | 185 ++ .../v1alpha1/StorageVersionSpec.java | 70 + .../v1alpha1/StorageVersionStatus.java | 134 + .../main/resources/schema/kube-schema.json | 162 ++ .../resources/schema/validation-schema.json | 367 ++- .../v1alpha1/StorageVersionTest.java | 113 + ...lid-internal-apiserver-storageversion.json | 31 + .../resources/schema/validation-schema.json | 8 +- .../main/resources/schema/kube-schema.json | 3 + .../resources/schema/validation-schema.json | 6 + .../cmd/generate/generate.go | 4 +- .../kubernetes-model-networking/pom.xml | 5 + .../kubernetes/api/model/KubeSchema.java | 34 +- .../api/model/ValidationSchema.java | 34 +- .../networking/v1alpha1/ClusterCIDR.java | 3 +- .../model/networking/v1alpha1/IPAddress.java | 180 ++ .../networking/v1alpha1/IPAddressList.java | 185 ++ .../networking/v1alpha1/IPAddressSpec.java | 100 + .../networking/v1alpha1/ParentReference.java | 160 ++ .../main/resources/schema/kube-schema.json | 113 +- .../resources/schema/validation-schema.json | 224 +- .../networking/v1alpha1/ClusterCIDRTest.java | 122 + .../networking/v1alpha1/IPAddressTest.java | 87 + .../src/test/resources/valid-clustercidr.json | 36 + .../src/test/resources/valid-ipaddress.json | 16 + .../resources/schema/validation-schema.json | 21 +- .../main/resources/schema/kube-schema.json | 3 + .../resources/schema/validation-schema.json | 22 +- .../cmd/generate/generate.go | 20 +- .../kubernetes/api/model/KubeSchema.java | 60 +- .../api/model/ValidationSchema.java | 60 +- .../AllocationResult.java | 29 +- .../v1alpha2/PodSchedulingContext.java | 196 ++ .../PodSchedulingContextList.java} | 20 +- .../PodSchedulingContextSpec.java} | 8 +- .../PodSchedulingContextStatus.java} | 8 +- .../{v1alpha1 => v1alpha2}/ResourceClaim.java | 6 +- .../ResourceClaimConsumerReference.java | 2 +- .../ResourceClaimList.java | 16 +- .../ResourceClaimParametersReference.java | 2 +- .../ResourceClaimSchedulingStatus.java | 2 +- .../ResourceClaimSpec.java | 2 +- .../ResourceClaimStatus.java | 2 +- .../ResourceClaimTemplate.java | 6 +- .../ResourceClaimTemplateList.java | 16 +- .../ResourceClaimTemplateSpec.java | 2 +- .../{v1alpha1 => v1alpha2}/ResourceClass.java | 6 +- .../ResourceClassList.java | 16 +- .../ResourceClassParametersReference.java | 2 +- .../resource/v1alpha2/ResourceHandle.java | 115 + .../main/resources/schema/kube-schema.json | 221 +- .../resources/schema/validation-schema.json | 329 +-- .../PodSchedulingContextTest.java} | 16 +- .../ResourceClaimTemplateTest.java | 2 +- .../ResourceClaimTest.java | 2 +- .../ResourceClassTest.java | 2 +- .../test/resources/valid-podscheduling.json | 2 +- .../test/resources/valid-resourceclaim.json | 2 +- .../valid-resourceclaimtemplate.json | 2 +- .../test/resources/valid-resourceclass.json | 2 +- .../main/resources/schema/kube-schema.json | 3 + .../resources/schema/validation-schema.json | 14 +- .../main/resources/schema/kube-schema.json | 3 + .../resources/schema/validation-schema.json | 36 +- .../api/model/config/v1/AWSDNSSpec.java | 100 + .../api/model/config/v1/AWSIngressSpec.java | 100 + .../model/config/v1/AzurePlatformStatus.java | 22 +- .../api/model/config/v1/AzureResourceTag.java | 115 + .../v1/BareMetalPlatformLoadBalancer.java | 100 + .../config/v1/BareMetalPlatformStatus.java | 49 +- .../v1/CloudControllerManagerStatus.java | 100 + .../v1/ClusterVersionCapabilitiesSpec.java | 118 + .../v1/ClusterVersionCapabilitiesStatus.java | 119 + .../model/config/v1/ClusterVersionSpec.java | 17 +- .../model/config/v1/ClusterVersionStatus.java | 17 +- .../api/model/config/v1/DNSPlatformSpec.java | 115 + .../api/model/config/v1/DNSSpec.java | 17 +- .../model/config/v1/ExternalPlatformSpec.java | 100 + .../config/v1/ExternalPlatformStatus.java | 100 + .../config/v1/FeatureGateAttributes.java | 100 + .../model/config/v1/FeatureGateDetails.java | 132 + .../model/config/v1/FeatureGateStatus.java | 51 +- .../config/v1/IBMCloudPlatformStatus.java | 17 +- .../model/config/v1/InfrastructureStatus.java | 17 +- .../model/config/v1/IngressPlatformSpec.java | 115 + .../api/model/config/v1/IngressSpec.java | 17 +- .../api/model/config/v1/IngressStatus.java | 19 +- .../api/model/config/v1/LoadBalancer.java | 100 + .../api/model/config/v1/MTUMigration.java | 115 + .../model/config/v1/MTUMigrationValues.java | 115 + .../api/model/config/v1/NetworkMigration.java | 17 +- .../v1/NutanixPlatformLoadBalancer.java | 100 + .../model/config/v1/NutanixPlatformSpec.java | 117 + .../config/v1/NutanixPlatformStatus.java | 162 ++ .../v1/NutanixPrismElementEndpoint.java | 115 + .../model/config/v1/NutanixPrismEndpoint.java | 115 + .../v1/OpenStackPlatformLoadBalancer.java | 100 + .../config/v1/OpenStackPlatformStatus.java | 49 +- .../config/v1/OvirtPlatformLoadBalancer.java | 100 + .../model/config/v1/OvirtPlatformStatus.java | 49 +- .../api/model/config/v1/PlatformSpec.java | 32 +- .../api/model/config/v1/PlatformStatus.java | 32 +- .../config/v1/PowerVSPlatformStatus.java | 32 +- .../openshift/api/model/config/v1/Update.java | 17 +- .../v1/VSpherePlatformFailureDomainSpec.java | 160 ++ .../v1/VSpherePlatformLoadBalancer.java | 100 + .../v1/VSpherePlatformNodeNetworking.java | 115 + .../v1/VSpherePlatformNodeNetworkingSpec.java | 134 + .../model/config/v1/VSpherePlatformSpec.java | 66 +- .../config/v1/VSpherePlatformStatus.java | 49 +- .../config/v1/VSpherePlatformTopology.java | 177 ++ .../config/v1/VSpherePlatformVCenterSpec.java | 132 + .../main/resources/schema/kube-schema.json | 688 ++++++ .../resources/schema/validation-schema.json | 1253 +++++++++- .../console/v1alpha1/ConsolePluginProxy.java | 86 +- ...a => ConsolePluginProxyServiceConfig.java} | 36 +- .../console/v1alpha1/ConsolePluginSpec.java | 11 +- .../main/resources/schema/kube-schema.json | 39 +- .../resources/schema/validation-schema.json | 74 +- .../cmd/generate/generate.go | 2 + .../model/hive/ibmcloud/v1/BootVolume.java | 100 + .../model/hive/ibmcloud/v1/DedicatedHost.java | 115 + .../model/hive/ibmcloud/v1/MachinePool.java | 149 ++ .../api/model/hive/ibmcloud/v1/Platform.java | 144 ++ .../hive/v1/ClusterDeprovisionPlatform.java | 17 +- .../api/model/hive/v1/ClusterPoolSpec.java | 17 +- .../api/model/hive/v1/ClusterPoolStatus.java | 19 +- .../model/hive/v1/ClusterProvisionSpec.java | 25 +- .../api/model/hive/v1/HibernationConfig.java | 101 + .../model/hive/v1/IBMClusterDeprovision.java | 159 ++ .../model/hive/v1/MachinePoolPlatform.java | 17 +- .../openshift/api/model/hive/v1/Platform.java | 17 +- .../main/resources/schema/kube-schema.json | 186 ++ .../resources/schema/validation-schema.json | 343 ++- .../cmd/generate/generate.go | 10 + .../openshift-model-installer/pom.xml | 12 + .../model/installer/aws/v1/EC2Metadata.java | 100 + .../model/installer/aws/v1/MachinePool.java | 17 +- .../api/model/installer/aws/v1/Platform.java | 32 +- .../installer/azure/v1/DiskEncryptionSet.java | 130 + .../model/installer/azure/v1/MachinePool.java | 62 +- .../api/model/installer/azure/v1/OSDisk.java | 17 +- .../api/model/installer/azure/v1/OSImage.java | 145 ++ .../model/installer/azure/v1/Platform.java | 99 +- .../model/installer/baremetal/v1/Host.java | 9 +- .../installer/baremetal/v1/Platform.java | 80 +- .../model/installer/gcp/v1/MachinePool.java | 63 +- .../api/model/installer/gcp/v1/OSDisk.java | 8 +- .../api/model/installer/gcp/v1/Platform.java | 17 +- .../model/installer/ibmcloud/v1/Platform.java | 102 +- .../installer/nutanix/v1/MachinePool.java | 195 ++ .../model/installer/nutanix/v1/OSDisk.java | 100 + .../model/installer/nutanix/v1/Platform.java | 240 ++ .../installer/nutanix/v1/PrismCentral.java | 130 + .../installer/nutanix/v1/PrismElement.java | 130 + .../installer/nutanix/v1/PrismEndpoint.java | 115 + .../installer/openstack/v1/FailureDomain.java | 132 + .../model/installer/openstack/v1/FixedIP.java | 101 + .../installer/openstack/v1/MachinePool.java | 18 +- .../openstack/v1/NamedPortTarget.java | 133 + .../installer/openstack/v1/NetworkFilter.java | 115 + .../installer/openstack/v1/Platform.java | 50 +- .../api/model/installer/ovirt/v1/CPU.java | 19 +- .../model/installer/ovirt/v1/MachinePool.java | 47 +- .../model/installer/ovirt/v1/Platform.java | 50 +- .../installer/powervs/v1/MachinePool.java | 162 ++ .../model/installer/powervs/v1/Platform.java | 268 ++ .../api/model/installer/v1/Capabilities.java | 118 + .../api/model/installer/v1/InstallConfig.java | 62 +- .../installer/v1/MachinePoolPlatform.java | 32 +- .../api/model/installer/v1/Platform.java | 38 +- .../installer/vsphere/v1/FailureDomain.java | 160 ++ .../installer/vsphere/v1/MachinePool.java | 22 +- .../model/installer/vsphere/v1/Platform.java | 86 +- .../model/installer/vsphere/v1/Topology.java | 178 ++ .../model/installer/vsphere/v1/VCenter.java | 162 ++ .../main/resources/schema/kube-schema.json | 1014 +++++++- .../resources/schema/validation-schema.json | 1451 ++++++++++- .../cmd/generate/generate.go | 7 + .../kubernetes/api/model/KubeSchema.java | 52 +- .../api/model/ValidationSchema.java | 52 +- .../api/model/machine/v1/NutanixCategory.java | 115 + .../machine/v1/NutanixResourceIdentifier.java | 130 + .../model/machine/v1alpha1/SubnetFilter.java | 400 +++ .../main/resources/schema/kube-schema.json | 120 + .../resources/schema/validation-schema.json | 213 ++ .../main/resources/schema/kube-schema.json | 487 ++++ .../resources/schema/validation-schema.json | 880 ++++++- .../operator/v1/EncryptionAlibaba.java | 115 + .../v1/ImageRegistryConfigStorage.java | 17 +- .../ImageRegistryConfigStorageAlibabaOSS.java | 145 ++ .../v1/ImageRegistryConfigStorageS3.java | 17 +- .../operator/v1/ImageRegistrySpec.java | 19 +- .../operator/v1/KMSEncryptionAlibaba.java | 100 + .../operator/v1/S3TrustedCASource.java | 100 + .../metal3/v1alpha1/HardwareRAIDVolume.java | 35 +- .../main/resources/schema/kube-schema.json | 131 + .../resources/schema/validation-schema.json | 237 ++ .../v1/AlertmanagerConfiguration.java | 100 + .../model/monitoring/v1/AlertmanagerSpec.java | 33 +- .../model/monitoring/v1/AttachMetadata.java | 100 + .../api/model/monitoring/v1/Endpoint.java | 17 +- .../api/model/monitoring/v1/HostAlias.java | 117 + .../model/monitoring/v1/ObjectReference.java | 144 ++ .../monitoring/v1/PodMetricsEndpoint.java | 17 +- .../model/monitoring/v1/PodMonitorSpec.java | 17 +- .../monitoring/v1/PrometheusCondition.java | 160 ++ .../model/monitoring/v1/PrometheusSpec.java | 52 +- .../model/monitoring/v1/PrometheusStatus.java | 36 +- .../api/model/monitoring/v1/QueueConfig.java | 19 +- .../model/monitoring/v1/RemoteReadSpec.java | 30 +- .../api/model/monitoring/v1/ShardStatus.java | 160 ++ .../model/monitoring/v1/ThanosRulerSpec.java | 37 +- .../v1alpha1/AlertmanagerConfigSpec.java | 18 +- .../monitoring/v1alpha1/DayOfMonthRange.java | 115 + .../model/monitoring/v1alpha1/HTTPConfig.java | 33 +- .../model/monitoring/v1alpha1/Matcher.java | 17 +- .../monitoring/v1alpha1/MuteTimeInterval.java | 118 + .../monitoring/v1alpha1/OpsGenieConfig.java | 57 +- .../monitoring/v1alpha1/PagerDutyConfig.java | 34 +- .../v1alpha1/PagerDutyImageConfig.java | 130 + .../v1alpha1/PagerDutyLinkConfig.java | 115 + .../model/monitoring/v1alpha1/Receiver.java | 34 +- .../api/model/monitoring/v1alpha1/Route.java | 18 +- .../model/monitoring/v1alpha1/SNSConfig.java | 238 ++ .../monitoring/v1alpha1/TelegramConfig.java | 206 ++ .../monitoring/v1alpha1/TimeInterval.java | 167 ++ .../model/monitoring/v1alpha1/TimeRange.java | 115 + .../main/resources/schema/kube-schema.json | 1024 +++++++- .../resources/schema/validation-schema.json | 2191 ++++++++++++++--- .../cmd/generate/generate.go | 6 +- .../openshift-model-operator/pom.xml | 4 + .../operator/v1/AWSCSIDriverConfigSpec.java | 100 + .../v1/AWSClassicLoadBalancerParameters.java | 33 +- .../operator/v1/AzureCSIDriverConfigSpec.java | 100 + .../operator/v1/AzureDiskEncryptionSet.java | 130 + .../operator/v1/CSIDriverConfigSpec.java | 160 ++ .../operator/v1/ClusterCSIDriverSpec.java | 32 +- .../operator/v1/ConsoleCustomization.java | 19 +- ...ContainerLoggingDestinationParameters.java | 32 +- .../api/model/operator/v1/DNSCache.java | 116 + .../model/operator/v1/DNSOverTLSConfig.java | 116 + .../api/model/operator/v1/DNSRecordSpec.java | 17 +- .../api/model/operator/v1/DNSSpec.java | 17 +- .../model/operator/v1/DNSTransportConfig.java | 115 + .../DeveloperConsoleCatalogCustomization.java | 19 +- .../v1/DeveloperConsoleCatalogTypes.java | 134 + .../api/model/operator/v1/EgressIPConfig.java | 100 + .../model/operator/v1/FeaturesMigration.java | 130 + .../api/model/operator/v1/ForwardPlugin.java | 32 +- .../operator/v1/GCPCSIDriverConfigSpec.java | 100 + .../model/operator/v1/GCPKMSKeyReference.java | 145 ++ .../api/model/operator/v1/GatewayConfig.java | 115 + .../operator/v1/HostNetworkStrategy.java | 49 +- .../v1/IBMLoadBalancerParameters.java | 100 + .../operator/v1/IngressControllerStatus.java | 35 +- .../v1/IngressControllerTuningOptions.java | 47 +- .../operator/v1/KubeAPIServerStatus.java | 18 +- .../operator/v1/LoadBalancerStrategy.java | 35 +- .../api/model/operator/v1/MTUMigration.java | 115 + .../model/operator/v1/MTUMigrationValues.java | 115 + .../model/operator/v1/NetworkMigration.java | 32 +- .../operator/v1/OVNKubernetesConfig.java | 64 +- .../api/model/operator/v1/Perspective.java | 133 + .../operator/v1/PerspectiveVisibility.java | 115 + .../operator/v1/PinnedResourceReference.java | 130 + .../model/operator/v1/PolicyAuditConfig.java | 17 +- .../model/operator/v1/PrivateStrategy.java | 32 +- .../v1/ProviderLoadBalancerParameters.java | 17 +- .../v1/ResourceAttributesAccessReview.java | 118 + .../v1/ServiceAccountIssuerStatus.java | 115 + .../api/model/operator/v1/StorageSpec.java | 19 +- .../model/operator/v1/UpstreamResolvers.java | 32 +- .../v1/VSphereCSIDriverConfigSpec.java | 103 + .../main/resources/schema/kube-schema.json | 568 +++++ .../resources/schema/validation-schema.json | 1029 +++++++- .../main/resources/schema/kube-schema.json | 40 + .../resources/schema/validation-schema.json | 83 +- .../api/model/BuildVolumeSource.java | 18 +- .../io/fabric8/openshift/api/model/Image.java | 27 +- .../api/model/ImageImportStatus.java | 20 +- .../openshift/api/model/ImageManifest.java | 175 ++ .../openshift/api/model/TagImportPolicy.java | 17 +- .../main/resources/schema/kube-schema.json | 96 + .../resources/schema/validation-schema.json | 182 ++ .../pkg/schemagen/generate.go | 7 +- ...est.java => PodSchedulingContextTest.java} | 44 +- .../mock/ResourceClaimTemplateTest.java | 20 +- .../client/mock/ResourceClaimTest.java | 20 +- .../client/mock/ResourceClassTest.java | 20 +- 366 files changed, 36293 insertions(+), 2843 deletions(-) rename kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/{V1Alpha1DynamicResourceAllocationAPIGroupDSL.java => V1Alpha2DynamicResourceAllocationAPIGroupDSL.java} (71%) rename kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/{V1Alpha1DynamicResourceAllocationAPIGroupClient.java => V1Alpha2DynamicResourceAllocationAPIGroupClient.java} (59%) create mode 100644 kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MatchCondition.java create mode 100644 kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/AuditAnnotation.java create mode 100644 kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ExpressionWarning.java create mode 100644 kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/MatchCondition.java create mode 100644 kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/TypeChecking.java create mode 100644 kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicyStatus.java create mode 100644 kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MatchCondition.java create mode 100644 kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/v1beta1/SelfSubjectReview.java create mode 100644 kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/v1beta1/SelfSubjectReviewStatus.java create mode 100644 kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/java/io/fabric8/kubernetes/api/model/authentication/v1beta1/SelfSubjectReviewTest.java create mode 100644 kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/resources/valid-selfsubjectreview.json create mode 100644 kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundle.java create mode 100644 kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundleList.java create mode 100644 kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundleSpec.java create mode 100644 kubernetes-model-generator/kubernetes-model-certificates/src/test/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundleTest.java create mode 100644 kubernetes-model-generator/kubernetes-model-certificates/src/test/resources/valid-clustertrustbundle.json create mode 100644 kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerResizePolicy.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/ServerStorageVersion.java rename kubernetes-model-generator/{kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodScheduling.java => kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersion.java} (86%) create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionCondition.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionList.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionSpec.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionStatus.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionTest.java create mode 100644 kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/resources/valid-internal-apiserver-storageversion.json create mode 100644 kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddress.java create mode 100644 kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddressList.java create mode 100644 kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddressSpec.java create mode 100644 kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ParentReference.java create mode 100644 kubernetes-model-generator/kubernetes-model-networking/src/test/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDRTest.java create mode 100644 kubernetes-model-generator/kubernetes-model-networking/src/test/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddressTest.java create mode 100644 kubernetes-model-generator/kubernetes-model-networking/src/test/resources/valid-clustercidr.json create mode 100644 kubernetes-model-generator/kubernetes-model-networking/src/test/resources/valid-ipaddress.json rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/AllocationResult.java (82%) create mode 100644 kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContext.java rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1/PodSchedulingList.java => v1alpha2/PodSchedulingContextList.java} (86%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1/PodSchedulingSpec.java => v1alpha2/PodSchedulingContextSpec.java} (93%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1/PodSchedulingStatus.java => v1alpha2/PodSchedulingContextStatus.java} (92%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClaim.java (97%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClaimConsumerReference.java (98%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClaimList.java (92%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClaimParametersReference.java (98%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClaimSchedulingStatus.java (98%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClaimSpec.java (98%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClaimStatus.java (98%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClaimTemplate.java (97%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClaimTemplateList.java (91%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClaimTemplateSpec.java (98%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClass.java (97%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClassList.java (92%) rename kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClassParametersReference.java (98%) create mode 100644 kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceHandle.java rename kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1/PodSchedulingTest.java => v1alpha2/PodSchedulingContextTest.java} (82%) rename kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClaimTemplateTest.java (98%) rename kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClaimTest.java (98%) rename kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/{v1alpha1 => v1alpha2}/ResourceClassTest.java (98%) create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSDNSSpec.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSIngressSpec.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzureResourceTag.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BareMetalPlatformLoadBalancer.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CloudControllerManagerStatus.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionCapabilitiesSpec.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionCapabilitiesStatus.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSPlatformSpec.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalPlatformSpec.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalPlatformStatus.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateAttributes.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateDetails.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressPlatformSpec.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/LoadBalancer.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/MTUMigration.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/MTUMigrationValues.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformLoadBalancer.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformSpec.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformStatus.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPrismElementEndpoint.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPrismEndpoint.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformLoadBalancer.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformLoadBalancer.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformFailureDomainSpec.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformLoadBalancer.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformNodeNetworking.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformNodeNetworkingSpec.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformTopology.java create mode 100644 kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformVCenterSpec.java rename kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/{ConsolePluginProxyService.java => ConsolePluginProxyServiceConfig.java} (78%) create mode 100644 kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/BootVolume.java create mode 100644 kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/DedicatedHost.java create mode 100644 kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/MachinePool.java create mode 100644 kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/Platform.java create mode 100644 kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/HibernationConfig.java create mode 100644 kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/IBMClusterDeprovision.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/EC2Metadata.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/DiskEncryptionSet.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSImage.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/MachinePool.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/OSDisk.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Platform.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/PrismCentral.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/PrismElement.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/PrismEndpoint.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FailureDomain.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FixedIP.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/NamedPortTarget.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/NetworkFilter.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/MachinePool.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Platform.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Capabilities.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/FailureDomain.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Topology.java create mode 100644 kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/VCenter.java create mode 100644 kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixCategory.java create mode 100644 kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixResourceIdentifier.java create mode 100644 kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/SubnetFilter.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/EncryptionAlibaba.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageAlibabaOSS.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/KMSEncryptionAlibaba.java create mode 100644 kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/S3TrustedCASource.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerConfiguration.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AttachMetadata.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/HostAlias.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ObjectReference.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusCondition.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ShardStatus.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/DayOfMonthRange.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/MuteTimeInterval.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PagerDutyImageConfig.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PagerDutyLinkConfig.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/SNSConfig.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TelegramConfig.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TimeInterval.java create mode 100644 kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TimeRange.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSCSIDriverConfigSpec.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AzureCSIDriverConfigSpec.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AzureDiskEncryptionSet.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSIDriverConfigSpec.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSCache.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSOverTLSConfig.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSTransportConfig.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogTypes.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EgressIPConfig.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/FeaturesMigration.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GCPCSIDriverConfigSpec.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GCPKMSKeyReference.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GatewayConfig.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IBMLoadBalancerParameters.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MTUMigration.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MTUMigrationValues.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Perspective.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PerspectiveVisibility.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PinnedResourceReference.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ResourceAttributesAccessReview.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceAccountIssuerStatus.java create mode 100644 kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/VSphereCSIDriverConfigSpec.java create mode 100644 kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageManifest.java rename kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/{PodSchedulingTest.java => PodSchedulingContextTest.java} (61%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32b208a58a6..4af4fd39794 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,18 @@ * Fix #5166: Remove opinionated messages from Config's `errorMessages` and deprecate it #### Dependency Upgrade +* Fix #5056: Update Kubernetes Model to v1.27.3 #### New Features * Fix #5133: Support for using TokenRequest for existing ServiceAccount #### _**Note**_: Breaking changes -* Fix #2718: KubernetesResourceUtil.isResourceReady was deprecated. Use +* Fix #2718: KubernetesResourceUtil.isResourceReady was deprecated. Use `client.resource(item).isReady()` or `Readiness.getInstance().isReady(item)` instead +* Resource classes in `resource.k8s.io/v1alpha1` have been moved to `resource.k8s.io/v1alpha2` apiGroup in Kubernetes 1.27. Users are required to change package of the following classes: + - `io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingContext` -> - `io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext` + - `io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim` -> - `io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim` + - `io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate` -> `io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate` + - `io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClass` -> `io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClass` ### 6.7.2 (2023-06-15) diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/V1Alpha1DynamicResourceAllocationAPIGroupDSL.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/V1Alpha2DynamicResourceAllocationAPIGroupDSL.java similarity index 71% rename from kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/V1Alpha1DynamicResourceAllocationAPIGroupDSL.java rename to kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/V1Alpha2DynamicResourceAllocationAPIGroupDSL.java index cb16b07d706..73aba4cd26d 100644 --- a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/V1Alpha1DynamicResourceAllocationAPIGroupDSL.java +++ b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/V1Alpha2DynamicResourceAllocationAPIGroupDSL.java @@ -15,19 +15,19 @@ */ package io.fabric8.kubernetes.client; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClass; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClass; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassList; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.Resource; -public interface V1Alpha1DynamicResourceAllocationAPIGroupDSL extends Client { +public interface V1Alpha2DynamicResourceAllocationAPIGroupDSL extends Client { /** * API entrypoint for resource.k8s.io/v1alpha1 ResourceClass * @@ -40,7 +40,7 @@ public interface V1Alpha1DynamicResourceAllocationAPIGroupDSL extends Client { * * @return {@link MixedOperation} for PodScheduling */ - MixedOperation> podSchedulings(); + MixedOperation> podSchedulings(); /** * API entrypoint for resource.k8s.io/v1alpha1 ResourceClaim diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/DynamicResourceAllocationAPIGroupDSL.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/DynamicResourceAllocationAPIGroupDSL.java index 6c7ea5ed2ac..86fdcc5268d 100644 --- a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/DynamicResourceAllocationAPIGroupDSL.java +++ b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/DynamicResourceAllocationAPIGroupDSL.java @@ -16,8 +16,8 @@ package io.fabric8.kubernetes.client.dsl; import io.fabric8.kubernetes.client.Client; -import io.fabric8.kubernetes.client.V1Alpha1DynamicResourceAllocationAPIGroupDSL; +import io.fabric8.kubernetes.client.V1Alpha2DynamicResourceAllocationAPIGroupDSL; public interface DynamicResourceAllocationAPIGroupDSL extends Client { - V1Alpha1DynamicResourceAllocationAPIGroupDSL v1alpha1(); + V1Alpha2DynamicResourceAllocationAPIGroupDSL v1alpha2(); } diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/DynamicResourceAllocationAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/DynamicResourceAllocationAPIGroupClient.java index 6dc4efa525e..df86b8014ea 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/DynamicResourceAllocationAPIGroupClient.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/DynamicResourceAllocationAPIGroupClient.java @@ -15,7 +15,7 @@ */ package io.fabric8.kubernetes.client.impl; -import io.fabric8.kubernetes.client.V1Alpha1DynamicResourceAllocationAPIGroupDSL; +import io.fabric8.kubernetes.client.V1Alpha2DynamicResourceAllocationAPIGroupDSL; import io.fabric8.kubernetes.client.dsl.DynamicResourceAllocationAPIGroupDSL; import io.fabric8.kubernetes.client.extension.ClientAdapter; @@ -27,7 +27,7 @@ public DynamicResourceAllocationAPIGroupClient newInstance() { } @Override - public V1Alpha1DynamicResourceAllocationAPIGroupDSL v1alpha1() { - return adapt(V1Alpha1DynamicResourceAllocationAPIGroupClient.class); + public V1Alpha2DynamicResourceAllocationAPIGroupDSL v1alpha2() { + return adapt(V1Alpha2DynamicResourceAllocationAPIGroupClient.class); } } diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/KubernetesClientImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/KubernetesClientImpl.java index eeaa4e9b1b7..b2a741bda01 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/KubernetesClientImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/KubernetesClientImpl.java @@ -80,7 +80,7 @@ import io.fabric8.kubernetes.client.RequestConfig; import io.fabric8.kubernetes.client.V1AdmissionRegistrationAPIGroupDSL; import io.fabric8.kubernetes.client.V1Alpha1AdmissionRegistrationAPIGroupDSL; -import io.fabric8.kubernetes.client.V1Alpha1DynamicResourceAllocationAPIGroupDSL; +import io.fabric8.kubernetes.client.V1Alpha2DynamicResourceAllocationAPIGroupDSL; import io.fabric8.kubernetes.client.V1ApiextensionAPIGroupDSL; import io.fabric8.kubernetes.client.V1AuthenticationAPIGroupDSL; import io.fabric8.kubernetes.client.V1AuthorizationAPIGroupDSL; @@ -260,8 +260,8 @@ protected void registerDefaultAdapters() { adapters.registerClient(V1DiscoveryAPIGroupDSL.class, new V1DiscoveryAPIGroupClient()); adapters.registerClient(DynamicResourceAllocationAPIGroupDSL.class, new DynamicResourceAllocationAPIGroupClient()); - adapters.registerClient(V1Alpha1DynamicResourceAllocationAPIGroupDSL.class, - new V1Alpha1DynamicResourceAllocationAPIGroupClient()); + adapters.registerClient(V1Alpha2DynamicResourceAllocationAPIGroupDSL.class, + new V1Alpha2DynamicResourceAllocationAPIGroupClient()); adapters.registerClient(CertificatesAPIGroupDSL.class, new CertificatesAPIGroupClient()); adapters.registerClient(V1CertificatesAPIGroupDSL.class, new V1CertificatesAPIGroupClient()); adapters.registerClient(V1beta1CertificatesAPIGroupDSL.class, new V1beta1CertificatesAPIGroupClient()); diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/V1Alpha1DynamicResourceAllocationAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/V1Alpha2DynamicResourceAllocationAPIGroupClient.java similarity index 59% rename from kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/V1Alpha1DynamicResourceAllocationAPIGroupClient.java rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/V1Alpha2DynamicResourceAllocationAPIGroupClient.java index 4bf42122c76..ec00ab3d9cb 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/V1Alpha1DynamicResourceAllocationAPIGroupClient.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/V1Alpha2DynamicResourceAllocationAPIGroupClient.java @@ -15,25 +15,25 @@ */ package io.fabric8.kubernetes.client.impl; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClass; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassList; -import io.fabric8.kubernetes.client.V1Alpha1DynamicResourceAllocationAPIGroupDSL; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClass; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassList; +import io.fabric8.kubernetes.client.V1Alpha2DynamicResourceAllocationAPIGroupDSL; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.Resource; import io.fabric8.kubernetes.client.extension.ClientAdapter; -public class V1Alpha1DynamicResourceAllocationAPIGroupClient extends - ClientAdapter implements V1Alpha1DynamicResourceAllocationAPIGroupDSL { +public class V1Alpha2DynamicResourceAllocationAPIGroupClient extends + ClientAdapter implements V1Alpha2DynamicResourceAllocationAPIGroupDSL { @Override - public V1Alpha1DynamicResourceAllocationAPIGroupClient newInstance() { - return new V1Alpha1DynamicResourceAllocationAPIGroupClient(); + public V1Alpha2DynamicResourceAllocationAPIGroupClient newInstance() { + return new V1Alpha2DynamicResourceAllocationAPIGroupClient(); } @Override @@ -42,8 +42,8 @@ public NonNamespaceOperation> podSchedulings() { - return resources(PodScheduling.class, PodSchedulingList.class); + public MixedOperation> podSchedulings() { + return resources(PodSchedulingContext.class, PodSchedulingContextList.class); } @Override diff --git a/kubernetes-model-generator/go.mod b/kubernetes-model-generator/go.mod index 3219e6052e1..7aa0848160d 100644 --- a/kubernetes-model-generator/go.mod +++ b/kubernetes-model-generator/go.mod @@ -5,25 +5,24 @@ go 1.17 require ( 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 - github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.0.0-20211201170610-92ffa60c683d // indirect - github.com/openshift/api v0.0.0-20211201215911-5a82bae32e46 + github.com/metal3-io/baremetal-operator/apis v0.2.0 + github.com/openshift/api v0.0.0 github.com/openshift/cloud-credential-operator v0.0.0-20211129235416-c4ce9b8b79de github.com/openshift/cluster-autoscaler-operator v0.0.1-0.20211120222321-da0812a49473 github.com/openshift/cluster-network-operator v0.0.0-20211123023629-88b7cdc9034e github.com/openshift/cluster-node-tuning-operator v0.0.0-20211115083052-29e877edbbf1 - github.com/openshift/hive/apis v0.0.0-20211217134024-32a93e12e129 - github.com/openshift/installer v0.9.0-master.0.20211223163410-37c09290190e + github.com/openshift/hive/apis v0.0.0-20220222213051-def9088fdb5a + github.com/openshift/installer v0.9.0-master.0.20230306121016-3485fddca1c3 github.com/openshift/machine-config-operator v0.0.1-0.20211201165713-c533e61a9e4f 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.26.0 - k8s.io/apiextensions-apiserver v0.26.0 - k8s.io/apimachinery v0.26.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.57.0 + k8s.io/api v0.27.3 + k8s.io/apiextensions-apiserver v0.27.3 + k8s.io/apimachinery v0.27.3 k8s.io/client-go v12.0.0+incompatible - k8s.io/kube-aggregator v0.26.0 - k8s.io/metrics v0.26.0 + k8s.io/kube-aggregator v0.27.3 + k8s.io/metrics v0.27.3 sigs.k8s.io/gateway-api v0.6.1 sigs.k8s.io/kube-storage-version-migrator v0.0.5 sigs.k8s.io/kustomize/api v0.13.1 @@ -31,73 +30,10 @@ require ( require ( 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/v3 v3.10.1 // indirect - github.com/evanphx/json-patch v5.6.0+incompatible // indirect - github.com/evanphx/json-patch/v5 v5.6.0 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/go-errors/errors v1.4.2 // indirect - github.com/go-logr/logr v1.2.3 // indirect - github.com/go-openapi/jsonpointer v0.19.6 // indirect - github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.3 // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.2 // indirect - github.com/google/gnostic v0.6.9 // indirect - github.com/google/go-cmp v0.5.9 // indirect - github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.2.0 // indirect - github.com/h2non/filetype v1.1.1 // indirect - github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect - github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/josharian/intern v1.0.0 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/mailru/easyjson v0.7.7 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect - 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.24.1 // 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.14.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect - github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/cobra v1.6.1 // indirect - github.com/spf13/pflag v1.0.5 // indirect - github.com/vmware/govmomi v0.24.0 // indirect - golang.org/x/net v0.7.0 // indirect - golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect - golang.org/x/time v0.3.0 // indirect - gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect - google.golang.org/grpc v1.49.0 // indirect - google.golang.org/protobuf v1.28.1 // indirect - gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/component-base v0.26.0 // indirect - k8s.io/klog/v2 v2.90.0 // indirect - k8s.io/kube-openapi v0.0.0-20230228151317-19cbebb19cb7 // indirect k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect - sigs.k8s.io/controller-runtime v0.12.1 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/kustomize/kyaml v0.14.0 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect - sigs.k8s.io/yaml v1.3.0 // indirect + sigs.k8s.io/controller-runtime v0.15.0 // indirect ) replace ( @@ -106,22 +42,25 @@ replace ( 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/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20230531194024-8dde0991ffdd + github.com/metal3-io/baremetal-operator/apis => github.com/openshift/baremetal-operator/apis v0.0.0-20230531194024-8dde0991ffdd 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/openshift/api => github.com/openshift/api v0.0.0-20230615141659-a6fbaf36017d + github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20220928142635-a40422bdea61 + github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20220928142635-a40422bdea61 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.26.0 - k8s.io/component-helpers => k8s.io/component-helpers v0.26.0 - k8s.io/controller-manager => k8s.io/controller-manager v0.26.0 - k8s.io/mount-utils => k8s.io/mount-utils v0.26.0 + k8s.io/client-go => k8s.io/client-go v0.27.3 + k8s.io/cloud-provider-vsphere => github.com/openshift/cloud-provider-vsphere v1.19.1-0.20211222185833-7829863d0558 + k8s.io/component-helpers => k8s.io/component-helpers v0.27.3 + k8s.io/controller-manager => k8s.io/controller-manager v0.27.3 + k8s.io/mount-utils => k8s.io/mount-utils v0.27.3 + sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.5 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 - sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.1 + sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.0.0-20230503161017-b9a504cea2c0 + sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.15.0 ) exclude ( diff --git a/kubernetes-model-generator/go.sum b/kubernetes-model-generator/go.sum index 5e74b2b3f6c..01d1a681494 100644 --- a/kubernetes-model-generator/go.sum +++ b/kubernetes-model-generator/go.sum @@ -1,17 +1,15 @@ +4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= +4d63.com/gochecknoglobals v0.1.0/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= +bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.36.0/go.mod h1:RUoy9p/M4ge0HzT8L+SDZ8jg+Q6fth0CiBuhFJpSV40= -cloud.google.com/go v0.37.2/go.mod h1:H8IAquKe2L30IxoupDgqTaQvKSwF/c8prYHynGIWQbA= cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.39.0/go.mod h1:rVLT6fkc8chs9sfPtFc1SBH6em7n+ZoXaG+87tDISts= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.49.0/go.mod h1:hGvAdzcWNbyuxS3nWhD7H2cIJxjRRTRLQVB0bdputVY= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= @@ -20,9 +18,7 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.58.0/go.mod h1:W+9FnSUw6nhVwXlFcp1eL+krq5+HQUJeUogSeJZZiWg= cloud.google.com/go v0.60.0/go.mod h1:yw2G51M9IfRboUH61Us8GqCeF1PzPblB823Mn2q2eAU= -cloud.google.com/go v0.61.0/go.mod h1:XukKJg4Y7QsUu0Hxg3qQKUWR4VuWivmyMK2+rUyxAqw= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.64.0/go.mod h1:xfORb36jGvE+6EexW71nMEtL025s3x6xvuYUKM4JLv4= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= @@ -36,94 +32,95 @@ cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aD 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 v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= +cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= +cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= +cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= 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= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.6.0/go.mod h1:hyFDG0qSGdHNz8Q6nDN8rYIkld0q/+5uBZaelxiDLfE= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/bigtable v1.5.0/go.mod h1:713PsD2nkJwTioSe6vF/sFCAcjhINJ62cEtKCr8u+F8= +cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= +cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= +cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= +cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= +cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= +cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= +cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/firestore v1.6.0/go.mod h1:afJwI0vaXwAG54kI7A//lP/lSPDkQORQuMkv56TxEPU= +cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= +cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= +cloud.google.com/go/monitoring v1.6.0/go.mod h1:w+OY1TYCk4MtvY7WfEHlIp5mP8SV/gDSqOsvGhVa2KM= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/pubsub v1.5.0/go.mod h1:ZEwJccE3z93Z2HWvstpri00jOg7oO4UZDtKhwDwqF0w= +cloud.google.com/go/spanner v1.7.0/go.mod h1:sd3K2gZ9Fd0vMPLXzeCrF6fq4i63Q7aTLW/lBIfBkIk= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.4.0/go.mod h1:ZusYJWlOshgSBGbt6K3GnB3MT3H1xs2id9+TCl4fDBA= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.7.0/go.mod h1:jGMIBwF+L/tL6WN/W5InNgYYu4HP0DvGB6rQ1mufWfs= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.9.0/go.mod h1:m+/etGaqZbylxaNT876QGXqEHp4PR2Rq5GMqICWb9bU= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.11.0/go.mod h1:/PAbprKS+5msVYogBmczjWalDXnQ9mr64yEq9YnyPeo= cloud.google.com/go/storage v1.16.0/go.mod h1:ieKBmUyzcftN5tbxwnXClMKH00CfcQ+xL6NN0r5QfmE= -code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod h1:sk5LnIjB/nIEU7yP5sDQExVm62wu0pBh3yrElngUisI= -contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA= -contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= -dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= +cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= +contrib.go.opencensus.io/exporter/prometheus v0.2.0/go.mod h1:TYmVAyE8Tn1lyPcltF5IYYfWp2KHu7lQGIZnj8iZMys= +contrib.go.opencensus.io/exporter/prometheus v0.4.0/go.mod h1:o7cosnyfuPVK0tB8q0QmaQNhGnptITnPQB+z1+qeFB0= +contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= -dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= -dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= -git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= -git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= 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/360EntSecGroup-Skylar/excelize v1.4.1/go.mod h1:vnax29X2usfl7HHkBrX5EvSCJcmH3dT9luvxzu8iGAE= github.com/AlecAivazis/survey/v2 v2.3.2/go.mod h1:TH2kPCDU3Kqq7pLbnCWwZXDBjnhZtmsCle5EiYDJ2fg= -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/AlecAivazis/survey/v2 v2.3.5/go.mod h1:4AuI9b7RjAR+G7v9+C4YSlX/YL3K3cWNXgWXOhllqvI= +github.com/Antonboom/errname v0.1.5/go.mod h1:DugbBstvPFQbv/5uLcRRzfrNqKE9tVdVCqWCLp6Cifo= +github.com/Antonboom/nilnil v0.1.0/go.mod h1:PhHLvRPSghY5Y7mX4TW+BHZQYo1A8flE5H20D3IPZBo= github.com/Azure/azure-sdk-for-go v31.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v33.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v36.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v42.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v44.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v47.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v46.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v48.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v51.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v63.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.3/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.2.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.0.0/go.mod h1:+6sju8gk8FRmSajX3Oz4G5Gm7P+mbqE9FVaXXFYTkCM= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0/go.mod h1:bhXu1AjYL+wutSL/kpSq6s7733q2Rb0yuot9Zgfqa/0= +github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.1/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1/go.mod h1:eZ4g6GUvXiGulfIbbhh1Xr4XwUYaYaWMqzGD/284wCA= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= 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.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= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest v0.9.2/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0= github.com/Azure/go-autorest/autorest v0.10.0/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= -github.com/Azure/go-autorest/autorest v0.11.3/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= -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 v0.11.28/go.mod h1:MrkzG3Y3AH668QyF9KRk5neJnGgmhQ6krbhR8Q5eMvA= 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= -github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= -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/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/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/adal v0.9.21/go.mod h1:zua7mBUaCc5YnSLKYgGJR/w5ePdMDA6H56upLsHzA9U= github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod h1:90gmfKdlmKgfjUpnCEpOJzsUEjrWDSLwHIG73tSXddM= -github.com/Azure/go-autorest/autorest/azure/cli v0.2.0/go.mod h1:WWTbGPvkAg3I4ms2j2s+Zr5xCGwGqTQh+6M2ZqOczkE= -github.com/Azure/go-autorest/autorest/azure/cli v0.3.0/go.mod h1:rNYMNAefZMRowqCV0cVhr/YDW5dD7afFq9nXAXL4ykE= github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod h1:ZG5p860J94/0kI9mNJVoIoLgXcirM2gF5i2kWloofxw= -github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod h1:JljT387FplPzBA31vUcvsetLKF3pec5bdAxjVU4kI2s= -github.com/Azure/go-autorest/autorest/azure/cli v0.4.1/go.mod h1:JfDgiIO1/RPu6z42AdQTyjOoCM2MFhLqSBDvMEkDgcg= -github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod h1:7qkJkT+j6b+hIpzMOwPChJhTqS8VbsqqgULzMNRugoM= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= @@ -132,6 +129,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= @@ -142,56 +140,34 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= -github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= +github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= +github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4= +github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4= +github.com/AzureAD/microsoft-authentication-library-for-go v0.7.0/go.mod h1:BDJ5qMFKx9DugEg3+uQSDCdbYPr5s9vBTrL9P8TpqOU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod h1:nuWgzSkT5PnyOd+272uUmV0dnAnAn42Mk7PiQC5VzN4= -github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d/go.mod h1:nuWgzSkT5PnyOd+272uUmV0dnAnAn42Mk7PiQC5VzN4= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/Djarvur/go-err113 v0.1.0/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/IBM-Cloud/bluemix-go v0.0.0-20210611051827-cdc80c935c05/go.mod h1:kqTYO0mts71aa8PVwviaKlCKYud/NbEkFIqU8aHH3/g= -github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.5.3/go.mod h1:RiUvKuHKTBmBApDMUQzBL14pQUGKcx/IioKQPIcRQjs= -github.com/IBM-Cloud/power-go-client v1.0.55/go.mod h1:I4r5tCrA8mV5GFqGAJG4/Tn+/JpR+XLnDCLLNVKJxuI= -github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca/go.mod h1:IjXrnOcTe92Q4pEBHmui3H/GM1hw5Pd0zXA5cw5/iZU= -github.com/IBM/appconfiguration-go-admin-sdk v0.1.0/go.mod h1:6x6KbqIwrEi07OvEM1+EnU4Lyk+JFm2O0vrSPPGTleU= -github.com/IBM/container-registry-go-sdk v0.0.13/go.mod h1:GYi1VN59VaJWWq2xP06o9Vpi6+K8V5vtmji6WjMJf0w= +github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= +github.com/IBM-Cloud/bluemix-go v0.0.0-20211102075456-ffc4e11dfb16/go.mod h1:q0fXFSbum/16D8Mgn1ROSfSyX4BmvBCm/hHdcXz0wCU= +github.com/IBM-Cloud/power-go-client v1.2.0/go.mod h1:Qfx0fNi+9hms+xu9Z6Euhu9088ByW6C/TCMLECTRWNE= github.com/IBM/go-sdk-core v1.1.0/go.mod h1:2pcx9YWsIsZ3I7kH+1amiAkXvLTZtAq9kbxsfXilSoY= -github.com/IBM/go-sdk-core/v3 v3.0.0/go.mod h1:JI5NS2+iCoY/D8Oq3JNEZNA7qO42agu6fnaUmDsRcJA= -github.com/IBM/go-sdk-core/v3 v3.2.4/go.mod h1:lk9eOzNbNltPf3CBpcg1Ewkhw4qC3u2QCCKDRsUA2M0= -github.com/IBM/go-sdk-core/v3 v3.3.1/go.mod h1:lk9eOzNbNltPf3CBpcg1Ewkhw4qC3u2QCCKDRsUA2M0= github.com/IBM/go-sdk-core/v4 v4.5.1/go.mod h1:lTUXbqIX6/aAbSCkP6q59+dyFsTwZAc0ewRS2vJWVbg= -github.com/IBM/go-sdk-core/v4 v4.8.1/go.mod h1:GECJ/p0r9Hs0XcOnCiGjZrt6M/rQc+gW8YkCsGJ+j5U= github.com/IBM/go-sdk-core/v4 v4.9.0/go.mod h1:DbQ+3pFoIjxGGTEiA9zQ2V0cemMNmFMkLBBnR729HKg= -github.com/IBM/go-sdk-core/v4 v4.10.0/go.mod h1:0uz2ca0MZ2DwsBRGl9Jp3EaCTqxmKZTdvV/CkCB7JnI= -github.com/IBM/go-sdk-core/v5 v5.0.0/go.mod h1:vyNdbFujJtdTj9HbihtvKwwS3k/GKSKpOx9ZIQ6MWDY= -github.com/IBM/go-sdk-core/v5 v5.0.3/go.mod h1:vyNdbFujJtdTj9HbihtvKwwS3k/GKSKpOx9ZIQ6MWDY= -github.com/IBM/go-sdk-core/v5 v5.1.0/go.mod h1:vyNdbFujJtdTj9HbihtvKwwS3k/GKSKpOx9ZIQ6MWDY= -github.com/IBM/go-sdk-core/v5 v5.2.0/go.mod h1:vyNdbFujJtdTj9HbihtvKwwS3k/GKSKpOx9ZIQ6MWDY= github.com/IBM/go-sdk-core/v5 v5.4.0/go.mod h1:+MNa5Jbqb9FO7KEevo982Pb/YXr4adkyEffJlPs2TGc= github.com/IBM/go-sdk-core/v5 v5.4.2/go.mod h1:Sn+z+qTDREQvCr+UFa22TqqfXNxx3o723y8GsfLV8e0= -github.com/IBM/go-sdk-core/v5 v5.4.3/go.mod h1:Sn+z+qTDREQvCr+UFa22TqqfXNxx3o723y8GsfLV8e0= github.com/IBM/go-sdk-core/v5 v5.6.3/go.mod h1:tt/B9rxLkRtglE7pvqLuYikgCXaZFL3btdruJaoUeek= -github.com/IBM/ibm-cos-sdk-go v1.3.1/go.mod h1:YLBAYobEA8bD27P7xpMwSQeNQu6W3DNBtBComXrRzRY= -github.com/IBM/ibm-cos-sdk-go v1.7.0/go.mod h1:Oi8AC5WNDhmUJgbo1GL2FtBdo0nRgbzE/1HmCL1SERU= -github.com/IBM/ibm-cos-sdk-go-config v1.2.0/go.mod h1:Wetfgv6m1xyuzpZLQTTLIBsWstxjYa15h+Utj7x53Dk= -github.com/IBM/keyprotect-go-client v0.7.0/go.mod h1:SVr2ylV/fhSQPDiUjWirN9fsyWFCNNbt8GIT8hPJVjE= +github.com/IBM/go-sdk-core/v5 v5.9.1/go.mod h1:axE2JrRq79gIJTjKPBwV6gWHswvVptBjbcvvCPIxARM= +github.com/IBM/go-sdk-core/v5 v5.9.5/go.mod h1:YlOwV9LeuclmT/qi/LAK2AsobbAP42veV0j68/rlZsE= github.com/IBM/networking-go-sdk v0.14.0/go.mod h1:8f3hEoWVUSYKbaIj7WZhdeJaseYGDSY85Iz+PqxLEbQ= -github.com/IBM/platform-services-go-sdk v0.18.12/go.mod h1:awc7TZUeGMlToSeMSaWEz34Knf0lQnuGWumcI4pcuoM= github.com/IBM/platform-services-go-sdk v0.18.16/go.mod h1:awc7TZUeGMlToSeMSaWEz34Knf0lQnuGWumcI4pcuoM= github.com/IBM/platform-services-go-sdk v0.19.4/go.mod h1:mKtwiSvf5s2nyaSvcG+GNphun5pmiABcnsPjXzkC0OE= -github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5/go.mod h1:b07XHUVh0XYnQE9s2mqgjYST1h9buaQNqN4EcKhOsX0= -github.com/IBM/schematics-go-sdk v0.0.2/go.mod h1:ymN1+3uEaWNT0RthwHzExxMiN0AnTh6W3piSY8canjs= -github.com/IBM/secrets-manager-go-sdk v0.1.19/go.mod h1:eO3dBhzPrHkkt+yPex/jB2xD6qHZxBko+Aw+0tfqHeA= github.com/IBM/vpc-go-sdk v0.6.0/go.mod h1:wxicPDnSTPXt1eNxSO/9KNGqOW9RMgxPoSh4gd8KJY4= -github.com/IBM/vpc-go-sdk v0.7.0/go.mod h1:wxicPDnSTPXt1eNxSO/9KNGqOW9RMgxPoSh4gd8KJY4= -github.com/IBM/vpc-go-sdk v1.0.1/go.mod h1:bhd7r482lV30UJz46r2oRgYGawGEo+TuS41ZLIY65y0= +github.com/IBM/vpc-go-sdk v0.20.0/go.mod h1:YPyIfI+/qhPqlYp+I7dyx2U1GLcXgp/jzVvsZfUH4y8= github.com/InVisionApp/go-health v2.1.0+incompatible/go.mod h1:/+Gv1o8JUsrjC6pi6MN6/CgKJo4OqZ6x77XAnImrzhg= -github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= @@ -200,13 +176,13 @@ github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy86 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Masterminds/sprig v2.20.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= github.com/Masterminds/squirrel v1.5.0/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= github.com/Masterminds/vcs v1.13.1/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -github.com/Microsoft/go-winio v0.4.13/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= @@ -214,136 +190,95 @@ github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugX github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -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/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= +github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= 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/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= -github.com/Microsoft/hcsshim v0.8.24 h1:jP+GMeRXIR1sH1kG4lJr9ShmSjVrua5jmFZDtfYGkn4= github.com/Microsoft/hcsshim v0.8.24/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg= +github.com/Microsoft/hcsshim v0.9.2 h1:wB06W5aYFfUB3IvootYAY2WnOmIdgPGfqSI6tufQNnY= +github.com/Microsoft/hcsshim v0.9.2/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= 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= -github.com/Netflix/go-expect v0.0.0-20190729225929-0e00d9168667/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc= +github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OpenPeeDeeP/depguard v1.0.0/go.mod h1:7/4sitnI9YlQgTLLk734QlzXT8DuHVnAyztLplQjk+o= github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= +github.com/OpenPeeDeeP/depguard v1.1.0/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc= +github.com/PaesslerAG/gval v1.0.0 h1:GEKnRwkWDdf9dOmKcNrar9EA1bz1z9DqPIO1+iLzhd8= github.com/PaesslerAG/gval v1.0.0/go.mod h1:y/nm5yEyTeX6av0OfKJNp9rBNj2XrGhAf5+v24IBN1I= github.com/PaesslerAG/jsonpath v0.1.0/go.mod h1:4BzmtoM/PI8fPO4aQGIusjGxGir2BzcV0grWtFzq1Y8= +github.com/PaesslerAG/jsonpath v0.1.1 h1:c1/AToHQMVsduPAa4Vh6xp2U0evy4t8SWp8imEsylIk= github.com/PaesslerAG/jsonpath v0.1.1/go.mod h1:lVboNxFGal/VwW6d9JzIy56bUsYAP6tH/x80vjnCseY= +github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= +github.com/ProtonMail/go-crypto v0.0.0-20210920160938-87db9fbc61c7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= +github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= +github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= -github.com/SAP/go-hdb v0.14.1/go.mod h1:7fdQLVC2lER3urZLjZCm0AuMQfApof92n3aylBPEkMo= -github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5/go.mod h1:gxOHeajFfvGQh/fxlC8oOKBe23xnnJTif00IFFbiT+o= +github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2/go.mod h1:XyjUkMA8GN+tOOPXvnbi3XuRxWFvTJntqvTFnjmhzbk= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/sarama v1.27.2/go.mod h1:g5s5osgELxgM+Md9Qni9rzo7Rbt+vvFQI4bt/Mc93II= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292/go.mod h1:KYCjqMOeHpNuTOiFQU6WEcTG7poCJrUs0YgyHNtn1no= github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA= github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod h1:5Jv4cbFiHJMsVxt52+i0Ha45fjshj6wxYr1r19tB9bw= +github.com/a8m/tree v0.0.0-20210115125333-10a5fd5b637d/go.mod h1:FSdwKX97koS5efgm8WevNf7XS3PqtyFkKDDXrz778cg= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo= +github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= +github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= -github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= -github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= -github.com/agl/ed25519 v0.0.0-20150830182803-278e1ec8e8a6/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= -github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/ahmetb/gen-crd-api-reference-docs v0.3.0/go.mod h1:TdjdkYhlOifCQWPs1UdTma97kQQMozf5h26hTuG70u8= github.com/ajeddeloh/go-json v0.0.0-20170920214419-6a2fe990e083/go.mod h1:otnto4/Icqn88WCcM4bhIJNSgsh9VLBuspyyCfvof9c= github.com/ajeddeloh/yaml v0.0.0-20170912190910-6b94386aeefd/go.mod h1:idhzw68Q7v4j+rQ2AGyq3OlZW2Jij9mdmGA4/Sk6J0E= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/alecthomas/kingpin/v2 v2.3.1/go.mod h1:oYL5vtsvEHZGHxU7DMp32Dvx+qL+ptGn6lWaot2vCNE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= -github.com/alibabacloud-go/cs-20151215/v2 v2.4.4/go.mod h1:pIg8PCfRO6qSylVbW9BiG6q0zaYCP/aIKCCEwsuvbPg= -github.com/alibabacloud-go/darabonba-openapi v0.1.4/go.mod h1:j03z4XUkIC9aBj/w5Bt7H0cygmPNt5sug8NXle68+Og= -github.com/alibabacloud-go/darabonba-openapi v0.1.5/go.mod h1:j03z4XUkIC9aBj/w5Bt7H0cygmPNt5sug8NXle68+Og= -github.com/alibabacloud-go/darabonba-string v1.0.0/go.mod h1:93cTfV3vuPhhEwGGpKKqhVW4jLe7tDpo3LUM0i0g6mA= -github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68/go.mod h1:6pb/Qy8c+lqua8cFpEy7g39NRRqOWc3rOwAy8m5Y2BY= -github.com/alibabacloud-go/endpoint-util v1.1.0/go.mod h1:O5FuCALmCKs2Ff7JFJMudHs0I5EBgecXXxZRyswlEjE= -github.com/alibabacloud-go/openapi-util v0.0.7/go.mod h1:sQuElr4ywwFRlCCberQwKRFhRzIyG4QTP/P4y1CJ6Ws= -github.com/alibabacloud-go/tea v1.1.0/go.mod h1:IkGyUSX4Ba1V+k4pCtJUc6jDpZLFph9QMy2VUPTwukg= -github.com/alibabacloud-go/tea v1.1.7/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4= -github.com/alibabacloud-go/tea v1.1.8/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4= -github.com/alibabacloud-go/tea v1.1.10/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4= -github.com/alibabacloud-go/tea v1.1.11/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4= -github.com/alibabacloud-go/tea v1.1.15/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A= -github.com/alibabacloud-go/tea-roa v1.2.8/go.mod h1:mmXHtSWCuOEUI3saHp0KRAk4zIUom3/RG9tdU+hziEM= -github.com/alibabacloud-go/tea-roa-utils v1.1.5/go.mod h1:7mkMI3FZEm4LGKIR1322y0N6N9EC0R1G/oXvzQjf1fQ= -github.com/alibabacloud-go/tea-rpc v1.1.8/go.mod h1:C1nOCvQ/WjIn3bVcBCcZY34s+1TqUowR44ovROFvwfw= -github.com/alibabacloud-go/tea-rpc-utils v1.1.2/go.mod h1:V5HdNi6Xdn0JMpgVhQ19vsFAS51tydr7BqcJtuXH1Yw= -github.com/alibabacloud-go/tea-utils v1.3.0/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE= -github.com/alibabacloud-go/tea-utils v1.3.1/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE= -github.com/alibabacloud-go/tea-utils v1.3.5/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE= -github.com/alibabacloud-go/tea-utils v1.3.6/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE= -github.com/alibabacloud-go/tea-utils v1.3.9/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE= -github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod h1:T9M45xf79ahXVelWoOBmH0y4aC1t5kXO5BxwyakgIGA= -github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190412020505-60e2075261b6/go.mod h1:T9M45xf79ahXVelWoOBmH0y4aC1t5kXO5BxwyakgIGA= -github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ= -github.com/aliyun/alibaba-cloud-sdk-go v1.61.1153/go.mod h1:pUKYbK5JQ+1Dfxk80P0qxGqe5dkxDoabbZS7zOcouyA= -github.com/aliyun/alibaba-cloud-sdk-go v1.61.1154/go.mod h1:pUKYbK5JQ+1Dfxk80P0qxGqe5dkxDoabbZS7zOcouyA= -github.com/aliyun/aliyun-datahub-sdk-go v0.1.5/go.mod h1:GwtZxKUD+aLBrtlkEcyPNAx+jRkBioEC7EKOlQ26lTc= -github.com/aliyun/aliyun-log-go-sdk v0.1.21/go.mod h1:aBG0R+MWRTgvlIODQkz+a3/RM9bQYKsmSbKdbIx4vpc= -github.com/aliyun/aliyun-mns-go-sdk v0.0.0-20210305050620-d1b5875bda58/go.mod h1:eD/mEH7SwtLSwI9p8fP9VTH2cYM3wFSY1WNaxEdLIFU= -github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= -github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= +github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= +github.com/aliyun/alibaba-cloud-sdk-go v1.61.1264/go.mod h1:9CMdKNL3ynIGPpfTcdwTvIm8SGuAZYYC4jFVSSvE1YQ= github.com/aliyun/aliyun-oss-go-sdk v2.1.8+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= -github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod h1:LDQHRZylxvcg8H7wBIDfvO5g/cy4/sz1iucBlc2l3Jw= -github.com/aliyun/aliyun-tablestore-go-sdk v4.1.3+incompatible/go.mod h1:LDQHRZylxvcg8H7wBIDfvO5g/cy4/sz1iucBlc2l3Jw= -github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw= -github.com/aliyun/fc-go-sdk v0.0.0-20200925033337-c013428cbe21/go.mod h1:X4Pc3TFz4LRXaQPhyzBU4Ec8pL/QvaJ36CFtLJsroIM= -github.com/aliyun/terraform-provider-alicloud v1.132.0/go.mod h1:7Ac42rNclVHQRkt91rPHJbHY4Ro1UzbU+sQ3xT9m5ds= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= -github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= -github.com/andybalholm/crlf v0.0.0-20171020200849-670099aa064f/go.mod h1:k8feO4+kXDxro6ErPXBRTJ/ro2mf0SsFG8s7doP9kJE= +github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= +github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= -github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= -github.com/antchfx/xpath v1.1.2/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk= -github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod h1:LzD22aAzDP8/dyiCKFp31He4m2GPjl0AFyzDtZzUu9M= +github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= 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/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= -github.com/apache/openwhisk-client-go v0.0.0-20200201143223-a804fb82d105/go.mod h1:jLLKYP7+1+LFlIJW1n9U1gqeveLM1HIwa4ZHNOFxjPw= +github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= 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= github.com/apparentlymart/go-cidr v1.0.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= -github.com/apparentlymart/go-cidr v1.0.1/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= -github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= -github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= -github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec= github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= -github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod h1:7kfpUbyCdGJ9fDRCp3fopPQi5+cKNHgTE4ZuNrO71Cw= -github.com/apparentlymart/go-versions v0.0.2-0.20180815153302-64b99f7cb171/go.mod h1:JXY95WvQrPJQtudvNARshgWajS7jNNlM90altXIPNyI= -github.com/apparentlymart/go-versions v1.0.1/go.mod h1:YF5j7IQtrOAOnsGkniupEA5bfCjzd7i14yu0shZavyM= -github.com/apple/foundationdb/bindings/go v0.0.0-20190411004307-cd5c9d91fad2/go.mod h1:OMVSB21p9+xQUIqlGizHPZfjK+SHws1ht+ZytVDoz9U= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod h1:3AMJUQhVx52RsWOnlkpikZr01T/yAVN2gn0861vByNg= -github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs= -github.com/armon/go-proxyproto v0.0.0-20190211145416-68259f75880e/go.mod h1:QmP9hvJ91BbJmGVGSbutW19IC0Q9phDCLGaomwTJbgU= +github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= @@ -354,91 +289,91 @@ github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:o github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= +github.com/ashanbrown/forbidigo v1.3.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= +github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI= 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.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= -github.com/aws/aws-sdk-go v1.19.39/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.47/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.28.8/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.30.24/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.30.28/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.33.21/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.34.21/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.32.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.35.20/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= -github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.37.4/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.36.30/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.37.14/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.44.51 h1:jO9hoLynZOrMM4dj0KjeKIK+c6PA+HQbKoHOkAEye2Y= +github.com/aws/aws-sdk-go v1.44.51/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= +github.com/bazelbuild/bazelisk v1.13.2/go.mod h1:jVD8/E7hMAXgWKCljEz8hOV0PZ+nFBgCpjIOJ6Xyzus= +github.com/bazelbuild/rules_go v0.34.0/go.mod h1:MC23Dc/wkXEyk3Wpq6lCqz0ZAYOZDw2DR5y3N1q2i7M= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= +github.com/beevik/etree v1.1.1-0.20200718192613-4a2f8b9d084c/go.mod h1:0yGO2rna3S9DkITDWHY1bMtcY4IJ4w+4S+EooZUR0bE= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= 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= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bflad/gopaniccheck v0.1.0/go.mod h1:ZCj2vSr7EqVeDaqVsWN4n2MwdROx1YL+LFo47TSWtsA= -github.com/bflad/tfproviderdocs v0.7.0/go.mod h1:W6wVZPtBa6V5bpjaK1eJAoVCL/7B4Amfrld0dro+fHU= -github.com/bflad/tfproviderlint v0.15.0/go.mod h1:0fdh7JywihC58Io8AZ+gpcmQtJggse0MCOXF2tMmnAQ= -github.com/bflad/tfproviderlint v0.18.0/go.mod h1:0fdh7JywihC58Io8AZ+gpcmQtJggse0MCOXF2tMmnAQ= 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/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/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= 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= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= -github.com/bmatcuk/doublestar v1.1.5/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= -github.com/bmatcuk/doublestar v1.2.1/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= -github.com/bmatcuk/doublestar v1.3.2/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= +github.com/blizzy78/varnamelen v0.6.1/go.mod h1:zy2Eic4qWqjrxa60jG34cfL0VXcSwzUrIx68eJPb4Q8= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= +github.com/bombsimon/wsl v1.2.5/go.mod h1:43lEF/i0kpXbLCeDXL9LMT8c92HyBywXb0AsgMHYngM= github.com/bombsimon/wsl/v3 v3.1.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= -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/bombsimon/wsl/v3 v3.3.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= +github.com/breml/bidichk v0.2.2/go.mod h1:zbfeitpevDUGI7V91Uzzuwrn4Vls8MoBMrwtt78jmso= +github.com/breml/errchkjson v0.2.3/go.mod h1:jZEATw/jF69cL1iy7//Yih8yp/mXp2CBoBr9GJwCAsY= 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/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= 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/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/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= +github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/cenkalti/backoff/v4 v4.0.0/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.3/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= +github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20180905225744-ee1a9a0726d2/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= +github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA= +github.com/charithe/durationcheck v0.0.9/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= +github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af/go.mod h1:Qjyv4H3//PWVzTeCezG2b9IRn6myJxJSr4TD/xo6ojU= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= -github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= -github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0/go.mod h1:5d8DqS60xkj9k3aXfL3+mXBH0DPYO0FQjcKosxl+b/Q= +github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -448,14 +383,16 @@ github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX 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/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= 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/cjlapao/common-go v0.0.24/go.mod h1:RZuwsymEIdwSubzUBpNYmmGfeITqHDV5iTgnr6zYwSc= +github.com/cjlapao/common-go v0.0.27/go.mod h1:OyTAY388jfEj8uaRzx0uYneFghKDLL5KP+ewSydlQ5g= +github.com/cjlapao/common-go v0.0.29/go.mod h1:OyTAY388jfEj8uaRzx0uYneFghKDLL5KP+ewSydlQ5g= +github.com/cjlapao/common-go-cryptorand v0.0.3/go.mod h1:o6EzggoV8LjJi4u7SrMa4QP4OurP/ibMQX8Rd6TVCL4= github.com/clarketm/json v1.14.1/go.mod h1:ynr2LRfb0fQU34l07csRNBTcivjySLLiY1YzQqKVfdo= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= -github.com/cloudfoundry-community/go-cfclient v0.0.0-20190201205600-f136f9222381/go.mod h1:e5+USP2j8Le2M0Jo3qKPFnNhuo1wueU4nWHCXBOfQ14= -github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:po7NpZ/QiTKzBKyrsEAxwnTamCoh8uDk/egRpQ7siIc= 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= @@ -465,6 +402,7 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH 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/cncf/xds/go v0.0.0-20211130200136-a8f946100490/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= @@ -472,8 +410,6 @@ github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= 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 v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= github.com/containerd/btrfs v1.0.0/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= @@ -487,6 +423,7 @@ github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on 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/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= 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= @@ -494,8 +431,9 @@ github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY= 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/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= +github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk= @@ -505,6 +443,8 @@ github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0Z github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms= github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= +github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM= +github.com/containerd/stargz-snapshotter/estargz v0.11.0/go.mod h1:/KsZXsJRllMbTKFfG0miFQWViQKdI9+9aSXs+HN0+ac= github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= @@ -525,7 +465,9 @@ github.com/containers/image v3.0.2+incompatible/go.mod h1:8Vtij257IWSanUQKe1tAeN 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/image/v5 v5.20.0/go.mod h1:5UL1ooih6+USVYXk19r8ScQNsbTprhlJxrHezAu4OVE= github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY= +github.com/containers/libtrust v0.0.0-20200511145503-9c3a6c22cd9a/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY= 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= @@ -533,7 +475,9 @@ github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B github.com/containers/storage v1.20.2/go.mod h1:oOB9Ie8OVPojvoaKWEGSEtHbXUAs+tSyr7RO7ZGteMc= github.com/containers/storage v1.28.1/go.mod h1:5bwiMh2LkrN3AWIfDFMH7A/xbVNLcve+oeXYvHvW8cc= github.com/containers/storage v1.32.6/go.mod h1:mdB+b89p+jU8zpzLTVXA0gWMmIo0WrkfGMh1R8O2IQw= -github.com/coreos/bbolt v1.3.0/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/containers/storage v1.38.2/go.mod h1:INP0RPLHWBxx+pTsO5uiHlDUGHDFvWZPWprAbAlQWPQ= +github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= +github.com/coredns/corefile-migration v1.0.12/go.mod h1:NJOI8ceUF/NTgEwtjD+TUq3/BnH/GF7WAM3RzCa3hBo= github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/container-linux-config-transpiler v0.9.0/go.mod h1:SlcxXZQ2c42knj8pezMiQsM1f+ADxFMjGetuMKR/YSQ= @@ -545,13 +489,11 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz github.com/coreos/go-iptables v0.4.2/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= -github.com/coreos/go-oidc v2.0.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-json v0.0.0-20211020211907-c63f628265de/go.mod h1:lryFBkhadOfv8Jue2Vr/f/Yviw8h1DQPQojbXqEChY0= 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-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= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -559,22 +501,22 @@ github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7 github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.4.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/ign-converter v0.0.0-20201123214124-8dac862888aa/go.mod h1:pqAsDWa5YDi10Va/aqQI0bwOs9hXqoE2xwb5vnFys5s= github.com/coreos/ignition v0.33.0/go.mod h1:WJQapxzEn9DE0ryxsGvm8QnBajm/XsS/PkrDqSpz+bA= -github.com/coreos/ignition v0.34.0/go.mod h1:WJQapxzEn9DE0ryxsGvm8QnBajm/XsS/PkrDqSpz+bA= github.com/coreos/ignition v0.35.0/go.mod h1:WJQapxzEn9DE0ryxsGvm8QnBajm/XsS/PkrDqSpz+bA= github.com/coreos/ignition/v2 v2.1.1/go.mod h1:RqmqU64zxarUJa3l4cHtbhcSwfQLpUhv0WVziZwoXvE= -github.com/coreos/ignition/v2 v2.3.0/go.mod h1:85dmM/CERMZXNrJsXqtNLIxR/dn8G9qlL1CmEjCugp0= github.com/coreos/ignition/v2 v2.7.0/go.mod h1:3CjaRpg51hmJzPjarbzB0RvSZbLkNOczxKJobTl6nOY= -github.com/coreos/ignition/v2 v2.9.0/go.mod h1:A5lFFzA2/zvZQPVEvI1lR5WPLWRb7KZ7Q1QOeUMtcAc= +github.com/coreos/ignition/v2 v2.12.0/go.mod h1:PEKv4yQSfWLya4y6vY1K+7+2lOf9t7O7gGljmp0hLIg= +github.com/coreos/ignition/v2 v2.14.0/go.mod h1:wxc4qdYEIHLygzWbVVEuoD7lQGTZmMgX0VjAPYBbeEQ= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/stream-metadata-go v0.1.3/go.mod h1:zxVoWUDB0H8+tZRhTs0LeLeR/QdmBsuo7FN1oOBrWTE= +github.com/coreos/stream-metadata-go v0.1.8/go.mod h1:RTjQyHgO/G37oJ3qnqYK6Z4TPZ5EsaabOtfMjVXmgko= github.com/coreos/vcontext v0.0.0-20190529201340-22b159166068/go.mod h1:E+6hug9bFSe0KZ2ZAzr8M9F5JlArJjv5D1JS7KSkPKE= github.com/coreos/vcontext v0.0.0-20191017033345-260217907eb5/go.mod h1:E+6hug9bFSe0KZ2ZAzr8M9F5JlArJjv5D1JS7KSkPKE= -github.com/coreos/vcontext v0.0.0-20200225161404-ee043618d38d/go.mod h1:z4pMVvaUrxs98RROlIYdAQCKhEicjnTirOaVyDRH5h8= -github.com/coreos/vcontext v0.0.0-20201120045928-b0e13dab675c/go.mod h1:z4pMVvaUrxs98RROlIYdAQCKhEicjnTirOaVyDRH5h8= +github.com/coreos/vcontext v0.0.0-20210407161507-4ee6c745c8bd/go.mod h1:z4pMVvaUrxs98RROlIYdAQCKhEicjnTirOaVyDRH5h8= +github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4/go.mod h1:HckqHnP/HI41vS0bfVjJ20u6jD0biI5+68QwZm5Xb9U= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -583,7 +525,10 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= +github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/cznic/b v0.0.0-20180115125044-35e9bbe41f07/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/fileutil v0.0.0-20180108211300-6a051e75936f/go.mod h1:8S58EK26zhXSxzv7NQFpnliaOQsmDUxvoQO3rt154Vg= github.com/cznic/golex v0.0.0-20170803123110-4ab7c5e190e4/go.mod h1:+bmmJDNmKlhWNG+gwWCkaBoTy39Fs+bzRxVBzoTQbIc= @@ -599,48 +544,50 @@ github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= github.com/daixiang0/gci v0.2.4/go.mod h1:+AV8KmHTGxxwp/pY84TLQfFKp2vuKXXJVzF3kD/hfR4= +github.com/daixiang0/gci v0.3.3/go.mod h1:1Xr2bxnQbDxCqqulUOv8qpGqkgRw9RSCGGjEC2LjF8o= +github.com/daixiang0/gci v0.9.0/go.mod h1:EpVfrztufwVgQRXjnX4zuNinEpLj5OmMjtu/+MB0V0c= +github.com/danielerez/go-dns-client v0.0.0-20200630114514-0b60d1703f0b/go.mod h1:2l39JZ3DOxVtByPDmp0Zhh4xS7603UHmeRtLCKzqQdQ= github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg= -github.com/dave/dst v0.26.2/go.mod h1:UMDJuIRPfyUCC78eFuB+SV/WI8oDeyFDvM/JR6NI3IU= -github.com/dave/gopackages v0.0.0-20170318123100-46e7023ec56e/go.mod h1:i00+b/gKdIDIxuLDFob7ustLAVqhsZRk2qVZrArELGQ= -github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= -github.com/dave/kerr v0.0.0-20170318121727-bc25dd6abe8e/go.mod h1:qZqlPyPvfsDJt+3wHJ1EvSXDuVjFTK0j2p/ca+gtsb8= -github.com/dave/rebecca v0.9.1/go.mod h1:N6XYdMD/OKw3lkF3ywh8Z6wPGuwNFDNtWYEMFWEmXBA= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod h1:CTDl0pzVzE5DEzZhPfvhY/9sPFMQIxaJ9VAMs9AagrE= github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= -github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a/go.mod h1:Bw9BbhOJVNR+t0jCqx2GC6zv0TGBsShs56Y3gfSCvl0= -github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= +github.com/daviddengcn/go-colortext v1.0.0/go.mod h1:zDqEI5NVUop5QPpVJUxE9UO10hRnmkD5G4Pmri9+m4c= github.com/deislabs/oras v0.11.1/go.mod h1:39lCtf8Q6WDC7ul9cnyWXONNzKvabEKk+AX+L0ImnQk= +github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c= github.com/denis-tingajkin/go-header v0.3.1/go.mod h1:sq/2IxMhaZX+RRcgHfCRx/m0M5na0fBt4/CRe7Lrji0= -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-20210518071019-eb3bbb144d8a/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= +github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/denisenkom/go-mssqldb v0.12.0/go.mod h1:iiK0YP1ZeepvmBQk/QpLEhhTNJgfzrpArPY/aFvc9yU= 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= -github.com/dimchansky/utfbom v1.0.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= -github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= +github.com/diskfs/go-diskfs v1.2.1-0.20210727185522-a769efacd235/go.mod h1:IoDpuEbpS+D+yCGdoOm6GNfyTeEws77ALvcMQFxmenw= github.com/distribution/distribution v2.7.1+incompatible/go.mod h1:EgLm2NgWtdKgzF9NpMzUKgzmR7AMmb0VQi2B+ZzDRjc= -github.com/dmacvicar/terraform-provider-libvirt v0.6.4-0.20201216193629-2b60d7626ff8/go.mod h1:RZqLUAMFQ32TmKpk1Ayb4zeTe7+7k0jfsWpW1UTqVDw= -github.com/dnaeon/go-vcr v0.0.0-20180920040454-5637cf3d8a31/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= -github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= +github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= +github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= +github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= 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/cli v20.10.14+incompatible h1:dSBKJOVesDgHo7rbxlYjYsXe7gPzrTT+/cKQgpDAazg= +github.com/docker/cli v20.10.14+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= 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= +github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v1.4.2-0.20191219165747-a9416c67da9f/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible h1:iWPIG7pWIsCwT6ZtHnTUpoVMnete7O/pzd9HFE3+tn8= github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.12+incompatible h1:CEeNmFM0QZIsJCZKMkZx0ZcahTiewkrgiwfYD+dfl1U= +github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o= github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= @@ -657,36 +604,32 @@ github.com/docker/libnetwork v0.0.0-20190731215715-7f13a5c99f4b/go.mod h1:93m0aT 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= -github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo= -github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= -github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74/go.mod h1:UqXY1lYT/ERa4OEAywUqdok1T4RCRdArkhic1Opuavo= +github.com/drone/envsubst/v2 v2.0.0-20210615175204-7bf45dbf5372/go.mod h1:esf2rsHFNlZlxsqsZDojNBcnNs5REqIvRrWRHqX0vEU= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustinkirkland/golang-petname v0.0.0-20170105215008-242afa0b4f8a/go.mod h1:V+Qd57rJe8gd4eiGzZyg4h54VLHmYVVw54iMnlAMrF8= -github.com/dustinkirkland/golang-petname v0.0.0-20170921220637-d3c2ba80e75e/go.mod h1:V+Qd57rJe8gd4eiGzZyg4h54VLHmYVVw54iMnlAMrF8= -github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0/go.mod h1:V+Qd57rJe8gd4eiGzZyg4h54VLHmYVVw54iMnlAMrF8= -github.com/dylanmei/iso8601 v0.1.0/go.mod h1:w9KhXSgIyROl1DefbMYIE7UVSIvELTbMrCfx+QkYnoQ= -github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod h1:lcy9/2gH1jn/VCLouHA6tOEwLoNVd4GW6zhuKLmHC2Y= +github.com/dustmop/soup v1.1.2-0.20190516214245-38228baa104e/go.mod h1:CgNC6SGbT+Xb8wGGvzilttZL1mc5sQ/5KkcxsZttMIk= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/elastic/go-licenser v0.3.1/go.mod h1:D8eNQk70FOCVBl3smCGQt/lv7meBeQno2eI1S5apiHQ= +github.com/elastic/go-sysinfo v1.1.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0= +github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU= github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/elazarl/goproxy v0.0.0-20190911111923-ecfe977594f1/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= +github.com/elazarl/goproxy v0.0.0-20200426045556-49ad98f6dac1/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= github.com/elazarl/goproxy/ext v0.0.0-20190911111923-ecfe977594f1/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= 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 v2.15.0+incompatible h1:8KpYO/Xl/ZudZs5RNOEhWMBY4hmzlZhhRd9cu+jrZP4= +github.com/emicklei/go-restful v2.15.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful/v3 v3.7.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ= @@ -701,23 +644,27 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m 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.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= 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/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= +github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcHcfgNWTk0= +github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= -github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.2.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= -github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= +github.com/fasthttp/router v1.4.4/go.mod h1:TiyF2kc+mogKcTxqkhUbiXpwklouv5dN58A0ZUo8J6s= github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -725,78 +672,87 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/filanov/stateswitch v0.0.0-20200714113403-51a42a34c604/go.mod h1:GYnXtGE0e/uuFBz4CbjJL0JmP3DWwzGtcpjZYYC9ikc= github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/form3tech-oss/jwt-go v3.2.1+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.4.0/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= -github.com/frankban/quicktest v1.4.1/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= -github.com/frankban/quicktest v1.10.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU= +github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= +github.com/frankban/quicktest v1.14.2/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fsouza/fake-gcs-server v1.7.0/go.mod h1:5XIRs4YvwNbNoz+1JF8j6KLAyDh7RHGAyAK3EP2EsNk= github.com/fsouza/go-dockerclient v0.0.0-20171004212419-da3951ba2e9e/go.mod h1:KpcjM623fQYE9MZiTGzKhjfxXAV9wbyX2C1cyRHfhl0= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= +github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3nqZCxaQ2Ze/sM= github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= -github.com/gammazero/deque v0.0.0-20180920172122-f6adf94963e4/go.mod h1:GeIq9qoE43YdGnDXURnmKTnGg15pQz4mYkXSTChbneI= -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/fzipp/gocyclo v0.4.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= 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= github.com/getsentry/raven-go v0.0.0-20190513200303-c977f96e1095/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew= github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= -github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/gibson042/canonicaljson-go v1.0.3/go.mod h1:DsLpJTThXyGNO+KZlI85C1/KDcImpP67k/RKVjcaEqo= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= +github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/go-air/gini v1.0.4/go.mod h1:dd8RvT1xcv6N1da33okvBd8DhMh1/A4siGy6ErjTljs= -github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= +github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= github.com/go-bindata/go-bindata/v3 v3.1.3/go.mod h1:1/zrpXsLD8YDIbhZRqXzm1Ghc7NhEvIN9+Z6R5/xH4I= +github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-critic/go-critic v0.3.5-0.20190526074819-1df300866540/go.mod h1:+sE8vrLDS2M0pZkBk0wy6+nLdKexVDrl/jBqQOTDThA= -github.com/go-critic/go-critic v0.5.0/go.mod h1:4jeRh3ZAVnRYhuWdOEvwzVqLUpxMSoAT0xZ74JsTPlo= +github.com/go-critic/go-critic v0.3.5-0.20190904082202-d79a9f0c64db/go.mod h1:+sE8vrLDS2M0pZkBk0wy6+nLdKexVDrl/jBqQOTDThA= github.com/go-critic/go-critic v0.5.2/go.mod h1:cc0+HvdE3lFpqLecgqMaJcvWWH77sLdBp+wLGPM1Yyo= +github.com/go-critic/go-critic v0.6.2/go.mod h1:td1s27kfmLpe5G/DPjlnFI7o1UCzePptwU7Az0V5iCM= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= -github.com/go-git/go-billy/v5 v5.1.0 h1:4pl5BV4o7ZG/lterP4S6WzJ6xr49Ba5ET9ygheTYahk= github.com/go-git/go-billy/v5 v5.1.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= -github.com/go-git/go-git-fixtures/v4 v4.0.1/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= +github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34= +github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= -github.com/go-git/go-git/v5 v5.1.0/go.mod h1:ZKfuPUoY1ZqIG4QG9BDBh3G4gLM5zvPuSJAozQrZuyM= -github.com/go-git/go-git/v5 v5.2.0/go.mod h1:kh02eMX+wdqqxgNMEyq8YgwlIOsDOa9homkUq1PoTMs= -github.com/go-git/go-git/v5 v5.3.0 h1:8WKMtJR2j8RntEXR/uvTKagfEt4GYlwQ7mntE4+0GWc= +github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0= github.com/go-git/go-git/v5 v5.3.0/go.mod h1:xdX4bWJ48aOrdhnl2XqHYstHbbp6+LFS4r4X+lNVprw= +github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4= +github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc= 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-gormigrate/gormigrate/v2 v2.0.1/go.mod h1:NtulswF5NeZBmyuhCrNtYk2veCLm6NxcyGlTC8YZ0Do= 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= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc= -github.com/go-ldap/ldap/v3 v3.1.3/go.mod h1:3rbOH3jRS2u6jg2rJnKAMLE/xQyCKIveG2Sa/Cohzb8= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-ldap/ldap/v3 v3.4.3/go.mod h1:7LdHfVt6iIOESVEe3Bs4Jp2sHEKgDeduAhgM1/f9qmo= github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM= -github.com/go-log/log v0.0.0-20181211034820-a514cf01a3eb/go.mod h1:4mBwpdRMFLiuXZDCwU2lKQFsoSCo72j3HqBK9d81N2M= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= @@ -808,13 +764,17 @@ github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTg github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= 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/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A= +github.com/go-logr/zapr v0.4.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= +github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= 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-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo= +github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= @@ -823,6 +783,9 @@ github.com/go-openapi/analysis v0.19.4/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9sn github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= github.com/go-openapi/analysis v0.19.10/go.mod h1:qmhS3VNFxBlquFJ0RGoDtylO9y4pgTAUNE9AEEMdlJQ= github.com/go-openapi/analysis v0.19.16/go.mod h1:GLInF007N83Ad3m8a/CbQ5TPzdnGT7workfHwuVjNVk= +github.com/go-openapi/analysis v0.20.0/go.mod h1:BMchjvaHDykmRMsK40iPtvyOfFdMMxlOmQr9FBZk+Og= +github.com/go-openapi/analysis v0.20.1/go.mod h1:BMchjvaHDykmRMsK40iPtvyOfFdMMxlOmQr9FBZk+Og= +github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= @@ -832,6 +795,8 @@ github.com/go-openapi/errors v0.19.7/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpX github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.20.0/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= +github.com/go-openapi/errors v0.20.1/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= +github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= @@ -845,8 +810,8 @@ github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3Hfo github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.4/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= +github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= @@ -861,13 +826,16 @@ github.com/go-openapi/loads v0.19.5/go.mod h1:dswLCAdonkRufe/gSUC3gN8nTSaB9uaS2e github.com/go-openapi/loads v0.19.6/go.mod h1:brCsvE6j8mnbmGBh103PT/QLHfbyDxA4hsKvYBNEGVc= github.com/go-openapi/loads v0.19.7/go.mod h1:brCsvE6j8mnbmGBh103PT/QLHfbyDxA4hsKvYBNEGVc= github.com/go-openapi/loads v0.20.0/go.mod h1:2LhKquiE513rN5xC6Aan6lYOSddlL8Mp20AW9kpviM4= +github.com/go-openapi/loads v0.20.2/go.mod h1:hTVUotJ+UonAMMZsvakEgmWKgtulweO9vYP2bQYKA/o= +github.com/go-openapi/loads v0.21.0/go.mod h1:rHYve9nZrQ4CJhyeIIFJINGCg1tQpx2yJrrNo8sf1ws= +github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g= github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= -github.com/go-openapi/runtime v0.19.11/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo= github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo= github.com/go-openapi/runtime v0.19.16/go.mod h1:5P9104EJgYcizotuXhEuUrzVc+j1RiSjahULvYmlv98= github.com/go-openapi/runtime v0.19.24/go.mod h1:Lm9YGCeecBnUUkFTxPC4s1+lwrkJ0pthx8YvyjCfkgk= +github.com/go-openapi/runtime v0.23.0/go.mod h1:aQg+kaIQEn+A2CRSY1TxbM8+sT9g2V3aLc1FbIAnbbs= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= @@ -876,9 +844,12 @@ github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8 github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= github.com/go-openapi/spec v0.19.6/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= github.com/go-openapi/spec v0.19.8/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= -github.com/go-openapi/spec v0.19.9/go.mod h1:vqK/dIdLGCosfvYsQV3WfC7N3TiZSnGY2RZKoFK7X28= github.com/go-openapi/spec v0.19.15/go.mod h1:+81FIL1JwC5P3/Iuuozq3pPE9dXdIEGxFutcFKaVbmU= github.com/go-openapi/spec v0.20.0/go.mod h1:+81FIL1JwC5P3/Iuuozq3pPE9dXdIEGxFutcFKaVbmU= +github.com/go-openapi/spec v0.20.1/go.mod h1:93x7oh+d+FQsmsieroS4cmR3u0p/ywH649a3qwC9OsQ= +github.com/go-openapi/spec v0.20.3/go.mod h1:gG4F8wdEDN+YPBMVnzE85Rbhf+Th2DTvA9nFPQ5AYEg= +github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= +github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA= github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= @@ -886,11 +857,14 @@ github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6 github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= github.com/go-openapi/strfmt v0.19.4/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk= github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk= -github.com/go-openapi/strfmt v0.19.8/go.mod h1:qBBipho+3EoIqn6YDI+4RnQEtj6jT/IdKm+PAlXxSUc= github.com/go-openapi/strfmt v0.19.10/go.mod h1:qBBipho+3EoIqn6YDI+4RnQEtj6jT/IdKm+PAlXxSUc= github.com/go-openapi/strfmt v0.19.11/go.mod h1:UukAYgTaQfqJuAFlNxxMWNvMYiwiXtLsF2VwmoFtbtc= github.com/go-openapi/strfmt v0.20.0/go.mod h1:UukAYgTaQfqJuAFlNxxMWNvMYiwiXtLsF2VwmoFtbtc= github.com/go-openapi/strfmt v0.20.1/go.mod h1:43urheQI9dNtE5lTZQfuFJvjYJKPrxicATpEfZwHUNk= +github.com/go-openapi/strfmt v0.20.2/go.mod h1:43urheQI9dNtE5lTZQfuFJvjYJKPrxicATpEfZwHUNk= +github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= +github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= +github.com/go-openapi/strfmt v0.21.2/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= @@ -899,19 +873,24 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/swag v0.19.7/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY= github.com/go-openapi/swag v0.19.9/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY= github.com/go-openapi/swag v0.19.12/go.mod h1:eFdyEBkTdoAf/9RXBvj4cr1nH7GD8Kzo5HTt47gr72M= +github.com/go-openapi/swag v0.19.13/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo= github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= -github.com/go-openapi/validate v0.19.6/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= github.com/go-openapi/validate v0.19.8/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= github.com/go-openapi/validate v0.19.10/go.mod h1:RKEZTUWDkxKQxN2jDT7ZnZi2bhZlbNMAuKvKB+IaGx8= github.com/go-openapi/validate v0.19.12/go.mod h1:Rzou8hA/CBw8donlS6WNEUQupNvUZ0waH08tGe6kAQ4= github.com/go-openapi/validate v0.19.15/go.mod h1:tbn/fdOwYHgrhPBzidZfJC2MIVvs9GA7monOmWBbeCI= github.com/go-openapi/validate v0.20.1/go.mod h1:b60iJT+xNNLfaQJUqLI7946tYiFEOuE9E4k54HpKcJ0= +github.com/go-openapi/validate v0.20.3/go.mod h1:goDdqVGiigM3jChcrYJxD2joalke3ZXeftD16byIjA4= +github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= +github.com/go-openapi/validate v0.22.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= @@ -920,20 +899,22 @@ github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEK github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/go-redis/redis v6.15.8+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= -github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= -github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= -github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= -github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= github.com/go-toolsmith/astequal v0.0.0-20180903214952-dcb477bfacd6/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= +github.com/go-toolsmith/astequal v1.0.1/go.mod h1:4oGA3EZXTVItV/ipGiOx7NWkY5veFfcsOJVS2YxltLw= github.com/go-toolsmith/astfmt v0.0.0-20180903215011-8f8ee99c3086/go.mod h1:mP93XdblcopXwlyN4X4uodxXQhldPGZbcEJIimQHrkg= github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= @@ -941,6 +922,7 @@ github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30/go.mod h1:SV2ur9 github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod h1:WoMrjiy4zvdS+Bg6z9jZH82QXwkcgCBX6nOfnmdaHks= github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc= +github.com/go-toolsmith/pkgload v1.0.2-0.20220101231613-e814995d17c5/go.mod h1:3NAwwmD4uY/yggRxoEjk/S00MIV3A+H7rrE3i87eYxM= github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= @@ -957,6 +939,7 @@ github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj github.com/gobuffalo/flect v0.2.0/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= github.com/gobuffalo/flect v0.2.2/go.mod h1:vmkQwuZYhN5Pc4ljYQZzP+1sq+NEkK+lh20jmEmX3jc= github.com/gobuffalo/flect v0.2.3/go.mod h1:vmkQwuZYhN5Pc4ljYQZzP+1sq+NEkK+lh20jmEmX3jc= +github.com/gobuffalo/flect v0.2.5/go.mod h1:1ZyCLIbg0YD7sDkzvFdPoOydPtD8y9JQnrOROolUcM8= github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= @@ -980,34 +963,39 @@ github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY9 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= 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-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= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godror/godror v0.13.3/go.mod h1:2ouUT4kdhUBk7TAkHWD4SN0CdI0pgEQbo8FVHhbSKWg= -github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -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.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= 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-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259/go.mod h1:9Qcha0gTWLw//0VNka1Cbnjvg3pNKGFdAm7E9sBabxE= +github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= 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-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= 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= +github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+wXQnTPR4KqTKDgJukSZ6amVRtWMPEjE6sQoK8= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -1015,7 +1003,6 @@ github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.0.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -1026,6 +1013,7 @@ github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/mock v1.7.0-rc.1/go.mod h1:s42URUywIqd+OcERslBJvOjepvNymP31m3q8d/GkuRs= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -1044,12 +1032,12 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= @@ -1062,8 +1050,9 @@ github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d/go.mod h1:ozx7R9S github.com/golangci/gofmt v0.0.0-20181222123516-0b8337e80d98/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= github.com/golangci/golangci-lint v1.18.0/go.mod h1:kaqo8l0OZKYPtjNmG4z4HrWLgcYNIJ9B9q3LWri9uLg= -github.com/golangci/golangci-lint v1.29.0/go.mod h1:Iq2GFBB9OoolSDWD81m0iJ2MR4MwDVbi4eC93fO7wh0= -github.com/golangci/golangci-lint v1.31.0/go.mod h1:aMQuNCA+NDU5+4jLL5pEuFHoue0IznKE2+/GsFvvs8A= +github.com/golangci/golangci-lint v1.21.0/go.mod h1:phxpHK52q7SE+5KpPnti4oZTdFCEsn/tKN+nFvCKXfk= +github.com/golangci/golangci-lint v1.32.0/go.mod h1:aEG8mkR2s0W900N8YVtSAhhemMGLRWZzASgaHc7eLt4= +github.com/golangci/golangci-lint v1.45.2/go.mod h1:f20dpzMmUTRp+oYnX0OGjV1Au3Jm2JeI9yLqHq1/xsI= github.com/golangci/gosec v0.0.0-20190211064107-66fb7fc33547/go.mod h1:0qUabqiIQgfmlAmulqxyiGkkyF6/tOGSnY2cnPVwrzU= github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU= github.com/golangci/lint-1 v0.0.0-20190420132249-ee948d087217/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= @@ -1073,22 +1062,30 @@ github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod h1:dEbvlS github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod h1:tf5+bzsHdTM0bsB7+8mt0GUMvjCgwLpTapNZHU8AajI= github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= -github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= +github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2/go.mod h1:LK+zW4MpyytAWQRz0M4xnzEk50lSvqDQKfx304apFkY= github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= +github.com/golangplus/bytes v1.0.0/go.mod h1:AdRaCFwmc/00ZzELMWb01soso6W1R/++O1XL80yAn+A= github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= +github.com/golangplus/fmt v1.0.0/go.mod h1:zpM0OfbMCjPtd2qkTD/jX2MgiFCqklhSUFyDW44gVQE= github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= +github.com/golangplus/testing v1.0.0/go.mod h1:ZDreixUV3YzhoVraIDyOzHrr76p6NUh6k/pPg/Q3gYA= github.com/gonum/blas v0.0.0-20181208220705-f22b278b28ac/go.mod h1:P32wAyui1PQ58Oce/KYkOqQv8cVw1zAapXOl+dRFGbc= github.com/gonum/floats v0.0.0-20181209220543-c233463c7e82/go.mod h1:PxC8OnwL11+aosOB5+iEPoV3picfs8tUpkVd0pDo+Kg= github.com/gonum/graph v0.0.0-20170401004347-50b27dea7ebb/go.mod h1:ye018NnX1zrbOLqwBvs2HqyyTouQgnL8C+qzYk1snPY= github.com/gonum/internal v0.0.0-20181124074243-f884aa714029/go.mod h1:Pu4dmpkhSyOzRwuXkOgAvijx4o+4YMUJJo9OvPYMkks= github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9/go.mod h1:XA3DeT6rxh2EAE789SSiSJNqxPaC0aE9J8NTOI0Jo/A= github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9/go.mod h1:0EXg4mc1CNP0HCqCz+K4ts155PXIlUywf0wqN+GfPZw= -github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= 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.12.4/go.mod h1:Av7CU6r6X3YmcHR9GXqVDaEJYfEtSxl6wvIjUQTriCw= github.com/google/cel-go v0.12.5/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw= +github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw= +github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA= +github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= +github.com/google/certificate-transparency-go v1.1.1/go.mod h1:FDKqPvSXawb2ecErVRrD+nfy23RCzyl7eqVCEmlT1Zs= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= @@ -1104,14 +1101,15 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= +github.com/google/go-github/v33 v33.0.0/go.mod h1:GMdDnVZY/2TsWgp/lkYnpSAh6TrzhANBBwm6k6TTEXg= github.com/google/go-intervals v0.0.2/go.mod h1:MkaR3LNRfeKLPmqgJYs4E66z5InYjmCjbbr4TQlcT6Y= -github.com/google/go-metrics-stackdriver v0.0.0-20190816035513-b52628e82e2a/go.mod h1:o93WzqysX0jP/10Y13hfL6aq9RoUvGaVdkrH5awMksE= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -1119,11 +1117,9 @@ github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= -github.com/google/pprof v0.0.0-20181127221834-b4f47329b966/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -1139,82 +1135,93 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe 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 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/renameio v1.0.0/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk= +github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk= +github.com/google/safetext v0.0.0-20230106111101-7156a760e523/go.mod h1:mJNEy0r5YPHC7ChQffpOszlGB4L1iqjXWpIEKcFpr9s= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= +github.com/google/trillian v1.3.11/go.mod h1:0tPraVHrSDkA3BO6vKX67zgLXs6SsOAbHEivX+9mPgw= +github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v0.0.0-20170306145142-6a5e28554805/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= -github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= +github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= +github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= +github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= -github.com/gookit/color v1.1.7/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ= -github.com/gookit/color v1.2.4/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg= +github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/gookit/color v1.2.5/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg= -github.com/gookit/color v1.2.9/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg= -github.com/gophercloud/gophercloud v0.0.0-20190208042652-bc37892e1968/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= +github.com/gookit/color v1.5.0/go.mod h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl7wAo= github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod h1:ozGNgr9KYOVATV5jsgHl/ceCDXGuguqOZAzoQ/2vcNM= -github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5/go.mod h1:gmC5oQqMDOMO1t1gq5DquX/yAU808e/4mzjjDA76+Ss= github.com/gophercloud/gophercloud v0.14.0/go.mod h1:VX0Ibx85B60B5XOrZr6kaNwrmPUzcmMpwxvQ1WQIIWM= github.com/gophercloud/gophercloud v0.15.1-0.20210202035223-633d73521055/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4= -github.com/gophercloud/gophercloud v0.17.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4= -github.com/gophercloud/gophercloud v0.18.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4= github.com/gophercloud/gophercloud v0.19.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4= -github.com/gophercloud/utils v0.0.0-20190128072930-fbb6ab446f01/go.mod h1:wjDF8z83zTeg5eMLml5EBSlAhbF7G8DobyI1YsMuyzw= -github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod h1:ehWUbLQJPqS0Ep+CxeD559hsm9pthPXadJNKwZkp43w= +github.com/gophercloud/gophercloud v1.1.1/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= +github.com/gophercloud/gophercloud v1.3.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= github.com/gophercloud/utils v0.0.0-20201221031838-d93cf4b3fa50/go.mod h1:ehWUbLQJPqS0Ep+CxeD559hsm9pthPXadJNKwZkp43w= -github.com/gophercloud/utils v0.0.0-20210202040619-eca783186fc4/go.mod h1:wx8HMD8oQD0Ryhz6+6ykq75PJ79iPyEqYHfwZ4l7OsA= -github.com/gophercloud/utils v0.0.0-20210530213738-7c693d7efe47/go.mod h1:wx8HMD8oQD0Ryhz6+6ykq75PJ79iPyEqYHfwZ4l7OsA= github.com/gophercloud/utils v0.0.0-20210720165645-8a3ad2ad9e70/go.mod h1:wx8HMD8oQD0Ryhz6+6ykq75PJ79iPyEqYHfwZ4l7OsA= -github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gophercloud/utils v0.0.0-20221207145018-e8fba78967ca/go.mod h1:z4Dey7xsTUXgcB1C8elMvGRKTjV1ez0eoYQlMrduG1g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= +github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0= 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 v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg= +github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= +github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= +github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= 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.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.2.1/go.mod h1:18U/DLpRgIUd459wGxVHE0fRgmo1UgHDcbw7F5idXu0= +github.com/gostaticanalysis/analysisutil v0.1.0/go.mod h1:dMhHRU9KTiDcuLGdy87/2gTR8WruwYZrKdRq9m1O6uw= +github.com/gostaticanalysis/analysisutil v0.4.1/go.mod h1:18U/DLpRgIUd459wGxVHE0fRgmo1UgHDcbw7F5idXu0= +github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/ojApNWb6C1//mXO48CXbVc= +github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnqWxw9wCauCMKp+IBI= github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= +github.com/gostaticanalysis/comment v1.4.2/go.mod h1:KLUTGDv6HOCotCH8h2erHKmpci2ZoR8VPu34YA2uzdM= +github.com/gostaticanalysis/forcetypeassert v0.1.0/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= +github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= +github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M= +github.com/gostaticanalysis/testutil v0.4.0/go.mod h1:bLIoPefWXrRi/ssLFWX1dx7Repi5x3CuviD3dgAZaBU= github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo= -github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.4.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -github.com/grpc-ecosystem/grpc-gateway v1.6.2/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= -github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.11.1/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/grpc-ecosystem/grpc-health-probe v0.3.2/go.mod h1:izVOQ4RWbjUR6lm4nn+VLJyQ+FyaiGmprEYgI04Gs7U= @@ -1223,213 +1230,83 @@ github.com/h2non/filetype v1.1.1 h1:xvOwnXKAckvtLWsN398qS9QhlxlnVXBjXBydK2/UFB4= github.com/h2non/filetype v1.1.1/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY= github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c h1:fEE5/5VNnYUoBOj2I9TP8Jc+a7lge3QWn9DKE7NCwfc= github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c/go.mod h1:ObS/W+h8RYb1Y7fYivughjxojTmIu5iAIjSrSLCLeqE= -github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= -github.com/hashicorp/aws-sdk-go-base v0.4.0/go.mod h1:eRhlz3c4nhqxFZJAahJEFL7gh6Jyj5rQmQc7F9eHFyQ= -github.com/hashicorp/aws-sdk-go-base v0.6.0/go.mod h1:2fRjWDv3jJBeN6mVWFHV6hFTNeFBx2gpDLQaZNxUVAY= -github.com/hashicorp/aws-sdk-go-base v0.7.0/go.mod h1:2fRjWDv3jJBeN6mVWFHV6hFTNeFBx2gpDLQaZNxUVAY= -github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod h1:mFrjN1mfidgJfYP1xrJCF+AfRhr6Eaqhb2+sfyn/OOI= -github.com/hashicorp/consul-template v0.22.0/go.mod h1:lHrykBIcPobCuEcIMLJryKxDyk2lUMnQWmffOEONH0k= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= +github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= +github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= 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-20180715044906-d6c0cd880357/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= 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= -github.com/hashicorp/go-azure-helpers v0.7.0/go.mod h1:3xdjhbL7qs69rnwxA0UENOzkPJjtTFIRb5aRyrEpbCU= -github.com/hashicorp/go-azure-helpers v0.9.0/go.mod h1:3xdjhbL7qs69rnwxA0UENOzkPJjtTFIRb5aRyrEpbCU= -github.com/hashicorp/go-azure-helpers v0.10.0/go.mod h1:YuAtHxm2v74s+IjQwUG88dHBJPd5jL+cXr5BGVzSKhE= -github.com/hashicorp/go-azure-helpers v0.11.2/go.mod h1:YuAtHxm2v74s+IjQwUG88dHBJPd5jL+cXr5BGVzSKhE= -github.com/hashicorp/go-azure-helpers v0.12.0/go.mod h1:Zc3v4DNeX6PDdy7NljlYpnrdac1++qNW0I4U+ofGwpg= -github.com/hashicorp/go-azure-helpers v0.16.5/go.mod h1:kR7+sTDEb9TOp/O80ss1UEJg1t4/BHLD/U8wHLS4BGQ= github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs= -github.com/hashicorp/go-gatedio v0.5.0/go.mod h1:Lr3t8L6IyxD3DAeaUxGcgl2JnRUpWMCsmBl4Omu/2t4= -github.com/hashicorp/go-gcp-common v0.5.0/go.mod h1:IDGUI2N/OS3PiU4qZcXJeWKPI6O/9Y8hOrbSiMcqyYw= -github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= -github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= -github.com/hashicorp/go-getter v1.5.1/go.mod h1:a7z7NPPfNQpJWcn4rSWFtdrSldqLdLPEF3d8nFMsSLM= -github.com/hashicorp/go-getter v1.5.2/go.mod h1:orNH3BTYLu/fIxGIdLjLoAJHWMDQ/UKQr5O4m3iBuoo= -github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= -github.com/hashicorp/go-hclog v0.0.0-20181001195459-61d530d6c27f/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v0.9.1/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v0.10.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.13.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod h1:6ij3Z20p+OhOkCSrA0gImAWoHYQRGbnlcuk6XYTiaRw= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.1.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-memdb v1.0.2/go.mod h1:I6dKdmYhZqU0RJSheVEWgTNWdVQH5QvTgIUQ0t/t32M= +github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= 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-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= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-plugin v1.0.0/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= -github.com/hashicorp/go-plugin v1.0.1-0.20190610192547-a1bc61569a26/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= -github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= -github.com/hashicorp/go-plugin v1.2.0/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0= -github.com/hashicorp/go-plugin v1.2.2/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0= -github.com/hashicorp/go-plugin v1.3.0/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0= -github.com/hashicorp/go-plugin v1.4.0/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= -github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a/go.mod h1:xbXnmKqX9/+RhPkJ4zrEx4738HacP72aaUPlT2RZ4sU= -github.com/hashicorp/go-retryablehttp v0.5.2/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-retryablehttp v0.6.2/go.mod h1:gEx6HMUGxYYhJScX7W1Il64m6cc2C1mDaW3NQ9sY1FY= -github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= -github.com/hashicorp/go-slug v0.4.1/go.mod h1:I5tq5Lv0E2xcNXNkmx7BSfzi1PsJ2cNjs3cC3LwyhK8= -github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-tfe v0.3.27/go.mod h1:DVPSW2ogH+M9W1/i50ASgMht8cHP7NxxK0nrY9aFikQ= -github.com/hashicorp/go-tfe v0.8.1/go.mod h1:XAV72S4O1iP8BDaqiaPLmL2B4EE6almocnOn8E8stHc= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.2-0.20191001231223-f32f5fe8d6a8/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.4.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.5.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= +github.com/hashicorp/hc-install v0.4.0/go.mod h1:5d155H8EC5ewegao9A4PUTMNPZaq+TbOzkJJZ4vrXeI= github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/hcl/v2 v2.0.0/go.mod h1:oVVDG71tEinNGYCxinCYadcmKU9bglqW9pV3txagJ90= -github.com/hashicorp/hcl/v2 v2.1.0/go.mod h1:oVVDG71tEinNGYCxinCYadcmKU9bglqW9pV3txagJ90= -github.com/hashicorp/hcl/v2 v2.3.0/go.mod h1:d+FwDBbOLvpAM3Z6J7gPj/VoAGkNe/gm352ZhjJ/Zv8= -github.com/hashicorp/hcl/v2 v2.5.0/go.mod h1:bQTN5mpo+jewjJgh8jr0JUguIi7qPHUF6yIfAEN3jqY= -github.com/hashicorp/hcl/v2 v2.6.0/go.mod h1:bQTN5mpo+jewjJgh8jr0JUguIi7qPHUF6yIfAEN3jqY= -github.com/hashicorp/hcl/v2 v2.8.2/go.mod h1:bQTN5mpo+jewjJgh8jr0JUguIi7qPHUF6yIfAEN3jqY= -github.com/hashicorp/hcl2 v0.0.0-20190821123243-0c888d1241f6/go.mod h1:Cxv+IJLuBiEhQ7pBYGEuORa0nr4U994pE8mYLuFd7v0= -github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590/go.mod h1:n2TSygSNwsLJ76m8qFXTSc7beTb+auJxYdqrnoqwZWE= -github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93/go.mod h1:n2TSygSNwsLJ76m8qFXTSc7beTb+auJxYdqrnoqwZWE= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.0/go.mod h1:ncdBp14cuox2iFOq3kDiquKU6fqsTBc3W6JvZwjxxsE= +github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.1.4/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/nomad/api v0.0.0-20190412184103-1c38ced33adf/go.mod h1:BDngVi1f4UA6aJq9WYTgxhfWSE1+42xshvstLU2fRGk= -github.com/hashicorp/raft v1.0.1/go.mod h1:DVSAWItjLjTOkVbSpWQ0j0kUADIvDaCtBxIcbNAQLkI= -github.com/hashicorp/raft v1.1.2-0.20191002163536-9c6bd3e3eb17/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8= -github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk= -github.com/hashicorp/raft-snapshot v1.0.2-0.20190827162939-8117efcc5aab/go.mod h1:5sL9eUn72lH5DzsFIJ9jaysITbHksSSszImWSOTC8Ic= -github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod h1:h/Ru6tmZazX7WO/GDmwdpS975F019L4t5ng5IgwbNrE= +github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/serf v0.8.3/go.mod h1:UpNcs7fFbpKIyZaUuSW6EPiH+eZC7OuyFD+wc1oal+k= -github.com/hashicorp/terraform v0.12.21/go.mod h1:eJcloDEx5ywM4a1tetIuVrlqklM0bUVRYJBYAh4CYzA= -github.com/hashicorp/terraform v0.14.6/go.mod h1:sRTcqhXPHnxp/zjhVkxTYCiluMzUqV8IWikuglTrz6o= -github.com/hashicorp/terraform-config-inspect v0.0.0-20190821133035-82a99dc22ef4/go.mod h1:JDmizlhaP5P0rYTTZB0reDMefAiJyfWPEtugV4in1oI= -github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= -github.com/hashicorp/terraform-config-inspect v0.0.0-20191121111010-e9629612a215/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= -github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= -github.com/hashicorp/terraform-config-inspect v0.0.0-20200806211835-c481b8bfa41e/go.mod h1:Z0Nnk4+3Cy89smEbrq+sl1bxc9198gIP4I7wcQF6Kqs= -github.com/hashicorp/terraform-exec v0.1.1/go.mod h1:yKWvMPtkTaHpeAmllw+1qdHZ7E5u+pAZ+x8e2jQF6gM= -github.com/hashicorp/terraform-exec v0.3.0/go.mod h1:yKWvMPtkTaHpeAmllw+1qdHZ7E5u+pAZ+x8e2jQF6gM= -github.com/hashicorp/terraform-exec v0.10.0/go.mod h1:tOT8j1J8rP05bZBGWXfMyU3HkLi1LWyqL3Bzsc3CJjo= -github.com/hashicorp/terraform-exec v0.13.1/go.mod h1:vH84znKpolnS9NPiDh8xeFsZopfTHQpQKjbKbXLPVrE= -github.com/hashicorp/terraform-json v0.4.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU= -github.com/hashicorp/terraform-json v0.5.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU= -github.com/hashicorp/terraform-json v0.6.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU= -github.com/hashicorp/terraform-json v0.9.0/go.mod h1:3defM4kkMfttwiE7VakJDwCd4R+umhSQnvJwORXbprE= -github.com/hashicorp/terraform-plugin-sdk v1.0.0/go.mod h1:NuwtLpEpPsFaKJPJNGtMcn9vlhe6Ofe+Y6NqXhJgV2M= -github.com/hashicorp/terraform-plugin-sdk v1.1.0/go.mod h1:NuwtLpEpPsFaKJPJNGtMcn9vlhe6Ofe+Y6NqXhJgV2M= -github.com/hashicorp/terraform-plugin-sdk v1.1.1/go.mod h1:NuwtLpEpPsFaKJPJNGtMcn9vlhe6Ofe+Y6NqXhJgV2M= -github.com/hashicorp/terraform-plugin-sdk v1.4.0/go.mod h1:H5QLx/uhwfxBZ59Bc5SqT19M4i+fYt7LZjHTpbLZiAg= -github.com/hashicorp/terraform-plugin-sdk v1.6.0/go.mod h1:H5QLx/uhwfxBZ59Bc5SqT19M4i+fYt7LZjHTpbLZiAg= -github.com/hashicorp/terraform-plugin-sdk v1.7.0/go.mod h1:OjgQmey5VxnPej/buEhe+YqKm0KNvV3QqU4hkqHqPCY= -github.com/hashicorp/terraform-plugin-sdk v1.8.0/go.mod h1:OjgQmey5VxnPej/buEhe+YqKm0KNvV3QqU4hkqHqPCY= -github.com/hashicorp/terraform-plugin-sdk v1.9.0/go.mod h1:C/AXwmDHqbc3h6URiHpIsVKrwV4PS0Sh0+VTaeEkShw= -github.com/hashicorp/terraform-plugin-sdk v1.11.0/go.mod h1:HiWIPD/T9HixIhQUwaSoDQxo4BLFdmiBi/Qz5gjB8Q0= -github.com/hashicorp/terraform-plugin-sdk v1.12.0/go.mod h1:HiWIPD/T9HixIhQUwaSoDQxo4BLFdmiBi/Qz5gjB8Q0= -github.com/hashicorp/terraform-plugin-sdk v1.13.1/go.mod h1:HiWIPD/T9HixIhQUwaSoDQxo4BLFdmiBi/Qz5gjB8Q0= -github.com/hashicorp/terraform-plugin-sdk v1.14.0/go.mod h1:t62Xy+m7Zjq5tA2vrs8Wuo/TQ0sc9Mx9MjXL3+7MHBQ= -github.com/hashicorp/terraform-plugin-sdk v1.15.0/go.mod h1:PuFTln8urDmRM6mV0II6apOTsyG/iHkxp+5W11eJE58= -github.com/hashicorp/terraform-plugin-sdk v1.16.0/go.mod h1:5sVxrwW6/xzFhZyql+Q9zXCUEJaGWcBIxBbZFLpVXOI= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.0/go.mod h1:xOf85UtHJ0/9/EF3eKgZFlJ6feN8sDtjQRWRHhimCUw= -github.com/hashicorp/terraform-plugin-test v1.2.0/go.mod h1:QIJHYz8j+xJtdtLrFTlzQVC0ocr3rf/OjIpgZLK56Hs= -github.com/hashicorp/terraform-plugin-test v1.3.0/go.mod h1:QIJHYz8j+xJtdtLrFTlzQVC0ocr3rf/OjIpgZLK56Hs= -github.com/hashicorp/terraform-plugin-test v1.4.3/go.mod h1:UA7z/02pgqsRLut4DJIPm0Hjnj27uOvhi19c8kTqIfM= -github.com/hashicorp/terraform-plugin-test/v2 v2.0.0-20200724200815-faa9931ac59e/go.mod h1:C6VALgUlvaif+PnHyRGKWPTdQkMJK4NQ20VJolxZLI0= -github.com/hashicorp/terraform-plugin-test/v2 v2.1.2/go.mod h1:jerO5mrd+jVNALy8aiq+VZOg/CR8T2T1QR3jd6JKGOI= -github.com/hashicorp/terraform-provider-google v1.20.1-0.20200824213103-e32ba28ec398/go.mod h1:qc51ZGlewTr4W9ho2SxvlPETQmDyeN/kC27b1mTQuQw= -github.com/hashicorp/terraform-provider-google v1.20.1-0.20200922000057-78da461b151a/go.mod h1:4JrXtiICFM47r7o5k5wNOynNNog+L5L9PNCsfaKFheU= -github.com/hashicorp/terraform-provider-kubernetes v1.13.3/go.mod h1:XSLp2+OcV4wZQ6VhgHswDwz4LJwiwO1/vbJYKt+gqWg= -github.com/hashicorp/terraform-provider-vsphere v1.24.3/go.mod h1:FgcsrcPpnjLUO4XWpudYiBho9ETIXYRxVXWV7R3Iz6k= -github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg= -github.com/hashicorp/terraform-svchost v0.0.0-20191119180714-d2e4933b9136/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg= -github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg= -github.com/hashicorp/vault v0.10.4/go.mod h1:KfSyffbKxoVyspOdlaGVjIuwLobi07qD1bAbosPMpP0= -github.com/hashicorp/vault v1.3.0/go.mod h1:b06flBzBl5H4rWbHg/Hcbvos1vlklo50J05XqIS79Co= -github.com/hashicorp/vault-plugin-auth-alicloud v0.5.2-0.20190814210027-93970f08f2ec/go.mod h1:TYFfVFgKF9x92T7uXouI9rLPkNnyXo/KkNcj5t+mjdM= -github.com/hashicorp/vault-plugin-auth-azure v0.5.2-0.20190814210035-08e00d801115/go.mod h1:sRhTnkcbjJgPeES0ddCTq8S2waSakyMiWLUwO5J/Wjk= -github.com/hashicorp/vault-plugin-auth-centrify v0.5.2-0.20190814210042-090ec2ed93ce/go.mod h1:WstOCHERNbk2dblnY5MV9Qeh/hzTSQpVs5xPuyAzlBo= -github.com/hashicorp/vault-plugin-auth-cf v0.0.0-20190821162840-1c2205826fee/go.mod h1:zOag32+pm1R4FFNhXMLP506Oesjoai3gHEEpxqUaTr0= -github.com/hashicorp/vault-plugin-auth-gcp v0.5.1/go.mod h1:eLj92eX8MPI4vY1jaazVLF2sVbSAJ3LRHLRhF/pUmlI= -github.com/hashicorp/vault-plugin-auth-gcp v0.5.2-0.20190930204802-acfd134850c2/go.mod h1:j0hMnnTD44zXGQhLM1jarYDaTmSp6OPiOzgFQ6mNgzc= -github.com/hashicorp/vault-plugin-auth-jwt v0.5.2-0.20191010173058-65cf93bad3f2/go.mod h1:Ti2NPndKhSGpSL6gWg11n7TkmuI7318BIPeojayIVRU= -github.com/hashicorp/vault-plugin-auth-kubernetes v0.5.2-0.20190925162726-2e5b0b8184e6/go.mod h1:qkrONCr71ckSCTItJQ1j9uet/faieZJ5c7+GZugTm7s= -github.com/hashicorp/vault-plugin-auth-oci v0.0.0-20190904175623-97c0c0187c5c/go.mod h1:YAl51RsYRihPbSdnug1NsvutzbRVfrZ12FjEIvSiOTs= -github.com/hashicorp/vault-plugin-database-elasticsearch v0.0.0-20190814210117-e079e01fbb93/go.mod h1:N9XpfMXjeLHBgUd8iy4avOC4mCSqUC7B/R8AtCYhcfE= -github.com/hashicorp/vault-plugin-secrets-ad v0.6.1-0.20191108162300-8f4121d78b9c/go.mod h1:Nmxv/d6tFm0lr8gbFIF+Hj+0xYcBiyfEwX2FscpbhbQ= -github.com/hashicorp/vault-plugin-secrets-alicloud v0.5.2-0.20190814210129-4d18bec92f56/go.mod h1:hJ42zFd3bHyE8O2liBUG+VPY0JxdMrj51TOwVGViUIU= -github.com/hashicorp/vault-plugin-secrets-azure v0.5.2/go.mod h1:SBc53adxMmf+o8zqRbqYvq+nuSrz8OHYmgmPfxVMJEo= -github.com/hashicorp/vault-plugin-secrets-gcp v0.5.3-0.20191112195538-3c798536d157/go.mod h1:Sc+ba3kscakE5a/pi8JJhWvXWok3cpt1P77DApmUuDc= -github.com/hashicorp/vault-plugin-secrets-gcpkms v0.5.2-0.20190814210149-315cdbf5de6e/go.mod h1:5prAHuCcBiyv+xfGBviTVYeDQUhmQYN7WrxC2gMRWeQ= -github.com/hashicorp/vault-plugin-secrets-kv v0.5.2-0.20191017213228-e8cf7060a4d0/go.mod h1:H0VKQagsJoK9o2qpULMgbspuWVnFe3G4S/K7f0Dr8qY= -github.com/hashicorp/vault/api v1.0.1/go.mod h1:AV/+M5VPDpB90arloVX0rVDUIHkONiwz5Uza9HRtpUE= -github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q= -github.com/hashicorp/vault/api v1.0.5-0.20190730042357-746c0b111519/go.mod h1:i9PKqwFko/s/aihU1uuHGh/FaQS+Xcgvd9dvnfAvQb0= -github.com/hashicorp/vault/api v1.0.5-0.20190814205728-e9c5cd8aca98/go.mod h1:t4IAg1Is4bLUtTq8cGgeUh0I8oDRBXPk2bM1Jvg/nWA= -github.com/hashicorp/vault/api v1.0.5-0.20191017194845-99f7184d3326/go.mod h1:8vZ3PoohxqemJEi//WSVsaMKwwXyyfP8zt9KHgBVhKU= -github.com/hashicorp/vault/api v1.0.5-0.20191108162021-73e607235264/go.mod h1:Uf8LaHyrYsgVgHzO2tMZKhqRGlL3UJ6XaSwW2EA1Iqo= -github.com/hashicorp/vault/api v1.0.5-0.20191108163347-bdd38fca2cff/go.mod h1:Uf8LaHyrYsgVgHzO2tMZKhqRGlL3UJ6XaSwW2EA1Iqo= -github.com/hashicorp/vault/sdk v0.1.8/go.mod h1:tHZfc6St71twLizWNHvnnbiGFo1aq0eD2jGPLtP8kAU= -github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= -github.com/hashicorp/vault/sdk v0.1.14-0.20190730042320-0dc007d98cc8/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= -github.com/hashicorp/vault/sdk v0.1.14-0.20190814205504-1cad00d1133b/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= -github.com/hashicorp/vault/sdk v0.1.14-0.20190919081434-645ac174deeb/go.mod h1:wcxXjskBz2VmyZm4MKNoLCOqsQEKkyBAUIP2YBTJL1g= -github.com/hashicorp/vault/sdk v0.1.14-0.20191017211055-9bd3a27a36c4/go.mod h1:tXLVOeyErHGojiim3hA6DUSxcRisohZbpATIpln8JsE= -github.com/hashicorp/vault/sdk v0.1.14-0.20191108161836-82f2b5571044/go.mod h1:PcekaFGiPJyHnFy+NZhP6ll650zEw51Ag7g/YEa+EOU= -github.com/hashicorp/vault/sdk v0.1.14-0.20191112033314-390e96e22eb2/go.mod h1:PcekaFGiPJyHnFy+NZhP6ll650zEw51Ag7g/YEa+EOU= -github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= +github.com/hashicorp/terraform-exec v0.17.3/go.mod h1:+NELG0EqQekJzhvikkeQsOAZpsw0cv/03rbeQJqscAI= +github.com/hashicorp/terraform-json v0.14.0/go.mod h1:5A9HIWPkk4e5aeeXIBbkcOvaZbIYnAIkEyqP2pNSckM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A= -github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A= -github.com/hokaccha/go-prettyjson v0.0.0-20170213120834-e6b9231a2b1c/go.mod h1:pFlLw2CfqZiIBOx6BuCeRLCrfxBJipTY0nIOF/VbGcI= +github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68= github.com/hokaccha/go-prettyjson v0.0.0-20190818114111-108c894c2c0e/go.mod h1:pFlLw2CfqZiIBOx6BuCeRLCrfxBJipTY0nIOF/VbGcI= -github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214/go.mod h1:kj6hFWqfwSjFjLnYW5PK1DoxZ4O0uapwHRmd9jhln4E= -github.com/hooklift/iso9660 v1.0.0/go.mod h1:sOC47ru8lB0DlU0EZ7BJ0KCP5rDqOvx0c/5K5ADm8H0= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= 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.4/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= @@ -1437,41 +1314,103 @@ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= +github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/itchyny/astgen-go v0.0.0-20200519013840-cf3ea398f645/go.mod h1:296z3W7Xsrp2mlIY88ruDKscuvrkL6zXCNRtaYVshzw= github.com/itchyny/go-flags v1.5.0/go.mod h1:lenkYuCobuxLBAd/HGFE4LRoW8D3B6iXRQfWYJ+MNbA= github.com/itchyny/gojq v0.11.0/go.mod h1:my6D2qN2Sm6qa+/5GsPDUZlCWGR+U8Qsa9he76sudv0= +github.com/itchyny/gojq v0.12.8/go.mod h1:gE2kZ9fVRU0+JAksaTzjIlgnCa2akU+a1V0WXgJQN5c= +github.com/itchyny/timefmt-go v0.1.3/go.mod h1:0osSSCQSASBJMsIZnhAaF1C2fCBTJZXrnj37mG8/c+A= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= +github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= +github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= +github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= +github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= +github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= +github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk= +github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= +github.com/jackc/pgconn v1.8.1/go.mod h1:JV6m6b6jhjdmzchES0drzCcYcAHS1OPD5xu3OZ/lE2g= +github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= +github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= +github.com/jackc/pgconn v1.10.1/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= +github.com/jackc/pgconn v1.12.0/go.mod h1:ZkhRC59Llhrq3oSfrikvwQ5NaxYExr6twkdkMLaKono= +github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= +github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= +github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= +github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= +github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.2.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.3.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= +github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= +github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= +github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0= +github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po= +github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= +github.com/jackc/pgtype v1.7.0/go.mod h1:ZnHF+rMePVqDKaOfJVI4Q8IVvAQMryDlDkZnKOI75BE= +github.com/jackc/pgtype v1.8.0/go.mod h1:PqDKcEBtllAtk/2p6z6SHdXW5UB+MhE75tUol2OKexE= +github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= +github.com/jackc/pgtype v1.9.1/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgtype v1.11.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgx v3.2.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= -github.com/jackc/pgx v3.3.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= -github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= +github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= +github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= +github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= +github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA= +github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o= +github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= +github.com/jackc/pgx/v4 v4.11.0/go.mod h1:i62xJgdrtVDsnL3U8ekyrQXEwGNTRoG7/8r+CIdYfcc= +github.com/jackc/pgx/v4 v4.12.0/go.mod h1:fE547h6VulLPA3kySjfnSG/e2D861g/50JlVUa/ub60= +github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= +github.com/jackc/pgx/v4 v4.14.1/go.mod h1:RgDuE4Z34o7XE92RpLsvFiOEfrAUT0Xt2KxvX73W06M= +github.com/jackc/pgx/v4 v4.16.0/go.mod h1:N0A9sFdWzkw/Jy1lwoiB64F2+ugFZi987zRxcPez/wI= +github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.2.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= -github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2/go.mod h1:xkfESuHriIekR+4RoV+fu91j/CfnYM29Zi2tMFw5iD4= -github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f/go.mod h1:3J2qVK16Lq8V+wfiL2lPeDZ7UWMxk5LemerHa1p6N00= -github.com/jefferai/jsonx v1.0.0/go.mod h1:OGmqmi2tTeI/PS+qQfBDToLHHJIy/RMp24fPo8vFvoQ= +github.com/jcchavezs/porto v0.1.0/go.mod h1:fESH0gzDHiutHRdX2hv27ojnOVFco37hg1W6E9EZF4A= github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag= -github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= -github.com/jen20/awspolicyequivalence v1.1.0/go.mod h1:PV1fS2xyHhCLp83vbgSMFr2drM4GzG61wkz+k4pOG3E= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= -github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= +github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= +github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a/go.mod h1:xRskid8CManxVta/ALEhJha/pweKBaVG6fWgc0yH25s= -github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s= +github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c= +github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= +github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= 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-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 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= @@ -1480,16 +1419,18 @@ github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXL github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= github.com/joelanford/ignore v0.0.0-20210607151042-0d25dc18b62d h1:A2/B900ip/Z20TzkLeGRNy1s6J2HmH9AmGt+dHyqb4I= github.com/joelanford/ignore v0.0.0-20210607151042-0d25dc18b62d/go.mod h1:7HQupe4vyNxMKXmM5DFuwXHsqwMyglcYmZBtlDPIcZ8= +github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +github.com/jongio/azidext/go/azidext v0.4.0/go.mod h1:VrlpGde5B+pPbTUxnThE5UIQQkcebdr3jrC2MmlMVSI= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod h1:U+RSyWxWd04xTqnuOQxnai7XGS2PrPY2cfGoDKtMHjA= -github.com/joyent/triton-go v0.0.0-20190112182421-51ffac552869/go.mod h1:U+RSyWxWd04xTqnuOQxnai7XGS2PrPY2cfGoDKtMHjA= +github.com/josharian/txtarfs v0.0.0-20210218200122-0702f000015a/go.mod h1:izVPOvVRsHiKkeGCT6tYBNWyDVuzj9wAaBb5R9qamfw= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -1506,9 +1447,13 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= github.com/juju/errors v0.0.0-20180806074554-22422dad46e1/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= +github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= github.com/juju/testing v0.0.0-20190613124551-e81189438503/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/julz/importas v0.1.0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= +github.com/justinas/alice v1.2.0/go.mod h1:fN5HRH/reO/zrUflLfTN43t3vXvKzvZIENsNEe7i7qA= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/k8snetworkplumbingwg/network-attachment-definition-client v0.0.0-20191119172530-79f836b90111/go.mod h1:MP2HbArq3QT+oVp8pmtHNZnSnkhdkHtDnc7h6nJXmBU= github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.2.0 h1:0kE7xeGPeCL+wIkQ+Q8w6YtyGVQzxL1YFMZ5Z6wvHVU= github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.2.0/go.mod h1:gnArGo7sgDTOvqcLpyLvmCWdbHz8BbM50yBIs0oVRKE= @@ -1518,34 +1463,34 @@ github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uia github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= -github.com/katbyte/terrafmt v0.2.1-0.20200303174203-e6a3e82cb21b/go.mod h1:WRq5tDmK04tcYbEr400zAUWtOK0jix54e8YeHP3IoQg= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= +github.com/kdomanski/iso9660 v0.2.1 h1:IepyfCeEqx77rZeOM4XZgWB4XJWEF7Jp+1ehMTrSElg= +github.com/kdomanski/iso9660 v0.2.1/go.mod h1:LY50s7BlG+ES6V99oxYGd0ub9giLrKdHZb3LLOweBj0= +github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= +github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak= github.com/kevinburke/go-bindata v3.16.0+incompatible/go.mod h1:/pEEZ72flUW2p0yi30bslSp9YqD9pysLxunQDdb2CPM= -github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M= -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/kevinburke/ssh_config v1.1.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= 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/errcheck v1.6.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v0.0.0-20161130080628-0de1eaf82fa3/go.mod h1:jxZFDH7ILpTPQTk+E2s+z4CUas9lVNjIuKR4c5/zKgM= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.10.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.10.5/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.10.8/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -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.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= -github.com/klauspost/compress v1.13.1 h1:wXr2uRxZTJXHLly6qhJabee5JqIhTRoLBhDOA74hDEQ= github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/compress v1.13.5/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.14.2/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.14.4 h1:eijASRJcobkVtSt81Olfh7JX43osYLwy5krOJo6YEu4= +github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/pgzip v1.2.4/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= @@ -1557,57 +1502,67 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pty v1.0.0/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.4/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/krishicks/yaml-patch v0.0.10/go.mod h1:Sm5TchwZS6sm7RJoyg87tzxm2ZcKzdRE4Q7TjNhPrME= github.com/kshvakov/clickhouse v1.3.5/go.mod h1:DMzX7FxRymoNkVgizH0DWAL8Cur7wHLgx3MUnGwJqpE= github.com/kubernetes-sigs/kube-storage-version-migrator v0.0.0-20191127225502-51849bc15f17/go.mod h1:enH0BVV+4+DAgWdwSlMefG8bBzTfVMTr1lApzdLZ/cc= +github.com/kulti/thelper v0.5.1/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5exl2U= +github.com/kunwardeep/paralleltest v1.0.3/go.mod h1:vLydzomDFpk7yu5UX02RmP0H8QfRPOV/oFhWN85Mjb4= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/kyoh86/exportloopref v0.1.7/go.mod h1:h1rDl2Kdj97+Kwh4gdz3ujE7XHmH51Q0lUiZ1z4NLj8= +github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= +github.com/labstack/echo/v4 v4.1.17/go.mod h1:Tn2yRQL/UclUalpb5rPdXDevbkJ+lp/2svdyFBg6CHQ= +github.com/labstack/echo/v4 v4.6.1/go.mod h1:RnjgMWNDB9g/HucVWhQYNQP9PvbYf6adqftqryo7s9k= +github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= +github.com/ldez/gomoddirectives v0.2.2/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0= +github.com/ldez/tagliatelle v0.3.1/go.mod h1:8s6WJQwEYHbKZDsp/LjArytKOG8qaMrKQQ3mFukHs88= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/leonklingele/grouper v1.1.0/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is= github.com/lestrrat-go/strftime v1.0.1/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g= +github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod h1:EFUvBDay26dErnNb70Nd0/VW3tJiIbETBPTl9ATXQag= +github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/libvirt/libvirt-go v4.10.0+incompatible/go.mod h1:34zsnB4iGeOv7Byj6qotuW8Ya4v4Tr43ttjz/F0wjLE= +github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libvirt/libvirt-go v5.10.0+incompatible/go.mod h1:34zsnB4iGeOv7Byj6qotuW8Ya4v4Tr43ttjz/F0wjLE= -github.com/libvirt/libvirt-go-xml v4.10.0+incompatible/go.mod h1:oBlgD3xOA01ihiK5stbhFzvieyW+jVS6kbbsMVF623A= github.com/libvirt/libvirt-go-xml v5.10.0+incompatible/go.mod h1:oBlgD3xOA01ihiK5stbhFzvieyW+jVS6kbbsMVF623A= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod h1:QdfYv6y6qPA9pbBA2qXtoT8BMKha6UyNbxWGWl/9Jfk= -github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod h1:KKqSnk/VVSW8kEyO2vVCXoanzEutKdlBAPohmGXkxCk= -github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod h1:3kvONayqCaj+UgrRZGpgfXzHdMYCAO0KAt4/8n0L57Y= -github.com/likexian/gokit v0.20.15/go.mod h1:kn+nTv3tqh6yhor9BC4Lfiu58SmH8NmQ2PmEl+uM6nU= -github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod h1:Typ1BfnATYtZ/+/shXfFYLrovhFyuKvzwrdOnIDHlmg= -github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod h1:U4O1vIJvIKwbMZKUJ62lppfdvkCdVd2nfMimHK81eec= -github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod h1:3BWwtmKP9cXWwYCr5bkoVDEfLywacOv0s06OBEDpyt8= +github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= -github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod h1:y54tfGmO3NKssKveTEFFzH8C/akrSOy/iW9qEAUDV84= +github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= +github.com/magefile/mage v1.12.1/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/magiconair/properties v1.7.6/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.2/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -1620,17 +1575,15 @@ github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/manifoldco/promptui v0.8.0/go.mod h1:n4zTdgP0vr0S3w7/O/g98U+e0gwLScEXGwov2nIKuGQ= +github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg= github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= 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/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= -github.com/masterzen/winrm v0.0.0-20190223112901-5e5c9a7fe54b/go.mod h1:wr1VqkwW0AB5JS0QLy5GpVMS9E3VtRoSYXUYyVk46KY= -github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88/go.mod h1:a2HXwefeat3evJHxFXSayvRHpYEPJYtErl4uIzfaUqY= github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= -github.com/matoous/godox v0.0.0-20200801072554-4fb83dc2941e/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= +github.com/matoous/godox v0.0.0-20210227103229-6504466cf951/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= +github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA= +github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= @@ -1638,102 +1591,121 @@ github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-oci8 v0.0.7/go.mod h1:wjDx6Xm9q7dFtHJvIlrI99JytznLw5wQ4R+9mNXJwGI= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= -github.com/mattn/go-shellwords v1.0.4/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= -github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= +github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mattn/go-shellwords v1.0.11/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= +github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= -github.com/matttproud/golang_protobuf_extensions v1.0.0/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM= github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= -github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.0.0-20211201170610-92ffa60c683d h1:9OI6BoimJazW/mgT8GTaXnwMXC5WmXRwKmubpVQzPnQ= -github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.0.0-20211201170610-92ffa60c683d/go.mod h1:Q+r+xTc1jDcx/y61bVspJ9ANiAjJlsx/j+sL44mCB8w= +github.com/mbilski/exhaustivestruct v1.0.1/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= +github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= +github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.2.0 h1:SWZAojnNaja3+yLO74Etv//xkG60lFSKKEWR/FXqNgE= +github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.2.0/go.mod h1:Dck2B6BQX3L+AE2Xe+LzrVPP1A/zQkhCU/aSVbsi7Nw= +github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= +github.com/mgechev/revive v1.1.4/go.mod h1:ZZq2bmyssGh8MSPz3VVziqRNIMYTJXzP8MUKG90vZ9A= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= -github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU= -github.com/michaelklishin/rabbit-hole v0.0.0-20191008194146-93d9988f0cd5/go.mod h1:+pmbihVqjC3GPdfWv1V2TnRSuVvwrWLKfEP/MZVB/Wc= -github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= -github.com/miekg/dns v1.0.8/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/microcosm-cc/bluemonday v1.0.15/go.mod h1:ZLvAzeakRwrGnzQEvstVzVt3ZpqOF2+sdFr0Om+ce30= +github.com/microcosm-cc/bluemonday v1.0.18/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM= +github.com/microsoft/kiota-abstractions-go v0.10.1/go.mod h1:wOO+hpReDIJa3BxbLNz4qvtZk2llS555mejkMc203bQ= +github.com/microsoft/kiota-abstractions-go v0.11.0/go.mod h1:wOO+hpReDIJa3BxbLNz4qvtZk2llS555mejkMc203bQ= +github.com/microsoft/kiota-abstractions-go v0.12.0/go.mod h1:Y555rARnJ3qqIvZXwrvxscUQ+HNsO7fGhFUXe2UpSbk= +github.com/microsoft/kiota-abstractions-go v0.14.0/go.mod h1:/zQPz5M7868/bbN8D4tZHhnOE23Tcc/JBKSNwljOch4= +github.com/microsoft/kiota-authentication-azure-go v0.5.0/go.mod h1:1Io6h+88FlDRmrajdjSnXPz8oyObUVjNuQZLhrF9kQk= +github.com/microsoft/kiota-http-go v0.9.0/go.mod h1:F652dnY3jVNmwSk46qHXt+HeEbxLkbbn3dUi3lSLHws= +github.com/microsoft/kiota-serialization-json-go v0.7.2/go.mod h1:Ojum5prlijopyCOZ2XctRcVlE2pU8h+43r3tMdiWoDU= +github.com/microsoft/kiota-serialization-text-go v0.6.0/go.mod h1:OUA4dNH+f6afiJUs+rQAatJos7QVF5PJkyrqoD89lx4= +github.com/microsoftgraph/msgraph-sdk-go v0.47.0/go.mod h1:I2iR+gJmKiZZ8ebE8mKQEiKXpePAahAIazx3F1kL6og= +github.com/microsoftgraph/msgraph-sdk-go-core v0.30.1/go.mod h1:RyqsMRKmZADSA/feLQMcynQJRENMzKM/Wg4dgQ/lW+s= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= +github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37/go.mod h1:dYWq+UWoFCDY1TndvFUQuhBbIYmZpjreC8adEAx93zE= -github.com/minsikl/netscaler-nitro-go v0.0.0-20170827154432-5b14ce3643e3/go.mod h1:jh28TRFZwBumf7OjMQbRb8TNtDuuX7QNAGRjFEt+h6I= github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/cli v1.1.1/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/cli v1.1.2/go.mod h1:6iaV0fGdElS6dPBx0EApTxHrcWvmJphyh2n8YBLPPZ4= -github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.1.1/go.mod h1:EBArHfARyrSWO/+Wyr9zwEkc6XMFB9XyNgFNmRkZZU4= +github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod h1:OaY7UOoTkkrX3wRwjpYRKafIkkyeD0UtweSHAWWiqQM= github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= +github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= -github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/go-testing-interface v1.0.4/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= -github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4= github.com/mitchellh/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= 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/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= +github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= +github.com/moby/moby v20.10.17+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/sys/mountinfo v0.4.1 h1:1O+1cHA1aujwEwwVMa2Xm2l+gIpUHyd3+D+d7LZh1kM= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= +github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI= +github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod h1:TjQg8pa4iejrUrjiz0MCtMV38jdMNW4doKSiBrEvCQQ= github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= +github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= +github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA= +github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1742,15 +1714,20 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= +github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= +github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mozilla/scribe v0.0.0-20180711195314-fb71baf557c1/go.mod h1:FIczTrinKo8VaLxe6PWTPEXRXDIHz2QAwiaBaP5/4a8= github.com/mozilla/tls-observatory v0.0.0-20180409132520-8791a200eb40/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/mozilla/tls-observatory v0.0.0-20200317151703-4fa42e1c2dee/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= -github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISeBAdw6E61aqQma60= +github.com/mozilla/tls-observatory v0.0.0-20210609171429-7bc42856d2e5/go.mod h1:FUqVoUPHSEdDR0MnFM3Dh8AU0pZHLXUD127SAJGER/s= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mtrmac/gpgme v0.1.2/go.mod h1:GYYHnGSuS7HK3zVS2n3y73y0okK/BeKzwnn5jgiVFNI= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= @@ -1758,8 +1735,11 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo= +github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= +github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE= github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= @@ -1768,30 +1748,28 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= github.com/nbutton23/zxcvbn-go v0.0.0-20160627004424-a22cb81b2ecd/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= github.com/nbutton23/zxcvbn-go v0.0.0-20171102151520-eafdab6b0663/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= -github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= -github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= -github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= -github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q= +github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nishanths/exhaustive v0.0.0-20200708172631-8866003e3856/go.mod h1:wBEpHwM2OdmeNpdCvRPUlkEbBuaFmcK4Wv8Q7FuGW3c= -github.com/nishanths/exhaustive v0.0.0-20200811152831-6cf413ae40e0/go.mod h1:wBEpHwM2OdmeNpdCvRPUlkEbBuaFmcK4Wv8Q7FuGW3c= -github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= -github.com/nwaples/rardecode v1.0.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= +github.com/nishanths/exhaustive v0.1.0/go.mod h1:S1j9110vxV1ECdCudXRkeMnFQ/DQk9ajLT0Uf2MYZQQ= +github.com/nishanths/exhaustive v0.7.11/go.mod h1:gX+MP7DWMKJmNa1HfMozK+u04hQd3na9i0hyqf3/dOI= +github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ= +github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB9sbB1usJ+xjQE= +github.com/nutanix-cloud-native/prism-go-client v0.2.1-0.20220804130801-c8a253627c64 h1:s6XG+YzY6du/VXWdc+/rj8mj/ccEdqYSEHYrmwyZvVg= +github.com/nutanix-cloud-native/prism-go-client v0.2.1-0.20220804130801-c8a253627c64/go.mod h1:LD0OSxwLPjf375SCAIp70NQRbTPeqKKlM64vx03burs= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ= github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= +github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -1806,21 +1784,26 @@ github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1ls github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= -github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= 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.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= github.com/onsi/ginkgo/v2 v2.3.0/go.mod h1:Eew0uilEqZmIEZr8JrvYlvOM7Rr6xzTmMV8AyFNU9d0= github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw= -github.com/onsi/ginkgo/v2 v2.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc= -github.com/onsi/ginkgo/v2 v2.6.0/go.mod h1:63DOGlLAH8+REH8jUGdL3YpCpu7JODesutUjdENfUAc= +github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo= +github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= +github.com/onsi/ginkgo/v2 v2.9.0/go.mod h1:4xkjoL/tZv4SMWeww56BU5kAt19mVB47gTWxmrTcxyk= +github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo= +github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts= +github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= +github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k= 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= github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -1831,19 +1814,27 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= -github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuKHUCQ= 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.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= +github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= github.com/onsi/gomega v1.21.1/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc= github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ1tuM= github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= -github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= +github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM= +github.com/onsi/gomega v1.27.1/go.mod h1:aHX5xOykVYzWOV4WqQy0sy8BQptgukenXpCXfadcIAw= +github.com/onsi/gomega v1.27.3/go.mod h1:5vG284IBtfDAmDyrK+eGyZmUgUlmi+Wngqo557cZ6Gw= +github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= +github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= +github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= +github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= 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= @@ -1857,8 +1848,9 @@ github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59P 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 h1:opHZMaswlyxz1OuGpBE53Dwe4/xF7EZTY0A2L/FpCOg= github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= +github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= +github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= 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/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= @@ -1867,75 +1859,87 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.m github.com/opencontainers/selinux v1.5.2/go.mod h1:yTcKuYAh6R95iDpefGLQaPaRwJFwyzAJufJyiTt7s0g= 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= -github.com/openshift/api v0.0.0-20211201215911-5a82bae32e46 h1:/EZ9QZVWoh4ygjZOGvw88yef3UjDNm0+JkGAy4ddJ+Q= -github.com/openshift/api v0.0.0-20211201215911-5a82bae32e46/go.mod h1:RsQCVJu4qhUawxxDP7pGlwU3IA4F01wYm3qKEu29Su8= -github.com/openshift/baremetal-operator v0.0.0-20211201170610-92ffa60c683d h1:4KkYItiWENIs2bV6lKOcIMdWUnZJA+GWT9Us7z0P1UA= -github.com/openshift/baremetal-operator v0.0.0-20211201170610-92ffa60c683d/go.mod h1:p32F1DBUxfgd0JjM4rCuhJomFJokEoWR1Z/LZNL2LM8= -github.com/openshift/baremetal-operator/apis v0.0.0-20211201170610-92ffa60c683d h1:DHGXCvXWsPExutf3tgQYD4TVDSAOviLXO7Vnc42oXhw= -github.com/openshift/baremetal-operator/apis v0.0.0-20211201170610-92ffa60c683d/go.mod h1:CVSU+wS3oYrFJooMeiyDtTpatoXoKyXPE2YS5vT26vE= +github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= +github.com/openshift-online/ocm-sdk-go v0.1.205/go.mod h1:iOhkt/6nFp9v7hasdmGbYlR/YKeUoaZKq5ZBrtyKwKg= +github.com/openshift/api v0.0.0-20230615141659-a6fbaf36017d h1:CZTZCcFRz7R7rvJhA+mreIUBNzK9V4e9SUqA7CGRCRo= +github.com/openshift/api v0.0.0-20230615141659-a6fbaf36017d/go.mod h1:4VWG+W22wrB4HfBL88P40DxLEpSOaiBVxUnfalfJo9k= +github.com/openshift/assisted-image-service v0.0.0-20220301135350-10a987fbc261/go.mod h1:bH4+AsmPy8mQQvtgedBm2Crs93TDWeXEMlIPrlEMpjA= +github.com/openshift/assisted-image-service v0.0.0-20220506122314-2f689a1084b8/go.mod h1:bH4+AsmPy8mQQvtgedBm2Crs93TDWeXEMlIPrlEMpjA= +github.com/openshift/assisted-service v0.0.0-20220928142635-a40422bdea61/go.mod h1:gDfktPtvo5h5MknuZcSoKi7yr1IhrDqcCzBSfOn6P3A= +github.com/openshift/assisted-service/api v0.0.0-20220928142635-a40422bdea61/go.mod h1:KXLo37GRdMYq/8PHRbvWPW9AEZjLI3NdFCySAwBJfAQ= +github.com/openshift/assisted-service/models v0.0.0-20220928142635-a40422bdea61/go.mod h1:jTawnnM2LU/AzpZLYxPeXQy4qBRl5iwFo1bu3zrPv2s= +github.com/openshift/baremetal-operator v0.0.0-20230531194024-8dde0991ffdd h1:9qVjITISv7qK0vji9x1CJtiL0h85uzpZpClRUnQJ8tU= +github.com/openshift/baremetal-operator v0.0.0-20230531194024-8dde0991ffdd/go.mod h1:a8QUrKYaUzbVby9X7hAOx4gnbgHGQE8CKxj5lHlOHAo= +github.com/openshift/baremetal-operator/apis v0.0.0-20230531194024-8dde0991ffdd h1:Ey0/ZXOEPTWeWyypFuLmQVr6ACZFL+88wRIEEigDXwY= +github.com/openshift/baremetal-operator/apis v0.0.0-20230531194024-8dde0991ffdd/go.mod h1:yDY2x0vBph8L68TCL7GS/DxBkqoHn5bGO0k0bzVuDXY= github.com/openshift/build-machinery-go v0.0.0-20200211121458-5e3d6e570160/go.mod h1:1CkcsT3aVebzRBzVTSbiKSkJMsC/CASqxesfqEMfJEc= github.com/openshift/build-machinery-go v0.0.0-20200424080330-082bf86082cc/go.mod h1:1CkcsT3aVebzRBzVTSbiKSkJMsC/CASqxesfqEMfJEc= github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/build-machinery-go v0.0.0-20210702090207-9c7b89e8633a/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/build-machinery-go v0.0.0-20210806203541-4ea9b6da3a37/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= +github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= +github.com/openshift/build-machinery-go v0.0.0-20220720161851-9b4f0386f6b0/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= +github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0/go.mod h1:uUQ4LClRO+fg5MF/P6QxjMCb1C9f7Oh4RKepftDnEJE= github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5/go.mod h1:5rGmrkQ8DJEUXA+AR3rEjfH+HFyg4/apY9iCQFgvPfE= github.com/openshift/client-go v0.0.0-20201020074620-f8fd44879f7c/go.mod h1:yZ3u8vgWC19I9gbDMRk8//9JwG/0Sth6v7C+m6R8HXs= github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49/go.mod h1:9/jG4I6sh+5QublJpZZ4Zs/P4/QCXMsQQ/K/058bSB8= github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47/go.mod h1:u7NRAjtYVAKokiI9LouzTv4mhds8P4S1TwdVAfbjKSk= -github.com/openshift/client-go v0.0.0-20210331195552-cf6c2669e01f/go.mod h1:hHaRJ6vp2MRd/CpuZ1oJkqnMGy5eEnoAkQmKPZKcUPI= -github.com/openshift/client-go v0.0.0-20210409155308-a8e62c60e930/go.mod h1:uBPbAyIbjMuhPQy4NgF8q1alNGX2qA8bXIkAycsSDc0= github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142/go.mod h1:fjS8r9mqDVsPb5td3NehsNOAWa4uiFkYEfVZioQ2gH0= github.com/openshift/client-go v0.0.0-20210730113412-1811c1b3fc0e/go.mod h1:P1pjphFOgm/nYjmtouHGaSLGtdP25dQICJnYtcYhfEs= github.com/openshift/client-go v0.0.0-20210916133943-9acee1a0fb83/go.mod h1:iSeqKIqUKxVec3gV1kNvwS1tjDpzpdP134RimkLc3BE= github.com/openshift/client-go v0.0.0-20211025111749-96ca2abfc56c/go.mod h1:xigLF97kzy1PZuDsC0Lfu6GlzChRt62+2Ts/nG3sPHY= +github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3/go.mod h1:cwhyki5lqBmrT0m8Im+9I7PGFaraOzcYPtEz93RcsGY= +github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea/go.mod h1:+J8DqZC60acCdpYkwVy/KH4cudgWiFZRNOBeghCzdGA= +github.com/openshift/client-go v0.0.0-20220915152853-9dfefb19db2e/go.mod h1:e+TTiBDGWB3O3p3iAzl054x3cZDWhrZ5+jxJRCdEFkA= +github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c/go.mod h1:lFMO8mLHXWFzSdYvGNo8ivF9SfF6zInA8ZGw4phRnUE= github.com/openshift/cloud-credential-operator v0.0.0-20200316201045-d10080b52c9e/go.mod h1:iPn+uhIe7nkP5BMHe2QnbLtg5m/AIQ1xvz9s3cig5ss= github.com/openshift/cloud-credential-operator v0.0.0-20211129235416-c4ce9b8b79de h1:2cBFUe1OnaAvYsjTohhq7ZapVgFyYBc8MpitGXlQDUg= github.com/openshift/cloud-credential-operator v0.0.0-20211129235416-c4ce9b8b79de/go.mod h1:GcMnjE58xI6WOtD25uqCbjPdwyn3tvkWsgWsRLb2qLo= -github.com/openshift/cluster-api v0.0.0-20190805113604-f8de78af80fc/go.mod h1:mNsD1dsD4T57kV4/C6zTHke/Ro166xgnyyRZqkamiEU= -github.com/openshift/cluster-api-actuator-pkg v0.0.0-20190614215203-42228d06a2ca/go.mod h1:KNPaA64x3Ok7z538kvS2acwC5fEwvPfF0RdTx2geQEE= -github.com/openshift/cluster-api-provider-alibaba v0.0.0-20211123142315-d16daa4e6349/go.mod h1:vJHKJg2+CEt1wmawpkFrg1IRlgyeaaGtzz76IM/z2os= +github.com/openshift/cloud-provider-vsphere v1.19.1-0.20211222185833-7829863d0558/go.mod h1:bgZfB07YK1CBbJRkFE13BHG+k53Qq0IuQyrehZAbv7M= github.com/openshift/cluster-api-provider-aws v0.2.1-0.20201125052318-b85a18cbf338/go.mod h1:5XOJ+v/n/hivGNeZAMBz9W7FeE+JB311fB9dSfp6WlY= github.com/openshift/cluster-api-provider-azure v0.0.0-20210209143830-3442c7a36c1e/go.mod h1:9sNMP9s/axIL/iGLt87ZmTcrc1+P6gB6I2llyPnEWbg= -github.com/openshift/cluster-api-provider-baremetal v0.0.0-20210924143856-c2d3ece4da38/go.mod h1:TyotVVwHJhqcDfX/0MkCjLOh7y6+RshdurRIboZ0/Hk= +github.com/openshift/cluster-api-provider-baremetal v0.0.0-20220408122422-7a548effc26e/go.mod h1:Q5WzHV1JZw/XNRnXCo8JfyOSegL13a+lhV4sc44lpSI= github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200701112720-3a7d727c9a10/go.mod h1:wgkZrOlcIMWTzo8khB4Js2PoDJDlIUUdzCBm7BuDdqw= github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200713133651-5c8a640669ac/go.mod h1:XVYX9JE339nKbDDa/W481XD+1GTeqeaBm8bDPr7WE7I= github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200901173901-9056dbc8c9b9/go.mod h1:rcwAydGZX+z4l91wtOdbq+fqDwuo6iu0YuFik3UUc+8= github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20201002065957-9854f7420570/go.mod h1:7NRECVE26rvP1/fs1CbhfY5gsgnnFQNhb9txTFzWmUw= github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20201201000827-1117a4fc438c/go.mod h1:21N0wWjiTQypZ7WosEYhcGJHr9JoDR1RBFztE0NvdYM= -github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20210615203611-a02074e8d5bb/go.mod h1:KLZ9LTM+EPEny4VXWNbBkJndhfKakmlqafeOfC0jxXA= -github.com/openshift/cluster-api-provider-ibmcloud v0.0.0-20211008100740-4d7907adbd6b/go.mod h1:xkkPB22FMQyrv3G0HLobylRsosJP4Voi8Yojg5WEYrs= -github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20191219173431-2336783d4603/go.mod h1:7pQ9Bzha+ug/5zd+0ufbDEcnn2OnNlPwRwYrzhXk4NM= -github.com/openshift/cluster-api-provider-openstack v0.0.0-20211111204942-611d320170af/go.mod h1:FimmVt2+i/aNr73dnD/lPC0oiXk2lOyuLM6heOroY3M= -github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20211111151530-06177b773958/go.mod h1:flNUjvyEfjs63P+zkSaRr66N4QrM4FSoeDvDiBunyyM= -github.com/openshift/cluster-autoscaler-operator v0.0.0-20190521201101-62768a6ba480/go.mod h1:/XmV44Fh28Vo3Ye93qFrxAbcFJ/Uy+7LPD+jGjmfJYc= +github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20230203123120-e55e92c14b2c/go.mod h1:lApSDY9c9SRjLgLAnwMhyuENQRHR/o1yBtH6RG8GScw= +github.com/openshift/cluster-api-provider-openstack v0.0.0-20230503161017-b9a504cea2c0/go.mod h1:JsgVTPA6DTTJFLUkBeIWrR+iJXXHMXFMARZqveeQs0Y= +github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20220323121149-e3f2850dd519/go.mod h1:C7unCUThP8eqT4xQfbvg3oIDn2S9TYtb0wbBoH/SR2U= github.com/openshift/cluster-autoscaler-operator v0.0.1-0.20211120222321-da0812a49473 h1:c30BJDzc/9/MrC8c9w5xAzj1q27VgHo6OpigESkzFI4= github.com/openshift/cluster-autoscaler-operator v0.0.1-0.20211120222321-da0812a49473/go.mod h1:72ieWchfTx9U7UbQO47vhSXBoCi2IJGZhXoCezan4EM= +github.com/openshift/cluster-baremetal-operator v0.0.0-20220430051313-3131de324a8c/go.mod h1:+iP7LgsHpOwhPV7i2rUo5vO6ht7KL2maoaT/MqDFXFE= github.com/openshift/cluster-network-operator v0.0.0-20211123023629-88b7cdc9034e h1:Ea7lFYCPn3E5EpS2iIL0mpqjqd65Cd9Q6o/CrIJElCk= github.com/openshift/cluster-network-operator v0.0.0-20211123023629-88b7cdc9034e/go.mod h1:11oN1MofM4EY7D20lgjcOHvDA7Z10xvwcRtWusNJ8Fk= github.com/openshift/cluster-node-tuning-operator v0.0.0-20211115083052-29e877edbbf1 h1:/cqx/zmIMgESKU9DMTrt2yIlQj64KKbjxUccd+LI5gY= github.com/openshift/cluster-node-tuning-operator v0.0.0-20211115083052-29e877edbbf1/go.mod h1:dqV8T3W4aL6mImhSzvWGRYwDFj0pfSCjJZrKjGBOW2s= -github.com/openshift/hive/apis v0.0.0-20211217134024-32a93e12e129 h1:uzrVhFKlJUrP0/K1SdAZqqUXXZpm9WPsf4S8+2gXRKE= -github.com/openshift/hive/apis v0.0.0-20211217134024-32a93e12e129/go.mod h1:77ODrnaHiDlfbqQgvk5nUWuqf2AsGY/99QlfNTiqHwI= -github.com/openshift/installer v0.9.0-master.0.20211223163410-37c09290190e h1:0sy8NI61K15CVeBq9LAaZB0unR1/vR11AgWoH1JXiPs= -github.com/openshift/installer v0.9.0-master.0.20211223163410-37c09290190e/go.mod h1:w/pR/ZBiCHEiRYe6kZkpLpc3Ukca69gKBIoXzITCo9c= +github.com/openshift/custom-resource-status v1.1.1/go.mod h1:vklCbKGD2iT8h4L2nGFYBHHe8/DaXWPozOP12JXllqA= +github.com/openshift/custom-resource-status v1.1.2/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA= +github.com/openshift/generic-admission-server v1.14.1-0.20210422140326-da96454c926d/go.mod h1:m+wYlVQdnPe8JGqoKVpCYnFRIVraqC1SrUowQXh6XlA= +github.com/openshift/hive/apis v0.0.0-20220222213051-def9088fdb5a h1:E+XPJs/aVvYsrlJzo2ED38ZTR2RTNUlFMmOaFAAdMZg= +github.com/openshift/hive/apis v0.0.0-20220222213051-def9088fdb5a/go.mod h1:E1bgquRiwfugdArdecPbpYIrAdve5kTzMaJb0+8jMXI= +github.com/openshift/image-customization-controller v0.0.0-20220509123740-3ad18911d14d/go.mod h1:xKmC9cy3nTlOArhCSVBLsqy1rqwQTX4uU5+pTMgcmKo= +github.com/openshift/installer v0.9.0-master.0.20230306121016-3485fddca1c3 h1:wgQIdKWOHIvGSyKiMBqKk3xw3kRFBQoyzJf8PWyC4YU= +github.com/openshift/installer v0.9.0-master.0.20230306121016-3485fddca1c3/go.mod h1:jRa14fBY1JdxiUw5L7WQd43/5Q16SmtIq1Gs3GbfCSw= github.com/openshift/library-go v0.0.0-20191003152030-97c62d8a2901/go.mod h1:NBttNjZpWwup/nthuLbPAPSYC8Qyo+BBK5bCtFoyYjo= github.com/openshift/library-go v0.0.0-20200512120242-21a1ff978534/go.mod h1:2kWwXTkpoQJUN3jZ3QW88EIY1hdRMqxgRs2hheEW/pg= github.com/openshift/library-go v0.0.0-20200909173121-1d055d971916/go.mod h1:6vwp+YhYOIlj8MpkQKkebTTSn2TuYyvgiAFQ206jIEQ= github.com/openshift/library-go v0.0.0-20200911100307-610c6e9e90b8/go.mod h1:NI6xOQGuTnLXeHW8Z2glKSFhF7X+YxlAlqlBMaK0zEM= github.com/openshift/library-go v0.0.0-20201109112824-093ad3cf6600/go.mod h1:1xYaYQcQsn+AyCRsvOU+Qn5z6GGiCmcblXkT/RZLVfo= +github.com/openshift/library-go v0.0.0-20201203122949-352bc2d14339/go.mod h1:1xYaYQcQsn+AyCRsvOU+Qn5z6GGiCmcblXkT/RZLVfo= github.com/openshift/library-go v0.0.0-20201215165635-4ee79b1caed5/go.mod h1:udseDnqxn5ON8i+NBjDp00fBTK0JRu1/6Y6tf6EivDE= github.com/openshift/library-go v0.0.0-20210205203934-9eb0d970f2f4/go.mod h1:udseDnqxn5ON8i+NBjDp00fBTK0JRu1/6Y6tf6EivDE= -github.com/openshift/library-go v0.0.0-20210408164723-7a65fdb398e2/go.mod h1:pnz961veImKsbn7pQcuFbcVpCQosYiC1fUOjzEDeOLU= github.com/openshift/library-go v0.0.0-20210708173104-7e7d216ed91c/go.mod h1:87ZYjEncF0YNUKNzncb8Fiw8yFNevpIWZW83C/etzpw= github.com/openshift/library-go v0.0.0-20210811133500-5e31383de2a7/go.mod h1:3GagmGg6gikg+hAqma7E7axBzs2pjx4+GrAbdl4OYdY= github.com/openshift/library-go v0.0.0-20210930103404-8911cacccb05/go.mod h1:b1cKE6TuNqjl7wT0y3W4g0qREuab1mH6WOJm9pT8L/A= -github.com/openshift/machine-api-operator v0.0.0-20190312153711-9650e16c9880/go.mod h1:7HeAh0v04zQn1L+4ItUjvpBQYsm2Nf81WaZLiXTcnkc= +github.com/openshift/library-go v0.0.0-20211220195323-eca2c467c492/go.mod h1:4UQ9snU1vg53fyTpHQw3vLPiAxI8ub5xrc+y8KPQQFs= +github.com/openshift/library-go v0.0.0-20220121154930-b7889002d63e/go.mod h1:6AmNM4N4nHftckybV/U7bQW+5AvK5TW81ndSI6KEidw= +github.com/openshift/library-go v0.0.0-20220920133651-093893cf326b/go.mod h1:KPBAXGaq7pPmA+1wUVtKr5Axg3R68IomWDkzaOxIhxM= github.com/openshift/machine-api-operator v0.2.1-0.20200611014855-9a69f85c32dd/go.mod h1:6vMi+R3xqznBdq5rgeal9N3ak3sOpy50t0fdRCcQXjE= github.com/openshift/machine-api-operator v0.2.1-0.20200701225707-950912b03628/go.mod h1:cxjy/RUzv5C2T5FNl1KKXUgtakWsezWQ642B/CD9VQA= github.com/openshift/machine-api-operator v0.2.1-0.20200722104429-f4f9b84df9b7/go.mod h1:XDsNRAVEJtkI00e51SAZ/PnqNJl1zv0rHXSdl9L1oOY= @@ -1943,25 +1947,24 @@ github.com/openshift/machine-api-operator v0.2.1-0.20200926044412-b7d860f8074c/g github.com/openshift/machine-api-operator v0.2.1-0.20201002104344-6abfb5440597/go.mod h1:+oAfoCl+TUd2TM79/6NdqLpFUHIJpmqkKdmiHe2O7mw= github.com/openshift/machine-api-operator v0.2.1-0.20201203125141-79567cb3368e/go.mod h1:Vxdx8K+8sbdcGozW86hSvcVl5JgJOqNFYhLRRhEM9HY= github.com/openshift/machine-api-operator v0.2.1-0.20210104142355-8e6ae0acdfcf/go.mod h1:U5eAHChde1XvtQy3s1Zcr7ll4X7heb0SzYpaiAwxmQc= -github.com/openshift/machine-api-operator v0.2.1-0.20210504014029-a132ec00f7dd/go.mod h1:DFZBMPtC2TYZH5NE9+2JQIpbZAnruqc9F26QmbOm9pw= -github.com/openshift/machine-api-operator v0.2.1-0.20210820103535-d50698c302f5/go.mod h1:ko7xmso6c25h9UL6Ai0I5l+6OgyVf+ebinAYXnwlGNg= -github.com/openshift/machine-api-operator v0.2.1-0.20211102083422-ee77ca7b9fd1/go.mod h1:8kWuB/zhnlBsNOyD1yz0epINZX5IodG3Z4iDwQrYKx0= github.com/openshift/machine-api-operator v0.2.1-0.20211111133920-c8bba3e64310/go.mod h1:8kWuB/zhnlBsNOyD1yz0epINZX5IodG3Z4iDwQrYKx0= +github.com/openshift/machine-api-operator v0.2.1-0.20211223185609-7ba373c29f8f/go.mod h1:RZsxoa6VEvLU/qIlA7/vX/1FJM6ikTrA9gsSaB5xVaQ= +github.com/openshift/machine-api-operator v0.2.1-0.20220331125846-eb5fce743ada/go.mod h1:kNbTDhr7z6uwF2wkUTJyLY6VfFXGpQ8DPwyGHOFrdig= +github.com/openshift/machine-api-operator v0.2.1-0.20220930152820-30825f121cc5/go.mod h1:4RAdph8vOsZNlts1xK8ZuEUKOko4E7qe9HeM1rMFyC0= +github.com/openshift/machine-api-operator v0.2.1-0.20230110071516-a99a63b99440/go.mod h1:Ukp3b4mbpU2SlDMc9c2uwUChmUNKUIK/MAgqarEel0o= +github.com/openshift/machine-api-provider-ibmcloud v0.0.0-20230124105206-50aa171a52e1/go.mod h1:UDA+gKaUSWbZsKbUbzybyaIqdksOQF5iKc+OsYnHL9k= github.com/openshift/machine-config-operator v0.0.0/go.mod h1:4IzikyGmUVQwlohScKeaAr5n2YzcWXkZvTMGGxDcU2Q= github.com/openshift/machine-config-operator v0.0.1-0.20210514234214-c415ce6aed25/go.mod h1:LC0tawtxYlQ94QiIMOZ68Q+B3xEO8Vq3FIn+srfm4mE= github.com/openshift/machine-config-operator v0.0.1-0.20211201165713-c533e61a9e4f h1:7DZAfMct9CYhjj7EyTTLfMGdE9RefMg6FkLJxwZxYhE= github.com/openshift/machine-config-operator v0.0.1-0.20211201165713-c533e61a9e4f/go.mod h1:zF2UGtp8GWQ9ggyIDYYkUwGKOxm1VXN3p9t1/ijX6DM= github.com/openshift/runtime-utils v0.0.0-20200415173359-c45d4ff3f912/go.mod h1:0OXNy7VoqFexkxKqyQbHJLPwn1MFp1/CxRJAgKHM+/o= github.com/openshift/runtime-utils v0.0.0-20210722191527-8b8348d80d1d/go.mod h1:H2kQ7bM4oYJk8G+N9ybDDlTg45V10G/+h2xL8zmjjHU= -github.com/openshift/terraform-provider-aws v1.60.1-0.20211215220004-24df6d73af46/go.mod h1:T4V1hyevFAuS/Bt3dh90ncYdyh2LVXYNK0kN33NTSfc= -github.com/openshift/terraform-provider-ibm v1.26.2-openshift-2/go.mod h1:LnGKkV2HJUeJrIMMPK+/Ka6F+5JIy45mbEj9VpoHHqc= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= -github.com/openzipkin/zipkin-go v0.1.3/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= @@ -1974,34 +1977,34 @@ github.com/operator-framework/operator-lifecycle-manager v0.19.1/go.mod h1:Wyy6a github.com/operator-framework/operator-registry v1.17.5 h1:LR8m1rFz5Gcyje8WK6iYt+gIhtzqo52zMRALdmTYHT0= github.com/operator-framework/operator-registry v1.17.5/go.mod h1:sRQIgDMZZdUcmHltzyCnM6RUoDF+WS8Arj1BQIARDS8= github.com/operator-framework/operator-sdk v0.5.1-0.20190301204940-c2efe6f74e7b/go.mod h1:iVyukRkam5JZa8AnjYf+/G3rk7JI1+M6GsU0sq0B9NA= -github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= -github.com/ory/dockertest v3.3.4+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= +github.com/ory/dockertest/v3 v3.9.1/go.mod h1:42Ir9hmvaAPm0Mgibk6mBPi7SFvTXxEcnztDYOJ//uM= github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913/go.mod h1:J6OG6YJVEWopen4avK3VNQSnALmmjvniMmni/YFYAwc= +github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f/go.mod h1:J6OG6YJVEWopen4avK3VNQSnALmmjvniMmni/YFYAwc= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/ovirt/go-ovirt v0.0.0-20210308100159-ac0bcbc88d7c/go.mod h1:fLDxPk1Sf64DBYtwIYxrnx3gPZ1q0xPdWdI1y9vxUaw= -github.com/ovirt/terraform-provider-ovirt v0.99.1-0.20211019085223-db1ac552ec57/go.mod h1:wnTGn9+USQJ51TMV5brymzjxUfmYmnOQZuNfYeuqky8= -github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod h1:L3UMQOThbttwfYRNFOWLLVXMhk5Lkio4GGOtw5UrxS0= -github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk= -github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk= +github.com/ovirt/go-ovirt v0.0.0-20210809163552-d4276e35d3db/go.mod h1:Zkdj9/rW6eyuw0uOeEns6O3pP5G2ak+bI/tgkQ/tEZI= +github.com/ovirt/go-ovirt-client v0.9.0/go.mod h1:OkR+/CC42lprXXzml/nTDPYzWTiYePvuaN2Kb2xeLr0= +github.com/ovirt/go-ovirt-client-log/v2 v2.2.0/go.mod h1:mDoU3KIwftpsgZGzXGk5d2UEJYTY0bYMfg/GwPapXL0= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/jwt v1.10.0/go.mod h1:TKhllgThT7TOP5rGr2zMLKEDZRAgJfBbtKyVeRsNB9A= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= +github.com/paulmach/orb v0.1.3/go.mod h1:VFlX/8C+IQ1p6FTRRKzKoOPJnvEtA5G0Veuqwbu//Vk= github.com/pbnjay/strptime v0.0.0-20140226051138-5c05b0d668c9/go.mod h1:6Hr+C/olSdkdL3z68MlyXWzwhvwmwN7KuUFXGb3PoOk= -github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.1.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= -github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= @@ -2009,13 +2012,12 @@ github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoU github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4 v2.2.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4 v2.2.6+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pierrec/lz4 v2.3.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pin/tftp v2.1.0+incompatible/go.mod h1:xVpZOMCXTy+A5QMjEVN0Glwa1sUvaJhFXbr/aAxuxGY= github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= +github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ= +github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -2024,91 +2026,104 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/profile v1.3.0/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/xattr v0.4.1/go.mod h1:W2cGD0TBEus7MkUgv0tNZ9JutLtVO3cXu+IBRuHqnFs= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/polyfloyd/go-errorlint v0.0.0-20201006195004-351e25ade6e3/go.mod h1:wi9BfjxjF/bwiZ701TzmfKu6UKC357IOAtNr0Td0Lvw= +github.com/polyfloyd/go-errorlint v0.0.0-20211125173453-6d6d39c5bb8b/go.mod h1:wi9BfjxjF/bwiZ701TzmfKu6UKC357IOAtNr0Td0Lvw= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.1/go.mod h1:6gapUrK/U1TAN7ciCoNRIdVC5sbdBTUh1DKN0g6uH7E= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= 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= -github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= +github.com/proglottis/gpgme v0.1.1/go.mod h1:fPbW/EZ0LvwQtH8Hy7eixhp1eF3G39dtx7GUN+0Gmy0= 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.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.57.0 h1:dslXhV7NbAFID2fh0ZLMjodbMYuitiJzDEpYNOoyRrg= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.57.0/go.mod h1:tflNO6iwG09icVcOe2VfhC73fmtKSKT1aNXYnVtAumU= 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= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= +github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= 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/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= -github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= +github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= 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= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -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/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= +github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y= +github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20180612222113-7d6f385de8be/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190227231451-bbced9601137/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= 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.6/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= 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= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= +github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= +github.com/prometheus/statsd_exporter v0.15.0/go.mod h1:Dv8HnkoLQkeEjkIE4/2ndAA7WL1zHKK7WMqFQqu72rw= +github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/pseudomuto/protoc-gen-doc v1.3.2/go.mod h1:y5+P6n3iGrbKG+9O04V5ld71in3v/bX88wUwgt+U8EA= +github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= +github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4domFU579Ga6E61sB9VFNaniPVwJP5C4bBCu3wA= github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= -github.com/quasilyte/go-ruleguard v0.1.2-0.20200318202121-b00d7a75d3d8/go.mod h1:CGFX09Ci3pq9QZdj86B+VGIdNj4VyCo2iPOGS9esB/k= github.com/quasilyte/go-ruleguard v0.2.0/go.mod h1:2RT/tf0Ce0UDj5y243iWKosQogJd8+1G3Rs2fxmlYnw= +github.com/quasilyte/go-ruleguard v0.3.1-0.20210203134552-1b5a410e1cc8/go.mod h1:KsAh3x0e7Fkpgs+Q9pNLS5XpFSvYCEVl5gP9Pp1xp30= +github.com/quasilyte/go-ruleguard v0.3.15/go.mod h1:NhuWhnlVEM1gT1A4VJHYfy9MuYSxxwHgxWoPsn9llB4= +github.com/quasilyte/go-ruleguard/dsl v0.3.0/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +github.com/quasilyte/go-ruleguard/dsl v0.3.12-0.20220101150716-969a394a9451/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +github.com/quasilyte/go-ruleguard/dsl v0.3.12/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +github.com/quasilyte/go-ruleguard/dsl v0.3.17/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= +github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= +github.com/quasilyte/go-ruleguard/rules v0.0.0-20211022131956-028d6511ab71/go.mod h1:4cgAphtvu7Ftv7vOT2ZOYhC6CvBxZixcasr8qIOTA50= +github.com/quasilyte/gogrep v0.0.0-20220103110004-ffaa07af02e3/go.mod h1:wSEyW6O61xRV6zb6My3HxrQ5/8ke7NE2OayqCHa3xRM= github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= -github.com/quasilyte/regex/syntax v0.0.0-20200805063351-8f842688393c/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= -github.com/rickb777/date v1.12.5-0.20200422084442-6300e543c4d9/go.mod h1:L8WrssTzvgYw34/Ppa0JpJfI7KKXZ2cVGI6Djt0brUU= -github.com/rickb777/plural v1.2.0/go.mod h1:UdpyWFCGbo3mvK3f/PfZOAOrkjzJlYN/sD46XNWJ+Es= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= @@ -2121,65 +2136,60 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.6.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= +github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351/go.mod h1:DCgfY80j8GYL7MLEfvcpSFvjD0L5yZq/aZUJmhZklyg= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryancurrah/gomodguard v1.1.0/go.mod h1:4O8tr7hBODaGE6VIhfJDHcwzh5GUccKSJBU0UMXJFVM= +github.com/ryancurrah/gomodguard v1.2.3/go.mod h1:rYbA/4Tg5c54mV1sv4sQTP5WOPBcoLtnBZ7/TEhXAbg= github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= -github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= -github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE= +github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= +github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= +github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHiuO9LYd+cIxzgEHCQI4= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/satori/uuid v0.0.0-20160927100844-b061729afc07/go.mod h1:B8HLsPLik/YNn6KKWVMDJ8nzCL8RP5WyfsnmvnAEwIU= -github.com/satori/uuid v1.2.0/go.mod h1:B8HLsPLik/YNn6KKWVMDJ8nzCL8RP5WyfsnmvnAEwIU= +github.com/savsgio/gotils v0.0.0-20210921075833-21a6215cb0e4/go.mod h1:oejLrk1Y/5zOF+c/aHtXqn3TFlzzbAgPWg8zBiAHDas= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdkkZBH4= +github.com/sebdah/goldie/v2 v2.5.3/go.mod h1:oZ9fp0+se1eapSRjfYbsV/0Hqhbuu3bJVvKI/NNtssI= github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= +github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/securego/gosec v0.0.0-20191002120514-e680875ea14d/go.mod h1:w5+eXa0mYznDkHaMCXA4XYffjlH+cy1oyKbfzJXa2Do= -github.com/securego/gosec/v2 v2.3.0/go.mod h1:UzeVyUXbxukhLeHKV3VVqo7HdoQR9MrRfFmZYotn8ME= github.com/securego/gosec/v2 v2.4.0/go.mod h1:0/Q4cjmlFDfDUj1+Fib61sc+U5IQb2w+Iv9/C3wPVko= +github.com/securego/gosec/v2 v2.10.0/go.mod h1:PVq8Ewh/nCN8l/kKC6zrGXSr7m2NmEK6ITIAWMtIaA0= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc= -github.com/shirou/gopsutil v2.19.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY= github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= +github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= -github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM= -github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= -github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= -github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI= -github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU= -github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag= -github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg= -github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw= -github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y= github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= -github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q= -github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ= -github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I= -github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0= -github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ= -github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk= -github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= -github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= @@ -2189,36 +2199,32 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/smartystreets/assertions v0.0.0-20180725160413-e900ae048470/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sivchari/containedctx v1.0.2/go.mod h1:PwZOeqm4/DLoJOqMSIJs3aKqXRX4YO+uXww087KZ7Bw= +github.com/sivchari/tenv v1.4.7/go.mod h1:5nF+bITvkebQVanjU6IuMbvIot/7ReNsUV7I5NbprB0= +github.com/slok/go-http-metrics v0.9.0/go.mod h1:VCio4Xl8m11JM/0Sl9265RdKyiMypzMo3w1M8xcZGtk= +github.com/slok/go-http-metrics v0.10.0/go.mod h1:lFqdaS4kWMfUKCSukjC47PdCeTk+hXDUVm8kLHRqJ38= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/assertions v1.1.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= -github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU= -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/softlayer/softlayer-go v1.0.3/go.mod h1:6HepcfAXROz0Rf63krk5hPZyHT6qyx2MNvYyHof7ik4= -github.com/softlayer/xmlrpc v0.0.0-20200409220501-5f089df7cb7e/go.mod h1:fKZCUVdirrxrBpwd9wb+lSoVixvpwAu8eHzbQB2tums= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= -github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE= -github.com/sourcegraph/go-diff v0.5.3/go.mod h1:v9JDtjCE4HHHCZGId75rg8gkKKa98RVjBcBGsVmMmak= -github.com/sourcegraph/go-diff v0.6.0/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= -github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= +github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.0/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.2.1/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.3.5/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.2.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.2/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= @@ -2227,6 +2233,7 @@ github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHN github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= +github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= @@ -2237,19 +2244,22 @@ github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA= +github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.0.2/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= +github.com/spf13/viper v1.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4= +github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= +github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= github.com/ssgreg/nlreturn/v2 v2.1.0/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= +github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= -github.com/stoewer/go-strcase v1.0.2/go.mod h1:eLfe5bL3qbL7ep/KafHzthxejrOF5J3xmt03uL5tzek= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= 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= @@ -2257,12 +2267,15 @@ github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5J 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/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/stew v0.0.0-20130812190256-80ef0842b48b/go.mod h1:yS/5aMz+lfJhykLjlAGbnhUhZIvVapOvtmk0MtzHktE= github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.1.4/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.2.3-0.20181224173747-660f15d67dbb/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.0/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= @@ -2271,59 +2284,50 @@ github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= 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/sylabs/release-tools v0.1.0/go.mod h1:pqP/z/11/rYMQ0OM/Nn7TxGijw7KfZwW9UolD/J1TUo= +github.com/sylabs/sif/v2 v2.3.2/go.mod h1:IrLX2pzmQ2O4qgv5iy3HdKJcBNYds9DTMd9Je8A9tX4= +github.com/sylvia7788/contextcheck v1.0.4/go.mod h1:vuPKJMQ7MQ91ZTqfdyreNKwZjyUg6KO+IebVyQDedZQ= 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= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tchap/go-patricia v2.3.0+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= -github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= +github.com/tdakkota/asciicheck v0.1.1/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tebeka/strftime v0.1.3/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIUJUJH6XQ= -github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4= -github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod h1:wk2XFUg6egk4tSDNZtXeKfe2G6690UVyt163PuUxBZk= -github.com/terraform-provider-openstack/terraform-provider-openstack v1.37.0/go.mod h1:tPCEc/DdR9fVX9rmcJiqa85oTG7BUb5Xc0bSY/aOTf8= -github.com/terraform-providers/terraform-provider-azuread v0.6.1-0.20191007035844-361c0a206ad4/go.mod h1:nIkEKBYPFXH/yU7mY7lK5Om6Krga/aMdD/B/OEJpWzc= -github.com/terraform-providers/terraform-provider-azuread v0.9.0/go.mod h1:sSDzB/8CD639+yWo5lZf+NJvGSYQBSS6z+GoET9IrzE= -github.com/terraform-providers/terraform-provider-azurerm v1.35.1-0.20191007093506-4b6a5b0c7b16/go.mod h1:N00ZH1STkxPcIuMgs8Pagr32PhXTXF5YN7PGrdammDg= -github.com/terraform-providers/terraform-provider-azurerm v1.44.1-0.20200911233120-57b2bfc9d42c/go.mod h1:vDv6JXP1AILPSbGX2ZyDfmHde+d54kFT6g6vCSsZL4Q= -github.com/terraform-providers/terraform-provider-azurestack v0.10.0/go.mod h1:J44/RLpDdRgyd8o6rI2e9SSnuaTlLA3BeTSIKB09i/8= -github.com/terraform-providers/terraform-provider-ignition v1.2.1/go.mod h1:tUlGVBhkz+z79iffnt7vKISS199MdPd85+l6SNpoS/s= -github.com/terraform-providers/terraform-provider-local v1.4.0/go.mod h1:nbnWkAjiiG0FHlsfYYMRfBwvDbo6eLjorQs/mmRGi14= -github.com/terraform-providers/terraform-provider-null v1.0.1-0.20191204185112-e5c592237f62/go.mod h1:RaAgicYv+oKLyZpaQB5BOkwL/t5WKYHQ+Q0kgMgXgR4= -github.com/terraform-providers/terraform-provider-openstack v1.15.0/go.mod h1:2aQ6n/BtChAl1y2S60vebhyJyZXBsuAI5G4+lHrT1Ew= -github.com/terraform-providers/terraform-provider-random v0.0.0-20190925200408-30dac3233094/go.mod h1:F4KE9YftuJyMiBth4W1kCrsyOHndtTjAmZ+ZzjqWY+4= -github.com/terraform-providers/terraform-provider-random v1.3.2-0.20190925210718-83518d96ae4f/go.mod h1:F4KE9YftuJyMiBth4W1kCrsyOHndtTjAmZ+ZzjqWY+4= -github.com/terraform-providers/terraform-provider-template v1.0.0/go.mod h1:/J+B8me5DCMa0rEBH5ic2aKPjhtpWNeScmxFJWxB1EU= -github.com/tetafro/godot v0.4.2/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0= -github.com/tetafro/godot v0.4.8/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0= +github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= +github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= +github.com/tetafro/godot v0.4.9/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0= +github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= +github.com/thedevsaddam/retry v0.0.0-20200324223450-9769a859cc6d/go.mod h1:2rz2mY+1qEXG47loLDkV+ZJHGFwmhax5rOTpP+5aR80= +github.com/thoas/go-funk v0.9.1/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= +github.com/thoas/go-funk v0.9.2/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w= +github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= +github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= +github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tombuildsstuff/giovanni v0.6.0/go.mod h1:Xu/XU+DiRrKTDoCnJNGuh9ysD0eJyi/zU/naFh2aN9I= -github.com/tombuildsstuff/giovanni v0.10.0/go.mod h1:WwPhFP2+WnhJzvPYDnsyBab2wOIksMX6xm+Tg+jVvKw= -github.com/tombuildsstuff/giovanni v0.12.0/go.mod h1:qJ5dpiYWkRsuOSXO8wHbee7+wElkLNfWVolcf59N84E= -github.com/tombuildsstuff/giovanni v0.15.1/go.mod h1:0TZugJPEtqzPlMpuJHYfXY6Dq2uLPrXf98D2XQSxNbA= +github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= +github.com/tomarrell/wrapcheck v0.0.0-20200807122107-df9e8bcb914d/go.mod h1:yiFB6fFoV7saXirUGfuK+cPtUh4NX/Hf5y2WC2lehu0= +github.com/tomarrell/wrapcheck/v2 v2.5.0/go.mod h1:68bQ/eJg55BROaRTbMjC7vuhL2OgfoG8bLp9ZyoBfyY= +github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= +github.com/tommy-muehle/go-mnd/v2 v2.5.0/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= -github.com/ugorji/go v1.1.2/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ugorji/go/codec v0.0.0-20190204201341-e444a5086c43/go.mod h1:iT03XoTwV7xq/+UGwKO3UbC1nNNlopQiY61beSdrtOA= -github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= -github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= @@ -2331,27 +2335,40 @@ github.com/ultraware/funlen v0.0.1/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lP github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= +github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= +github.com/uudashr/gocognit v1.0.5/go.mod h1:wgYz0mitoKOTysqxTDMOUXg+Jb5SvtihkfmugIZYpEA= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s= -github.com/valyala/fasthttp v1.12.0/go.mod h1:229t1eWu9UXTPmoUkbpN/fctKPBY4IJoFXQnxHGXy6E= -github.com/valyala/fasthttp v1.15.1/go.mod h1:YOKImeEosDdBPnxc0gy7INqi3m1zK6A+xl6TwOBhHCA= -github.com/valyala/fasthttp v1.22.0/go.mod h1:0mw2RjXGOzxf4NL2jni3gUQ7LfjjUSiG5sskOUUSEpU= +github.com/valyala/fasthttp v1.16.0/go.mod h1:YOKImeEosDdBPnxc0gy7INqi3m1zK6A+xl6TwOBhHCA= +github.com/valyala/fasthttp v1.30.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus= +github.com/valyala/fasthttp v1.31.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus= +github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/valyala/quicktemplate v1.1.1/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4= -github.com/valyala/quicktemplate v1.5.1/go.mod h1:v7yYWpBEiutDyNfVaph6oC/yKwejzVyTX/2cwwHxyok= -github.com/valyala/quicktemplate v1.6.2/go.mod h1:mtEJpQtUiBV0SHhMX6RtiJtqxncgrfmjcUy5T68X8TM= +github.com/valyala/quicktemplate v1.2.0/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4= +github.com/valyala/quicktemplate v1.6.3/go.mod h1:fwPzK2fHuYEODzJ9pkw0ipCPNHZ2tD5KW4lOuSdPKzY= +github.com/valyala/quicktemplate v1.7.0/go.mod h1:sqKJnoaOF88V07vkO+9FL8fb9uZg/VPSJnLYn+LmLk8= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/vbatts/tar-split v0.11.1/go.mod h1:LEuURwDEiWjRjwu46yU3KVGuUdVv/dcnpcEPSzR8z6g= +github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI= github.com/vbauerster/mpb/v5 v5.2.2/go.mod h1:W5Fvgw4dm3/0NhqzV8j6EacfuTe5SvnzBRwiXxDR9ww= github.com/vbauerster/mpb/v6 v6.0.3/go.mod h1:5luBx4rDLWxpA4t6I5sdeeQuZhqDxc+wr5Nqf35+tnM= github.com/vbauerster/mpb/v7 v7.0.3/go.mod h1:NXGsfPGx6G2JssqvEcULtDqUrxuuYs4llpv8W6ZUpzk= +github.com/vbauerster/mpb/v7 v7.3.2/go.mod h1:wfxIZcOJq/bG1/lAtfzMXcOiSvbqVi/5GX5WCSi+IsA= github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= +github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8/go.mod h1:dniwbG03GafCjFohMDmz6Zc6oCuiqgH6tGNyXTkHzXE= github.com/vincent-petithory/dataurl v0.0.0-20160330182126-9a301d65acbb/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U= github.com/vincent-petithory/dataurl v0.0.0-20191104211930-d1553a71de50/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U= +github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U= github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netlink v1.0.0/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= @@ -2360,20 +2377,22 @@ github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmF github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= -github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= -github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= -github.com/vmware/govmomi v0.22.2-0.20200523220130-61b30e20be49/go.mod h1:Y+Wq4lst78L85Ge/F8+ORXIWiKYqaro1vhAulACy9Lc= +github.com/vmware-tanzu/vm-operator-api v0.1.4-0.20201118171008-5ca641b0e126/go.mod h1:mubK0QMyaA2TbeAmGsu2GVfiqDFppNUAUqoMPoKFgzM= +github.com/vmware/govmomi v0.22.1/go.mod h1:Y+Wq4lst78L85Ge/F8+ORXIWiKYqaro1vhAulACy9Lc= github.com/vmware/govmomi v0.22.2/go.mod h1:Y+Wq4lst78L85Ge/F8+ORXIWiKYqaro1vhAulACy9Lc= -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/govmomi v0.27.4/go.mod h1:daTuJEcQosNMXYJOeku0qdBJP9SOLLWB3Mqz8THtv6o= github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk= +github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3/go.mod h1:CSBTxrhePCm0cmXNKDGeu+6bOQzpaEklfCqEpn89JWk= github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI= +github.com/vmware/vsphere-automation-sdk-go/lib v0.2.0/go.mod h1://FsAiCrr+T/Eq2Uxtq8UPVPbZWV7iLIvvXK17rsIxE= +github.com/vmware/vsphere-automation-sdk-go/runtime v0.2.0/go.mod h1:M6pTKDrJrPlVG++lboLRf0bDYc3TJ2fsR+KOoWXfCns= +github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.3.0/go.mod h1:k9tf91B5Ah7gkaM2s+Z6nATmn6gKmgt8AqJ8RUiKLfo= 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= github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= +github.com/xanzy/ssh-agent v0.3.1/go.mod h1:QIE4lCeL7nkC25x+yA3LBIYfwCc1TFziCtG7cBAac6w= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= @@ -2385,67 +2404,91 @@ github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b/go.mod h1:N2 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 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= +github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= -github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= +github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk= +github.com/yeya24/promlinter v0.1.1-0.20210918184747-d757024714a1/go.mod h1:rs5vtZzeBHqqMwXqFScncpCF6u06lezhZepno9AB1Oc= +github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= +github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/yujunz/go-getter v1.5.1-lite.0.20201201013212-6d9c071adddf/go.mod h1:bL0Pr07HEdsMZ1WBqZIxXj96r5LnFsY4LgPaPEGkw1k= +github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.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-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= -github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= -github.com/zclconf/go-cty v1.1.1/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= -github.com/zclconf/go-cty v1.2.1/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= -github.com/zclconf/go-cty v1.4.0/go.mod h1:nHzOclRkoj++EU9ZjSrZvRG0BXIWt8c7loYc0qXAFGQ= -github.com/zclconf/go-cty v1.6.1/go.mod h1:VDR4+I79ubFBGm1uJac1226K5yANQFHeauxPBoP54+o= -github.com/zclconf/go-cty v1.7.1/go.mod h1:VDR4+I79ubFBGm1uJac1226K5yANQFHeauxPBoP54+o= -github.com/zclconf/go-cty v1.8.1/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= +github.com/zclconf/go-cty v1.10.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= +github.com/zclconf/go-cty v1.11.0/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA= github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= -github.com/zclconf/go-cty-yaml v1.0.1/go.mod h1:IP3Ylp0wQpYm50IHK8OZWKMu6sPJIUgKa8XhiVHura0= -github.com/zclconf/go-cty-yaml v1.0.2/go.mod h1:IP3Ylp0wQpYm50IHK8OZWKMu6sPJIUgKa8XhiVHura0= +github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= +gitlab.com/bosi/decorder v0.2.1/go.mod h1:6C/nhLSbF6qZbYD8bRmISBwc6vcWdNsiIBkRvjJFrH0= gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE= +go.elastic.co/apm v1.15.0/go.mod h1:dylGv2HKR0tiCV+wliJz1KHtDyuD8SPe69oV7VyK6WY= +go.elastic.co/apm/module/apmhttp v1.15.0/go.mod h1:NruY6Jq8ALLzWUVUQ7t4wIzn+onKoiP5woJJdTV7GMg= +go.elastic.co/apm/module/apmlogrus v1.15.0/go.mod h1:mvs7soORJBrUyqNgj+9/5f8Z8//W1L849RkCF7Thhu0= +go.elastic.co/fastjson v1.1.0/go.mod h1:boNGISWMjQsUPy/t6yqt2/1Wx4YNPSe+mZjlyw9vKKI= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= -go.etcd.io/etcd v0.0.0-20190412021913-f29b1ada1971/go.mod h1:KSGwdbiFchh5KIC9My2+ZVl5/3ANcwohw50dpPwa2cw= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.etcd.io/etcd v0.0.0-20200513171258-e048e166ab9c/go.mod h1:xCI7ZzBfRuGgBXyXO6yfWfDmlWd35khcWpUa4L0xI/k= go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod h1:skWido08r9w6Lq/w70DO5XYIKMu4QFu1+4VsqLQuJy8= 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/api/v3 v3.5.5/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= +go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA= 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/pkg/v3 v3.5.5/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= +go.etcd.io/etcd/client/pkg/v3 v3.5.6/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= +go.etcd.io/etcd/client/pkg/v3 v3.5.7/go.mod h1:o0Abi1MK86iad3YrWhgUsbGx1pmTS+hrORWc2CamuhY= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= +go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU= go.etcd.io/etcd/client/v2 v2.305.5/go.mod h1:zQjKllfqfBVyVStbt4FaosoX2iYd8fV/GRy/PbowgP4= +go.etcd.io/etcd/client/v2 v2.305.7/go.mod h1:GQGT5Z3TBuAQGvgPfhR7VPySu/SudxmEkRq9BgzFU6s= 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/client/v3 v3.5.5/go.mod h1:aApjR4WGlSumpnJ2kloS75h6aHUmAyaPLjHMxpc7E7c= +go.etcd.io/etcd/client/v3 v3.5.7/go.mod h1:sOWmj9DZUMyAngS7QQwCyAXXAL6WhgTOPLNS/NabQgw= 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/pkg/v3 v3.5.5/go.mod h1:6ksYFxttiUGzC2uxyqiyOEvhAiD0tuIqSZkX3TyPdaE= +go.etcd.io/etcd/pkg/v3 v3.5.7/go.mod h1:kcOfWt3Ov9zgYdOiJ/o1Y9zFfLhQjylTgL4Lru8opRo= 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/raft/v3 v3.5.5/go.mod h1:76TA48q03g1y1VpTue92jZLr9lIHKUNcYdZOOGyx8rI= +go.etcd.io/etcd/raft/v3 v3.5.7/go.mod h1:TflkAb/8Uy6JFBxcRaH2Fr6Slm9mCPVdI2efzxY96yU= 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.etcd.io/etcd/server/v3 v3.5.5/go.mod h1:rZ95vDw/jrvsbj9XpTqPrTAB9/kzchVdhRirySPkUBc= +go.etcd.io/etcd/server/v3 v3.5.7/go.mod h1:gxBgT84issUVBRpZ3XkW1T55NjOb4vZZRI4wVvNhf4A= 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= @@ -2455,12 +2498,15 @@ go.mongodb.org/mongo-driver v1.3.4/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS go.mongodb.org/mongo-driver v1.4.2/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= go.mongodb.org/mongo-driver v1.4.3/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= go.mongodb.org/mongo-driver v1.4.4/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= +go.mongodb.org/mongo-driver v1.4.6/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= go.mongodb.org/mongo-driver v1.5.1/go.mod h1:gRXCHX4Jo7J0IJ1oDQyUxF7jfy19UfxniMS4xxMmUqw= go.mongodb.org/mongo-driver v1.7.1/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8= +go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= +go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= +go.mongodb.org/mongo-driver v1.8.0/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= +go.mongodb.org/mongo-driver v1.8.3/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= +go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403/go.mod h1:jHoPAGnDrCy6kaI2tAze5Prf0Nr0w/oNkROt2lw3n3o= go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= -go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= -go.opencensus.io v0.19.1/go.mod h1:gug0GbSHa8Pafr0d2urOSgoXHZ6x/RUlaiT0d9pqb4A= -go.opencensus.io v0.19.2/go.mod h1:NO/8qkisMZLZ1FCsKNqtJPwc8/TaclWyY0B6wcYNg9M= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -2477,10 +2523,12 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.2 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0/go.mod h1:9NiG9I2aHTKkcxqCILhjtyNA1QEiCjdBACv4IvrFQ+c= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1/go.mod h1:9NiG9I2aHTKkcxqCILhjtyNA1QEiCjdBACv4IvrFQ+c= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU= go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= +go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0/go.mod h1:78XhIg8Ht9vR4tbLNUhXsiOnE2HOuSeKAiAcoVQEpOY= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1/go.mod h1:Kv8liBeVNFkkkbilbgWRpV+wWuu+H5xdOT6HAgd30iw= @@ -2499,23 +2547,30 @@ go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16g go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x7ZTuYBr3sUk= go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4= go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/AzrK+kxfGqySM= +go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= +go.starlark.net v0.0.0-20190528202925-30ae18b8564f/go.mod h1:c1/X6cHgvdXj6pUlmWKMkuqRnW4K8x2vwt6JAaaircg= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.8.0 h1:CUhrE4N1rqSE6FM9ecihEjRkLQu8cDfgDyoOs83mEY4= go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= +go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= +go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= @@ -2523,36 +2578,30 @@ go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= go4.org v0.0.0-20191010144846-132d2879e1e9/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= go4.org v0.0.0-20200104003542-c7e774b10ea0/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= -golang.org/x/arch v0.0.0-20180920145803-b19384d3c130/go.mod h1:cYlCBUl1MsqxdiKgmc4uh7TxZfWSFLOGSRR090WDxt8= -golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= -golang.org/x/build v0.0.0-20190314133821-5284462c4bec/go.mod h1:atTaCNAy0f16Ah5aV1gMSwgiKVHwu/JncqDpuRr7lS4= +goji.io v2.0.2+incompatible/go.mod h1:sbqFwrtqZACxLBTQcdgVjFh54yGVCvwq8+w49MVMMIk= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20180608092829-8ac0e0d97ce4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -2560,31 +2609,44 @@ golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= +golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +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/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= 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= @@ -2598,11 +2660,10 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -2626,14 +2687,19 @@ golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hM golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= 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.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= 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/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= -golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= +golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= 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= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2642,15 +2708,12 @@ golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190228165749-92fc7df08ae7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -2658,7 +2721,6 @@ golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190502183928-7f726cade0ab/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= 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= @@ -2666,16 +2728,13 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL 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= -golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190930134127-c5a3c61f89f3/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -2692,10 +2751,9 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -2704,38 +2762,54 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226101413-39120d07d75e/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210913180222-943fd674d43e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/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-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 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-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220524220425-1d687d428aca/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= 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= -golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2752,10 +2826,17 @@ golang.org/x/oauth2 v0.0.0-20210615190721-d04028783cf1/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= +golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= +golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= +golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk= +golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec= +golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= +golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -2770,28 +2851,24 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= +golang.org/x/sync v0.2.0/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= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181021155630-eda9bb28ed51/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181218192612-074acd46bca6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190102155601-82a175fd1598/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2800,29 +2877,23 @@ golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190426135247-a129542de9ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -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-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-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= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -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-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= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190927073244-c990c680b611/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2831,8 +2902,10 @@ golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191020212454-3e7259c5e7c2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191110163157-d32e6e3b99c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2849,14 +2922,12 @@ golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2869,7 +2940,7 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2877,11 +2948,13 @@ golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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-20201204225414-ed752295db88/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= @@ -2889,56 +2962,98 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/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-20210906170528-6f6e22806c34/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-20210910150752-751e447fb3d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210915083310-ed5796bab164/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-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211001092434-39dca1131b70/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/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-20211025201205-69cdffdb9359/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-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211123173158-ef496fb156ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211213223007-03aa0b5f6827/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-20220111092808-5a964db01320/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-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/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-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/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-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/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-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/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= golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY= +golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= +golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915090833-1cbadb444a80/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -2947,16 +3062,22 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20170915040203-e531a2a1c15f/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2965,10 +3086,8 @@ golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190121143147-24cd39ecf745/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2976,16 +3095,19 @@ golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190221204921-83362c3779f5/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190307163923-6a08e3108db3/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190321232350-e250d351ecad/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190425222832-ad9eeb80039a/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190521203540-521d6ed310dd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -2998,15 +3120,18 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= -golang.org/x/tools v0.0.0-20190718200317-82a3ea8a504c/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190909030654-5b82db07426d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190916130336-e45ffcd953cc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190930201159-7c411dea38b0/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -3017,8 +3142,7 @@ golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191204011308-9611592c72f6/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -3029,16 +3153,14 @@ golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200214201135-548b770e2dfa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200321224714-0d839f3cf2ed/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200331202046-9d5940d49312/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200409170454-77362c5149f0/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200410194907-79a7a3126eef/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -3048,7 +3170,6 @@ golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200519015757-0d0afa43d58a/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200601175630-2caf76543d99/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200606014950-c42cb6316fb6/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200610160956-3e83d1e96d0e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -3056,67 +3177,84 @@ golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200616195046-dc31b401abb5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200624225443-88f3c62a19ff/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200625211823-6506e20df31f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200630154851-b2d8b0336632/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200701041122-1837592efa10/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200710042808-f1c4188a97a1/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200721032237-77f530d86f9a/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200706234117-b22de6825cf7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200731060945-b5fad4ed8dd6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200812195022-5ae4c3c160a0/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200827163409-021d7c6f1ec3/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200828161849-5deb26317202/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20200911153331-7ad463ce66dd/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201011145850-ed2f50202694/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201013201025-64a9e34f3752/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201020123448-f5c826d1900e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201028111035-eafbe7b904eb/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201028025901-8cd080b735b3/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201114224030-61ea331ec02b/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201230224404-63754364767c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210107193943-4ed967dd8eff/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1-0.20210205202024-ef80cdb6ec6d/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= +golang.org/x/tools v0.1.1-0.20210302220138-2ac05c832e1a/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= 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.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= +golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/tools v0.1.9-0.20211228192929-ee1ca4ffc4da/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/tools v0.1.9/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/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= +golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= +golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= +golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= -gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= +gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= 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-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= -google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= -google.golang.org/api v0.2.0/go.mod h1:IfRCZScioGtypHNTlz3gFk67J8uePVW7uDTBzXuIkhU= -google.golang.org/api v0.3.0/go.mod h1:IuvZyQh8jgscv8qWfQ4ABd8m7hEudgBFM/EdhA3BnXw= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.3.2/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.10.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= @@ -3124,18 +3262,13 @@ google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/ google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.21.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.23.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.26.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.31.0/go.mod h1:CL+9IBCa2WWU6gRuBWaKqGWLFFwbEUXkfeMkHLQWYWo= -google.golang.org/api v0.31.1-0.20200914161323-7b3b1fe2dc94/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.33.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.34.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= @@ -3152,40 +3285,46 @@ google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv 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/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= +google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= +google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= +google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= +google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= +google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= +google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= +google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= +google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= +google.golang.org/api v0.91.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= 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= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= 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/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= -google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= -google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= -google.golang.org/genproto v0.0.0-20190201180003-4b09977fb922/go.mod h1:L3J43x8/uS+qIUoksaLKe6OS3nUKxOKuIFz1sl2/jx4= +google.golang.org/genproto v0.0.0-20181107211654-5fc9ac540362/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= 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-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= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191203220235-3fa9dbf08042/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= @@ -3196,33 +3335,27 @@ google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200310143817-43be25429f5a/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200409111301-baae70f3302d/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200507105951-43844f6eee31/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200603110839-e855014d5736/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200608115520-7c474a2e3482/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200610104632-a5b850bcf112/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200626011028-ee7919e894b5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200711021454-869866162049/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200721032028-5044d0edf986/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200707001353-8e8330bf89df/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200815001618-f69a88009b70/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200827165113-ac2560b5e952/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200831141814-d751682dd103/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200911024640-645f7a48b24f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201102152239-715cce707fb0/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -3232,6 +3365,7 @@ google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= @@ -3252,21 +3386,44 @@ google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEc 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-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 h1:hrbNEivu7Zn1pxvHk6MBrq9iE22woVILTHqexqBxe6I= +google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= +google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220808131553-a91ffa7f803e h1:yXLYwnRRqNHIwwHZLiA9/aC9uieNrOF0owsijAiZJr8= +google.golang.org/genproto v0.0.0-20220808131553-a91ffa7f803e/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc= 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= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= @@ -3276,12 +3433,11 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.0/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= @@ -3294,12 +3450,19 @@ google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ 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/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= +google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= 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= @@ -3316,8 +3479,9 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.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= @@ -3329,7 +3493,8 @@ gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/djherbis/times.v1 v1.2.0/go.mod h1:AQlg6unIsrsCEdQYhTzERy542dz6SFdQFZFv6mUY0P8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= @@ -3338,32 +3503,24 @@ gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8 gopkg.in/go-playground/validator.v9 v9.30.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= gopkg.in/go-playground/validator.v9 v9.31.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw= -gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= +gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.61.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= -gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= -gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= -gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= -gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= +gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ldap.v2 v2.5.1/go.mod h1:oI0cpe/D7HRtBQl8aTg+ZmzFUAvu4lsv3eLXMLGFxWk= gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod h1:N1eN2tsCx0Ydtgjl4cqmbRCsY4/+z4cYDeqwZTk6zog= -gopkg.in/ory-am/dockertest.v3 v3.3.4/go.mod h1:s9mmoLkaGeAh97qygnNj4xWkiN7e1SKekYC6CovU+ek= -gopkg.in/resty.v1 v1.11.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/square/go-jose.v2 v2.3.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/src-d/go-billy.v4 v4.3.0/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk= +gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= @@ -3374,6 +3531,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.6/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -3386,15 +3544,23 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C 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/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0/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= +gorm.io/driver/mysql v1.3.2/go.mod h1:ChK6AHbHgDCFZyJp0F+BmVGb06PSIoh9uVYKAlRbb2U= +gorm.io/driver/postgres v1.3.1/go.mod h1:WwvWOuR9unCLpGWCL6Y3JOeBWvbKi6JLhayiVclSZZU= +gorm.io/driver/postgres v1.3.5/go.mod h1:EGCWefLFQSVFrHGy4J8EtiHCWX5Q8t0yz2Jt9aKkGzU= +gorm.io/driver/sqlite v1.3.1/go.mod h1:wJx0hJspfycZ6myN38x1O/AqLtNS6c5o9TndewFbELg= +gorm.io/driver/sqlserver v1.3.1/go.mod h1:w25Vrx2BG+CJNUu/xKbFhaKlGxT/nzRkhWCCoptX8tQ= +gorm.io/gorm v1.23.1/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= +gorm.io/gorm v1.23.4/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= +gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= 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= -grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= +gotest.tools/v3 v3.2.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A= helm.sh/helm/v3 v3.6.1/go.mod h1:mIIus8EOqj+obtycw3sidsR4ORr2aFDmXMSI3k+oeVY= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -3402,22 +3568,20 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.6/go.mod h1:pyyisuGw24ruLjrr1ddx39WE0y9OooInRzEYLhQB2YY= +honnef.co/go/tools v0.2.2/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= k8s.io/api v0.0.0-20181115043458-b799cb063522/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= -k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= -k8s.io/api v0.0.0-20190409092523-d687e77c8ae9/go.mod h1:FQEUn50aaytlU65qqBn/w+5ugllHwrBzKm7DzbnXdzE= -k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod h1:TBhBqb1AWbBQbW3XRusr7n7E4v2+5ZY8r8sAMnyFC5A= k8s.io/api v0.17.0/go.mod h1:npsyOePkeP0CPwyGfXDHxvypiYMJxBWAMpQxCaJ4ZxI= +k8s.io/api v0.17.4/go.mod h1:5qxx6vjmwUVG2nHQTKGlLts8Tbok8PzHl4vHtVFuZCA= k8s.io/api v0.18.0-beta.2/go.mod h1:2oeNnWEqcSmaM/ibSh3t7xcIqbkGXhzZdn4ezV9T4m0= k8s.io/api v0.18.0-rc.1/go.mod h1:ZOh6SbHjOYyaMLlWmB2+UOQKEWDpCnVEVpEyt7S2J9s= k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8= k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= k8s.io/api v0.18.3/go.mod h1:UOaMwERbqJMfeeeHc8XJKawj4P9TgDRnViIqqBeH2QA= k8s.io/api v0.19.0/go.mod h1:I1K45XlvTrDjmj5LoM5LuP/KYrhWbjUKT/SoPG0qTjw= -k8s.io/api v0.19.1/go.mod h1:+u/k4/K/7vp4vsfdT7dyl8Oxk1F26Md4g5F26Tu85PU= k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= +k8s.io/api v0.19.5/go.mod h1:yGZReuNa0vj56op6eT+NLrXJne0R0u9ktexZ8jdJzpc= 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= @@ -3432,9 +3596,23 @@ k8s.io/api v0.22.0-rc.0/go.mod h1:EUcKB6RvpW74HMRUSSNwpUzrIHBdGT1FeAvOV+txic0= k8s.io/api v0.22.0/go.mod h1:0AoXXqst47OI/L0oGKq9DG61dvGRPXs7X4/B7KyjBCU= 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.26.0 h1:IpPlZnxBpV1xl7TGk/X6lFtpgjgntCg8PJ+qrPHAC7I= +k8s.io/api v0.23.0/go.mod h1:8wmDdLBHBNxtOIytwLstXt5E9PddnZb0GaMcqsvDBpg= +k8s.io/api v0.23.1/go.mod h1:WfXnOnwSqNtG62Y1CdjoMxh7r7u9QXGCkA1u0na2jgo= +k8s.io/api v0.23.3/go.mod h1:w258XdGyvCmnBj/vGzQMj6kzdufJZVUwEM1U2fRJwSQ= +k8s.io/api v0.23.4/go.mod h1:i77F4JfyNNrhOjZF7OwwNJS5Y1S9dpwvb9iYRYRczfI= +k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8= +k8s.io/api v0.24.2/go.mod h1:AHqbSkTm6YrQ0ObxjO3Pmp/ubFF/KuM7jU+3khoBsOg= +k8s.io/api v0.24.3-rc.0/go.mod h1:jH15fEHDJYMFiiXfsmWVp0E6FZlsCGY/YP8oftaGdKQ= +k8s.io/api v0.25.0/go.mod h1:ttceV1GyV1i1rnmvzT3BST08N6nGt+dudGrquzVQWPk= +k8s.io/api v0.25.1/go.mod h1:hh4itDvrWSJsmeUc28rIFNri8MatNAAxJjKcQmhX6TU= +k8s.io/api v0.25.2/go.mod h1:qP1Rn4sCVFwx/xIhe+we2cwBLTXNcheRyYXwajonhy0= +k8s.io/api v0.25.6/go.mod h1:bVp01KUcl8VUHFBTJMOknWNo7XvR0cMbeTTuFg1zCUs= k8s.io/api v0.26.0/go.mod h1:k6HDTaIFC8yn1i6pSClSqIwLABIcLV9l5Q4EcngKnQg= +k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg= +k8s.io/api v0.27.1/go.mod h1:z5g/BpAiD+f6AArpqNjkY+cji8ueZDU/WV1jcj5Jk4E= +k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4= +k8s.io/api v0.27.3 h1:yR6oQXXnUEBWEWcvPWS0jQL575KoAboQPfJAuKNrw5Y= +k8s.io/api v0.27.3/go.mod h1:C4BNvZnQOF7JA/0Xed2S+aUyJSfTGkGFxLXz9MnpIpg= 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= @@ -3449,27 +3627,32 @@ k8s.io/apiextensions-apiserver v0.21.0/go.mod h1:gsQGNtGkc/YoDG9loKI0V+oLZM4ljRP k8s.io/apiextensions-apiserver v0.21.1/go.mod h1:KESQFCGjqVcVsZ9g0xX5bacMjyX5emuWcS2arzdEouA= k8s.io/apiextensions-apiserver v0.21.2/go.mod h1:+Axoz5/l3AYpGLlhJDfcVQzCerVYq3K3CvDMvw6X1RA= k8s.io/apiextensions-apiserver v0.21.3/go.mod h1:kl6dap3Gd45+21Jnh6utCx8Z2xxLm8LGDkprcd+KbsE= +k8s.io/apiextensions-apiserver v0.21.4/go.mod h1:OoC8LhI9LnV+wKjZkXIBbLUwtnOGJiTRE33qctH5CIk= k8s.io/apiextensions-apiserver v0.22.0-rc.0/go.mod h1:KSr+2VJ6ye8Fy50q7xHZ/Tw8vrRII82KIKbz9eUFmeo= k8s.io/apiextensions-apiserver v0.22.0/go.mod h1:+9w/QQC/lwH2qTbpqndXXjwBgidlSmytvIUww16UACE= k8s.io/apiextensions-apiserver v0.22.1/go.mod h1:HeGmorjtRmRLE+Q8dJu6AYRoZccvCMsghwS8XTUYb2c= 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.26.0 h1:Gy93Xo1eg2ZIkNX/8vy5xviVSxwQulsnUdQ00nEdpDo= +k8s.io/apiextensions-apiserver v0.23.0/go.mod h1:xIFAEEDlAZgpVBl/1VSjGDmLoXAWRG40+GsWhKhAxY4= +k8s.io/apiextensions-apiserver v0.23.1/go.mod h1:0qz4fPaHHsVhRApbtk3MGXNn2Q9M/cVWWhfHdY2SxiM= +k8s.io/apiextensions-apiserver v0.23.5/go.mod h1:ntcPWNXS8ZPKN+zTXuzYMeg731CP0heCTl6gYBxLcuQ= +k8s.io/apiextensions-apiserver v0.25.0/go.mod h1:3pAjZiN4zw7R8aZC5gR0y3/vCkGlAjCazcg1me8iB/E= +k8s.io/apiextensions-apiserver v0.25.2/go.mod h1:iRwwRDlWPfaHhuBfQ0WMa5skdQfrE18QXJaJvIDLvE8= k8s.io/apiextensions-apiserver v0.26.0/go.mod h1:7ez0LTiyW5nq3vADtK6C3kMESxadD51Bh6uz3JOlqWQ= +k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM= +k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ= +k8s.io/apiextensions-apiserver v0.27.3 h1:xAwC1iYabi+TDfpRhxh4Eapl14Hs2OftM2DN5MpgKX4= +k8s.io/apiextensions-apiserver v0.27.3/go.mod h1:BH3wJ5NsB9XE1w+R6SSVpKmYNyIiyIz9xAmBl8Mb+84= 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= -k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA= -k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= +k8s.io/apimachinery v0.17.4/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g= k8s.io/apimachinery v0.18.0-beta.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.18.0-rc.1/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.18.3/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= k8s.io/apimachinery v0.19.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.19.1/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= +k8s.io/apimachinery v0.19.5/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q= 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= @@ -3484,15 +3667,29 @@ k8s.io/apimachinery v0.22.0-rc.0/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxb k8s.io/apimachinery v0.22.0/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= k8s.io/apimachinery v0.22.2/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= -k8s.io/apimachinery v0.22.3/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= -k8s.io/apimachinery v0.26.0 h1:1feANjElT7MvPqp0JT6F3Ss6TWDwmcjLypwoPpEf7zg= +k8s.io/apimachinery v0.23.0/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc= +k8s.io/apimachinery v0.23.1/go.mod h1:SADt2Kl8/sttJ62RRsi9MIV4o8f5S3coArm0Iu3fBno= +k8s.io/apimachinery v0.23.3/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= +k8s.io/apimachinery v0.23.4/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= +k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= +k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apimachinery v0.24.3-rc.0/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= +k8s.io/apimachinery v0.25.1/go.mod h1:hqqA1X0bsgsxI6dXsJ4HnNTBOmJNxyPp8dw3u2fSHwA= +k8s.io/apimachinery v0.25.2/go.mod h1:hqqA1X0bsgsxI6dXsJ4HnNTBOmJNxyPp8dw3u2fSHwA= +k8s.io/apimachinery v0.25.6/go.mod h1:1S2i1QHkmxc8+EZCIxe/fX5hpldVXk4gvnJInMEb8D4= k8s.io/apimachinery v0.26.0/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= +k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= +k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM= +k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= +k8s.io/apimachinery v0.27.3 h1:Ubye8oBufD04l9QnNtW05idcOe9Z3GQN8+7PqmuVcUM= +k8s.io/apimachinery v0.27.3/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= 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= k8s.io/apiserver v0.18.3/go.mod h1:tHQRmthRPLUtwqsOnJJMoI8SW3lnoReZeE861lH8vUw= k8s.io/apiserver v0.19.0/go.mod h1:XvzqavYj73931x7FLtyagh8WibHpePJ1QwWrSJs2CLk= -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= @@ -3502,26 +3699,41 @@ k8s.io/apiserver v0.21.0/go.mod h1:w2YSn4/WIwYuxG5zJmcqtRdtqgW/J2JRgFAqps3bBpg= k8s.io/apiserver v0.21.1/go.mod h1:nLLYZvMWn35glJ4/FZRhzLG/3MPxAaZTgV4FJZdr+tY= k8s.io/apiserver v0.21.2/go.mod h1:lN4yBoGyiNT7SC1dmNk0ue6a5Wi6O3SWOIw91TsucQw= k8s.io/apiserver v0.21.3/go.mod h1:eDPWlZG6/cCCMj/JBcEpDoK+I+6i3r9GsChYBHSbAzU= +k8s.io/apiserver v0.21.4/go.mod h1:SErUuFBBPZUcD2nsUU8hItxoYheqyYr2o/pCINEPW8g= k8s.io/apiserver v0.22.0-rc.0/go.mod h1:1AfFSkRbaPVFzfSIWd0m/onp49mmAOqXR9qrLJFixlw= k8s.io/apiserver v0.22.0/go.mod h1:04kaIEzIQrTGJ5syLppQWvpkLJXQtJECHmae+ZGc/nc= 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.23.1/go.mod h1:Bqt0gWbeM2NefS8CjWswwd2VNAKN6lUKR85Ft4gippY= +k8s.io/apiserver v0.23.5/go.mod h1:7wvMtGJ42VRxzgVI7jkbKvMbuCbVbgsWFT7RyXiRNTw= +k8s.io/apiserver v0.24.2/go.mod h1:pSuKzr3zV+L+MWqsEo0kHHYwCo77AT5qXbFXP2jbvFI= +k8s.io/apiserver v0.24.3-rc.0/go.mod h1:ncA+FP0AIol0mykLTyo/ND2hocXyJf59DNOitz+l/0E= +k8s.io/apiserver v0.25.0/go.mod h1:BKwsE+PTC+aZK+6OJQDPr0v6uS91/HWxX7evElAH6xo= +k8s.io/apiserver v0.25.1/go.mod h1:IB1EhM28U3cCrV+VNC06p1/YSZMCNYiH+P5sI5yLaZY= +k8s.io/apiserver v0.25.2/go.mod h1:30r7xyQTREWCkG2uSjgjhQcKVvAAlqoD+YyrqR6Cn+I= k8s.io/apiserver v0.26.0/go.mod h1:aWhlLD+mU+xRo+zhkvP/gFNbShI4wBDHS33o0+JGI84= +k8s.io/apiserver v0.26.1/go.mod h1:wr75z634Cv+sifswE9HlAo5FQ7UoUauIICRlOE+5dCg= +k8s.io/apiserver v0.27.2/go.mod h1:EsOf39d75rMivgvvwjJ3OW/u9n1/BmUMK5otEOJrb1Y= +k8s.io/apiserver v0.27.3/go.mod h1:Y61+EaBMVWUBJtxD5//cZ48cHZbQD+yIyV/4iEBhhNA= 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= k8s.io/cli-runtime v0.20.0/go.mod h1:C5tewU1SC1t09D7pmkk83FT4lMAw+bvMDuRxA7f0t2s= k8s.io/cli-runtime v0.20.6/go.mod h1:JVERW478qcxWrUjJuWQSqyJeiz9QC4T6jmBznHFBC8w= k8s.io/cli-runtime v0.21.0-rc.0/go.mod h1:Gp9Njd5Z9IayPHKL8AKVVMrdzHrMHN+WnGMHYC7Lsds= k8s.io/cli-runtime v0.21.0/go.mod h1:XoaHP93mGPF37MkLbjGVYqg3S1MnsFdKtiA/RZzzxOo= +k8s.io/cli-runtime v0.21.4/go.mod h1:eRbLHYkdVWzvG87yrkgGd8CqX6/+fAG9DTdAqTXmlRY= 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.26.0 h1:lT1D3OfO+wIi9UFolCrifbjUUgu7CpLca0AD8ghRLI8= -k8s.io/client-go v0.26.0/go.mod h1:I2Sh57A79EQsDmn7F7ASpmru1cceh3ocVT9KlX2jEZg= -k8s.io/cluster-bootstrap v0.0.0-20190202014938-c9acc0c1bea2/go.mod h1:iBSm2nwo3OaiuW8VDvc3ySDXK5SKfUrxwPvBloKG7zg= +k8s.io/cli-runtime v0.23.0/go.mod h1:B5N3YH0KP1iKr6gEuJ/RRmGjO0mJQ/f/JrsmEiPQAlU= +k8s.io/cli-runtime v0.25.1/go.mod h1:JSzAcqIK3JK7Ab/TY0PENKhmEg/HboNWK3VKiwsYB6E= +k8s.io/cli-runtime v0.25.6/go.mod h1:mspX5g+K3RbhNs12mPqH+ZlPfclaJIRpQvdogKOH+6o= +k8s.io/client-go v0.27.3 h1:7dnEGHZEJld3lYwxvLl7WoehK6lAq7GvgjxpA3nv1E8= +k8s.io/client-go v0.27.3/go.mod h1:2MBEKuTo6V1lbKy3z1euEGnhPfGZLKTS9tiJ2xodM48= +k8s.io/cloud-provider v0.23.1/go.mod h1:kI8AnYwOSru5Bci8pPUWwV5kJMVkY1ICOp1p8KKZWpc= +k8s.io/cluster-bootstrap v0.21.4/go.mod h1:GtXGuiEtdV4XQJcscR6qQCm/vtQWkhUi3qnl9KL9jzw= +k8s.io/cluster-bootstrap v0.23.1/go.mod h1:p2732QxwSa13WPemmyIeykk16qVw15W7lgNRB6x7NpY= 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= k8s.io/code-generator v0.17.0/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= k8s.io/code-generator v0.18.0-beta.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/code-generator v0.18.0-rc.1/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= @@ -3529,8 +3741,8 @@ k8s.io/code-generator v0.18.0/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRV k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/code-generator v0.18.3/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= k8s.io/code-generator v0.19.0/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk= -k8s.io/code-generator v0.19.1/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk= k8s.io/code-generator v0.19.2/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk= +k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= k8s.io/code-generator v0.20.0/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg= k8s.io/code-generator v0.20.1/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg= k8s.io/code-generator v0.20.6/go.mod h1:i6FmG+QxaLxvJsezvZp0q/gAEzzOz3U53KFibghWToU= @@ -3539,20 +3751,32 @@ k8s.io/code-generator v0.21.0/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHD k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/code-generator v0.21.2/go.mod h1:8mXJDCB7HcRo1xiEQstcguZkbxZaqeUOrO9SsicWs3U= k8s.io/code-generator v0.21.3/go.mod h1:K3y0Bv9Cz2cOW2vXUrNZlFbflhuPvuadW6JdnN6gGKo= +k8s.io/code-generator v0.21.4/go.mod h1:K3y0Bv9Cz2cOW2vXUrNZlFbflhuPvuadW6JdnN6gGKo= k8s.io/code-generator v0.22.0-rc.0/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= k8s.io/code-generator v0.22.0/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= k8s.io/code-generator v0.22.1/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= 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.23.1/go.mod h1:V7yn6VNTCWW8GqodYCESVo95fuiEg713S8B7WacWZDA= +k8s.io/code-generator v0.23.3/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk= +k8s.io/code-generator v0.23.5/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk= +k8s.io/code-generator v0.24.2/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= +k8s.io/code-generator v0.25.0/go.mod h1:B6jZgI3DvDFAualltPitbYMQ74NjaCFxum3YeKZZ+3w= +k8s.io/code-generator v0.25.1/go.mod h1:f61OcU2VqVQcjt/6TrU0sta1TA5hHkOO6ZZPwkL9Eys= +k8s.io/code-generator v0.25.2/go.mod h1:f61OcU2VqVQcjt/6TrU0sta1TA5hHkOO6ZZPwkL9Eys= +k8s.io/code-generator v0.25.6/go.mod h1:aDxzxJynLKQkaa117y0FFcgZ5jG8+GobxZ2JUntmvKk= k8s.io/code-generator v0.26.0/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I= +k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I= +k8s.io/code-generator v0.27.2/go.mod h1:DPung1sI5vBgn4AGKtlPRQAyagj/ir/4jI55ipZHVww= +k8s.io/code-generator v0.27.3/go.mod h1:DPung1sI5vBgn4AGKtlPRQAyagj/ir/4jI55ipZHVww= 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= k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM= k8s.io/component-base v0.18.3/go.mod h1:bp5GzGR0aGkYEfTj+eTY0AN/vXTgkJdQXjNTTVUaa3k= k8s.io/component-base v0.19.0/go.mod h1:dKsY8BxkA+9dZIAh2aWJLL/UdASFDNtGYTCItL4LM7Y= -k8s.io/component-base v0.19.1/go.mod h1:b0vDKYa8EdJJ8dHUA6fGPj4z8taqGks5mfZvp3p/jVo= k8s.io/component-base v0.19.2/go.mod h1:g5LrsiTiabMLZ40AR6Hl45f088DevyGY+cCE2agEIVo= +k8s.io/component-base v0.19.5/go.mod h1:5N/uv5A7fyr0d+t/b1HynXKkUVPEhc8ljkMaBJv4Tp8= 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.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= @@ -3561,14 +3785,26 @@ k8s.io/component-base v0.21.0/go.mod h1:qvtjz6X0USWXbgmbfXR+Agik4RZ3jv2Bgr5QnZzd k8s.io/component-base v0.21.1/go.mod h1:NgzFZ2qu4m1juby4TnrmpR8adRk6ka62YdH5DkIIyKA= k8s.io/component-base v0.21.2/go.mod h1:9lvmIThzdlrJj5Hp8Z/TOgIkdfsNARQ1pT+3PByuiuc= k8s.io/component-base v0.21.3/go.mod h1:kkuhtfEHeZM6LkX0saqSK8PbdO7A0HigUngmhhrwfGQ= +k8s.io/component-base v0.21.4/go.mod h1:ZKG0eHVX+tUDcaoIGpU3Vtk4TIjMddN9uhEWDmW6Nyg= k8s.io/component-base v0.22.0-rc.0/go.mod h1:DKSub/kewg24bK+3ZJ/csu86fSBYpGdYk837eCTvEKg= k8s.io/component-base v0.22.0/go.mod h1:SXj6Z+V6P6GsBhHZVbWCw9hFjUdUYnJerlhhPnYCBCg= k8s.io/component-base v0.22.1/go.mod h1:0D+Bl8rrnsPN9v0dyYvkqFfBeAd4u7n77ze+p8CMiPo= 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.26.0 h1:0IkChOCohtDHttmKuz+EP3j3+qKmV55rM9gIFTXA7Vs= +k8s.io/component-base v0.23.0/go.mod h1:DHH5uiFvLC1edCpvcTDV++NKULdYYU6pR9Tt3HIKMKI= +k8s.io/component-base v0.23.1/go.mod h1:6llmap8QtJIXGDd4uIWJhAq0Op8AtQo6bDW2RrNMTeo= +k8s.io/component-base v0.23.5/go.mod h1:c5Nq44KZyt1aLl0IpHX82fhsn84Sb0jjzwjpcA42bY0= +k8s.io/component-base v0.24.2/go.mod h1:ucHwW76dajvQ9B7+zecZAP3BVqvrHoOxm8olHEg0nmM= +k8s.io/component-base v0.24.3-rc.0/go.mod h1:Fwv2jZwQrKaeW7AikarrC4XjbU6BaGsJDejRO5sAED0= +k8s.io/component-base v0.25.0/go.mod h1:F2Sumv9CnbBlqrpdf7rKZTmmd2meJq0HizeyY/yAFxk= +k8s.io/component-base v0.25.1/go.mod h1:j78+TFdsKM8RXHfM88oeAdZu2v9qMZdQZOfg0LGW+q4= +k8s.io/component-base v0.25.2/go.mod h1:90W21YMr+Yjg7MX+DohmZLzjsBtaxQDDwaX4YxDkl60= +k8s.io/component-base v0.25.6/go.mod h1:k7DfcfJ8cOI6A2xTCfU5LxsnXV+lWw1ME8cRCHzIh6o= k8s.io/component-base v0.26.0/go.mod h1:lqHwlfV1/haa14F/Z5Zizk5QmzaVf23nQzCwVOQpfC8= -k8s.io/component-helpers v0.26.0/go.mod h1:jHN01qS/Jdj95WCbTe9S2VZ9yxpxXNY488WjF+yW4fo= +k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU= +k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo= +k8s.io/component-base v0.27.3/go.mod h1:JNiKYcGImpQ44iwSYs6dysxzR9SxIIgQalk4HaCNVUY= +k8s.io/component-helpers v0.27.3/go.mod h1:uxhXqoWHh4eBVcPj+LKWjtQq0V/vP5ihn4xmf5xNZso= +k8s.io/controller-manager v0.27.3/go.mod h1:dH5WQMqZOTHZdY8sTQRv1RkZRibaaDx7sncvejUUICc= 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= @@ -3581,13 +3817,14 @@ k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= @@ -3597,97 +3834,120 @@ k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= 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.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.90.0 h1:VkTxIV/FjRXn1fgNNcKGM8cfmL1Z33ZjXRTVxKCoF5M= k8s.io/klog/v2 v2.90.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= +k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kms v0.26.0/go.mod h1:ReC1IEGuxgfN+PDCIpR6w8+XMmDE7uJhxcCwMZFdIYc= +k8s.io/kms v0.26.1/go.mod h1:ReC1IEGuxgfN+PDCIpR6w8+XMmDE7uJhxcCwMZFdIYc= +k8s.io/kms v0.27.2/go.mod h1:dahSqjI05J55Fo5qipzvHSRbm20d7llrSeQjjl86A7c= +k8s.io/kms v0.27.3/go.mod h1:VDfnSIK0dk5J+jasbe+kKpb3CQVwlcDeBLyq59P2KyY= 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= -k8s.io/kube-aggregator v0.19.1/go.mod h1:oAj1kWeSDCh7sdzUOs6XXPn/jbzJY+yGGxDd0QyLJC8= k8s.io/kube-aggregator v0.19.2/go.mod h1:wVsjy6OTeUrWkgG9WVsGftnjpm8JIY0vJV7LH2j4nhM= k8s.io/kube-aggregator v0.20.0/go.mod h1:3Is/gzzWmhhG/rA3CpA1+eVye87lreBQDFGcAGT7gzo= -k8s.io/kube-aggregator v0.21.0-rc.0/go.mod h1:M+whOmsAeQf8ObJ0/eO9Af1Dz2UQEB9OW9BWmt9b2sU= k8s.io/kube-aggregator v0.21.0/go.mod h1:sIaa9L4QCBo9gjPyoGJns4cBjYVLq3s49FxF7m/1A0A= k8s.io/kube-aggregator v0.21.1/go.mod h1:cAZ0n02IiSl57sQSHz4vvrz3upQRMbytOiZnpPJaQzQ= 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.26.0 h1:XF/Q5FwdLmCsK1RKGFNWfIo/b+r63sXOu+KKcaIFa/M= -k8s.io/kube-aggregator v0.26.0/go.mod h1:QUGAvubVFZ43JiT2gMm6f15FvFkyJcZeDcV1nIbmfgk= +k8s.io/kube-aggregator v0.23.0/go.mod h1:b1vpoaTWKZjCzvbe1KXFw3vPbISrghJsg7/RI8oZUME= +k8s.io/kube-aggregator v0.24.2/go.mod h1:Ju2jNDixn+vqeeKEBfjfpc204bO1pbdXX0N9knCxeMQ= +k8s.io/kube-aggregator v0.25.0/go.mod h1:dfdl4aQkleiWK/U++UDLdDC8g2rsonhkB23zzUeBCgM= +k8s.io/kube-aggregator v0.27.3 h1:0o/Q30C84hHvhUef7OOTHMhO2eCySOPHKOUUrhBwpfo= +k8s.io/kube-aggregator v0.27.3/go.mod h1:zbx67NbFee9cqjbXjib89/oOyrXdOq3UYStIBGazv08= 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= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= -k8s.io/kube-openapi v0.0.0-20200831175022-64514a1d5d59/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= 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-20220124234850-424119656bbf/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= +k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= +k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661/go.mod h1:daOouuuwd9JXpv1L7Y34iV3yf6nxzipkKMWWlqlvK9M= +k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596/go.mod h1:/BYxry62FuDzmI+i9B+X2pqfySRmSOW2ARmj5Zbqhj0= -k8s.io/kube-openapi v0.0.0-20230228151317-19cbebb19cb7 h1:GGNnJLiG6Dk4o75ZHMD40IVsodq/s4kiR0Va5orFZco= -k8s.io/kube-openapi v0.0.0-20230228151317-19cbebb19cb7/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY= +k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY= +k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= +k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= 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= -k8s.io/kubectl v0.19.1/go.mod h1:jZM7qucrDpQu05OAoSJk0yRRHRZNydya40dILYh8ODc= k8s.io/kubectl v0.20.0/go.mod h1:8x5GzQkgikz7M2eFGGuu6yOfrenwnw5g4RXOUgbjR1M= k8s.io/kubectl v0.20.6/go.mod h1:yTCGVrlkBuQhFbKA1R65+lQ9hH7XeyOqUd0FUPFicPg= k8s.io/kubectl v0.21.0-rc.0/go.mod h1:eOKzb5p2/9pNzt2TQpVSzfB/41W6ZMm0JbJEIvyH08U= k8s.io/kubectl v0.21.0/go.mod h1:EU37NukZRXn1TpAkMUoy8Z/B2u6wjHDS4aInsDzVvks= +k8s.io/kubectl v0.21.4/go.mod h1:rRYB5HeScoGQKxZDQmus17pTSVIuqfm0D31ApET/qSM= 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/kubectl v0.23.0/go.mod h1:TfcGEs3u4dkmoC2eku1GYymdGaMtPMcaLLFrX/RB2kI= +k8s.io/kubectl v0.25.1/go.mod h1:ki8ymtGZau2M1lloUV2fqMxP9UCX/i0WIhnWTfqsGSY= +k8s.io/kubectl v0.25.6/go.mod h1:sqtVRxDlZdaSusmLVysYo8S7h4mB/Fe8YWvt2KCle3k= 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/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= k8s.io/metrics v0.20.0/go.mod h1:9yiRhfr8K8sjdj2EthQQE9WvpYDvsXIV3CjN4Ruq4Jw= k8s.io/metrics v0.20.6/go.mod h1:d+OAIaXutom9kGWcBit/M8OkDpIzBKTsm47+KcUt7VI= k8s.io/metrics v0.21.0-rc.0/go.mod h1:iCF67TNbrhChr/eb99uHt0H1hE7Rd1EC2Ic/yknzIE4= k8s.io/metrics v0.21.0/go.mod h1:L3Ji9EGPP1YBbfm9sPfEXSpnj8i24bfQbAFAsW0NueQ= +k8s.io/metrics v0.21.4/go.mod h1:uhWoVuVumUMSeCa1B1p2tm4Y4XuZIg0n24QEtB54wuA= 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.26.0 h1:U/NzZHKDrIVGL93AUMRkqqXjOah3wGvjSnKmG/5NVCs= -k8s.io/metrics v0.26.0/go.mod h1:cf5MlG4ZgWaEFZrR9+sOImhZ2ICMpIdNurA+D8snIs8= -k8s.io/utils v0.0.0-20190529001817-6999998975a7/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +k8s.io/metrics v0.23.0/go.mod h1:NDiZTwppEtAuKJ1Rxt3S4dhyRzdp6yUcJf0vo023dPo= +k8s.io/metrics v0.25.1/go.mod h1:/t3eughLPd1sQNc47py2vTOY8e1E8bIxecA8rq/qQjM= +k8s.io/metrics v0.25.6/go.mod h1:LGcsjMsQQvt/4vrvQzqOIHv9/sIVov1ZE7HtQxc8d9w= +k8s.io/metrics v0.27.3 h1:pBVKgQjfui8xzfTidIxiOmLHwcCk3KbeuWowo/Oh0t0= +k8s.io/metrics v0.27.3/go.mod h1:pXj63OTdOjpYgSc95p+88fB3t4krLybM7MOeqIksI6o= 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= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200327001022-6496210b90e8/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20200821003339-5e75c0163111/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= 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-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230115233650-391b47cb4029/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 h1:kmDqav+P+/5e1i9tFfHq1qcF3sOrDp+YEkVDAHu7Jwk= k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -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= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= -mvdan.cc/gofumpt v0.0.0-20200709182408-4fd085cb6d5f/go.mod h1:9VQ397fNXEnF84t90W4r4TRCQK+pg9f8ugVfyj+S26w= +mvdan.cc/editorconfig v0.2.0/go.mod h1:lvnnD3BNdBYkhq+B4uBuFFKatfp02eB6HixDvEz91C0= mvdan.cc/gofumpt v0.0.0-20200802201014-ab5a8192947d/go.mod h1:bzrjFmaD6+xqohD3KYP0H2FEuxknnBmyyOxdhLdaIws= +mvdan.cc/gofumpt v0.3.0/go.mod h1:0+VyGZWleeIj5oostkOex+nDBA0eyavuDnDusAJ8ylo= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= +mvdan.cc/sh/v3 v3.5.1/go.mod h1:1JcoyAKm1lZw/2bZje/iYKWicU/KMd0rsyJeKHnsK4E= mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34/go.mod h1:H6SUd1XjIs+qQCyskXg5OFSrilMRUkD8ePJpHKDPaeY= mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7/go.mod h1:HGC5lll35J70Y5v7vCGb9oLhHoScFwkHDJm/05RdSTc= +mvdan.cc/unparam v0.0.0-20211214103731-d0ef000c54e5/go.mod h1:b8RRCBm0eeiWR8cfN88xeq2G5SG3VKGO+5UPWi5FSOY= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/letsencrypt v0.0.3 h1:H7xDfhkaFFSYEJlKeq38RwX2jYcnTeHuDQyT+mMNMwM= rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY= @@ -3700,9 +3960,17 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyz sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.19/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.21/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= 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/apiserver-network-proxy/konnectivity-client v0.0.33/go.mod h1:soWkSNf2tZC7aMibXEqVhCd73GOY5fJikn8qbdzemB0= -sigs.k8s.io/controller-runtime v0.14.1 h1:vThDes9pzg0Y+UbCPY3Wj34CGIYPgdmspPm2GIpxpzM= -sigs.k8s.io/controller-runtime v0.14.1/go.mod h1:GaRkrY8a7UZF0kqFFbUKG7n9ICiTY5T55P1RiE3UZlU= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35/go.mod h1:WxjusMwXlKzfAs4p9km6XJRndVt2FROgMVCE4cdohFo= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0= +sigs.k8s.io/cluster-api v0.4.5/go.mod h1:KKycu4yJEm1sxKG5UaHX9ZnYxRiBzJsFjJVmvMQUP2k= +sigs.k8s.io/cluster-api/test v0.4.5/go.mod h1:QSthG8w6jaeNE9hwDxntAspluG8xPJFzi1ptSGoNNbw= +sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0UPojU= +sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk= +sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220907012636-c83076e9f792/go.mod h1:oiCXd8V7ZaS/wwvXKZ9pYkoU0BYM86CyEa0RvivM0nw= sigs.k8s.io/controller-tools v0.2.8/go.mod h1:9VKHPszmf2DHz/QmHkcfZoewO6BL7pPs9uAiBVsaJSE= sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= sigs.k8s.io/controller-tools v0.4.0/go.mod h1:G9rHdZMVlBDocIxGkK3jHLWqcTMNvveypYJwrvYKjWU= @@ -3712,8 +3980,11 @@ sigs.k8s.io/controller-tools v0.6.1/go.mod h1:U6O1RF5w17iX2d+teSXELpJsdexmrTb126 sigs.k8s.io/controller-tools v0.6.2/go.mod h1:oaeGpjXn6+ZSEIQkUe/+3I40PNiDYp9aeawbt3xTgJ8= sigs.k8s.io/controller-tools v0.6.3-0.20210916130746-94401651a6c3/go.mod h1:oaeGpjXn6+ZSEIQkUe/+3I40PNiDYp9aeawbt3xTgJ8= sigs.k8s.io/controller-tools v0.7.0/go.mod h1:bpBAo0VcSDDLuWt47evLhMLPxRPxMDInTEH/YbdeMK0= +sigs.k8s.io/controller-tools v0.10.0/go.mod h1:uvr0EW6IsprfB0jpQq6evtKy+hHyHCXNfdWI5ONPx94= sigs.k8s.io/gateway-api v0.6.1 h1:d/nIkhtbU0zVoFsriKi8lXwBYKNopz3EGeSwDqxeTRs= sigs.k8s.io/gateway-api v0.6.1/go.mod h1:EYJT+jlPWTeNskjV0JTki/03WX1cyAnBhwBJfYHpV/0= +sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= +sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= @@ -3724,16 +3995,32 @@ sigs.k8s.io/kube-storage-version-migrator v0.0.5 h1:PumtXIUB3BJ3LnTV/j+owQEybKR2 sigs.k8s.io/kube-storage-version-migrator v0.0.5/go.mod h1:igyHfaOB680DSAOk5x/8mcKk6t6y05AhSl7q+eV22NU= sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= +sigs.k8s.io/kustomize/api v0.7.4/go.mod h1:HkbVkf2FjT4G1iOFnPVsr013Af5RFD6dEJg/cUIWiM0= sigs.k8s.io/kustomize/api v0.8.5/go.mod h1:M377apnKT5ZHJS++6H4rQoCHmWtt6qTpp3mbe7p6OLY= +sigs.k8s.io/kustomize/api v0.8.8/go.mod h1:He1zoK0nk43Pc6NlV085xDXDXTNprtcyKZVm3swsdNY= sigs.k8s.io/kustomize/api v0.8.11/go.mod h1:a77Ls36JdfCWojpUqR6m60pdGY1AYFix4AH83nJtY1g= +sigs.k8s.io/kustomize/api v0.10.1/go.mod h1:2FigT1QN6xKdcnGS2Ppp1uIWrtWN28Ms8A3OZUZhwr8= +sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s= sigs.k8s.io/kustomize/api v0.13.1 h1:2jLAM6w5nGznnQgq2V0YUMFGtAixD2SO8Q+f5B9Un9U= sigs.k8s.io/kustomize/api v0.13.1/go.mod h1:KDhwElNK4jxc2/cEpFQOnYT/72t+ET7yeasogV89ow4= +sigs.k8s.io/kustomize/cmd/config v0.9.1/go.mod h1:HAoxw2o0Kwfdre4+xAQpgD0ljMzUZvLnqcpItqnqFlk= sigs.k8s.io/kustomize/cmd/config v0.9.7/go.mod h1:MvXCpHs77cfyxRmCNUQjIqCmZyYsbn5PyQpWiq44nW0= +sigs.k8s.io/kustomize/cmd/config v0.9.10/go.mod h1:Mrby0WnRH7hA6OwOYnYpfpiY0WJIMgYrEDfwOeFdMK0= sigs.k8s.io/kustomize/cmd/config v0.9.13/go.mod h1:7547FLF8W/lTaDf0BDqFTbZxM9zqwEJqCKN9sSR0xSs= +sigs.k8s.io/kustomize/cmd/config v0.10.2/go.mod h1:K2aW7nXJ0AaT+VA/eO0/dzFLxmpFcTzudmAgDwPY1HQ= +sigs.k8s.io/kustomize/cmd/config v0.10.9/go.mod h1:T0s850zPV3wKfBALA0dyeP/K74jlJcoP8Pr9ZWwE3MQ= +sigs.k8s.io/kustomize/kustomize/v3 v3.9.4/go.mod h1:WYtmBLKU5/hd/Xrrs04PoUC1A+Pp2NEQN262xKgNrn8= sigs.k8s.io/kustomize/kustomize/v4 v4.0.5/go.mod h1:C7rYla7sI8EnxHE/xEhRBSHMNfcL91fx0uKmUlUhrBk= +sigs.k8s.io/kustomize/kustomize/v4 v4.1.2/go.mod h1:PxBvo4WGYlCLeRPL+ziT64wBXqbgfcalOS/SXa/tcyo= sigs.k8s.io/kustomize/kustomize/v4 v4.2.0/go.mod h1:MOkR6fmhwG7hEDRXBYELTi5GSFcLwfqwzTRHW3kv5go= +sigs.k8s.io/kustomize/kustomize/v4 v4.4.1/go.mod h1:qOKJMMz2mBP+vcS7vK+mNz4HBLjaQSWRY22EF6Tb7Io= +sigs.k8s.io/kustomize/kustomize/v4 v4.5.7/go.mod h1:VSNKEH9D9d9bLiWEGbS6Xbg/Ih0tgQalmPvntzRxZ/Q= +sigs.k8s.io/kustomize/kyaml v0.10.9/go.mod h1:K9yg1k/HB/6xNOf5VH3LhTo1DK9/5ykSZO5uIv+Y/1k= sigs.k8s.io/kustomize/kyaml v0.10.15/go.mod h1:mlQFagmkm1P+W4lZJbJ/yaxMd8PqMRSC4cPcfUVt5Hg= +sigs.k8s.io/kustomize/kyaml v0.10.17/go.mod h1:mlQFagmkm1P+W4lZJbJ/yaxMd8PqMRSC4cPcfUVt5Hg= sigs.k8s.io/kustomize/kyaml v0.11.0/go.mod h1:GNMwjim4Ypgp/MueD3zXHLRJEjz7RvtPae0AwlvEMFM= +sigs.k8s.io/kustomize/kyaml v0.13.0/go.mod h1:FTJxEZ86ScK184NpGSAQcfEqee0nul8oLCK30D47m4E= +sigs.k8s.io/kustomize/kyaml v0.13.9/go.mod h1:QsRbD0/KcU+wdk0/L0fIp2KLnohkVzs6fQ85/nOXac4= sigs.k8s.io/kustomize/kyaml v0.14.0 h1:uzH0MzMtYypHW09LbMDk8k/lT/LSsUuCoZIuEGhIBNE= sigs.k8s.io/kustomize/kyaml v0.14.0/go.mod h1:AN1/IpawKilWD7V+YvQwRGUvuUOOWpjsHu6uHwonSF4= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= @@ -3745,8 +4032,9 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= 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/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= @@ -3754,7 +4042,6 @@ sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-admissionregistration/cmd/generate/generate.go index 2dc2bef54b2..a6e0f73c4d1 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/cmd/generate/generate.go +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/cmd/generate/generate.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" apimachineryversion "k8s.io/apimachinery/pkg/version" authenticationapi "k8s.io/api/authentication/v1" + authenticationv1beta1 "k8s.io/api/authentication/v1beta1" authenticationv1alpha1 "k8s.io/api/authentication/v1alpha1" v1beta1admission "k8s.io/api/admission/v1beta1" @@ -65,6 +66,7 @@ type Schema struct { TokenReview authenticationapi.TokenReview TokenRequest authenticationapi.TokenRequest + V1Beta1SelfSubjectReview authenticationv1beta1.SelfSubjectReview SelfSubjectReview authenticationv1alpha1.SelfSubjectReview V1Beta1AdmissionReview v1beta1admission.AdmissionReview @@ -114,6 +116,7 @@ func main() { {"k8s.io/api/admissionregistration/v1", "admissionregistration.k8s.io", "io.fabric8.kubernetes.api.model.admissionregistration.v1", "kubernetes_admissionregistration_v1_", true}, {"k8s.io/api/authentication/v1", "authentication.k8s.io", "io.fabric8.kubernetes.api.model.authentication", "kubernetes_authentication_", true}, {"k8s.io/api/authentication/v1alpha1", "authentication.k8s.io", "io.fabric8.kubernetes.api.model.authentication.v1alpha1", "kubernetes_authentication_v1alpha1_", true}, + {"k8s.io/api/authentication/v1beta1", "authentication.k8s.io", "io.fabric8.kubernetes.api.model.authentication.v1beta1", "kubernetes_authentication_v1beta1_", true}, {"k8s.io/apimachinery/pkg/util/intstr", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_pkg_util_intstr_", false}, {"k8s.io/apimachinery/pkg/runtime", "", "io.fabric8.kubernetes.api.model.runtime", "kubernetes_apimachinery_pkg_runtime_", false}, {"k8s.io/apimachinery/pkg/version", "", "io.fabric8.kubernetes.api.model.version", "kubernetes_apimachinery_pkg_version_", false}, diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index ae2078170c3..fcffbbf3de0 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -26,7 +26,6 @@ import io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList; import io.fabric8.kubernetes.api.model.authentication.TokenRequest; import io.fabric8.kubernetes.api.model.authentication.TokenReview; -import io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview; import io.fabric8.kubernetes.api.model.version.Info; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -78,6 +77,7 @@ "V1Beta1AdmissionReview", "V1Beta1Operation", "V1Beta1PatchType", + "V1Beta1SelfSubjectReview", "V1MutatingWebhookConfiguration", "V1MutatingWebhookConfigurationList", "V1Operation", @@ -159,7 +159,7 @@ public class KubeSchema { @JsonProperty("SelfSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview; @JsonProperty("SelfSubjectReview") - private SelfSubjectReview selfSubjectReview; + private io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview; @JsonProperty("SelfSubjectRulesReview") private io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview; @JsonProperty("ServiceReference") @@ -192,6 +192,8 @@ public class KubeSchema { private java.lang.String v1Beta1Operation; @JsonProperty("V1Beta1PatchType") private java.lang.String v1Beta1PatchType; + @JsonProperty("V1Beta1SelfSubjectReview") + private io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview; @JsonProperty("V1MutatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration; @JsonProperty("V1MutatingWebhookConfigurationList") @@ -296,10 +298,11 @@ public KubeSchema() { * @param v1beta1SelfSubjectRulesReview * @param typeMeta * @param tokenRequest + * @param v1Beta1SelfSubjectReview * @param objectMeta * @param time */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, ValidatingAdmissionPolicy validatingAdmissionPolicies, ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, ValidatingAdmissionPolicy validatingAdmissionPolicies, ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -338,6 +341,7 @@ public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList b this.v1Beta1AdmissionReview = v1Beta1AdmissionReview; this.v1Beta1Operation = v1Beta1Operation; this.v1Beta1PatchType = v1Beta1PatchType; + this.v1Beta1SelfSubjectReview = v1Beta1SelfSubjectReview; this.v1MutatingWebhookConfiguration = v1MutatingWebhookConfiguration; this.v1MutatingWebhookConfigurationList = v1MutatingWebhookConfigurationList; this.v1Operation = v1Operation; @@ -560,12 +564,12 @@ public void setSelfSubjectAccessReview(io.fabric8.kubernetes.api.model.authoriza } @JsonProperty("SelfSubjectReview") - public SelfSubjectReview getSelfSubjectReview() { + public io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview getSelfSubjectReview() { return selfSubjectReview; } @JsonProperty("SelfSubjectReview") - public void setSelfSubjectReview(SelfSubjectReview selfSubjectReview) { + public void setSelfSubjectReview(io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview) { this.selfSubjectReview = selfSubjectReview; } @@ -729,6 +733,16 @@ public void setV1Beta1PatchType(java.lang.String v1Beta1PatchType) { this.v1Beta1PatchType = v1Beta1PatchType; } + @JsonProperty("V1Beta1SelfSubjectReview") + public io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview getV1Beta1SelfSubjectReview() { + return v1Beta1SelfSubjectReview; + } + + @JsonProperty("V1Beta1SelfSubjectReview") + public void setV1Beta1SelfSubjectReview(io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview) { + this.v1Beta1SelfSubjectReview = v1Beta1SelfSubjectReview; + } + @JsonProperty("V1MutatingWebhookConfiguration") public io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration getV1MutatingWebhookConfiguration() { return v1MutatingWebhookConfiguration; diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index bc633999e86..2e026cc9724 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -26,7 +26,6 @@ import io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList; import io.fabric8.kubernetes.api.model.authentication.TokenRequest; import io.fabric8.kubernetes.api.model.authentication.TokenReview; -import io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview; import io.fabric8.kubernetes.api.model.version.Info; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -78,6 +77,7 @@ "V1Beta1AdmissionReview", "V1Beta1Operation", "V1Beta1PatchType", + "V1Beta1SelfSubjectReview", "V1MutatingWebhookConfiguration", "V1MutatingWebhookConfigurationList", "V1Operation", @@ -159,7 +159,7 @@ public class ValidationSchema { @JsonProperty("SelfSubjectAccessReview") private io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview; @JsonProperty("SelfSubjectReview") - private SelfSubjectReview selfSubjectReview; + private io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview; @JsonProperty("SelfSubjectRulesReview") private io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview; @JsonProperty("ServiceReference") @@ -192,6 +192,8 @@ public class ValidationSchema { private java.lang.String v1Beta1Operation; @JsonProperty("V1Beta1PatchType") private java.lang.String v1Beta1PatchType; + @JsonProperty("V1Beta1SelfSubjectReview") + private io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview; @JsonProperty("V1MutatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration; @JsonProperty("V1MutatingWebhookConfigurationList") @@ -296,10 +298,11 @@ public ValidationSchema() { * @param v1beta1SelfSubjectRulesReview * @param typeMeta * @param tokenRequest + * @param v1Beta1SelfSubjectReview * @param objectMeta * @param time */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, ValidatingAdmissionPolicy validatingAdmissionPolicies, ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, ValidatingAdmissionPolicy validatingAdmissionPolicies, ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -338,6 +341,7 @@ public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Kubernetes this.v1Beta1AdmissionReview = v1Beta1AdmissionReview; this.v1Beta1Operation = v1Beta1Operation; this.v1Beta1PatchType = v1Beta1PatchType; + this.v1Beta1SelfSubjectReview = v1Beta1SelfSubjectReview; this.v1MutatingWebhookConfiguration = v1MutatingWebhookConfiguration; this.v1MutatingWebhookConfigurationList = v1MutatingWebhookConfigurationList; this.v1Operation = v1Operation; @@ -560,12 +564,12 @@ public void setSelfSubjectAccessReview(io.fabric8.kubernetes.api.model.authoriza } @JsonProperty("SelfSubjectReview") - public SelfSubjectReview getSelfSubjectReview() { + public io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview getSelfSubjectReview() { return selfSubjectReview; } @JsonProperty("SelfSubjectReview") - public void setSelfSubjectReview(SelfSubjectReview selfSubjectReview) { + public void setSelfSubjectReview(io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview) { this.selfSubjectReview = selfSubjectReview; } @@ -729,6 +733,16 @@ public void setV1Beta1PatchType(java.lang.String v1Beta1PatchType) { this.v1Beta1PatchType = v1Beta1PatchType; } + @JsonProperty("V1Beta1SelfSubjectReview") + public io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview getV1Beta1SelfSubjectReview() { + return v1Beta1SelfSubjectReview; + } + + @JsonProperty("V1Beta1SelfSubjectReview") + public void setV1Beta1SelfSubjectReview(io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview) { + this.v1Beta1SelfSubjectReview = v1Beta1SelfSubjectReview; + } + @JsonProperty("V1MutatingWebhookConfiguration") public io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration getV1MutatingWebhookConfiguration() { return v1MutatingWebhookConfiguration; diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MatchCondition.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MatchCondition.java new file mode 100644 index 00000000000..1f7071a7db2 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MatchCondition.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.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", + "expression", + "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 MatchCondition implements KubernetesResource +{ + + @JsonProperty("expression") + private String expression; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MatchCondition() { + } + + /** + * + * @param expression + * @param name + */ + public MatchCondition(String expression, String name) { + super(); + this.expression = expression; + this.name = name; + } + + @JsonProperty("expression") + public String getExpression() { + return expression; + } + + @JsonProperty("expression") + public void setExpression(String expression) { + this.expression = expression; + } + + @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-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhook.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhook.java index 4a13e9c911f..eddcdf92f0d 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhook.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhook.java @@ -37,6 +37,7 @@ "admissionReviewVersions", "clientConfig", "failurePolicy", + "matchConditions", "matchPolicy", "name", "namespaceSelector", @@ -73,6 +74,9 @@ public class MutatingWebhook implements KubernetesResource private WebhookClientConfig clientConfig; @JsonProperty("failurePolicy") private String failurePolicy; + @JsonProperty("matchConditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchConditions = new ArrayList(); @JsonProperty("matchPolicy") private String matchPolicy; @JsonProperty("name") @@ -110,15 +114,17 @@ public MutatingWebhook() { * @param timeoutSeconds * @param rules * @param clientConfig + * @param matchConditions * @param objectSelector * @param failurePolicy * @param sideEffects */ - public MutatingWebhook(List admissionReviewVersions, WebhookClientConfig clientConfig, String failurePolicy, String matchPolicy, String name, io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector objectSelector, String reinvocationPolicy, List rules, String sideEffects, Integer timeoutSeconds) { + public MutatingWebhook(List admissionReviewVersions, WebhookClientConfig clientConfig, String failurePolicy, List matchConditions, String matchPolicy, String name, io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector objectSelector, String reinvocationPolicy, List rules, String sideEffects, Integer timeoutSeconds) { super(); this.admissionReviewVersions = admissionReviewVersions; this.clientConfig = clientConfig; this.failurePolicy = failurePolicy; + this.matchConditions = matchConditions; this.matchPolicy = matchPolicy; this.name = name; this.namespaceSelector = namespaceSelector; @@ -159,6 +165,16 @@ public void setFailurePolicy(String failurePolicy) { this.failurePolicy = failurePolicy; } + @JsonProperty("matchConditions") + public List getMatchConditions() { + return matchConditions; + } + + @JsonProperty("matchConditions") + public void setMatchConditions(List matchConditions) { + this.matchConditions = matchConditions; + } + @JsonProperty("matchPolicy") public String getMatchPolicy() { return matchPolicy; diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhook.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhook.java index c13a80142b3..63841232dae 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhook.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhook.java @@ -37,6 +37,7 @@ "admissionReviewVersions", "clientConfig", "failurePolicy", + "matchConditions", "matchPolicy", "name", "namespaceSelector", @@ -72,6 +73,9 @@ public class ValidatingWebhook implements KubernetesResource private WebhookClientConfig clientConfig; @JsonProperty("failurePolicy") private String failurePolicy; + @JsonProperty("matchConditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchConditions = new ArrayList(); @JsonProperty("matchPolicy") private String matchPolicy; @JsonProperty("name") @@ -106,15 +110,17 @@ public ValidatingWebhook() { * @param timeoutSeconds * @param rules * @param clientConfig + * @param matchConditions * @param objectSelector * @param failurePolicy * @param sideEffects */ - public ValidatingWebhook(List admissionReviewVersions, WebhookClientConfig clientConfig, String failurePolicy, String matchPolicy, String name, io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector objectSelector, List rules, String sideEffects, Integer timeoutSeconds) { + public ValidatingWebhook(List admissionReviewVersions, WebhookClientConfig clientConfig, String failurePolicy, List matchConditions, String matchPolicy, String name, io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector objectSelector, List rules, String sideEffects, Integer timeoutSeconds) { super(); this.admissionReviewVersions = admissionReviewVersions; this.clientConfig = clientConfig; this.failurePolicy = failurePolicy; + this.matchConditions = matchConditions; this.matchPolicy = matchPolicy; this.name = name; this.namespaceSelector = namespaceSelector; @@ -154,6 +160,16 @@ public void setFailurePolicy(String failurePolicy) { this.failurePolicy = failurePolicy; } + @JsonProperty("matchConditions") + public List getMatchConditions() { + return matchConditions; + } + + @JsonProperty("matchConditions") + public void setMatchConditions(List matchConditions) { + this.matchConditions = matchConditions; + } + @JsonProperty("matchPolicy") public String getMatchPolicy() { return matchPolicy; diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/AuditAnnotation.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/AuditAnnotation.java new file mode 100644 index 00000000000..f5a8cb4379e --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/AuditAnnotation.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.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.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", + "key", + "valueExpression" +}) +@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 AuditAnnotation implements KubernetesResource +{ + + @JsonProperty("key") + private String key; + @JsonProperty("valueExpression") + private String valueExpression; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AuditAnnotation() { + } + + /** + * + * @param valueExpression + * @param key + */ + public AuditAnnotation(String key, String valueExpression) { + super(); + this.key = key; + this.valueExpression = valueExpression; + } + + @JsonProperty("key") + public String getKey() { + return key; + } + + @JsonProperty("key") + public void setKey(String key) { + this.key = key; + } + + @JsonProperty("valueExpression") + public String getValueExpression() { + return valueExpression; + } + + @JsonProperty("valueExpression") + public void setValueExpression(String valueExpression) { + this.valueExpression = valueExpression; + } + + @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-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ExpressionWarning.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ExpressionWarning.java new file mode 100644 index 00000000000..da25882d117 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ExpressionWarning.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.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.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", + "fieldRef", + "warning" +}) +@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 ExpressionWarning implements KubernetesResource +{ + + @JsonProperty("fieldRef") + private String fieldRef; + @JsonProperty("warning") + private String warning; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ExpressionWarning() { + } + + /** + * + * @param fieldRef + * @param warning + */ + public ExpressionWarning(String fieldRef, String warning) { + super(); + this.fieldRef = fieldRef; + this.warning = warning; + } + + @JsonProperty("fieldRef") + public String getFieldRef() { + return fieldRef; + } + + @JsonProperty("fieldRef") + public void setFieldRef(String fieldRef) { + this.fieldRef = fieldRef; + } + + @JsonProperty("warning") + public String getWarning() { + return warning; + } + + @JsonProperty("warning") + public void setWarning(String warning) { + this.warning = warning; + } + + @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-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/MatchCondition.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/MatchCondition.java new file mode 100644 index 00000000000..1e21330e2c1 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/MatchCondition.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.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.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", + "expression", + "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 MatchCondition implements KubernetesResource +{ + + @JsonProperty("expression") + private String expression; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MatchCondition() { + } + + /** + * + * @param expression + * @param name + */ + public MatchCondition(String expression, String name) { + super(); + this.expression = expression; + this.name = name; + } + + @JsonProperty("expression") + public String getExpression() { + return expression; + } + + @JsonProperty("expression") + public void setExpression(String expression) { + this.expression = expression; + } + + @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-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/TypeChecking.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/TypeChecking.java new file mode 100644 index 00000000000..78624329d5a --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/TypeChecking.java @@ -0,0 +1,103 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.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.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", + "expressionWarnings" +}) +@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 TypeChecking implements KubernetesResource +{ + + @JsonProperty("expressionWarnings") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List expressionWarnings = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public TypeChecking() { + } + + /** + * + * @param expressionWarnings + */ + public TypeChecking(List expressionWarnings) { + super(); + this.expressionWarnings = expressionWarnings; + } + + @JsonProperty("expressionWarnings") + public List getExpressionWarnings() { + return expressionWarnings; + } + + @JsonProperty("expressionWarnings") + public void setExpressionWarnings(List expressionWarnings) { + this.expressionWarnings = expressionWarnings; + } + + @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-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicy.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicy.java index 1b0f21d4d4e..56b41e922d2 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicy.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicy.java @@ -36,7 +36,8 @@ "apiVersion", "kind", "metadata", - "spec" + "spec", + "status" }) @ToString @EqualsAndHashCode @@ -82,6 +83,8 @@ public class ValidatingAdmissionPolicy implements HasMetadata private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ValidatingAdmissionPolicySpec spec; + @JsonProperty("status") + private ValidatingAdmissionPolicyStatus status; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -98,13 +101,15 @@ public ValidatingAdmissionPolicy() { * @param apiVersion * @param kind * @param spec + * @param status */ - public ValidatingAdmissionPolicy(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ValidatingAdmissionPolicySpec spec) { + public ValidatingAdmissionPolicy(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ValidatingAdmissionPolicySpec spec, ValidatingAdmissionPolicyStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; this.metadata = metadata; this.spec = spec; + this.status = status; } /** @@ -167,6 +172,16 @@ public void setSpec(ValidatingAdmissionPolicySpec spec) { this.spec = spec; } + @JsonProperty("status") + public ValidatingAdmissionPolicyStatus getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(ValidatingAdmissionPolicyStatus status) { + this.status = status; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicyBindingSpec.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicyBindingSpec.java index e94a1eda4ff..5ce6492ea5a 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicyBindingSpec.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicyBindingSpec.java @@ -1,7 +1,9 @@ package io.fabric8.kubernetes.api.model.admissionregistration.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; @@ -35,7 +37,8 @@ "metadata", "matchResources", "paramRef", - "policyName" + "policyName", + "validationActions" }) @ToString @EqualsAndHashCode @@ -64,6 +67,9 @@ public class ValidatingAdmissionPolicyBindingSpec implements KubernetesResource private ParamRef paramRef; @JsonProperty("policyName") private String policyName; + @JsonProperty("validationActions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List validationActions = new ArrayList(); @JsonIgnore private Map additionalProperties = new HashMap(); @@ -79,12 +85,14 @@ public ValidatingAdmissionPolicyBindingSpec() { * @param paramRef * @param policyName * @param matchResources + * @param validationActions */ - public ValidatingAdmissionPolicyBindingSpec(MatchResources matchResources, ParamRef paramRef, String policyName) { + public ValidatingAdmissionPolicyBindingSpec(MatchResources matchResources, ParamRef paramRef, String policyName, List validationActions) { super(); this.matchResources = matchResources; this.paramRef = paramRef; this.policyName = policyName; + this.validationActions = validationActions; } @JsonProperty("matchResources") @@ -117,6 +125,16 @@ public void setPolicyName(String policyName) { this.policyName = policyName; } + @JsonProperty("validationActions") + public List getValidationActions() { + return validationActions; + } + + @JsonProperty("validationActions") + public void setValidationActions(List validationActions) { + this.validationActions = validationActions; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicySpec.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicySpec.java index d32f844ba33..c40e295daf3 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicySpec.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicySpec.java @@ -35,7 +35,9 @@ "apiVersion", "kind", "metadata", + "auditAnnotations", "failurePolicy", + "matchConditions", "matchConstraints", "paramKind", "validations" @@ -61,13 +63,20 @@ public class ValidatingAdmissionPolicySpec implements KubernetesResource { + @JsonProperty("auditAnnotations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List auditAnnotations = new ArrayList(); @JsonProperty("failurePolicy") private String failurePolicy; + @JsonProperty("matchConditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchConditions = new ArrayList(); @JsonProperty("matchConstraints") private MatchResources matchConstraints; @JsonProperty("paramKind") private ParamKind paramKind; @JsonProperty("validations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) private List validations = new ArrayList(); @JsonIgnore private Map additionalProperties = new HashMap(); @@ -82,18 +91,32 @@ public ValidatingAdmissionPolicySpec() { /** * * @param paramKind + * @param auditAnnotations + * @param matchConditions * @param matchConstraints * @param validations * @param failurePolicy */ - public ValidatingAdmissionPolicySpec(String failurePolicy, MatchResources matchConstraints, ParamKind paramKind, List validations) { + public ValidatingAdmissionPolicySpec(List auditAnnotations, String failurePolicy, List matchConditions, MatchResources matchConstraints, ParamKind paramKind, List validations) { super(); + this.auditAnnotations = auditAnnotations; this.failurePolicy = failurePolicy; + this.matchConditions = matchConditions; this.matchConstraints = matchConstraints; this.paramKind = paramKind; this.validations = validations; } + @JsonProperty("auditAnnotations") + public List getAuditAnnotations() { + return auditAnnotations; + } + + @JsonProperty("auditAnnotations") + public void setAuditAnnotations(List auditAnnotations) { + this.auditAnnotations = auditAnnotations; + } + @JsonProperty("failurePolicy") public String getFailurePolicy() { return failurePolicy; @@ -104,6 +127,16 @@ public void setFailurePolicy(String failurePolicy) { this.failurePolicy = failurePolicy; } + @JsonProperty("matchConditions") + public List getMatchConditions() { + return matchConditions; + } + + @JsonProperty("matchConditions") + public void setMatchConditions(List matchConditions) { + this.matchConditions = matchConditions; + } + @JsonProperty("matchConstraints") public MatchResources getMatchConstraints() { return matchConstraints; diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicyStatus.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicyStatus.java new file mode 100644 index 00000000000..d7849ca9ad9 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicyStatus.java @@ -0,0 +1,134 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.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.Condition; +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", + "observedGeneration", + "typeChecking" +}) +@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 ValidatingAdmissionPolicyStatus implements KubernetesResource +{ + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList(); + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("typeChecking") + private TypeChecking typeChecking; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ValidatingAdmissionPolicyStatus() { + } + + /** + * + * @param typeChecking + * @param conditions + * @param observedGeneration + */ + public ValidatingAdmissionPolicyStatus(List conditions, Long observedGeneration, TypeChecking typeChecking) { + super(); + this.conditions = conditions; + this.observedGeneration = observedGeneration; + this.typeChecking = typeChecking; + } + + @JsonProperty("conditions") + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("observedGeneration") + public Long getObservedGeneration() { + return observedGeneration; + } + + @JsonProperty("observedGeneration") + public void setObservedGeneration(Long observedGeneration) { + this.observedGeneration = observedGeneration; + } + + @JsonProperty("typeChecking") + public TypeChecking getTypeChecking() { + return typeChecking; + } + + @JsonProperty("typeChecking") + public void setTypeChecking(TypeChecking typeChecking) { + this.typeChecking = typeChecking; + } + + @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-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/Validation.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/Validation.java index acddb5e566e..722909378ad 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/Validation.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/Validation.java @@ -35,6 +35,7 @@ "metadata", "expression", "message", + "messageExpression", "reason" }) @ToString @@ -62,6 +63,8 @@ public class Validation implements KubernetesResource private String expression; @JsonProperty("message") private String message; + @JsonProperty("messageExpression") + private String messageExpression; @JsonProperty("reason") private String reason; @JsonIgnore @@ -78,12 +81,14 @@ public Validation() { * * @param reason * @param expression + * @param messageExpression * @param message */ - public Validation(String expression, String message, String reason) { + public Validation(String expression, String message, String messageExpression, String reason) { super(); this.expression = expression; this.message = message; + this.messageExpression = messageExpression; this.reason = reason; } @@ -107,6 +112,16 @@ public void setMessage(String message) { this.message = message; } + @JsonProperty("messageExpression") + public String getMessageExpression() { + return messageExpression; + } + + @JsonProperty("messageExpression") + public void setMessageExpression(String messageExpression) { + this.messageExpression = messageExpression; + } + @JsonProperty("reason") public String getReason() { return reason; diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MatchCondition.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MatchCondition.java new file mode 100644 index 00000000000..114fc720fbc --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MatchCondition.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +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", + "expression", + "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 MatchCondition implements KubernetesResource +{ + + @JsonProperty("expression") + private String expression; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MatchCondition() { + } + + /** + * + * @param expression + * @param name + */ + public MatchCondition(String expression, String name) { + super(); + this.expression = expression; + this.name = name; + } + + @JsonProperty("expression") + public String getExpression() { + return expression; + } + + @JsonProperty("expression") + public void setExpression(String expression) { + this.expression = expression; + } + + @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-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhook.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhook.java index 2cb8c57a037..e0326b93fa7 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhook.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhook.java @@ -38,6 +38,7 @@ "admissionReviewVersions", "clientConfig", "failurePolicy", + "matchConditions", "matchPolicy", "name", "namespaceSelector", @@ -75,6 +76,9 @@ public class MutatingWebhook implements KubernetesResource private WebhookClientConfig clientConfig; @JsonProperty("failurePolicy") private String failurePolicy; + @JsonProperty("matchConditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchConditions = new ArrayList(); @JsonProperty("matchPolicy") private String matchPolicy; @JsonProperty("name") @@ -112,15 +116,17 @@ public MutatingWebhook() { * @param timeoutSeconds * @param rules * @param clientConfig + * @param matchConditions * @param objectSelector * @param failurePolicy * @param sideEffects */ - public MutatingWebhook(List admissionReviewVersions, WebhookClientConfig clientConfig, String failurePolicy, String matchPolicy, String name, io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector objectSelector, String reinvocationPolicy, List rules, String sideEffects, Integer timeoutSeconds) { + public MutatingWebhook(List admissionReviewVersions, WebhookClientConfig clientConfig, String failurePolicy, List matchConditions, String matchPolicy, String name, io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector objectSelector, String reinvocationPolicy, List rules, String sideEffects, Integer timeoutSeconds) { super(); this.admissionReviewVersions = admissionReviewVersions; this.clientConfig = clientConfig; this.failurePolicy = failurePolicy; + this.matchConditions = matchConditions; this.matchPolicy = matchPolicy; this.name = name; this.namespaceSelector = namespaceSelector; @@ -161,6 +167,16 @@ public void setFailurePolicy(String failurePolicy) { this.failurePolicy = failurePolicy; } + @JsonProperty("matchConditions") + public List getMatchConditions() { + return matchConditions; + } + + @JsonProperty("matchConditions") + public void setMatchConditions(List matchConditions) { + this.matchConditions = matchConditions; + } + @JsonProperty("matchPolicy") public String getMatchPolicy() { return matchPolicy; diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhook.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhook.java index cdc4ee61b8c..3afc896d5c9 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhook.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhook.java @@ -38,6 +38,7 @@ "admissionReviewVersions", "clientConfig", "failurePolicy", + "matchConditions", "matchPolicy", "name", "namespaceSelector", @@ -74,6 +75,9 @@ public class ValidatingWebhook implements KubernetesResource private WebhookClientConfig clientConfig; @JsonProperty("failurePolicy") private String failurePolicy; + @JsonProperty("matchConditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchConditions = new ArrayList(); @JsonProperty("matchPolicy") private String matchPolicy; @JsonProperty("name") @@ -108,15 +112,17 @@ public ValidatingWebhook() { * @param timeoutSeconds * @param rules * @param clientConfig + * @param matchConditions * @param objectSelector * @param failurePolicy * @param sideEffects */ - public ValidatingWebhook(List admissionReviewVersions, WebhookClientConfig clientConfig, String failurePolicy, String matchPolicy, String name, io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector objectSelector, List rules, String sideEffects, Integer timeoutSeconds) { + public ValidatingWebhook(List admissionReviewVersions, WebhookClientConfig clientConfig, String failurePolicy, List matchConditions, String matchPolicy, String name, io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector objectSelector, List rules, String sideEffects, Integer timeoutSeconds) { super(); this.admissionReviewVersions = admissionReviewVersions; this.clientConfig = clientConfig; this.failurePolicy = failurePolicy; + this.matchConditions = matchConditions; this.matchPolicy = matchPolicy; this.name = name; this.namespaceSelector = namespaceSelector; @@ -156,6 +162,16 @@ public void setFailurePolicy(String failurePolicy) { this.failurePolicy = failurePolicy; } + @JsonProperty("matchConditions") + public List getMatchConditions() { + return matchConditions; + } + + @JsonProperty("matchConditions") + public void setMatchConditions(List matchConditions) { + this.matchConditions = matchConditions; + } + @JsonProperty("matchPolicy") public String getMatchPolicy() { return matchPolicy; diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/v1beta1/SelfSubjectReview.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/v1beta1/SelfSubjectReview.java new file mode 100644 index 00000000000..aa738204868 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/v1beta1/SelfSubjectReview.java @@ -0,0 +1,180 @@ + +package io.fabric8.kubernetes.api.model.authentication.v1beta1; + +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", + "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) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1beta1") +@Group("authentication.k8s.io") +public class SelfSubjectReview implements HasMetadata +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "authentication.k8s.io/v1beta1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "SelfSubjectReview"; + @JsonProperty("metadata") + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + @JsonProperty("status") + private SelfSubjectReviewStatus status; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public SelfSubjectReview() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param status + */ + public SelfSubjectReview(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, SelfSubjectReviewStatus status) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + this.metadata = metadata; + 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("status") + public SelfSubjectReviewStatus getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(SelfSubjectReviewStatus 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-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/v1beta1/SelfSubjectReviewStatus.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/v1beta1/SelfSubjectReviewStatus.java new file mode 100644 index 00000000000..596c5dd2b7d --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/v1beta1/SelfSubjectReviewStatus.java @@ -0,0 +1,101 @@ + +package io.fabric8.kubernetes.api.model.authentication.v1beta1; + +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.fabric8.kubernetes.api.model.authentication.UserInfo; +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", + "userInfo" +}) +@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 SelfSubjectReviewStatus implements KubernetesResource +{ + + @JsonProperty("userInfo") + private UserInfo userInfo; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public SelfSubjectReviewStatus() { + } + + /** + * + * @param userInfo + */ + public SelfSubjectReviewStatus(UserInfo userInfo) { + super(); + this.userInfo = userInfo; + } + + @JsonProperty("userInfo") + public UserInfo getUserInfo() { + return userInfo; + } + + @JsonProperty("userInfo") + public void setUserInfo(UserInfo userInfo) { + this.userInfo = userInfo; + } + + @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-admissionregistration/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json index 969953da2bc..2f18a670d7f 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 @@ -278,6 +278,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1_MatchCondition": { + "type": "object", + "properties": { + "expression": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1_MutatingWebhook": { "type": "object", "properties": { @@ -294,6 +310,14 @@ "failurePolicy": { "type": "string" }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition" + } + }, "matchPolicy": { "type": "string" }, @@ -509,6 +533,14 @@ "failurePolicy": { "type": "string" }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition" + } + }, "matchPolicy": { "type": "string" }, @@ -628,6 +660,54 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1alpha1_AuditAnnotation": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "valueExpression": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.AuditAnnotation", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1alpha1_ExpressionWarning": { + "type": "object", + "properties": { + "fieldRef": { + "type": "string" + }, + "warning": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ExpressionWarning", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1alpha1_MatchCondition": { + "type": "object", + "properties": { + "expression": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1alpha1_MatchResources": { "type": "object", "properties": { @@ -745,6 +825,24 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1alpha1_TypeChecking": { + "type": "object", + "properties": { + "expressionWarnings": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ExpressionWarning", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ExpressionWarning" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.TypeChecking", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicy": { "type": "object", "properties": { @@ -765,6 +863,10 @@ "spec": { "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicySpec", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicySpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyStatus" } }, "additionalProperties": true, @@ -847,6 +949,13 @@ }, "policyName": { "type": "string" + }, + "validationActions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true, @@ -891,9 +1000,25 @@ "kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicySpec": { "type": "object", "properties": { + "auditAnnotations": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_AuditAnnotation", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.AuditAnnotation" + } + }, "failurePolicy": { "type": "string" }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchCondition" + } + }, "matchConstraints": { "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchResources", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchResources" @@ -904,6 +1029,7 @@ }, "validations": { "type": "array", + "javaOmitEmpty": true, "items": { "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Validation", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Validation" @@ -916,6 +1042,32 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyStatus": { + "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apimachinery_Condition", + "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" + } + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, + "typeChecking": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_TypeChecking", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.TypeChecking" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1alpha1_Validation": { "type": "object", "properties": { @@ -925,6 +1077,9 @@ "message": { "type": "string" }, + "messageExpression": { + "type": "string" + }, "reason": { "type": "string" } @@ -935,6 +1090,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1beta1_MatchCondition": { + "type": "object", + "properties": { + "expression": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1beta1_MutatingWebhook": { "type": "object", "properties": { @@ -952,6 +1123,14 @@ "failurePolicy": { "type": "string" }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" + } + }, "matchPolicy": { "type": "string" }, @@ -1093,6 +1272,14 @@ "failurePolicy": { "type": "string" }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" + } + }, "matchPolicy": { "type": "string" }, @@ -1281,6 +1468,36 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_apimachinery_Condition": { + "type": "object", + "properties": { + "lastTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "message": { + "type": "string" + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.Condition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_apimachinery_CreateOptions": { "type": "object", "properties": { @@ -1578,6 +1795,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -2277,6 +2497,48 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_authentication_v1beta1_SelfSubjectReview": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "authentication.k8s.io/v1beta1", + "required": true + }, + "kind": { + "type": "string", + "default": "SelfSubjectReview", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "status": { + "$ref": "#/definitions/kubernetes_authentication_v1beta1_SelfSubjectReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReviewStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_authentication_v1beta1_SelfSubjectReviewStatus": { + "type": "object", + "properties": { + "userInfo": { + "$ref": "#/definitions/kubernetes_authentication_UserInfo", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.UserInfo" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReviewStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_authorization_v1_LocalSubjectAccessReview": { "type": "object", "properties": { @@ -3146,6 +3408,10 @@ "V1Beta1PatchType": { "type": "string" }, + "V1Beta1SelfSubjectReview": { + "$ref": "#/definitions/kubernetes_authentication_v1beta1_SelfSubjectReview", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview" + }, "V1MutatingWebhookConfiguration": { "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhookConfiguration", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration" 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 85cdbfa1acc..37f0a75642d 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 @@ -278,6 +278,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1_MatchCondition": { + "type": "object", + "properties": { + "expression": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1_MutatingWebhook": { "type": "object", "properties": { @@ -294,6 +310,14 @@ "failurePolicy": { "type": "string" }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition" + } + }, "matchPolicy": { "type": "string" }, @@ -509,6 +533,14 @@ "failurePolicy": { "type": "string" }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition" + } + }, "matchPolicy": { "type": "string" }, @@ -628,6 +660,54 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1alpha1_AuditAnnotation": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "valueExpression": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.AuditAnnotation", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1alpha1_ExpressionWarning": { + "type": "object", + "properties": { + "fieldRef": { + "type": "string" + }, + "warning": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ExpressionWarning", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1alpha1_MatchCondition": { + "type": "object", + "properties": { + "expression": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1alpha1_MatchResources": { "type": "object", "properties": { @@ -745,6 +825,24 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1alpha1_TypeChecking": { + "type": "object", + "properties": { + "expressionWarnings": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ExpressionWarning", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ExpressionWarning" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.TypeChecking", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicy": { "type": "object", "properties": { @@ -765,6 +863,10 @@ "spec": { "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicySpec", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicySpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyStatus" } }, "additionalProperties": true, @@ -847,6 +949,13 @@ }, "policyName": { "type": "string" + }, + "validationActions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true, @@ -891,9 +1000,25 @@ "kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicySpec": { "type": "object", "properties": { + "auditAnnotations": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_AuditAnnotation", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.AuditAnnotation" + } + }, "failurePolicy": { "type": "string" }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchCondition" + } + }, "matchConstraints": { "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchResources", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchResources" @@ -904,6 +1029,7 @@ }, "validations": { "type": "array", + "javaOmitEmpty": true, "items": { "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Validation", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Validation" @@ -916,6 +1042,32 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyStatus": { + "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apimachinery_Condition", + "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" + } + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, + "typeChecking": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_TypeChecking", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.TypeChecking" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1alpha1_Validation": { "type": "object", "properties": { @@ -925,6 +1077,9 @@ "message": { "type": "string" }, + "messageExpression": { + "type": "string" + }, "reason": { "type": "string" } @@ -935,6 +1090,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1beta1_MatchCondition": { + "type": "object", + "properties": { + "expression": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1beta1_MutatingWebhook": { "type": "object", "properties": { @@ -952,6 +1123,14 @@ "failurePolicy": { "type": "string" }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" + } + }, "matchPolicy": { "type": "string" }, @@ -1093,6 +1272,14 @@ "failurePolicy": { "type": "string" }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" + } + }, "matchPolicy": { "type": "string" }, @@ -1281,6 +1468,36 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_apimachinery_Condition": { + "type": "object", + "properties": { + "lastTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "message": { + "type": "string" + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.Condition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_apimachinery_CreateOptions": { "type": "object", "properties": { @@ -1578,6 +1795,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -2277,6 +2497,48 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_authentication_v1beta1_SelfSubjectReview": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "authentication.k8s.io/v1beta1", + "required": true + }, + "kind": { + "type": "string", + "default": "SelfSubjectReview", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "status": { + "$ref": "#/definitions/kubernetes_authentication_v1beta1_SelfSubjectReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReviewStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_authentication_v1beta1_SelfSubjectReviewStatus": { + "type": "object", + "properties": { + "userInfo": { + "$ref": "#/definitions/kubernetes_authentication_UserInfo", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.UserInfo" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReviewStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_authorization_v1_LocalSubjectAccessReview": { "type": "object", "properties": { @@ -3146,6 +3408,10 @@ "V1Beta1PatchType": { "type": "string" }, + "V1Beta1SelfSubjectReview": { + "$ref": "#/definitions/kubernetes_authentication_v1beta1_SelfSubjectReview", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview" + }, "V1MutatingWebhookConfiguration": { "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhookConfiguration", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration" @@ -3320,7 +3586,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admission.k8s.io/v1beta1", + "default": "admission.k8s.io/v1", "required": true }, "kind": { @@ -3329,12 +3595,12 @@ "required": true }, "request": { - "$ref": "#/definitions/kubernetes_admission_v1beta1_AdmissionRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest" + "$ref": "#/definitions/kubernetes_admission_v1_AdmissionRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest" }, "response": { - "$ref": "#/definitions/kubernetes_admission_v1beta1_AdmissionResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse" + "$ref": "#/definitions/kubernetes_admission_v1_AdmissionResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse" } }, "additionalProperties": true @@ -3398,6 +3664,17 @@ }, "additionalProperties": true }, + "auditannotation": { + "properties": { + "key": { + "type": "string" + }, + "valueExpression": { + "type": "string" + } + }, + "additionalProperties": true + }, "boundobjectreference": { "properties": { "apiVersion": { @@ -3415,6 +3692,31 @@ }, "additionalProperties": true }, + "condition": { + "properties": { + "lastTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "message": { + "type": "string" + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, "createoptions": { "properties": { "apiVersion": { @@ -3479,6 +3781,17 @@ }, "additionalProperties": true }, + "expressionwarning": { + "properties": { + "fieldRef": { + "type": "string" + }, + "warning": { + "type": "string" + } + }, + "additionalProperties": true + }, "fieldsv1": { "additionalProperties": true }, @@ -3687,6 +4000,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -3701,7 +4017,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1beta1", + "default": "authorization.k8s.io/v1", "required": true }, "kind": { @@ -3714,12 +4030,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 @@ -3752,6 +4068,17 @@ }, "additionalProperties": true }, + "matchcondition": { + "properties": { + "expression": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true + }, "matchresources": { "properties": { "excludeResourceRules": { @@ -3788,17 +4115,26 @@ "properties": { "admissionReviewVersions": { "type": "array", + "javaOmitEmpty": true, "items": { "type": "string" } }, "clientConfig": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_WebhookClientConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.WebhookClientConfig" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_WebhookClientConfig", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.WebhookClientConfig" }, "failurePolicy": { "type": "string" }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" + } + }, "matchPolicy": { "type": "string" }, @@ -3837,7 +4173,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "kind": { @@ -3853,8 +4189,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MutatingWebhook", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhook" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhook", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhook" } } }, @@ -4315,7 +4651,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authentication.k8s.io/v1alpha1", + "default": "authentication.k8s.io/v1beta1", "required": true }, "kind": { @@ -4328,8 +4664,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "status": { - "$ref": "#/definitions/kubernetes_authentication_v1alpha1_SelfSubjectReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReviewStatus" + "$ref": "#/definitions/kubernetes_authentication_v1beta1_SelfSubjectReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReviewStatus" } }, "additionalProperties": true @@ -4487,7 +4823,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1", + "default": "authorization.k8s.io/v1beta1", "required": true }, "kind": { @@ -4500,12 +4836,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -4574,15 +4910,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" } } }, @@ -4718,6 +5054,19 @@ }, "additionalProperties": true }, + "typechecking": { + "properties": { + "expressionWarnings": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ExpressionWarning", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ExpressionWarning" + } + } + }, + "additionalProperties": true + }, "typemeta": { "properties": { "apiVersion": { @@ -4804,6 +5153,10 @@ "spec": { "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicySpec", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicySpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyStatus" } }, "additionalProperties": true @@ -4870,6 +5223,13 @@ }, "policyName": { "type": "string" + }, + "validationActions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true @@ -4903,9 +5263,25 @@ }, "validatingadmissionpolicyspec": { "properties": { + "auditAnnotations": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_AuditAnnotation", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.AuditAnnotation" + } + }, "failurePolicy": { "type": "string" }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchCondition" + } + }, "matchConstraints": { "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchResources", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchResources" @@ -4916,6 +5292,7 @@ }, "validations": { "type": "array", + "javaOmitEmpty": true, "items": { "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Validation", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Validation" @@ -4924,21 +5301,51 @@ }, "additionalProperties": true }, + "validatingadmissionpolicystatus": { + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apimachinery_Condition", + "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" + } + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, + "typeChecking": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_TypeChecking", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.TypeChecking" + } + }, + "additionalProperties": true + }, "validatingwebhook": { "properties": { "admissionReviewVersions": { "type": "array", + "javaOmitEmpty": true, "items": { "type": "string" } }, "clientConfig": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_WebhookClientConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.WebhookClientConfig" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_WebhookClientConfig", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.WebhookClientConfig" }, "failurePolicy": { "type": "string" }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" + } + }, "matchPolicy": { "type": "string" }, @@ -5031,6 +5438,9 @@ "message": { "type": "string" }, + "messageExpression": { + "type": "string" + }, "reason": { "type": "string" } @@ -5043,8 +5453,8 @@ "type": "string" }, "service": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ServiceReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ServiceReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference" }, "url": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/java/io/fabric8/kubernetes/api/model/authentication/v1beta1/SelfSubjectReviewTest.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/java/io/fabric8/kubernetes/api/model/authentication/v1beta1/SelfSubjectReviewTest.java new file mode 100644 index 00000000000..1dfcac61ba2 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/java/io/fabric8/kubernetes/api/model/authentication/v1beta1/SelfSubjectReviewTest.java @@ -0,0 +1,82 @@ +/** + * 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.api.model.authentication.v1beta1; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.fabric8.kubernetes.api.model.Namespaced; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.Arrays; +import java.util.Scanner; + +import static org.assertj.core.api.Assertions.assertThat; + +class SelfSubjectReviewTest { + private final ObjectMapper mapper = new ObjectMapper(); + + @Test + void isClusterScoped() { + assertThat(SelfSubjectReview.class).isNotInstanceOf(Namespaced.class); + } + + @Test + void deserializationAndSerializationShouldWorkAsExpected() throws IOException { + // Given + String originalJson = new Scanner(getClass().getResourceAsStream("/valid-selfsubjectreview.json")) + .useDelimiter("\\A") + .next(); + + // When + final SelfSubjectReview selfSubjectReview = mapper.readValue(originalJson, SelfSubjectReview.class); + final String serializedJson = mapper.writeValueAsString(selfSubjectReview); + + // Then + assertThat(serializedJson).isNotNull(); + assertThat(selfSubjectReview) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "test-selfsubjectreview") + .hasFieldOrPropertyWithValue("status.userInfo.username", "kubernetes-admin") + .hasFieldOrPropertyWithValue("status.userInfo.uid", "some-user-id") + .hasFieldOrPropertyWithValue("status.userInfo.groups", Arrays.asList("system:masters", "system:authenticated")); + } + + @Test + void builderShouldCreateObject() { + // Given + SelfSubjectReviewBuilder selfSubjectReviewBuilder = new SelfSubjectReviewBuilder() + .withNewMetadata() + .withName("test-selfsubjectreview") + .endMetadata() + .withNewStatus() + .withNewUserInfo() + .withUsername("kubernetes-admin") + .withUid("some-user-id") + .addToGroups("system:masters", "system:authenticated") + .endUserInfo() + .endStatus(); + // When + SelfSubjectReview selfSubjectReview = selfSubjectReviewBuilder.build(); + + // Then + assertThat(selfSubjectReview) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "test-selfsubjectreview") + .hasFieldOrPropertyWithValue("status.userInfo.username", "kubernetes-admin") + .hasFieldOrPropertyWithValue("status.userInfo.uid", "some-user-id") + .hasFieldOrPropertyWithValue("status.userInfo.groups", Arrays.asList("system:masters", "system:authenticated")); + } +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/resources/valid-selfsubjectreview.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/resources/valid-selfsubjectreview.json new file mode 100644 index 00000000000..545e2b80b2d --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/resources/valid-selfsubjectreview.json @@ -0,0 +1,21 @@ +{ + "kind": "SelfSubjectReview", + "apiVersion": "authentication.k8s.io/v1beta1", + "metadata": { + "name": "test-selfsubjectreview" + }, + "status": { + "userInfo": { + "username": "kubernetes-admin", + "uid": "some-user-id", + "groups": [ + "system:masters", "system:authenticated" + ], + "extra": { + "extraKey": [ + "extraValue" + ] + } + } + } +} diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/ValidationRule.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/ValidationRule.java index d9ca8331011..fd6a6f3559a 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/ValidationRule.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/ValidationRule.java @@ -34,6 +34,7 @@ "kind", "metadata", "message", + "messageExpression", "rule" }) @ToString @@ -59,6 +60,8 @@ public class ValidationRule implements KubernetesResource @JsonProperty("message") private String message; + @JsonProperty("messageExpression") + private String messageExpression; @JsonProperty("rule") private String rule; @JsonIgnore @@ -73,12 +76,14 @@ public ValidationRule() { /** * + * @param messageExpression * @param rule * @param message */ - public ValidationRule(String message, String rule) { + public ValidationRule(String message, String messageExpression, String rule) { super(); this.message = message; + this.messageExpression = messageExpression; this.rule = rule; } @@ -92,6 +97,16 @@ public void setMessage(String message) { this.message = message; } + @JsonProperty("messageExpression") + public String getMessageExpression() { + return messageExpression; + } + + @JsonProperty("messageExpression") + public void setMessageExpression(String messageExpression) { + this.messageExpression = messageExpression; + } + @JsonProperty("rule") public String getRule() { return rule; diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/ValidationRule.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/ValidationRule.java index 84514ee92eb..1aa2099afa3 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/ValidationRule.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/ValidationRule.java @@ -34,6 +34,7 @@ "kind", "metadata", "message", + "messageExpression", "rule" }) @ToString @@ -59,6 +60,8 @@ public class ValidationRule implements KubernetesResource @JsonProperty("message") private String message; + @JsonProperty("messageExpression") + private String messageExpression; @JsonProperty("rule") private String rule; @JsonIgnore @@ -73,12 +76,14 @@ public ValidationRule() { /** * + * @param messageExpression * @param rule * @param message */ - public ValidationRule(String message, String rule) { + public ValidationRule(String message, String messageExpression, String rule) { super(); this.message = message; + this.messageExpression = messageExpression; this.rule = rule; } @@ -92,6 +97,16 @@ public void setMessage(String message) { this.message = message; } + @JsonProperty("messageExpression") + public String getMessageExpression() { + return messageExpression; + } + + @JsonProperty("messageExpression") + public void setMessageExpression(String messageExpression) { + this.messageExpression = messageExpression; + } + @JsonProperty("rule") public String getRule() { return rule; 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 98a1c741a48..1c3e43dfe76 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 @@ -441,11 +441,6 @@ }, "kubernetes_apiextensions_v1_JSON": { "type": "object", - "properties": { - "Raw": { - "type": "string" - } - }, "additionalProperties": true, "existingJavaType": "com.fasterxml.jackson.databind.JsonNode", "javaInterfaces": [ @@ -752,6 +747,9 @@ "message": { "type": "string" }, + "messageExpression": { + "type": "string" + }, "rule": { "type": "string" } @@ -1179,11 +1177,6 @@ }, "kubernetes_apiextensions_v1beta1_JSON": { "type": "object", - "properties": { - "Raw": { - "type": "string" - } - }, "additionalProperties": true, "existingJavaType": "com.fasterxml.jackson.databind.JsonNode", "javaInterfaces": [ @@ -1490,6 +1483,9 @@ "message": { "type": "string" }, + "messageExpression": { + "type": "string" + }, "rule": { "type": "string" } @@ -1800,6 +1796,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" 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 a7f5273e007..820dc368484 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 @@ -441,11 +441,6 @@ }, "kubernetes_apiextensions_v1_JSON": { "type": "object", - "properties": { - "Raw": { - "type": "string" - } - }, "additionalProperties": true, "existingJavaType": "com.fasterxml.jackson.databind.JsonNode", "javaInterfaces": [ @@ -752,6 +747,9 @@ "message": { "type": "string" }, + "messageExpression": { + "type": "string" + }, "rule": { "type": "string" } @@ -1179,11 +1177,6 @@ }, "kubernetes_apiextensions_v1beta1_JSON": { "type": "object", - "properties": { - "Raw": { - "type": "string" - } - }, "additionalProperties": true, "existingJavaType": "com.fasterxml.jackson.databind.JsonNode", "javaInterfaces": [ @@ -1490,6 +1483,9 @@ "message": { "type": "string" }, + "messageExpression": { + "type": "string" + }, "rule": { "type": "string" } @@ -1800,6 +1796,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -2567,13 +2566,13 @@ }, "customresourcecolumndefinition": { "properties": { - "description": { + "JSONPath": { "type": "string" }, - "format": { + "description": { "type": "string" }, - "jsonPath": { + "format": { "type": "string" }, "name": { @@ -2714,16 +2713,24 @@ }, "customresourcedefinitionspec": { "properties": { + "additionalPrinterColumns": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceColumnDefinition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceColumnDefinition" + } + }, "conversion": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceConversion", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceConversion" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceConversion", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceConversion" }, "group": { "type": "string" }, "names": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionNames", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionNames", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames" }, "preserveUnknownFields": { "type": "boolean" @@ -2731,11 +2738,23 @@ "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_v1_CustomResourceDefinitionVersion", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionVersion" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionVersion", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionVersion" } } }, @@ -2769,8 +2788,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": { @@ -2783,8 +2802,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" @@ -2793,8 +2812,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 @@ -2950,11 +2969,6 @@ "additionalProperties": true }, "json": { - "properties": { - "Raw": { - "type": "string" - } - }, "additionalProperties": true }, "jsonschemaprops": { @@ -2966,48 +2980,48 @@ "type": "string" }, "additionalItems": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrBool", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrBool" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrBool", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrBool" }, "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrBool", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrBool" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrBool", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrBool" }, "allOf": { "type": "array", "javaOmitEmpty": true, "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" } }, "anyOf": { "type": "array", "javaOmitEmpty": true, "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" } }, "default": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" }, "definitions": { "type": "object", "additionalProperties": { - "$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" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "dependencies": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrStringArray", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrStringArray", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray\u003e" + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray\u003e" }, "description": { "type": "string" @@ -3016,12 +3030,12 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" } }, "example": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" }, "exclusiveMaximum": { @@ -3031,8 +3045,8 @@ "type": "boolean" }, "externalDocs": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_ExternalDocumentation", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ExternalDocumentation" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ExternalDocumentation", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ExternalDocumentation" }, "format": { "type": "string" @@ -3041,8 +3055,8 @@ "type": "string" }, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrArray", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrArray" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrArray", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrArray" }, "maxItems": { "type": "integer", @@ -3078,8 +3092,8 @@ "type": "number" }, "not": { - "$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" }, "nullable": { "type": "boolean" @@ -3088,8 +3102,8 @@ "type": "array", "javaOmitEmpty": true, "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" } }, "pattern": { @@ -3098,18 +3112,18 @@ "patternProperties": { "type": "object", "additionalProperties": { - "$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" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "properties": { "type": "object", "additionalProperties": { - "$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" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "required": { "type": "array", @@ -3153,8 +3167,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_ValidationRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ValidationRule" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ValidationRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ValidationRule" } } }, @@ -3165,13 +3179,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 @@ -3182,8 +3196,8 @@ "type": "boolean" }, "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 @@ -3197,8 +3211,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 @@ -3281,6 +3295,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -3670,6 +3687,9 @@ "message": { "type": "string" }, + "messageExpression": { + "type": "string" + }, "rule": { "type": "string" } @@ -3682,8 +3702,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-apps/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/kube-schema.json index 27f56f024b0..8dfdc868e62 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 @@ -374,6 +374,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -2452,6 +2455,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -2552,6 +2563,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_ContainerState": { "type": "object", "properties": { @@ -2640,6 +2667,14 @@ "kubernetes_core_ContainerStatus": { "type": "object", "properties": { + "allocatedResources": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", + "existingJavaType": "Quantity" + }, + "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + }, "containerID": { "type": "string" }, @@ -2661,6 +2696,10 @@ "ready": { "type": "boolean" }, + "resources": { + "$ref": "#/definitions/kubernetes_core_ResourceRequirements", + "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" + }, "restartCount": { "type": "integer" }, @@ -3047,6 +3086,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -3165,6 +3212,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -5662,6 +5717,9 @@ "reason": { "type": "string" }, + "resize": { + "type": "string" + }, "startTime": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "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 ae3d2ea29f4..194bd6da5bf 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 @@ -374,6 +374,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -2452,6 +2455,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -2552,6 +2563,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_ContainerState": { "type": "object", "properties": { @@ -2640,6 +2667,14 @@ "kubernetes_core_ContainerStatus": { "type": "object", "properties": { + "allocatedResources": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", + "existingJavaType": "Quantity" + }, + "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + }, "containerID": { "type": "string" }, @@ -2661,6 +2696,10 @@ "ready": { "type": "boolean" }, + "resources": { + "$ref": "#/definitions/kubernetes_core_ResourceRequirements", + "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" + }, "restartCount": { "type": "integer" }, @@ -3047,6 +3086,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -3165,6 +3212,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -5662,6 +5717,9 @@ "reason": { "type": "string" }, + "resize": { + "type": "string" + }, "startTime": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -8512,6 +8570,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -8598,6 +8664,17 @@ }, "additionalProperties": true }, + "containerresizepolicy": { + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true + }, "containerstate": { "properties": { "running": { @@ -8665,6 +8742,14 @@ }, "containerstatus": { "properties": { + "allocatedResources": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", + "existingJavaType": "Quantity" + }, + "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + }, "containerID": { "type": "string" }, @@ -8686,6 +8771,10 @@ "ready": { "type": "boolean" }, + "resources": { + "$ref": "#/definitions/kubernetes_core_ResourceRequirements", + "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" + }, "restartCount": { "type": "integer" }, @@ -9493,6 +9582,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -9606,6 +9703,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -10335,6 +10440,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -12067,6 +12175,9 @@ "reason": { "type": "string" }, + "resize": { + "type": "string" + }, "startTime": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" 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 85bfde278a9..039fd164bbf 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 @@ -331,6 +331,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" 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 b72ba7d6ece..ca954253f40 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 @@ -331,6 +331,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -2764,8 +2767,8 @@ "type": "string" }, "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 @@ -2775,12 +2778,9 @@ "container": { "type": "string" }, - "currentAverageUtilization": { - "type": "integer" - }, - "currentAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" }, "name": { "type": "string" @@ -2868,13 +2868,20 @@ }, "externalmetricsource": { "properties": { - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + "metricName": { + "type": "string" }, - "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + "metricSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "targetAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + }, + "targetValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" } }, "additionalProperties": true @@ -2882,12 +2889,12 @@ "externalmetricstatus": { "properties": { "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" }, "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" } }, "additionalProperties": true @@ -2954,12 +2961,12 @@ "horizontalpodautoscalerbehavior": { "properties": { "scaleDown": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" }, "scaleUp": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" } }, "additionalProperties": true @@ -3013,27 +3020,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 @@ -3092,8 +3090,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingPolicy", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingPolicy" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingPolicy" } }, "selectPolicy": { @@ -3253,6 +3251,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -3334,24 +3335,24 @@ "metricstatus": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ContainerResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ContainerResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_ContainerResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricStatus" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ExternalMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ExternalMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_ExternalMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricStatus" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ObjectMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ObjectMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_ObjectMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricStatus" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_PodsMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.PodsMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_PodsMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricStatus" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_ResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricStatus" }, "type": { "type": "string" @@ -3474,34 +3475,48 @@ }, "objectmetricsource": { "properties": { - "describedObject": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.CrossVersionObjectReference" + "averageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" + "metricName": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" + }, + "targetValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" } }, "additionalProperties": true }, "objectmetricstatus": { "properties": { - "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" + "averageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "describedObject": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.CrossVersionObjectReference" + "currentValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" + "metricName": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" } }, "additionalProperties": true @@ -3578,13 +3593,16 @@ }, "podsmetricstatus": { "properties": { - "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" + "currentAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" + "metricName": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" } }, "additionalProperties": true @@ -3616,21 +3634,21 @@ "name": { "type": "string" }, - "targetAverageUtilization": { - "type": "integer" - }, - "targetAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" } }, "additionalProperties": true }, "resourcemetricstatus": { "properties": { - "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + "currentAverageUtilization": { + "type": "integer" + }, + "currentAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, "name": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json index ab46046b9c7..edf2ce7edbf 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 @@ -344,6 +344,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1759,6 +1762,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1839,6 +1850,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_DownwardAPIProjection": { "type": "object", "properties": { @@ -2049,6 +2076,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -2167,6 +2202,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" 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 ff1d93e28ad..25d939150c1 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 @@ -344,6 +344,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1759,6 +1762,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1839,6 +1850,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_DownwardAPIProjection": { "type": "object", "properties": { @@ -2049,6 +2076,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -2167,6 +2202,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -4821,6 +4864,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -4892,6 +4943,17 @@ }, "additionalProperties": true }, + "containerresizepolicy": { + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true + }, "createoptions": { "properties": { "apiVersion": { @@ -4924,7 +4986,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "batch/v1", + "default": "batch/v1beta1", "required": true }, "kind": { @@ -4937,12 +4999,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_batch_v1_CronJobSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobSpec" + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobSpec" }, "status": { - "$ref": "#/definitions/kubernetes_batch_v1_CronJobStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobStatus" + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobStatus" } }, "additionalProperties": true @@ -4951,14 +5013,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": { @@ -4982,8 +5044,8 @@ "type": "integer" }, "jobTemplate": { - "$ref": "#/definitions/kubernetes_batch_v1_JobTemplateSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobTemplateSpec" + "$ref": "#/definitions/kubernetes_batch_v1beta1_JobTemplateSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.JobTemplateSpec" }, "schedule": { "type": "string" @@ -5260,6 +5322,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -5373,6 +5443,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -6081,6 +6159,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" diff --git a/kubernetes-model-generator/kubernetes-model-certificates/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-certificates/cmd/generate/generate.go index d9717d5c3cd..a56717149b6 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/cmd/generate/generate.go +++ b/kubernetes-model-generator/kubernetes-model-certificates/cmd/generate/generate.go @@ -25,6 +25,7 @@ import ( apimachineryversion "k8s.io/apimachinery/pkg/version" certificates "k8s.io/api/certificates/v1" + v1alpha1certificates "k8s.io/api/certificates/v1alpha1" v1beta1certificates "k8s.io/api/certificates/v1beta1" "log" @@ -61,6 +62,8 @@ type Schema struct { CertificateSigningRequestStatus certificates.CertificateSigningRequestStatus CertificateSigningRequestCondition certificates.CertificateSigningRequestCondition CertificateSigningRequestList certificates.CertificateSigningRequestList + V1Alpha1ClusterTrustBundle v1alpha1certificates.ClusterTrustBundle + V1Alpha1ClusterTrustBundleList v1alpha1certificates.ClusterTrustBundleList V1Beta1CertificateSigningRequest v1beta1certificates.CertificateSigningRequest V1Beta1CertificateSigningRequestSpec v1beta1certificates.CertificateSigningRequestSpec V1Beta1CertificateSigningRequestStatus v1beta1certificates.CertificateSigningRequestStatus @@ -74,6 +77,7 @@ func main() { {"k8s.io/apimachinery/pkg/runtime", "", "io.fabric8.kubernetes.api.model.runtime", "kubernetes_apimachinery_pkg_runtime_", false}, {"k8s.io/apimachinery/pkg/version", "", "io.fabric8.kubernetes.api.model.version", "kubernetes_apimachinery_pkg_version_", false}, {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, + {"k8s.io/api/certificates/v1alpha1", "certificates.k8s.io", "io.fabric8.kubernetes.api.model.certificates.v1alpha1", "kubernetes_certificates_v1alpha1_", true}, {"k8s.io/api/certificates/v1beta1", "certificates.k8s.io", "io.fabric8.kubernetes.api.model.certificates.v1beta1", "kubernetes_certificates_v1beta1_", true}, {"k8s.io/api/certificates/v1", "certificates.k8s.io", "io.fabric8.kubernetes.api.model.certificates.v1", "kubernetes_certificates_v1_", true}, } diff --git a/kubernetes-model-generator/kubernetes-model-certificates/pom.xml b/kubernetes-model-generator/kubernetes-model-certificates/pom.xml index b2ceb001887..5eb0c09214e 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-certificates/pom.xml @@ -45,6 +45,11 @@ io.fabric8 kubernetes-model-common + + org.assertj + assertj-core + test + diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 450d697c00d..6e3c6d5cba7 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -18,6 +18,8 @@ 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.certificates.v1alpha1.ClusterTrustBundle; +import io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundleList; import io.fabric8.kubernetes.api.model.version.Info; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -54,6 +56,8 @@ "Time", "TypeMeta", "UpdateOptions", + "V1Alpha1ClusterTrustBundle", + "V1Alpha1ClusterTrustBundleList", "V1Beta1CertificateSigningRequest", "V1Beta1CertificateSigningRequestCondition", "V1Beta1CertificateSigningRequestList", @@ -124,6 +128,10 @@ public class KubeSchema { private TypeMeta typeMeta; @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; + @JsonProperty("V1Alpha1ClusterTrustBundle") + private ClusterTrustBundle v1Alpha1ClusterTrustBundle; + @JsonProperty("V1Alpha1ClusterTrustBundleList") + private ClusterTrustBundleList v1Alpha1ClusterTrustBundleList; @JsonProperty("V1Beta1CertificateSigningRequest") private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest; @JsonProperty("V1Beta1CertificateSigningRequestCondition") @@ -156,11 +164,13 @@ public KubeSchema() { * @param v1Beta1CertificateSigningRequestCondition * @param v1Beta1CertificateSigningRequestSpec * @param rootPaths + * @param v1Alpha1ClusterTrustBundle * @param certificateSigningRequestStatus * @param info * @param patchOptions * @param deleteOptions * @param quantity + * @param v1Alpha1ClusterTrustBundleList * @param certificateSigningRequestList * @param createOptions * @param aPIGroup @@ -174,7 +184,7 @@ public KubeSchema() { * @param status * @param v1Beta1CertificateSigningRequest */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus, 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, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus, 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, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ClusterTrustBundle v1Alpha1ClusterTrustBundle, ClusterTrustBundleList v1Alpha1ClusterTrustBundleList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -198,6 +208,8 @@ public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList b this.time = time; this.typeMeta = typeMeta; this.updateOptions = updateOptions; + this.v1Alpha1ClusterTrustBundle = v1Alpha1ClusterTrustBundle; + this.v1Alpha1ClusterTrustBundleList = v1Alpha1ClusterTrustBundleList; this.v1Beta1CertificateSigningRequest = v1Beta1CertificateSigningRequest; this.v1Beta1CertificateSigningRequestCondition = v1Beta1CertificateSigningRequestCondition; this.v1Beta1CertificateSigningRequestList = v1Beta1CertificateSigningRequestList; @@ -425,6 +437,26 @@ public void setUpdateOptions(UpdateOptions updateOptions) { this.updateOptions = updateOptions; } + @JsonProperty("V1Alpha1ClusterTrustBundle") + public ClusterTrustBundle getV1Alpha1ClusterTrustBundle() { + return v1Alpha1ClusterTrustBundle; + } + + @JsonProperty("V1Alpha1ClusterTrustBundle") + public void setV1Alpha1ClusterTrustBundle(ClusterTrustBundle v1Alpha1ClusterTrustBundle) { + this.v1Alpha1ClusterTrustBundle = v1Alpha1ClusterTrustBundle; + } + + @JsonProperty("V1Alpha1ClusterTrustBundleList") + public ClusterTrustBundleList getV1Alpha1ClusterTrustBundleList() { + return v1Alpha1ClusterTrustBundleList; + } + + @JsonProperty("V1Alpha1ClusterTrustBundleList") + public void setV1Alpha1ClusterTrustBundleList(ClusterTrustBundleList v1Alpha1ClusterTrustBundleList) { + this.v1Alpha1ClusterTrustBundleList = v1Alpha1ClusterTrustBundleList; + } + @JsonProperty("V1Beta1CertificateSigningRequest") public io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest getV1Beta1CertificateSigningRequest() { return v1Beta1CertificateSigningRequest; diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index b3832c1d924..be5e052d1ea 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -18,6 +18,8 @@ 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.certificates.v1alpha1.ClusterTrustBundle; +import io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundleList; import io.fabric8.kubernetes.api.model.version.Info; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -54,6 +56,8 @@ "Time", "TypeMeta", "UpdateOptions", + "V1Alpha1ClusterTrustBundle", + "V1Alpha1ClusterTrustBundleList", "V1Beta1CertificateSigningRequest", "V1Beta1CertificateSigningRequestCondition", "V1Beta1CertificateSigningRequestList", @@ -124,6 +128,10 @@ public class ValidationSchema { private TypeMeta typeMeta; @JsonProperty("UpdateOptions") private UpdateOptions updateOptions; + @JsonProperty("V1Alpha1ClusterTrustBundle") + private ClusterTrustBundle v1Alpha1ClusterTrustBundle; + @JsonProperty("V1Alpha1ClusterTrustBundleList") + private ClusterTrustBundleList v1Alpha1ClusterTrustBundleList; @JsonProperty("V1Beta1CertificateSigningRequest") private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest; @JsonProperty("V1Beta1CertificateSigningRequestCondition") @@ -156,11 +164,13 @@ public ValidationSchema() { * @param v1Beta1CertificateSigningRequestCondition * @param v1Beta1CertificateSigningRequestSpec * @param rootPaths + * @param v1Alpha1ClusterTrustBundle * @param certificateSigningRequestStatus * @param info * @param patchOptions * @param deleteOptions * @param quantity + * @param v1Alpha1ClusterTrustBundleList * @param certificateSigningRequestList * @param createOptions * @param aPIGroup @@ -174,7 +184,7 @@ public ValidationSchema() { * @param status * @param v1Beta1CertificateSigningRequest */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus, 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, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus, 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, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ClusterTrustBundle v1Alpha1ClusterTrustBundle, ClusterTrustBundleList v1Alpha1ClusterTrustBundleList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -198,6 +208,8 @@ public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Kubernetes this.time = time; this.typeMeta = typeMeta; this.updateOptions = updateOptions; + this.v1Alpha1ClusterTrustBundle = v1Alpha1ClusterTrustBundle; + this.v1Alpha1ClusterTrustBundleList = v1Alpha1ClusterTrustBundleList; this.v1Beta1CertificateSigningRequest = v1Beta1CertificateSigningRequest; this.v1Beta1CertificateSigningRequestCondition = v1Beta1CertificateSigningRequestCondition; this.v1Beta1CertificateSigningRequestList = v1Beta1CertificateSigningRequestList; @@ -425,6 +437,26 @@ public void setUpdateOptions(UpdateOptions updateOptions) { this.updateOptions = updateOptions; } + @JsonProperty("V1Alpha1ClusterTrustBundle") + public ClusterTrustBundle getV1Alpha1ClusterTrustBundle() { + return v1Alpha1ClusterTrustBundle; + } + + @JsonProperty("V1Alpha1ClusterTrustBundle") + public void setV1Alpha1ClusterTrustBundle(ClusterTrustBundle v1Alpha1ClusterTrustBundle) { + this.v1Alpha1ClusterTrustBundle = v1Alpha1ClusterTrustBundle; + } + + @JsonProperty("V1Alpha1ClusterTrustBundleList") + public ClusterTrustBundleList getV1Alpha1ClusterTrustBundleList() { + return v1Alpha1ClusterTrustBundleList; + } + + @JsonProperty("V1Alpha1ClusterTrustBundleList") + public void setV1Alpha1ClusterTrustBundleList(ClusterTrustBundleList v1Alpha1ClusterTrustBundleList) { + this.v1Alpha1ClusterTrustBundleList = v1Alpha1ClusterTrustBundleList; + } + @JsonProperty("V1Beta1CertificateSigningRequest") public io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest getV1Beta1CertificateSigningRequest() { return v1Beta1CertificateSigningRequest; diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundle.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundle.java new file mode 100644 index 00000000000..5829097169f --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundle.java @@ -0,0 +1,180 @@ + +package io.fabric8.kubernetes.api.model.certificates.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.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) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1alpha1") +@Group("certificates.k8s.io") +public class ClusterTrustBundle implements HasMetadata +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "certificates.k8s.io/v1alpha1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "ClusterTrustBundle"; + @JsonProperty("metadata") + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + @JsonProperty("spec") + private ClusterTrustBundleSpec spec; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ClusterTrustBundle() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param spec + */ + public ClusterTrustBundle(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ClusterTrustBundleSpec 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 ClusterTrustBundleSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(ClusterTrustBundleSpec 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-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundleList.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundleList.java new file mode 100644 index 00000000000..b9532cec399 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundleList.java @@ -0,0 +1,185 @@ + +package io.fabric8.kubernetes.api.model.certificates.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 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", + "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) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1alpha1") +@Group("certificates.k8s.io") +public class ClusterTrustBundleList implements KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "certificates.k8s.io/v1alpha1"; + @JsonProperty("items") + private List items = new ArrayList(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "ClusterTrustBundleList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ClusterTrustBundleList() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param items + */ + public ClusterTrustBundleList(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-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundleSpec.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundleSpec.java new file mode 100644 index 00000000000..af12be64a79 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundleSpec.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.certificates.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.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", + "signerName", + "trustBundle" +}) +@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 ClusterTrustBundleSpec implements KubernetesResource +{ + + @JsonProperty("signerName") + private String signerName; + @JsonProperty("trustBundle") + private String trustBundle; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ClusterTrustBundleSpec() { + } + + /** + * + * @param trustBundle + * @param signerName + */ + public ClusterTrustBundleSpec(String signerName, String trustBundle) { + super(); + this.signerName = signerName; + this.trustBundle = trustBundle; + } + + @JsonProperty("signerName") + public String getSignerName() { + return signerName; + } + + @JsonProperty("signerName") + public void setSignerName(String signerName) { + this.signerName = signerName; + } + + @JsonProperty("trustBundle") + public String getTrustBundle() { + return trustBundle; + } + + @JsonProperty("trustBundle") + public void setTrustBundle(String trustBundle) { + this.trustBundle = trustBundle; + } + + @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-certificates/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/kube-schema.json index eb59d54772e..f33b88f0f76 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 @@ -296,6 +296,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -909,6 +912,82 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_certificates_v1alpha1_ClusterTrustBundle": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "certificates.k8s.io/v1alpha1", + "required": true + }, + "kind": { + "type": "string", + "default": "ClusterTrustBundle", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_certificates_v1alpha1_ClusterTrustBundleSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundleSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundle", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_certificates_v1alpha1_ClusterTrustBundleList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "certificates.k8s.io/v1alpha1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_certificates_v1alpha1_ClusterTrustBundle", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundle" + } + }, + "kind": { + "type": "string", + "default": "ClusterTrustBundleList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundleList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundle\u003e" + ] + }, + "kubernetes_certificates_v1alpha1_ClusterTrustBundleSpec": { + "type": "object", + "properties": { + "signerName": { + "type": "string" + }, + "trustBundle": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundleSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_certificates_v1beta1_CertificateSigningRequest": { "type": "object", "properties": { @@ -1164,6 +1243,14 @@ "$ref": "#/definitions/kubernetes_apimachinery_UpdateOptions", "existingJavaType": "io.fabric8.kubernetes.api.model.UpdateOptions" }, + "V1Alpha1ClusterTrustBundle": { + "$ref": "#/definitions/kubernetes_certificates_v1alpha1_ClusterTrustBundle", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundle" + }, + "V1Alpha1ClusterTrustBundleList": { + "$ref": "#/definitions/kubernetes_certificates_v1alpha1_ClusterTrustBundleList", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundleList" + }, "V1Beta1CertificateSigningRequest": { "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequest", "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest" 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 958f1d5997b..d8f12b4a36e 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 @@ -296,6 +296,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -909,6 +912,82 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_certificates_v1alpha1_ClusterTrustBundle": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "certificates.k8s.io/v1alpha1", + "required": true + }, + "kind": { + "type": "string", + "default": "ClusterTrustBundle", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_certificates_v1alpha1_ClusterTrustBundleSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundleSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundle", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_certificates_v1alpha1_ClusterTrustBundleList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "certificates.k8s.io/v1alpha1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_certificates_v1alpha1_ClusterTrustBundle", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundle" + } + }, + "kind": { + "type": "string", + "default": "ClusterTrustBundleList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundleList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundle\u003e" + ] + }, + "kubernetes_certificates_v1alpha1_ClusterTrustBundleSpec": { + "type": "object", + "properties": { + "signerName": { + "type": "string" + }, + "trustBundle": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundleSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_certificates_v1beta1_CertificateSigningRequest": { "type": "object", "properties": { @@ -1164,6 +1243,14 @@ "$ref": "#/definitions/kubernetes_apimachinery_UpdateOptions", "existingJavaType": "io.fabric8.kubernetes.api.model.UpdateOptions" }, + "V1Alpha1ClusterTrustBundle": { + "$ref": "#/definitions/kubernetes_certificates_v1alpha1_ClusterTrustBundle", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundle" + }, + "V1Alpha1ClusterTrustBundleList": { + "$ref": "#/definitions/kubernetes_certificates_v1alpha1_ClusterTrustBundleList", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundleList" + }, "V1Beta1CertificateSigningRequest": { "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequest", "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest" @@ -1250,7 +1337,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "certificates.k8s.io/v1", + "default": "certificates.k8s.io/v1beta1", "required": true }, "kind": { @@ -1263,12 +1350,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec" + "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec" }, "status": { - "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus" + "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus" } }, "additionalProperties": true @@ -1302,14 +1389,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": { @@ -1377,13 +1464,73 @@ "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" } } }, "additionalProperties": true }, + "clustertrustbundle": { + "properties": { + "apiVersion": { + "type": "string", + "default": "certificates.k8s.io/v1alpha1", + "required": true + }, + "kind": { + "type": "string", + "default": "ClusterTrustBundle", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_certificates_v1alpha1_ClusterTrustBundleSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundleSpec" + } + }, + "additionalProperties": true + }, + "clustertrustbundlelist": { + "properties": { + "apiVersion": { + "type": "string", + "default": "certificates.k8s.io/v1alpha1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_certificates_v1alpha1_ClusterTrustBundle", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1alpha1.ClusterTrustBundle" + } + }, + "kind": { + "type": "string", + "default": "ClusterTrustBundleList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true + }, + "clustertrustbundlespec": { + "properties": { + "signerName": { + "type": "string" + }, + "trustBundle": { + "type": "string" + } + }, + "additionalProperties": true + }, "createoptions": { "properties": { "apiVersion": { @@ -1590,6 +1737,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/test/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundleTest.java b/kubernetes-model-generator/kubernetes-model-certificates/src/test/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundleTest.java new file mode 100644 index 00000000000..d0dc48ac22a --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/test/java/io/fabric8/kubernetes/api/model/certificates/v1alpha1/ClusterTrustBundleTest.java @@ -0,0 +1,77 @@ +/** + * 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.api.model.certificates.v1alpha1; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.fabric8.kubernetes.api.model.Namespaced; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.Scanner; + +import static org.assertj.core.api.Assertions.assertThat; + +class ClusterTrustBundleTest { + private final ObjectMapper mapper = new ObjectMapper(); + + @Test + void isClusterScoped() { + assertThat(ClusterTrustBundle.class).isNotInstanceOf(Namespaced.class); + } + + @Test + void deserializationAndSerializationShouldWorkAsExpected() throws IOException { + // Given + String originalJson = new Scanner(getClass().getResourceAsStream("/valid-clustertrustbundle.json")) + .useDelimiter("\\A") + .next(); + + // When + final ClusterTrustBundle clusterTrustBundle = mapper.readValue(originalJson, ClusterTrustBundle.class); + final String serializedJson = mapper.writeValueAsString(clusterTrustBundle); + + // Then + assertThat(serializedJson).isNotNull(); + assertThat(clusterTrustBundle) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "example.com:mysigner:foo") + .hasFieldOrPropertyWithValue("spec.signerName", "example.com/mysigner") + .hasFieldOrPropertyWithValue("spec.trustBundle", "-----BEGIN CERTIFICATE----- PEM data -----END CERTIFICATE-----"); + } + + @Test + void builderShouldCreateObject() { + // Given + ClusterTrustBundleBuilder clusterTrustBundleBuilder = new ClusterTrustBundleBuilder() + .withNewMetadata() + .withName("example.com:mysigner:foo") + .endMetadata() + .withNewSpec() + .withSignerName("example.com/mysigner") + .withTrustBundle("-----BEGIN CERTIFICATE----- PEM data -----END CERTIFICATE-----") + .endSpec(); + + // When + ClusterTrustBundle resourceClaim = clusterTrustBundleBuilder.build(); + + // Then + assertThat(resourceClaim) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "example.com:mysigner:foo") + .hasFieldOrPropertyWithValue("spec.signerName", "example.com/mysigner") + .hasFieldOrPropertyWithValue("spec.trustBundle", "-----BEGIN CERTIFICATE----- PEM data -----END CERTIFICATE-----"); + } +} diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/test/resources/valid-clustertrustbundle.json b/kubernetes-model-generator/kubernetes-model-certificates/src/test/resources/valid-clustertrustbundle.json new file mode 100644 index 00000000000..e848efde607 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/test/resources/valid-clustertrustbundle.json @@ -0,0 +1,11 @@ +{ + "apiVersion": "certificates.k8s.io/v1alpha1", + "kind": "ClusterTrustBundle", + "metadata": { + "name": "example.com:mysigner:foo" + }, + "spec": { + "signerName": "example.com/mysigner", + "trustBundle": "-----BEGIN CERTIFICATE----- PEM data -----END CERTIFICATE-----" + } +} 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 ada7150e110..4d938459dcd 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 @@ -296,6 +296,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" 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 ff69854b56e..a3d8a745f1e 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 @@ -296,6 +296,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1264,6 +1267,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Container.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Container.java index c2a2e457c04..05c789139e0 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Container.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Container.java @@ -35,6 +35,7 @@ "name", "ports", "readinessProbe", + "resizePolicy", "resources", "securityContext", "startupProbe", @@ -85,6 +86,9 @@ public class Container implements KubernetesResource private List ports = new ArrayList(); @JsonProperty("readinessProbe") private Probe readinessProbe; + @JsonProperty("resizePolicy") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List resizePolicy = new ArrayList(); @JsonProperty("resources") private ResourceRequirements resources; @JsonProperty("securityContext") @@ -141,10 +145,11 @@ public Container() { * @param name * @param tty * @param readinessProbe + * @param resizePolicy * @param stdinOnce * @param envFrom */ - public Container(List args, List command, List env, List envFrom, String image, String imagePullPolicy, Lifecycle lifecycle, Probe livenessProbe, String name, List ports, Probe readinessProbe, ResourceRequirements resources, SecurityContext securityContext, Probe startupProbe, Boolean stdin, Boolean stdinOnce, String terminationMessagePath, String terminationMessagePolicy, Boolean tty, List volumeDevices, List volumeMounts, String workingDir) { + public Container(List args, List command, List env, List envFrom, String image, String imagePullPolicy, Lifecycle lifecycle, Probe livenessProbe, String name, List ports, Probe readinessProbe, List resizePolicy, ResourceRequirements resources, SecurityContext securityContext, Probe startupProbe, Boolean stdin, Boolean stdinOnce, String terminationMessagePath, String terminationMessagePolicy, Boolean tty, List volumeDevices, List volumeMounts, String workingDir) { super(); this.args = args; this.command = command; @@ -157,6 +162,7 @@ public Container(List args, List command, List env, List this.name = name; this.ports = ports; this.readinessProbe = readinessProbe; + this.resizePolicy = resizePolicy; this.resources = resources; this.securityContext = securityContext; this.startupProbe = startupProbe; @@ -280,6 +286,16 @@ public void setReadinessProbe(Probe readinessProbe) { this.readinessProbe = readinessProbe; } + @JsonProperty("resizePolicy") + public List getResizePolicy() { + return resizePolicy; + } + + @JsonProperty("resizePolicy") + public void setResizePolicy(List resizePolicy) { + this.resizePolicy = resizePolicy; + } + @JsonProperty("resources") public ResourceRequirements getResources() { return resources; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerResizePolicy.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerResizePolicy.java new file mode 100644 index 00000000000..723ff2bbee5 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerResizePolicy.java @@ -0,0 +1,94 @@ + +package io.fabric8.kubernetes.api.model; + +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.sundr.builder.annotations.Buildable; +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", + "resourceName", + "restartPolicy" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") +public class ContainerResizePolicy implements KubernetesResource +{ + + @JsonProperty("resourceName") + private String resourceName; + @JsonProperty("restartPolicy") + private String restartPolicy; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ContainerResizePolicy() { + } + + /** + * + * @param resourceName + * @param restartPolicy + */ + public ContainerResizePolicy(String resourceName, String restartPolicy) { + super(); + this.resourceName = resourceName; + this.restartPolicy = restartPolicy; + } + + @JsonProperty("resourceName") + public String getResourceName() { + return resourceName; + } + + @JsonProperty("resourceName") + public void setResourceName(String resourceName) { + this.resourceName = resourceName; + } + + @JsonProperty("restartPolicy") + public String getRestartPolicy() { + return restartPolicy; + } + + @JsonProperty("restartPolicy") + public void setRestartPolicy(String restartPolicy) { + this.restartPolicy = restartPolicy; + } + + @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-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStatus.java index 7a2a114a797..89079f243ff 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStatus.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStatus.java @@ -2,6 +2,7 @@ package io.fabric8.kubernetes.api.model; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -22,12 +23,14 @@ "apiVersion", "kind", "metadata", + "allocatedResources", "containerID", "image", "imageID", "lastState", "name", "ready", + "resources", "restartCount", "started", "state" @@ -43,18 +46,23 @@ public class ContainerStatus implements KubernetesResource { + @JsonProperty("allocatedResources") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map allocatedResources = new LinkedHashMap(); @JsonProperty("containerID") - private String containerID; + private java.lang.String containerID; @JsonProperty("image") - private String image; + private java.lang.String image; @JsonProperty("imageID") - private String imageID; + private java.lang.String imageID; @JsonProperty("lastState") private ContainerState lastState; @JsonProperty("name") - private String name; + private java.lang.String name; @JsonProperty("ready") private Boolean ready; + @JsonProperty("resources") + private ResourceRequirements resources; @JsonProperty("restartCount") private Integer restartCount; @JsonProperty("started") @@ -62,7 +70,7 @@ public class ContainerStatus implements KubernetesResource @JsonProperty("state") private ContainerState state; @JsonIgnore - private Map additionalProperties = new HashMap(); + private Map additionalProperties = new HashMap(); /** * No args constructor for use in serialization @@ -73,56 +81,70 @@ public ContainerStatus() { /** * + * @param allocatedResources * @param image * @param imageID * @param restartCount * @param ready * @param name + * @param resources * @param started * @param state * @param containerID * @param lastState */ - public ContainerStatus(String containerID, String image, String imageID, ContainerState lastState, String name, Boolean ready, Integer restartCount, Boolean started, ContainerState state) { + public ContainerStatus(Map allocatedResources, java.lang.String containerID, java.lang.String image, java.lang.String imageID, ContainerState lastState, java.lang.String name, Boolean ready, ResourceRequirements resources, Integer restartCount, Boolean started, ContainerState state) { super(); + this.allocatedResources = allocatedResources; this.containerID = containerID; this.image = image; this.imageID = imageID; this.lastState = lastState; this.name = name; this.ready = ready; + this.resources = resources; this.restartCount = restartCount; this.started = started; this.state = state; } + @JsonProperty("allocatedResources") + public Map getAllocatedResources() { + return allocatedResources; + } + + @JsonProperty("allocatedResources") + public void setAllocatedResources(Map allocatedResources) { + this.allocatedResources = allocatedResources; + } + @JsonProperty("containerID") - public String getContainerID() { + public java.lang.String getContainerID() { return containerID; } @JsonProperty("containerID") - public void setContainerID(String containerID) { + public void setContainerID(java.lang.String containerID) { this.containerID = containerID; } @JsonProperty("image") - public String getImage() { + public java.lang.String getImage() { return image; } @JsonProperty("image") - public void setImage(String image) { + public void setImage(java.lang.String image) { this.image = image; } @JsonProperty("imageID") - public String getImageID() { + public java.lang.String getImageID() { return imageID; } @JsonProperty("imageID") - public void setImageID(String imageID) { + public void setImageID(java.lang.String imageID) { this.imageID = imageID; } @@ -137,12 +159,12 @@ public void setLastState(ContainerState lastState) { } @JsonProperty("name") - public String getName() { + public java.lang.String getName() { return name; } @JsonProperty("name") - public void setName(String name) { + public void setName(java.lang.String name) { this.name = name; } @@ -156,6 +178,16 @@ public void setReady(Boolean ready) { this.ready = ready; } + @JsonProperty("resources") + public ResourceRequirements getResources() { + return resources; + } + + @JsonProperty("resources") + public void setResources(ResourceRequirements resources) { + this.resources = resources; + } + @JsonProperty("restartCount") public Integer getRestartCount() { return restartCount; @@ -187,12 +219,12 @@ public void setState(ContainerState state) { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { + public void setAdditionalProperty(java.lang.String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/EphemeralContainer.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/EphemeralContainer.java index 0328b8f6f71..8d7e8a5aedc 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/EphemeralContainer.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/EphemeralContainer.java @@ -35,6 +35,7 @@ "name", "ports", "readinessProbe", + "resizePolicy", "resources", "securityContext", "startupProbe", @@ -86,6 +87,9 @@ public class EphemeralContainer implements KubernetesResource private List ports = new ArrayList(); @JsonProperty("readinessProbe") private Probe readinessProbe; + @JsonProperty("resizePolicy") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List resizePolicy = new ArrayList(); @JsonProperty("resources") private ResourceRequirements resources; @JsonProperty("securityContext") @@ -145,10 +149,11 @@ public EphemeralContainer() { * @param name * @param tty * @param readinessProbe + * @param resizePolicy * @param stdinOnce * @param envFrom */ - public EphemeralContainer(List args, List command, List env, List envFrom, String image, String imagePullPolicy, Lifecycle lifecycle, Probe livenessProbe, String name, List ports, Probe readinessProbe, ResourceRequirements resources, SecurityContext securityContext, Probe startupProbe, Boolean stdin, Boolean stdinOnce, String targetContainerName, String terminationMessagePath, String terminationMessagePolicy, Boolean tty, List volumeDevices, List volumeMounts, String workingDir) { + public EphemeralContainer(List args, List command, List env, List envFrom, String image, String imagePullPolicy, Lifecycle lifecycle, Probe livenessProbe, String name, List ports, Probe readinessProbe, List resizePolicy, ResourceRequirements resources, SecurityContext securityContext, Probe startupProbe, Boolean stdin, Boolean stdinOnce, String targetContainerName, String terminationMessagePath, String terminationMessagePolicy, Boolean tty, List volumeDevices, List volumeMounts, String workingDir) { super(); this.args = args; this.command = command; @@ -161,6 +166,7 @@ public EphemeralContainer(List args, List command, List this.name = name; this.ports = ports; this.readinessProbe = readinessProbe; + this.resizePolicy = resizePolicy; this.resources = resources; this.securityContext = securityContext; this.startupProbe = startupProbe; @@ -285,6 +291,16 @@ public void setReadinessProbe(Probe readinessProbe) { this.readinessProbe = readinessProbe; } + @JsonProperty("resizePolicy") + public List getResizePolicy() { + return resizePolicy; + } + + @JsonProperty("resizePolicy") + public void setResizePolicy(List resizePolicy) { + this.resizePolicy = resizePolicy; + } + @JsonProperty("resources") public ResourceRequirements getResources() { return resources; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ListOptions.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ListOptions.java index 59846bb0ed0..8394670285a 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ListOptions.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ListOptions.java @@ -33,6 +33,7 @@ "limit", "resourceVersion", "resourceVersionMatch", + "sendInitialEvents", "timeoutSeconds", "watch" }) @@ -80,6 +81,8 @@ public class ListOptions implements KubernetesResource private String resourceVersion; @JsonProperty("resourceVersionMatch") private String resourceVersionMatch; + @JsonProperty("sendInitialEvents") + private Boolean sendInitialEvents; @JsonProperty("timeoutSeconds") private Long timeoutSeconds; @JsonProperty("watch") @@ -104,11 +107,12 @@ public ListOptions() { * @param resourceVersion * @param labelSelector * @param limit + * @param sendInitialEvents * @param timeoutSeconds * @param fieldSelector * @param allowWatchBookmarks */ - public ListOptions(Boolean allowWatchBookmarks, String apiVersion, String _continue, String fieldSelector, String kind, String labelSelector, Long limit, String resourceVersion, String resourceVersionMatch, Long timeoutSeconds, Boolean watch) { + public ListOptions(Boolean allowWatchBookmarks, String apiVersion, String _continue, String fieldSelector, String kind, String labelSelector, Long limit, String resourceVersion, String resourceVersionMatch, Boolean sendInitialEvents, Long timeoutSeconds, Boolean watch) { super(); this.allowWatchBookmarks = allowWatchBookmarks; this.apiVersion = apiVersion; @@ -119,6 +123,7 @@ public ListOptions(Boolean allowWatchBookmarks, String apiVersion, String _conti this.limit = limit; this.resourceVersion = resourceVersion; this.resourceVersionMatch = resourceVersionMatch; + this.sendInitialEvents = sendInitialEvents; this.timeoutSeconds = timeoutSeconds; this.watch = watch; } @@ -233,6 +238,16 @@ public void setResourceVersionMatch(String resourceVersionMatch) { this.resourceVersionMatch = resourceVersionMatch; } + @JsonProperty("sendInitialEvents") + public Boolean getSendInitialEvents() { + return sendInitialEvents; + } + + @JsonProperty("sendInitialEvents") + public void setSendInitialEvents(Boolean sendInitialEvents) { + this.sendInitialEvents = sendInitialEvents; + } + @JsonProperty("timeoutSeconds") public Long getTimeoutSeconds() { return timeoutSeconds; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodStatus.java index 8e2f24a3681..62c975faabd 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodStatus.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodStatus.java @@ -36,6 +36,7 @@ "podIPs", "qosClass", "reason", + "resize", "startTime" }) @ToString @@ -78,6 +79,8 @@ public class PodStatus implements KubernetesResource private java.lang.String qosClass; @JsonProperty("reason") private java.lang.String reason; + @JsonProperty("resize") + private java.lang.String resize; @JsonProperty("startTime") private String startTime; @JsonIgnore @@ -101,12 +104,13 @@ public PodStatus() { * @param podIPs * @param podIP * @param ephemeralContainerStatuses + * @param resize * @param startTime * @param qosClass * @param conditions * @param initContainerStatuses */ - public PodStatus(List conditions, List containerStatuses, List ephemeralContainerStatuses, java.lang.String hostIP, List initContainerStatuses, java.lang.String message, java.lang.String nominatedNodeName, java.lang.String phase, java.lang.String podIP, List podIPs, java.lang.String qosClass, java.lang.String reason, String startTime) { + public PodStatus(List conditions, List containerStatuses, List ephemeralContainerStatuses, java.lang.String hostIP, List initContainerStatuses, java.lang.String message, java.lang.String nominatedNodeName, java.lang.String phase, java.lang.String podIP, List podIPs, java.lang.String qosClass, java.lang.String reason, java.lang.String resize, String startTime) { super(); this.conditions = conditions; this.containerStatuses = containerStatuses; @@ -120,6 +124,7 @@ public PodStatus(List conditions, List containerS this.podIPs = podIPs; this.qosClass = qosClass; this.reason = reason; + this.resize = resize; this.startTime = startTime; } @@ -243,6 +248,16 @@ public void setReason(java.lang.String reason) { this.reason = reason; } + @JsonProperty("resize") + public java.lang.String getResize() { + return resize; + } + + @JsonProperty("resize") + public void setResize(java.lang.String resize) { + this.resize = resize; + } + @JsonProperty("startTime") public String getStartTime() { return startTime; 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 9d8a5819c59..f9b8072ae97 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 @@ -655,6 +655,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -2243,6 +2246,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -2343,6 +2354,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_ContainerState": { "type": "object", "properties": { @@ -2431,6 +2458,14 @@ "kubernetes_core_ContainerStatus": { "type": "object", "properties": { + "allocatedResources": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + }, + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + }, "containerID": { "type": "string" }, @@ -2452,6 +2487,10 @@ "ready": { "type": "boolean" }, + "resources": { + "$ref": "#/definitions/kubernetes_core_ResourceRequirements", + "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" + }, "restartCount": { "type": "integer" }, @@ -2838,6 +2877,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -2956,6 +3003,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -5633,6 +5688,9 @@ "reason": { "type": "string" }, + "resize": { + "type": "string" + }, "startTime": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", "existingJavaType": "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 30e0fab1796..4089a2a0345 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 @@ -655,6 +655,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -2243,6 +2246,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -2343,6 +2354,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_ContainerState": { "type": "object", "properties": { @@ -2431,6 +2458,14 @@ "kubernetes_core_ContainerStatus": { "type": "object", "properties": { + "allocatedResources": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + }, + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + }, "containerID": { "type": "string" }, @@ -2452,6 +2487,10 @@ "ready": { "type": "boolean" }, + "resources": { + "$ref": "#/definitions/kubernetes_core_ResourceRequirements", + "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" + }, "restartCount": { "type": "integer" }, @@ -2838,6 +2877,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -2956,6 +3003,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -5633,6 +5688,9 @@ "reason": { "type": "string" }, + "resize": { + "type": "string" + }, "startTime": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", "existingJavaType": "String" @@ -8914,6 +8972,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -9000,6 +9066,17 @@ }, "additionalProperties": true }, + "containerresizepolicy": { + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true + }, "containerstate": { "properties": { "running": { @@ -9067,6 +9144,14 @@ }, "containerstatus": { "properties": { + "allocatedResources": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + }, + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + }, "containerID": { "type": "string" }, @@ -9088,6 +9173,10 @@ "ready": { "type": "boolean" }, + "resources": { + "$ref": "#/definitions/kubernetes_core_ResourceRequirements", + "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" + }, "restartCount": { "type": "integer" }, @@ -9557,6 +9646,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -9670,6 +9767,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -10599,6 +10704,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -12422,6 +12530,9 @@ "reason": { "type": "string" }, + "resize": { + "type": "string" + }, "startTime": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", "existingJavaType": "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 865061c51a7..40a386a4b63 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 @@ -296,6 +296,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" 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 b6af4844651..4475268973d 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 @@ -296,6 +296,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1470,14 +1473,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": { @@ -1492,8 +1495,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" } } }, @@ -1675,6 +1678,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" 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 82a2ffc32c0..6123bb9bfae 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 @@ -296,6 +296,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" 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 256d6b93f3f..987bd9313ba 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 @@ -296,6 +296,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1348,14 +1351,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "events.k8s.io/v1beta1", + "default": "events.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_events_v1beta1_Event", - "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1beta1.Event" + "$ref": "#/definitions/kubernetes_events_v1_Event", + "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1.Event" } }, "kind": { @@ -1535,6 +1538,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" 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 f0dd799f413..ca8f2a4f97d 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 @@ -374,6 +374,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1209,6 +1212,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1289,6 +1300,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_DownwardAPIProjection": { "type": "object", "properties": { @@ -1499,6 +1526,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1617,6 +1652,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" 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 cde7865d911..337e168c89e 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 @@ -374,6 +374,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1209,6 +1212,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1289,6 +1300,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_DownwardAPIProjection": { "type": "object", "properties": { @@ -1499,6 +1526,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1617,6 +1652,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -5415,6 +5458,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -5486,6 +5537,17 @@ }, "additionalProperties": true }, + "containerresizepolicy": { + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true + }, "createoptions": { "properties": { "apiVersion": { @@ -6093,6 +6155,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -6206,6 +6276,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -6971,6 +7049,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" 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 178f79d2665..993e36b7146 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/cmd/generate/generate.go +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/cmd/generate/generate.go @@ -24,6 +24,7 @@ import ( flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" flowcontrolv1beta3 "k8s.io/api/flowcontrol/v1beta3" + apiserverinternalv1alpha1 "k8s.io/api/apiserverinternal/v1alpha1" "log" @@ -53,6 +54,8 @@ type Schema struct { V1beta3FlowSchemaList flowcontrolv1beta3.FlowSchemaList V1beta3PriorityLevelConfiguration flowcontrolv1beta3.PriorityLevelConfiguration V1beta3PriorityLevelConfigurationList flowcontrolv1beta3.PriorityLevelConfigurationList + V1Alpha1StorageVersion apiserverinternalv1alpha1.StorageVersion + V1Alpha1StorageVersionList apiserverinternalv1alpha1.StorageVersionList } func main() { @@ -66,6 +69,7 @@ func main() { {"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}, {"k8s.io/api/flowcontrol/v1beta3", "flowcontrol.apiserver.k8s.io", "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3", "kubernetes_flowcontrol_v1beta3_", true}, + {"k8s.io/api/apiserverinternal/v1alpha1", "internal.apiserver.k8s.io", "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1", "kubernetes_internal_apiserver_v1alpha1_", true}, } typeMap := map[reflect.Type]reflect.Type{ diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/pom.xml b/kubernetes-model-generator/kubernetes-model-flowcontrol/pom.xml index 4fefe42f85c..d4b0905dd1c 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/pom.xml @@ -34,7 +34,8 @@ true * - io.fabric8.kubernetes.api.model.flowcontrol** + io.fabric8.kubernetes.api.model.flowcontrol**, + io.fabric8.kubernetes.api.model.internal.apiserver** @@ -47,6 +48,11 @@ io.fabric8 kubernetes-model-common + + org.assertj + assertj-core + test + 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 8604eaa0bf0..7edc4e5f48f 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,6 +19,8 @@ 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.internal.apiserver.v1alpha1.StorageVersion; +import io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionList; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -32,6 +34,8 @@ "apiVersion", "kind", "metadata", + "V1Alpha1StorageVersion", + "V1Alpha1StorageVersionList", "V1alpha1FlowSchema", "V1alpha1FlowSchemaList", "V1alpha1PriorityLevelConfiguration", @@ -69,6 +73,10 @@ }) public class KubeSchema { + @JsonProperty("V1Alpha1StorageVersion") + private StorageVersion v1Alpha1StorageVersion; + @JsonProperty("V1Alpha1StorageVersionList") + private StorageVersionList v1Alpha1StorageVersionList; @JsonProperty("V1alpha1FlowSchema") private io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchema v1alpha1FlowSchema; @JsonProperty("V1alpha1FlowSchemaList") @@ -118,11 +126,13 @@ public KubeSchema() { * @param v1beta3PriorityLevelConfigurationList * @param v1beta2FlowSchema * @param v1alpha1PriorityLevelConfiguration + * @param v1Alpha1StorageVersion * @param v1beta1PriorityLevelConfiguration * @param v1beta3PriorityLevelConfiguration * @param v1beta2PriorityLevelConfigurationList * @param v1alpha1FlowSchema * @param v1alpha1FlowSchemaList + * @param v1Alpha1StorageVersionList * @param v1alpha1PriorityLevelConfigurationList * @param v1beta1PriorityLevelConfigurationList * @param v1beta1FlowSchema @@ -130,8 +140,10 @@ public KubeSchema() { * @param v1beta3FlowSchemaList * @param v1beta2PriorityLevelConfiguration */ - public KubeSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchema v1alpha1FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchemaList v1alpha1FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfiguration v1alpha1PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfigurationList v1alpha1PriorityLevelConfigurationList, 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, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema v1beta3FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList v1beta3FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration v1beta3PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList v1beta3PriorityLevelConfigurationList) { + public KubeSchema(StorageVersion v1Alpha1StorageVersion, StorageVersionList v1Alpha1StorageVersionList, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchema v1alpha1FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchemaList v1alpha1FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfiguration v1alpha1PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfigurationList v1alpha1PriorityLevelConfigurationList, 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, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema v1beta3FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList v1beta3FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration v1beta3PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList v1beta3PriorityLevelConfigurationList) { super(); + this.v1Alpha1StorageVersion = v1Alpha1StorageVersion; + this.v1Alpha1StorageVersionList = v1Alpha1StorageVersionList; this.v1alpha1FlowSchema = v1alpha1FlowSchema; this.v1alpha1FlowSchemaList = v1alpha1FlowSchemaList; this.v1alpha1PriorityLevelConfiguration = v1alpha1PriorityLevelConfiguration; @@ -150,6 +162,26 @@ public KubeSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchem this.v1beta3PriorityLevelConfigurationList = v1beta3PriorityLevelConfigurationList; } + @JsonProperty("V1Alpha1StorageVersion") + public StorageVersion getV1Alpha1StorageVersion() { + return v1Alpha1StorageVersion; + } + + @JsonProperty("V1Alpha1StorageVersion") + public void setV1Alpha1StorageVersion(StorageVersion v1Alpha1StorageVersion) { + this.v1Alpha1StorageVersion = v1Alpha1StorageVersion; + } + + @JsonProperty("V1Alpha1StorageVersionList") + public StorageVersionList getV1Alpha1StorageVersionList() { + return v1Alpha1StorageVersionList; + } + + @JsonProperty("V1Alpha1StorageVersionList") + public void setV1Alpha1StorageVersionList(StorageVersionList v1Alpha1StorageVersionList) { + this.v1Alpha1StorageVersionList = v1Alpha1StorageVersionList; + } + @JsonProperty("V1alpha1FlowSchema") public io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchema getV1alpha1FlowSchema() { return v1alpha1FlowSchema; 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 24703eec516..257c00eaec1 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,6 +19,8 @@ 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.internal.apiserver.v1alpha1.StorageVersion; +import io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionList; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -32,6 +34,8 @@ "apiVersion", "kind", "metadata", + "V1Alpha1StorageVersion", + "V1Alpha1StorageVersionList", "V1alpha1FlowSchema", "V1alpha1FlowSchemaList", "V1alpha1PriorityLevelConfiguration", @@ -69,6 +73,10 @@ }) public class ValidationSchema { + @JsonProperty("V1Alpha1StorageVersion") + private StorageVersion v1Alpha1StorageVersion; + @JsonProperty("V1Alpha1StorageVersionList") + private StorageVersionList v1Alpha1StorageVersionList; @JsonProperty("V1alpha1FlowSchema") private io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchema v1alpha1FlowSchema; @JsonProperty("V1alpha1FlowSchemaList") @@ -118,11 +126,13 @@ public ValidationSchema() { * @param v1beta3PriorityLevelConfigurationList * @param v1beta2FlowSchema * @param v1alpha1PriorityLevelConfiguration + * @param v1Alpha1StorageVersion * @param v1beta1PriorityLevelConfiguration * @param v1beta3PriorityLevelConfiguration * @param v1beta2PriorityLevelConfigurationList * @param v1alpha1FlowSchema * @param v1alpha1FlowSchemaList + * @param v1Alpha1StorageVersionList * @param v1alpha1PriorityLevelConfigurationList * @param v1beta1PriorityLevelConfigurationList * @param v1beta1FlowSchema @@ -130,8 +140,10 @@ public ValidationSchema() { * @param v1beta3FlowSchemaList * @param v1beta2PriorityLevelConfiguration */ - public ValidationSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchema v1alpha1FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchemaList v1alpha1FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfiguration v1alpha1PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfigurationList v1alpha1PriorityLevelConfigurationList, 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, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema v1beta3FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList v1beta3FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration v1beta3PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList v1beta3PriorityLevelConfigurationList) { + public ValidationSchema(StorageVersion v1Alpha1StorageVersion, StorageVersionList v1Alpha1StorageVersionList, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchema v1alpha1FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchemaList v1alpha1FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfiguration v1alpha1PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfigurationList v1alpha1PriorityLevelConfigurationList, 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, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema v1beta3FlowSchema, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaList v1beta3FlowSchemaList, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration v1beta3PriorityLevelConfiguration, io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationList v1beta3PriorityLevelConfigurationList) { super(); + this.v1Alpha1StorageVersion = v1Alpha1StorageVersion; + this.v1Alpha1StorageVersionList = v1Alpha1StorageVersionList; this.v1alpha1FlowSchema = v1alpha1FlowSchema; this.v1alpha1FlowSchemaList = v1alpha1FlowSchemaList; this.v1alpha1PriorityLevelConfiguration = v1alpha1PriorityLevelConfiguration; @@ -150,6 +162,26 @@ public ValidationSchema(io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.Flo this.v1beta3PriorityLevelConfigurationList = v1beta3PriorityLevelConfigurationList; } + @JsonProperty("V1Alpha1StorageVersion") + public StorageVersion getV1Alpha1StorageVersion() { + return v1Alpha1StorageVersion; + } + + @JsonProperty("V1Alpha1StorageVersion") + public void setV1Alpha1StorageVersion(StorageVersion v1Alpha1StorageVersion) { + this.v1Alpha1StorageVersion = v1Alpha1StorageVersion; + } + + @JsonProperty("V1Alpha1StorageVersionList") + public StorageVersionList getV1Alpha1StorageVersionList() { + return v1Alpha1StorageVersionList; + } + + @JsonProperty("V1Alpha1StorageVersionList") + public void setV1Alpha1StorageVersionList(StorageVersionList v1Alpha1StorageVersionList) { + this.v1Alpha1StorageVersionList = v1Alpha1StorageVersionList; + } + @JsonProperty("V1alpha1FlowSchema") public io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchema getV1alpha1FlowSchema() { return v1alpha1FlowSchema; diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/ServerStorageVersion.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/ServerStorageVersion.java new file mode 100644 index 00000000000..8b51f878498 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/ServerStorageVersion.java @@ -0,0 +1,133 @@ + +package io.fabric8.kubernetes.api.model.internal.apiserver.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.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", + "apiServerID", + "decodableVersions", + "encodingVersion" +}) +@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 ServerStorageVersion implements KubernetesResource +{ + + @JsonProperty("apiServerID") + private String apiServerID; + @JsonProperty("decodableVersions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List decodableVersions = new ArrayList(); + @JsonProperty("encodingVersion") + private String encodingVersion; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ServerStorageVersion() { + } + + /** + * + * @param apiServerID + * @param decodableVersions + * @param encodingVersion + */ + public ServerStorageVersion(String apiServerID, List decodableVersions, String encodingVersion) { + super(); + this.apiServerID = apiServerID; + this.decodableVersions = decodableVersions; + this.encodingVersion = encodingVersion; + } + + @JsonProperty("apiServerID") + public String getApiServerID() { + return apiServerID; + } + + @JsonProperty("apiServerID") + public void setApiServerID(String apiServerID) { + this.apiServerID = apiServerID; + } + + @JsonProperty("decodableVersions") + public List getDecodableVersions() { + return decodableVersions; + } + + @JsonProperty("decodableVersions") + public void setDecodableVersions(List decodableVersions) { + this.decodableVersions = decodableVersions; + } + + @JsonProperty("encodingVersion") + public String getEncodingVersion() { + return encodingVersion; + } + + @JsonProperty("encodingVersion") + public void setEncodingVersion(String encodingVersion) { + this.encodingVersion = encodingVersion; + } + + @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-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodScheduling.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersion.java similarity index 86% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodScheduling.java rename to kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersion.java index 9e9e72a258c..ca86f575405 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodScheduling.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersion.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1; import java.util.HashMap; import java.util.Map; @@ -15,7 +15,6 @@ 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; @@ -62,8 +61,8 @@ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) @Version("v1alpha1") -@Group("resource.k8s.io") -public class PodScheduling implements HasMetadata, Namespaced +@Group("internal.apiserver.k8s.io") +public class StorageVersion implements HasMetadata { /** @@ -72,20 +71,20 @@ public class PodScheduling implements HasMetadata, Namespaced * */ @JsonProperty("apiVersion") - private String apiVersion = "resource.k8s.io/v1alpha1"; + private String apiVersion = "internal.apiserver.k8s.io/v1alpha1"; /** * * (Required) * */ @JsonProperty("kind") - private String kind = "PodScheduling"; + private String kind = "StorageVersion"; @JsonProperty("metadata") private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") - private PodSchedulingSpec spec; + private StorageVersionSpec spec; @JsonProperty("status") - private PodSchedulingStatus status; + private StorageVersionStatus status; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -93,7 +92,7 @@ public class PodScheduling implements HasMetadata, Namespaced * No args constructor for use in serialization * */ - public PodScheduling() { + public StorageVersion() { } /** @@ -104,7 +103,7 @@ public PodScheduling() { * @param spec * @param status */ - public PodScheduling(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, PodSchedulingSpec spec, PodSchedulingStatus status) { + public StorageVersion(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, StorageVersionSpec spec, StorageVersionStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -164,22 +163,22 @@ public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { } @JsonProperty("spec") - public PodSchedulingSpec getSpec() { + public StorageVersionSpec getSpec() { return spec; } @JsonProperty("spec") - public void setSpec(PodSchedulingSpec spec) { + public void setSpec(StorageVersionSpec spec) { this.spec = spec; } @JsonProperty("status") - public PodSchedulingStatus getStatus() { + public StorageVersionStatus getStatus() { return status; } @JsonProperty("status") - public void setStatus(PodSchedulingStatus status) { + public void setStatus(StorageVersionStatus status) { this.status = status; } diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionCondition.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionCondition.java new file mode 100644 index 00000000000..dffaf19c1d9 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionCondition.java @@ -0,0 +1,175 @@ + +package io.fabric8.kubernetes.api.model.internal.apiserver.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.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", + "observedGeneration", + "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 StorageVersionCondition implements KubernetesResource +{ + + @JsonProperty("lastTransitionTime") + private String lastTransitionTime; + @JsonProperty("message") + private java.lang.String message; + @JsonProperty("observedGeneration") + private Long observedGeneration; + @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 StorageVersionCondition() { + } + + /** + * + * @param reason + * @param lastTransitionTime + * @param message + * @param type + * @param observedGeneration + * @param status + */ + public StorageVersionCondition(String lastTransitionTime, java.lang.String message, Long observedGeneration, java.lang.String reason, java.lang.String status, java.lang.String type) { + super(); + this.lastTransitionTime = lastTransitionTime; + this.message = message; + this.observedGeneration = observedGeneration; + 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("observedGeneration") + public Long getObservedGeneration() { + return observedGeneration; + } + + @JsonProperty("observedGeneration") + public void setObservedGeneration(Long observedGeneration) { + this.observedGeneration = observedGeneration; + } + + @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/internal/apiserver/v1alpha1/StorageVersionList.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionList.java new file mode 100644 index 00000000000..f27d6119feb --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionList.java @@ -0,0 +1,185 @@ + +package io.fabric8.kubernetes.api.model.internal.apiserver.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 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", + "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) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1alpha1") +@Group("internal.apiserver.k8s.io") +public class StorageVersionList implements KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "internal.apiserver.k8s.io/v1alpha1"; + @JsonProperty("items") + private List items = new ArrayList(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "StorageVersionList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public StorageVersionList() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param items + */ + public StorageVersionList(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/internal/apiserver/v1alpha1/StorageVersionSpec.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionSpec.java new file mode 100644 index 00000000000..8a0de91592f --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionSpec.java @@ -0,0 +1,70 @@ + +package io.fabric8.kubernetes.api.model.internal.apiserver.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.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" +}) +@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 StorageVersionSpec implements KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @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/internal/apiserver/v1alpha1/StorageVersionStatus.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionStatus.java new file mode 100644 index 00000000000..671ccfb77b6 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionStatus.java @@ -0,0 +1,134 @@ + +package io.fabric8.kubernetes.api.model.internal.apiserver.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.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", + "commonEncodingVersion", + "conditions", + "storageVersions" +}) +@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 StorageVersionStatus implements KubernetesResource +{ + + @JsonProperty("commonEncodingVersion") + private String commonEncodingVersion; + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList(); + @JsonProperty("storageVersions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List storageVersions = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public StorageVersionStatus() { + } + + /** + * + * @param commonEncodingVersion + * @param conditions + * @param storageVersions + */ + public StorageVersionStatus(String commonEncodingVersion, List conditions, List storageVersions) { + super(); + this.commonEncodingVersion = commonEncodingVersion; + this.conditions = conditions; + this.storageVersions = storageVersions; + } + + @JsonProperty("commonEncodingVersion") + public String getCommonEncodingVersion() { + return commonEncodingVersion; + } + + @JsonProperty("commonEncodingVersion") + public void setCommonEncodingVersion(String commonEncodingVersion) { + this.commonEncodingVersion = commonEncodingVersion; + } + + @JsonProperty("conditions") + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("storageVersions") + public List getStorageVersions() { + return storageVersions; + } + + @JsonProperty("storageVersions") + public void setStorageVersions(List storageVersions) { + this.storageVersions = storageVersions; + } + + @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 edd3b0e5d90..22c3dc9eaf2 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 @@ -2232,10 +2232,172 @@ "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] + }, + "kubernetes_internal_apiserver_v1alpha1_ServerStorageVersion": { + "type": "object", + "properties": { + "apiServerID": { + "type": "string" + }, + "decodableVersions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "encodingVersion": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.ServerStorageVersion", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_internal_apiserver_v1alpha1_StorageVersion": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "internal.apiserver.k8s.io/v1alpha1", + "required": true + }, + "kind": { + "type": "string", + "default": "StorageVersion", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersionSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersionStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersion", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_internal_apiserver_v1alpha1_StorageVersionCondition": { + "type": "object", + "properties": { + "lastTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "message": { + "type": "string" + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_internal_apiserver_v1alpha1_StorageVersionList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "internal.apiserver.k8s.io/v1alpha1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersion", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersion" + } + }, + "kind": { + "type": "string", + "default": "StorageVersionList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersion\u003e" + ] + }, + "kubernetes_internal_apiserver_v1alpha1_StorageVersionSpec": { + "type": "object", + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_internal_apiserver_v1alpha1_StorageVersionStatus": { + "type": "object", + "properties": { + "commonEncodingVersion": { + "type": "string" + }, + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersionCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionCondition" + } + }, + "storageVersions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_ServerStorageVersion", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.ServerStorageVersion" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] } }, "type": "object", "properties": { + "V1Alpha1StorageVersion": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersion", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersion" + }, + "V1Alpha1StorageVersionList": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersionList", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionList" + }, "V1alpha1FlowSchema": { "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_FlowSchema", "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchema" 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 708f4aabb37..89b5a797e8c 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 @@ -2232,10 +2232,172 @@ "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] + }, + "kubernetes_internal_apiserver_v1alpha1_ServerStorageVersion": { + "type": "object", + "properties": { + "apiServerID": { + "type": "string" + }, + "decodableVersions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "encodingVersion": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.ServerStorageVersion", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_internal_apiserver_v1alpha1_StorageVersion": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "internal.apiserver.k8s.io/v1alpha1", + "required": true + }, + "kind": { + "type": "string", + "default": "StorageVersion", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersionSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersionStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersion", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_internal_apiserver_v1alpha1_StorageVersionCondition": { + "type": "object", + "properties": { + "lastTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "message": { + "type": "string" + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_internal_apiserver_v1alpha1_StorageVersionList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "internal.apiserver.k8s.io/v1alpha1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersion", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersion" + } + }, + "kind": { + "type": "string", + "default": "StorageVersionList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersion\u003e" + ] + }, + "kubernetes_internal_apiserver_v1alpha1_StorageVersionSpec": { + "type": "object", + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_internal_apiserver_v1alpha1_StorageVersionStatus": { + "type": "object", + "properties": { + "commonEncodingVersion": { + "type": "string" + }, + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersionCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionCondition" + } + }, + "storageVersions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_ServerStorageVersion", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.ServerStorageVersion" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] } }, "type": "object", "properties": { + "V1Alpha1StorageVersion": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersion", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersion" + }, + "V1Alpha1StorageVersionList": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersionList", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionList" + }, "V1alpha1FlowSchema": { "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_FlowSchema", "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchema" @@ -2318,7 +2480,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta1", + "default": "flowcontrol.apiserver.k8s.io/v1alpha1", "required": true }, "kind": { @@ -2331,12 +2493,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_v1alpha1_FlowSchemaSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchemaSpec" }, "status": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchemaStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaStatus" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_FlowSchemaStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchemaStatus" } }, "additionalProperties": true @@ -2366,14 +2528,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1alpha1", + "default": "flowcontrol.apiserver.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_FlowSchema", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchema" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchema", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema" } }, "kind": { @@ -2391,22 +2553,22 @@ "flowschemaspec": { "properties": { "distinguisherMethod": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_FlowDistinguisherMethod", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowDistinguisherMethod" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowDistinguisherMethod", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowDistinguisherMethod" }, "matchingPrecedence": { "type": "integer" }, "priorityLevelConfiguration": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_PriorityLevelConfigurationReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfigurationReference" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationReference" }, "rules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_PolicyRulesWithSubjects", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PolicyRulesWithSubjects" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PolicyRulesWithSubjects", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PolicyRulesWithSubjects" } } }, @@ -2418,8 +2580,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowSchemaCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchemaCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaCondition" } } }, @@ -2445,8 +2607,8 @@ "type": "integer" }, "limitResponse": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitResponse" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_LimitResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.LimitResponse" } }, "additionalProperties": true @@ -2454,8 +2616,8 @@ "limitresponse": { "properties": { "queuing": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_QueuingConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.QueuingConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_QueuingConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.QueuingConfiguration" }, "type": { "type": "string" @@ -2633,23 +2795,23 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_NonResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.NonResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_NonResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.NonResourcePolicyRule" } }, "resourceRules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_ResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.ResourcePolicyRule" } }, "subjects": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_Subject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.Subject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_Subject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.Subject" } } }, @@ -2659,7 +2821,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta1", + "default": "flowcontrol.apiserver.k8s.io/v1alpha1", "required": true }, "kind": { @@ -2672,12 +2834,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationSpec" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_PriorityLevelConfigurationSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfigurationSpec" }, "status": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationStatus" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_PriorityLevelConfigurationStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfigurationStatus" } }, "additionalProperties": true @@ -2740,8 +2902,8 @@ "prioritylevelconfigurationspec": { "properties": { "limited": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_LimitedPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.LimitedPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_LimitedPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.LimitedPriorityLevelConfiguration" }, "type": { "type": "string" @@ -2755,8 +2917,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PriorityLevelConfigurationCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationCondition" } } }, @@ -2808,6 +2970,24 @@ }, "additionalProperties": true }, + "serverstorageversion": { + "properties": { + "apiServerID": { + "type": "string" + }, + "decodableVersions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "encodingVersion": { + "type": "string" + } + }, + "additionalProperties": true + }, "serviceaccountsubject": { "properties": { "name": { @@ -2819,22 +2999,127 @@ }, "additionalProperties": true }, + "storageversion": { + "properties": { + "apiVersion": { + "type": "string", + "default": "internal.apiserver.k8s.io/v1alpha1", + "required": true + }, + "kind": { + "type": "string", + "default": "StorageVersion", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersionSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersionStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionStatus" + } + }, + "additionalProperties": true + }, + "storageversioncondition": { + "properties": { + "lastTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "message": { + "type": "string" + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, + "storageversionlist": { + "properties": { + "apiVersion": { + "type": "string", + "default": "internal.apiserver.k8s.io/v1alpha1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersion", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersion" + } + }, + "kind": { + "type": "string", + "default": "StorageVersionList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true + }, + "storageversionspec": { + "additionalProperties": true + }, + "storageversionstatus": { + "properties": { + "commonEncodingVersion": { + "type": "string" + }, + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_StorageVersionCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.StorageVersionCondition" + } + }, + "storageVersions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_internal_apiserver_v1alpha1_ServerStorageVersion", + "existingJavaType": "io.fabric8.kubernetes.api.model.internal.apiserver.v1alpha1.ServerStorageVersion" + } + } + }, + "additionalProperties": true + }, "subject": { "properties": { "group": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_GroupSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.GroupSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_GroupSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.GroupSubject" }, "kind": { "type": "string" }, "serviceAccount": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ServiceAccountSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ServiceAccountSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_ServiceAccountSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ServiceAccountSubject" }, "user": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_UserSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.UserSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_UserSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.UserSubject" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionTest.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionTest.java new file mode 100644 index 00000000000..4726e15fbc6 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionTest.java @@ -0,0 +1,113 @@ +/** + * 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.api.model.internal.apiserver.v1alpha1; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.fabric8.kubernetes.api.model.Namespaced; +import org.assertj.core.api.InstanceOfAssertFactories; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.Arrays; +import java.util.Scanner; + +import static org.assertj.core.api.Assertions.assertThat; + +class StorageVersionTest { + private final ObjectMapper mapper = new ObjectMapper(); + + @Test + void isClusterScoped() { + assertThat(StorageVersion.class).isNotInstanceOf(Namespaced.class); + } + + @Test + void deserializationAndSerializationShouldWorkAsExpected() throws IOException { + // Given + String originalJson = new Scanner(getClass().getResourceAsStream("/valid-internal-apiserver-storageversion.json")) + .useDelimiter("\\A") + .next(); + + // When + final StorageVersion storageVersion = mapper.readValue(originalJson, StorageVersion.class); + final String serializedJson = mapper.writeValueAsString(storageVersion); + + // Then + assertThat(serializedJson).isNotNull(); + assertThat(storageVersion) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "apps.deployments") + .hasFieldOrPropertyWithValue("status.commonEncodingVersion", "apps/v1") + .satisfies(s -> assertThat(s.getStatus().getConditions()) + .singleElement(InstanceOfAssertFactories.type(StorageVersionCondition.class)) + .hasFieldOrPropertyWithValue("lastTransitionTime", "2023-06-04T17:16:57Z") + .hasFieldOrPropertyWithValue("message", "Common encoding version set") + .hasFieldOrPropertyWithValue("reason", "CommonEncodingVersionSet") + .hasFieldOrPropertyWithValue("status", "True") + .hasFieldOrPropertyWithValue("type", "AllEncodingVersionsEqual")) + .satisfies(s -> assertThat(s.getStatus().getStorageVersions()) + .singleElement(InstanceOfAssertFactories.type(ServerStorageVersion.class)) + .hasFieldOrPropertyWithValue("apiServerID", "kube-apiserver-803c62b1-340f-4055-93ca-44aba8a35574") + .hasFieldOrPropertyWithValue("decodableVersions", Arrays.asList("apps/v1", "apps/v1beta2", "apps/v1beta1")) + .hasFieldOrPropertyWithValue("encodingVersion", "apps/v1")); + } + + @Test + void builderShouldCreateObject() { + // Given + StorageVersionBuilder storageVersionBuilder = new StorageVersionBuilder() + .withNewMetadata() + .withName("apps.deployments") + .endMetadata() + .withNewSpec() + .endSpec() + .withNewStatus() + .withCommonEncodingVersion("apps/v1") + .addNewCondition() + .withLastTransitionTime("2023-06-04T17:16:57Z") + .withMessage("Common encoding version set") + .withReason("CommonEncodingVersionSet") + .withStatus("True") + .withType("AllEncodingVersionsEqual") + .endCondition() + .addNewStorageVersion() + .withApiServerID("kube-apiserver-803c62b1-340f-4055-93ca-44aba8a35574") + .addToDecodableVersions("apps/v1", "apps/v1beta2", "apps/v1beta1") + .withEncodingVersion("apps/v1") + .endStorageVersion() + .endStatus(); + // When + StorageVersion storageVersion = storageVersionBuilder.build(); + + // Then + assertThat(storageVersion) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "apps.deployments") + .hasFieldOrPropertyWithValue("status.commonEncodingVersion", "apps/v1") + .satisfies(s -> assertThat(s.getStatus().getConditions()) + .singleElement(InstanceOfAssertFactories.type(StorageVersionCondition.class)) + .hasFieldOrPropertyWithValue("lastTransitionTime", "2023-06-04T17:16:57Z") + .hasFieldOrPropertyWithValue("message", "Common encoding version set") + .hasFieldOrPropertyWithValue("reason", "CommonEncodingVersionSet") + .hasFieldOrPropertyWithValue("status", "True") + .hasFieldOrPropertyWithValue("type", "AllEncodingVersionsEqual")) + .satisfies(s -> assertThat(s.getStatus().getStorageVersions()) + .singleElement(InstanceOfAssertFactories.type(ServerStorageVersion.class)) + .hasFieldOrPropertyWithValue("apiServerID", "kube-apiserver-803c62b1-340f-4055-93ca-44aba8a35574") + .hasFieldOrPropertyWithValue("decodableVersions", Arrays.asList("apps/v1", "apps/v1beta2", "apps/v1beta1")) + .hasFieldOrPropertyWithValue("encodingVersion", "apps/v1")); + } +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/resources/valid-internal-apiserver-storageversion.json b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/resources/valid-internal-apiserver-storageversion.json new file mode 100644 index 00000000000..f7007a5c64b --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/test/resources/valid-internal-apiserver-storageversion.json @@ -0,0 +1,31 @@ +{ + "apiVersion": "internal.apiserver.k8s.io/v1alpha1", + "kind": "StorageVersion", + "metadata": { + "name": "apps.deployments" + }, + "spec": {}, + "status": { + "commonEncodingVersion": "apps/v1", + "conditions": [ + { + "lastTransitionTime": "2023-06-04T17:16:57Z", + "message": "Common encoding version set", + "reason": "CommonEncodingVersionSet", + "status": "True", + "type": "AllEncodingVersionsEqual" + } + ], + "storageVersions": [ + { + "apiServerID": "kube-apiserver-803c62b1-340f-4055-93ca-44aba8a35574", + "decodableVersions": [ + "apps/v1", + "apps/v1beta2", + "apps/v1beta1" + ], + "encodingVersion": "apps/v1" + } + ] + } +} 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 e4be69ec0f2..b5b7a388056 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 @@ -2625,14 +2625,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_GatewayClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewayClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass" } }, "kind": { @@ -3642,7 +3642,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "kind": { 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 c7d399fa68a..34fec892712 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 @@ -297,6 +297,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" 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 7d5b7de9dee..7df24bea9e5 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 @@ -297,6 +297,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1339,6 +1342,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" 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 6591317e1b6..5a491b2c343 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/cmd/generate/generate.go +++ b/kubernetes-model-generator/kubernetes-model-networking/cmd/generate/generate.go @@ -70,7 +70,9 @@ type Schema struct { IngressClass networkingv1beta1.IngressClass IngressClassList networkingv1beta1.IngressClassList V1Alpha1ClusterCIDR networkingv1alpha1.ClusterCIDR - V1Alpha1ClusterCIDRList networkingv1alpha1.ClusterCIDRList + V1Alpha1ClusterCIDRList networkingv1alpha1.ClusterCIDRList + V1Alpha1IPAddress networkingv1alpha1.IPAddress + V1Alpha1IPAddressList networkingv1alpha1.IPAddressList } func main() { diff --git a/kubernetes-model-generator/kubernetes-model-networking/pom.xml b/kubernetes-model-generator/kubernetes-model-networking/pom.xml index 7b5538afa0f..dfefdc613ba 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-networking/pom.xml @@ -45,6 +45,11 @@ io.fabric8 kubernetes-model-common + + org.assertj + assertj-core + test + 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 1a392a6c21f..5736cee26a4 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 @@ -21,6 +21,8 @@ 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.networking.v1alpha1.IPAddress; +import io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddressList; import io.fabric8.kubernetes.api.model.version.Info; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -61,6 +63,8 @@ "UpdateOptions", "V1Alpha1ClusterCIDR", "V1Alpha1ClusterCIDRList", + "V1Alpha1IPAddress", + "V1Alpha1IPAddressList", "V1Ingress", "V1IngressClass", "V1IngressClassList", @@ -138,6 +142,10 @@ public class KubeSchema { private ClusterCIDR v1Alpha1ClusterCIDR; @JsonProperty("V1Alpha1ClusterCIDRList") private ClusterCIDRList v1Alpha1ClusterCIDRList; + @JsonProperty("V1Alpha1IPAddress") + private IPAddress v1Alpha1IPAddress; + @JsonProperty("V1Alpha1IPAddressList") + private IPAddressList v1Alpha1IPAddressList; @JsonProperty("V1Ingress") private io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress; @JsonProperty("V1IngressClass") @@ -182,14 +190,16 @@ public KubeSchema() { * @param ingress * @param typeMeta * @param objectMeta + * @param v1Alpha1IPAddress * @param getOptions * @param time * @param v1IngressClass * @param v1IngressClassList * @param v1IngressList * @param status + * @param v1Alpha1IPAddressList */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList 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) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList 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, IPAddress v1Alpha1IPAddress, IPAddressList v1Alpha1IPAddressList, 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; @@ -217,6 +227,8 @@ public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList b this.updateOptions = updateOptions; this.v1Alpha1ClusterCIDR = v1Alpha1ClusterCIDR; this.v1Alpha1ClusterCIDRList = v1Alpha1ClusterCIDRList; + this.v1Alpha1IPAddress = v1Alpha1IPAddress; + this.v1Alpha1IPAddressList = v1Alpha1IPAddressList; this.v1Ingress = v1Ingress; this.v1IngressClass = v1IngressClass; this.v1IngressClassList = v1IngressClassList; @@ -483,6 +495,26 @@ public void setV1Alpha1ClusterCIDRList(ClusterCIDRList v1Alpha1ClusterCIDRList) this.v1Alpha1ClusterCIDRList = v1Alpha1ClusterCIDRList; } + @JsonProperty("V1Alpha1IPAddress") + public IPAddress getV1Alpha1IPAddress() { + return v1Alpha1IPAddress; + } + + @JsonProperty("V1Alpha1IPAddress") + public void setV1Alpha1IPAddress(IPAddress v1Alpha1IPAddress) { + this.v1Alpha1IPAddress = v1Alpha1IPAddress; + } + + @JsonProperty("V1Alpha1IPAddressList") + public IPAddressList getV1Alpha1IPAddressList() { + return v1Alpha1IPAddressList; + } + + @JsonProperty("V1Alpha1IPAddressList") + public void setV1Alpha1IPAddressList(IPAddressList v1Alpha1IPAddressList) { + this.v1Alpha1IPAddressList = v1Alpha1IPAddressList; + } + @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 be6805527be..fa0c19033f7 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 @@ -21,6 +21,8 @@ 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.networking.v1alpha1.IPAddress; +import io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddressList; import io.fabric8.kubernetes.api.model.version.Info; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; @@ -61,6 +63,8 @@ "UpdateOptions", "V1Alpha1ClusterCIDR", "V1Alpha1ClusterCIDRList", + "V1Alpha1IPAddress", + "V1Alpha1IPAddressList", "V1Ingress", "V1IngressClass", "V1IngressClassList", @@ -138,6 +142,10 @@ public class ValidationSchema { private ClusterCIDR v1Alpha1ClusterCIDR; @JsonProperty("V1Alpha1ClusterCIDRList") private ClusterCIDRList v1Alpha1ClusterCIDRList; + @JsonProperty("V1Alpha1IPAddress") + private IPAddress v1Alpha1IPAddress; + @JsonProperty("V1Alpha1IPAddressList") + private IPAddressList v1Alpha1IPAddressList; @JsonProperty("V1Ingress") private io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress; @JsonProperty("V1IngressClass") @@ -182,14 +190,16 @@ public ValidationSchema() { * @param ingress * @param typeMeta * @param objectMeta + * @param v1Alpha1IPAddress * @param getOptions * @param time * @param v1IngressClass * @param v1IngressClassList * @param v1IngressList * @param status + * @param v1Alpha1IPAddressList */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList 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) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList 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, IPAddress v1Alpha1IPAddress, IPAddressList v1Alpha1IPAddressList, 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; @@ -217,6 +227,8 @@ public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Kubernetes this.updateOptions = updateOptions; this.v1Alpha1ClusterCIDR = v1Alpha1ClusterCIDR; this.v1Alpha1ClusterCIDRList = v1Alpha1ClusterCIDRList; + this.v1Alpha1IPAddress = v1Alpha1IPAddress; + this.v1Alpha1IPAddressList = v1Alpha1IPAddressList; this.v1Ingress = v1Ingress; this.v1IngressClass = v1IngressClass; this.v1IngressClassList = v1IngressClassList; @@ -483,6 +495,26 @@ public void setV1Alpha1ClusterCIDRList(ClusterCIDRList v1Alpha1ClusterCIDRList) this.v1Alpha1ClusterCIDRList = v1Alpha1ClusterCIDRList; } + @JsonProperty("V1Alpha1IPAddress") + public IPAddress getV1Alpha1IPAddress() { + return v1Alpha1IPAddress; + } + + @JsonProperty("V1Alpha1IPAddress") + public void setV1Alpha1IPAddress(IPAddress v1Alpha1IPAddress) { + this.v1Alpha1IPAddress = v1Alpha1IPAddress; + } + + @JsonProperty("V1Alpha1IPAddressList") + public IPAddressList getV1Alpha1IPAddressList() { + return v1Alpha1IPAddressList; + } + + @JsonProperty("V1Alpha1IPAddressList") + public void setV1Alpha1IPAddressList(IPAddressList v1Alpha1IPAddressList) { + this.v1Alpha1IPAddressList = v1Alpha1IPAddressList; + } + @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 index df64c32efba..378dfa0527e 100644 --- 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 @@ -15,7 +15,6 @@ 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; @@ -62,7 +61,7 @@ }) @Version("v1alpha1") @Group("networking.k8s.io") -public class ClusterCIDR implements HasMetadata, Namespaced +public class ClusterCIDR implements HasMetadata { /** diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddress.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddress.java new file mode 100644 index 00000000000..294b6ef1cc4 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddress.java @@ -0,0 +1,180 @@ + +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.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) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1alpha1") +@Group("networking.k8s.io") +public class IPAddress implements HasMetadata +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "networking.k8s.io/v1alpha1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "IPAddress"; + @JsonProperty("metadata") + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + @JsonProperty("spec") + private IPAddressSpec spec; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public IPAddress() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param spec + */ + public IPAddress(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, IPAddressSpec 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 IPAddressSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(IPAddressSpec 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/IPAddressList.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddressList.java new file mode 100644 index 00000000000..12d55d41965 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddressList.java @@ -0,0 +1,185 @@ + +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 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", + "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) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1alpha1") +@Group("networking.k8s.io") +public class IPAddressList 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 = "IPAddressList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public IPAddressList() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param items + */ + public IPAddressList(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/IPAddressSpec.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddressSpec.java new file mode 100644 index 00000000000..cf07cee5774 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddressSpec.java @@ -0,0 +1,100 @@ + +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.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", + "parentRef" +}) +@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 IPAddressSpec implements KubernetesResource +{ + + @JsonProperty("parentRef") + private ParentReference parentRef; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public IPAddressSpec() { + } + + /** + * + * @param parentRef + */ + public IPAddressSpec(ParentReference parentRef) { + super(); + this.parentRef = parentRef; + } + + @JsonProperty("parentRef") + public ParentReference getParentRef() { + return parentRef; + } + + @JsonProperty("parentRef") + public void setParentRef(ParentReference parentRef) { + this.parentRef = parentRef; + } + + @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/ParentReference.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ParentReference.java new file mode 100644 index 00000000000..27db8299e48 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ParentReference.java @@ -0,0 +1,160 @@ + +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.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", + "name", + "namespace", + "resource", + "uid" +}) +@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 ParentReference implements KubernetesResource +{ + + @JsonProperty("group") + private String group; + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("resource") + private String resource; + @JsonProperty("uid") + private String uid; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ParentReference() { + } + + /** + * + * @param uid + * @param resource + * @param name + * @param namespace + * @param group + */ + public ParentReference(String group, String name, String namespace, String resource, String uid) { + super(); + this.group = group; + this.name = name; + this.namespace = namespace; + this.resource = resource; + this.uid = uid; + } + + @JsonProperty("group") + public String getGroup() { + return group; + } + + @JsonProperty("group") + public void setGroup(String group) { + this.group = group; + } + + @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; + } + + @JsonProperty("resource") + public String getResource() { + return resource; + } + + @JsonProperty("resource") + public void setResource(String resource) { + this.resource = resource; + } + + @JsonProperty("uid") + public String getUid() { + return uid; + } + + @JsonProperty("uid") + public void setUid(String uid) { + this.uid = uid; + } + + @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 cecfee19fac..f1f8a3dd09a 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 @@ -374,6 +374,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1632,8 +1635,7 @@ "additionalProperties": true, "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDR", "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.HasMetadata", - "io.fabric8.kubernetes.api.model.Namespaced" + "io.fabric8.kubernetes.api.model.HasMetadata" ] }, "kubernetes_networking_v1alpha1_ClusterCIDRList": { @@ -1691,6 +1693,105 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_networking_v1alpha1_IPAddress": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "networking.k8s.io/v1alpha1", + "required": true + }, + "kind": { + "type": "string", + "default": "IPAddress", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_IPAddressSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddressSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddress", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_networking_v1alpha1_IPAddressList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "networking.k8s.io/v1alpha1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_IPAddress", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddress" + } + }, + "kind": { + "type": "string", + "default": "IPAddressList", + "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.IPAddressList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddress\u003e" + ] + }, + "kubernetes_networking_v1alpha1_IPAddressSpec": { + "type": "object", + "properties": { + "parentRef": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_ParentReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ParentReference" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddressSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_networking_v1alpha1_ParentReference": { + "type": "object", + "properties": { + "group": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + }, + "resource": { + "type": "string" + }, + "uid": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ParentReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_networking_v1beta1_HTTPIngressPath": { "type": "object", "properties": { @@ -2182,6 +2283,14 @@ "$ref": "#/definitions/kubernetes_networking_v1alpha1_ClusterCIDRList", "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDRList" }, + "V1Alpha1IPAddress": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_IPAddress", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddress" + }, + "V1Alpha1IPAddressList": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_IPAddressList", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddressList" + }, "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 5a23c3ddf9d..4127cec5e91 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 @@ -374,6 +374,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1632,8 +1635,7 @@ "additionalProperties": true, "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDR", "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.HasMetadata", - "io.fabric8.kubernetes.api.model.Namespaced" + "io.fabric8.kubernetes.api.model.HasMetadata" ] }, "kubernetes_networking_v1alpha1_ClusterCIDRList": { @@ -1691,6 +1693,105 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_networking_v1alpha1_IPAddress": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "networking.k8s.io/v1alpha1", + "required": true + }, + "kind": { + "type": "string", + "default": "IPAddress", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_IPAddressSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddressSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddress", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_networking_v1alpha1_IPAddressList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "networking.k8s.io/v1alpha1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_IPAddress", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddress" + } + }, + "kind": { + "type": "string", + "default": "IPAddressList", + "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.IPAddressList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddress\u003e" + ] + }, + "kubernetes_networking_v1alpha1_IPAddressSpec": { + "type": "object", + "properties": { + "parentRef": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_ParentReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ParentReference" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddressSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_networking_v1alpha1_ParentReference": { + "type": "object", + "properties": { + "group": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + }, + "resource": { + "type": "string" + }, + "uid": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ParentReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_networking_v1beta1_HTTPIngressPath": { "type": "object", "properties": { @@ -2182,6 +2283,14 @@ "$ref": "#/definitions/kubernetes_networking_v1alpha1_ClusterCIDRList", "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ClusterCIDRList" }, + "V1Alpha1IPAddress": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_IPAddress", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddress" + }, + "V1Alpha1IPAddressList": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_IPAddressList", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddressList" + }, "V1Ingress": { "$ref": "#/definitions/kubernetes_networking_v1_Ingress", "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.Ingress" @@ -2468,8 +2577,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" } } }, @@ -2551,7 +2660,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1beta1", + "default": "networking.k8s.io/v1", "required": true }, "kind": { @@ -2564,8 +2673,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressClassSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassSpec" + "$ref": "#/definitions/kubernetes_networking_v1_IngressClassSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressClassSpec" } }, "additionalProperties": true @@ -2574,14 +2683,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": { @@ -2735,9 +2844,9 @@ }, "ingressspec": { "properties": { - "defaultBackend": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressBackend", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressBackend" + "backend": { + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressBackend", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressBackend" }, "ingressClassName": { "type": "string" @@ -2746,16 +2855,16 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressRule" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressRule" } }, "tls": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressTLS", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressTLS" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressTLS", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressTLS" } } }, @@ -2800,6 +2909,64 @@ }, "additionalProperties": true }, + "ipaddress": { + "properties": { + "apiVersion": { + "type": "string", + "default": "networking.k8s.io/v1alpha1", + "required": true + }, + "kind": { + "type": "string", + "default": "IPAddress", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_IPAddressSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddressSpec" + } + }, + "additionalProperties": true + }, + "ipaddresslist": { + "properties": { + "apiVersion": { + "type": "string", + "default": "networking.k8s.io/v1alpha1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_IPAddress", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.IPAddress" + } + }, + "kind": { + "type": "string", + "default": "IPAddressList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true + }, + "ipaddressspec": { + "properties": { + "parentRef": { + "$ref": "#/definitions/kubernetes_networking_v1alpha1_ParentReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1alpha1.ParentReference" + } + }, + "additionalProperties": true + }, "ipblock": { "properties": { "cidr": { @@ -2931,6 +3098,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -3319,6 +3489,26 @@ }, "additionalProperties": true }, + "parentreference": { + "properties": { + "group": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + }, + "resource": { + "type": "string" + }, + "uid": { + "type": "string" + } + }, + "additionalProperties": true + }, "patch": { "additionalProperties": true }, diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/test/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDRTest.java b/kubernetes-model-generator/kubernetes-model-networking/src/test/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDRTest.java new file mode 100644 index 00000000000..c509bd78417 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-networking/src/test/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/ClusterCIDRTest.java @@ -0,0 +1,122 @@ +/** + * 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.api.model.networking.v1alpha1; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.api.model.NodeSelectorBuilder; +import io.fabric8.kubernetes.api.model.NodeSelectorTermBuilder; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.Collections; +import java.util.Scanner; + +import static org.assertj.core.api.Assertions.assertThat; + +class ClusterCIDRTest { + private final ObjectMapper mapper = new ObjectMapper(); + + @Test + void isClusterScoped() { + assertThat(ClusterCIDR.class).isNotInstanceOf(Namespaced.class); + } + + @Test + void deserializationAndSerializationShouldWorkAsExpected() throws IOException { + // Given + String originalJson = new Scanner(getClass().getResourceAsStream("/valid-clustercidr.json")) + .useDelimiter("\\A") + .next(); + + // When + final ClusterCIDR clusterCIDR = mapper.readValue(originalJson, ClusterCIDR.class); + final String serializedJson = mapper.writeValueAsString(clusterCIDR); + + // Then + assertThat(serializedJson).isNotNull(); + assertThat(clusterCIDR) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "test-clustercidr") + .hasFieldOrPropertyWithValue("spec.nodeSelector.nodeSelectorTerms", + Collections.singletonList(new NodeSelectorTermBuilder() + .addNewMatchField() + .withKey("metadata.name") + .withOperator("In") + .withValues("test-name") + .endMatchField() + .addNewMatchExpression() + .withKey("metadata.name") + .withOperator("In") + .withValues("test-name") + .endMatchExpression() + .build())) + .hasFieldOrPropertyWithValue("spec.perNodeHostBits", 4) + .hasFieldOrPropertyWithValue("spec.ipv4", "10.0.0.0/8") + .hasFieldOrPropertyWithValue("spec.ipv6", "2001:db8::/64"); + } + + @Test + void builderShouldCreateObject() { + // Given + ClusterCIDRBuilder clusterCIDRBuilder = new ClusterCIDRBuilder() + .withNewMetadata() + .withName("test-clustercidr") + .endMetadata() + .withNewSpec() + .withIpv4("10.0.0.0/8") + .withIpv6("2001:db8::/64") + .withPerNodeHostBits(4) + .withNodeSelector(new NodeSelectorBuilder() + .withNodeSelectorTerms(Collections.singletonList(new NodeSelectorTermBuilder() + .addNewMatchField() + .withKey("metadata.name") + .withOperator("In") + .withValues("test-name") + .endMatchField() + .addNewMatchExpression() + .withKey("metadata.name") + .withOperator("In") + .withValues("test-name") + .endMatchExpression() + .build())) + .build()) + .endSpec(); + // When + ClusterCIDR clusterCIDR = clusterCIDRBuilder.build(); + + // Then + assertThat(clusterCIDR) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "test-clustercidr") + .hasFieldOrPropertyWithValue("spec.nodeSelector.nodeSelectorTerms", + Collections.singletonList(new NodeSelectorTermBuilder() + .addNewMatchField() + .withKey("metadata.name") + .withOperator("In") + .withValues("test-name") + .endMatchField() + .addNewMatchExpression() + .withKey("metadata.name") + .withOperator("In") + .withValues("test-name") + .endMatchExpression() + .build())) + .hasFieldOrPropertyWithValue("spec.perNodeHostBits", 4) + .hasFieldOrPropertyWithValue("spec.ipv4", "10.0.0.0/8") + .hasFieldOrPropertyWithValue("spec.ipv6", "2001:db8::/64"); + } +} diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/test/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddressTest.java b/kubernetes-model-generator/kubernetes-model-networking/src/test/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddressTest.java new file mode 100644 index 00000000000..e3f459eae64 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-networking/src/test/java/io/fabric8/kubernetes/api/model/networking/v1alpha1/IPAddressTest.java @@ -0,0 +1,87 @@ +/** + * 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.api.model.networking.v1alpha1; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.fabric8.kubernetes.api.model.Namespaced; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.Scanner; + +import static org.assertj.core.api.Assertions.assertThat; + +class IPAddressTest { + private final ObjectMapper mapper = new ObjectMapper(); + + @Test + void isClusterScoped() { + assertThat(IPAddress.class).isNotInstanceOf(Namespaced.class); + } + + @Test + void deserializationAndSerializationShouldWorkAsExpected() throws IOException { + // Given + String originalJson = new Scanner(getClass().getResourceAsStream("/valid-ipaddress.json")) + .useDelimiter("\\A") + .next(); + + // When + final IPAddress ipAddress = mapper.readValue(originalJson, IPAddress.class); + final String serializedJson = mapper.writeValueAsString(ipAddress); + + // Then + assertThat(serializedJson).isNotNull(); + assertThat(ipAddress) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "192.168.1.5") + .hasFieldOrPropertyWithValue("spec.parentRef.group", "apps") + .hasFieldOrPropertyWithValue("spec.parentRef.resource", "Deployment") + .hasFieldOrPropertyWithValue("spec.parentRef.namespace", "default") + .hasFieldOrPropertyWithValue("spec.parentRef.name", "test-deploy") + .hasFieldOrPropertyWithValue("spec.parentRef.uid", "95f24228-b0fb-499c-94f0-801a707c6875"); + } + + @Test + void builderShouldCreateObject() { + // Given + IPAddressBuilder ipAddressBuilder = new IPAddressBuilder() + .withNewMetadata() + .withName("192.168.1.5") + .endMetadata() + .withNewSpec() + .withNewParentRef() + .withGroup("apps") + .withResource("Deployment") + .withNamespace("default") + .withName("test-deploy") + .withUid("95f24228-b0fb-499c-94f0-801a707c6875") + .endParentRef() + .endSpec(); + // When + IPAddress ipAddress = ipAddressBuilder.build(); + + // Then + assertThat(ipAddress) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "192.168.1.5") + .hasFieldOrPropertyWithValue("spec.parentRef.group", "apps") + .hasFieldOrPropertyWithValue("spec.parentRef.resource", "Deployment") + .hasFieldOrPropertyWithValue("spec.parentRef.namespace", "default") + .hasFieldOrPropertyWithValue("spec.parentRef.name", "test-deploy") + .hasFieldOrPropertyWithValue("spec.parentRef.uid", "95f24228-b0fb-499c-94f0-801a707c6875"); + } +} diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/test/resources/valid-clustercidr.json b/kubernetes-model-generator/kubernetes-model-networking/src/test/resources/valid-clustercidr.json new file mode 100644 index 00000000000..0cde9a29aaf --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-networking/src/test/resources/valid-clustercidr.json @@ -0,0 +1,36 @@ +{ + "kind": "ClusterCIDR", + "apiVersion": "networking.k8s.io/v1alpha1", + "metadata": { + "name": "test-clustercidr" + }, + "spec": { + "nodeSelector": { + "nodeSelectorTerms": [ + { + "matchExpressions": [ + { + "key": "metadata.name", + "operator": "In", + "values": [ + "test-name" + ] + } + ], + "matchFields": [ + { + "key": "metadata.name", + "operator": "In", + "values": [ + "test-name" + ] + } + ] + } + ] + }, + "perNodeHostBits": 4, + "ipv4": "10.0.0.0/8", + "ipv6": "2001:db8::/64" + } +} diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/test/resources/valid-ipaddress.json b/kubernetes-model-generator/kubernetes-model-networking/src/test/resources/valid-ipaddress.json new file mode 100644 index 00000000000..d02941d8273 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-networking/src/test/resources/valid-ipaddress.json @@ -0,0 +1,16 @@ +{ + "kind": "IPAddress", + "apiVersion": "networking.k8s.io/v1alpha1", + "metadata": { + "name": "192.168.1.5" + }, + "spec": { + "parentRef": { + "group": "apps", + "resource": "Deployment", + "namespace": "default", + "name": "test-deploy", + "uid": "95f24228-b0fb-499c-94f0-801a707c6875" + } + } +} 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 6d0a562243c..6d777250167 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 @@ -1110,9 +1110,12 @@ "properties": { "apiVersion": { "type": "string", - "default": "node.k8s.io/v1alpha1", + "default": "node.k8s.io/v1beta1", "required": true }, + "handler": { + "type": "string" + }, "kind": { "type": "string", "default": "RuntimeClass", @@ -1122,9 +1125,13 @@ "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, - "spec": { - "$ref": "#/definitions/kubernetes_node_v1alpha_RuntimeClassSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassSpec" + "overhead": { + "$ref": "#/definitions/kubernetes_node_v1beta1_Overhead", + "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1beta1.Overhead" + }, + "scheduling": { + "$ref": "#/definitions/kubernetes_node_v1beta1_Scheduling", + "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1beta1.Scheduling" } }, "additionalProperties": true @@ -1133,14 +1140,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "node.k8s.io/v1beta1", + "default": "node.k8s.io/v1alpha1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_node_v1beta1_RuntimeClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass" + "$ref": "#/definitions/kubernetes_node_v1alpha_RuntimeClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1alpha1.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 4e4dfad5577..264cb0450da 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 @@ -374,6 +374,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" 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 be6ce22442e..db66f77cdcd 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 @@ -374,6 +374,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -2157,6 +2160,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -2360,7 +2366,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "policy/v1", + "default": "policy/v1beta1", "required": true }, "kind": { @@ -2373,12 +2379,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetSpec" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetSpec" }, "status": { - "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetStatus" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetStatus" } }, "additionalProperties": true @@ -2387,14 +2393,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "policy/v1", + "default": "policy/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudget", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudget", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-resource/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-resource/cmd/generate/generate.go index 13e3e204a48..c477e574eee 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/cmd/generate/generate.go +++ b/kubernetes-model-generator/kubernetes-model-resource/cmd/generate/generate.go @@ -19,7 +19,7 @@ import ( "bytes" "encoding/json" "fmt" - v1alpha1resource "k8s.io/api/resource/v1alpha1" + v1alpha2resource "k8s.io/api/resource/v1alpha2" "log" "reflect" @@ -32,14 +32,14 @@ import ( ) type Schema struct { - ResourceClaim v1alpha1resource.ResourceClaim - ResourceClaimList v1alpha1resource.ResourceClaimList - PodScheduling v1alpha1resource.PodScheduling - PodSchedulingList v1alpha1resource.PodSchedulingList - ResourceClass v1alpha1resource.ResourceClaim - ResourceClassList v1alpha1resource.ResourceClassList - ResourceClaimTemplate v1alpha1resource.ResourceClaimTemplate - ResourceClaimTemplateList v1alpha1resource.ResourceClaimTemplateList + ResourceClaim v1alpha2resource.ResourceClaim + ResourceClaimList v1alpha2resource.ResourceClaimList + ResourceClass v1alpha2resource.ResourceClaim + PodSchedulingContext v1alpha2resource.PodSchedulingContext + PodSchedulingContextList v1alpha2resource.PodSchedulingContextList + ResourceClassList v1alpha2resource.ResourceClassList + ResourceClaimTemplate v1alpha2resource.ResourceClaimTemplate + ResourceClaimTemplateList v1alpha2resource.ResourceClaimTemplateList } func main() { @@ -48,7 +48,7 @@ func main() { {"k8s.io/apimachinery/pkg/version", "", "io.fabric8.kubernetes.api.model.version", "kubernetes_apimachinery_pkg_version_", false}, {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, {"k8s.io/api/core/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_core_", false}, - {"k8s.io/api/resource/v1alpha1", "resource.k8s.io", "io.fabric8.kubernetes.api.model.resource.v1alpha1", "kubernetes_resource_v1alpha1_", true}, + {"k8s.io/api/resource/v1alpha2", "resource.k8s.io", "io.fabric8.kubernetes.api.model.resource.v1alpha2", "kubernetes_resource_v1alpha2_", true}, } typeMap := map[reflect.Type]reflect.Type{ diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 85839db0eda..c41d8edba06 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -19,13 +19,13 @@ 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.resource.v1alpha1.PodScheduling; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassList; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -39,8 +39,8 @@ "apiVersion", "kind", "metadata", - "PodScheduling", - "PodSchedulingList", + "PodSchedulingContext", + "PodSchedulingContextList", "ResourceClaim", "ResourceClaimList", "ResourceClaimTemplate", @@ -68,10 +68,10 @@ }) public class KubeSchema { - @JsonProperty("PodScheduling") - private PodScheduling podScheduling; - @JsonProperty("PodSchedulingList") - private PodSchedulingList podSchedulingList; + @JsonProperty("PodSchedulingContext") + private PodSchedulingContext podSchedulingContext; + @JsonProperty("PodSchedulingContextList") + private PodSchedulingContextList podSchedulingContextList; @JsonProperty("ResourceClaim") private ResourceClaim resourceClaim; @JsonProperty("ResourceClaimList") @@ -96,19 +96,19 @@ public KubeSchema() { /** * - * @param podScheduling + * @param podSchedulingContext * @param resourceClaimList * @param resourceClaimTemplate * @param resourceClassList * @param resourceClaimTemplateList * @param resourceClaim - * @param podSchedulingList + * @param podSchedulingContextList * @param resourceClass */ - public KubeSchema(PodScheduling podScheduling, PodSchedulingList podSchedulingList, ResourceClaim resourceClaim, ResourceClaimList resourceClaimList, ResourceClaimTemplate resourceClaimTemplate, ResourceClaimTemplateList resourceClaimTemplateList, ResourceClaim resourceClass, ResourceClassList resourceClassList) { + public KubeSchema(PodSchedulingContext podSchedulingContext, PodSchedulingContextList podSchedulingContextList, ResourceClaim resourceClaim, ResourceClaimList resourceClaimList, ResourceClaimTemplate resourceClaimTemplate, ResourceClaimTemplateList resourceClaimTemplateList, ResourceClaim resourceClass, ResourceClassList resourceClassList) { super(); - this.podScheduling = podScheduling; - this.podSchedulingList = podSchedulingList; + this.podSchedulingContext = podSchedulingContext; + this.podSchedulingContextList = podSchedulingContextList; this.resourceClaim = resourceClaim; this.resourceClaimList = resourceClaimList; this.resourceClaimTemplate = resourceClaimTemplate; @@ -117,24 +117,24 @@ public KubeSchema(PodScheduling podScheduling, PodSchedulingList podSchedulingLi this.resourceClassList = resourceClassList; } - @JsonProperty("PodScheduling") - public PodScheduling getPodScheduling() { - return podScheduling; + @JsonProperty("PodSchedulingContext") + public PodSchedulingContext getPodSchedulingContext() { + return podSchedulingContext; } - @JsonProperty("PodScheduling") - public void setPodScheduling(PodScheduling podScheduling) { - this.podScheduling = podScheduling; + @JsonProperty("PodSchedulingContext") + public void setPodSchedulingContext(PodSchedulingContext podSchedulingContext) { + this.podSchedulingContext = podSchedulingContext; } - @JsonProperty("PodSchedulingList") - public PodSchedulingList getPodSchedulingList() { - return podSchedulingList; + @JsonProperty("PodSchedulingContextList") + public PodSchedulingContextList getPodSchedulingContextList() { + return podSchedulingContextList; } - @JsonProperty("PodSchedulingList") - public void setPodSchedulingList(PodSchedulingList podSchedulingList) { - this.podSchedulingList = podSchedulingList; + @JsonProperty("PodSchedulingContextList") + public void setPodSchedulingContextList(PodSchedulingContextList podSchedulingContextList) { + this.podSchedulingContextList = podSchedulingContextList; } @JsonProperty("ResourceClaim") diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index da29623f00b..e0231ef866f 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -19,13 +19,13 @@ 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.resource.v1alpha1.PodScheduling; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassList; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -39,8 +39,8 @@ "apiVersion", "kind", "metadata", - "PodScheduling", - "PodSchedulingList", + "PodSchedulingContext", + "PodSchedulingContextList", "ResourceClaim", "ResourceClaimList", "ResourceClaimTemplate", @@ -68,10 +68,10 @@ }) public class ValidationSchema { - @JsonProperty("PodScheduling") - private PodScheduling podScheduling; - @JsonProperty("PodSchedulingList") - private PodSchedulingList podSchedulingList; + @JsonProperty("PodSchedulingContext") + private PodSchedulingContext podSchedulingContext; + @JsonProperty("PodSchedulingContextList") + private PodSchedulingContextList podSchedulingContextList; @JsonProperty("ResourceClaim") private ResourceClaim resourceClaim; @JsonProperty("ResourceClaimList") @@ -96,19 +96,19 @@ public ValidationSchema() { /** * - * @param podScheduling + * @param podSchedulingContext * @param resourceClaimList * @param resourceClaimTemplate * @param resourceClassList * @param resourceClaimTemplateList * @param resourceClaim - * @param podSchedulingList + * @param podSchedulingContextList * @param resourceClass */ - public ValidationSchema(PodScheduling podScheduling, PodSchedulingList podSchedulingList, ResourceClaim resourceClaim, ResourceClaimList resourceClaimList, ResourceClaimTemplate resourceClaimTemplate, ResourceClaimTemplateList resourceClaimTemplateList, ResourceClaim resourceClass, ResourceClassList resourceClassList) { + public ValidationSchema(PodSchedulingContext podSchedulingContext, PodSchedulingContextList podSchedulingContextList, ResourceClaim resourceClaim, ResourceClaimList resourceClaimList, ResourceClaimTemplate resourceClaimTemplate, ResourceClaimTemplateList resourceClaimTemplateList, ResourceClaim resourceClass, ResourceClassList resourceClassList) { super(); - this.podScheduling = podScheduling; - this.podSchedulingList = podSchedulingList; + this.podSchedulingContext = podSchedulingContext; + this.podSchedulingContextList = podSchedulingContextList; this.resourceClaim = resourceClaim; this.resourceClaimList = resourceClaimList; this.resourceClaimTemplate = resourceClaimTemplate; @@ -117,24 +117,24 @@ public ValidationSchema(PodScheduling podScheduling, PodSchedulingList podSchedu this.resourceClassList = resourceClassList; } - @JsonProperty("PodScheduling") - public PodScheduling getPodScheduling() { - return podScheduling; + @JsonProperty("PodSchedulingContext") + public PodSchedulingContext getPodSchedulingContext() { + return podSchedulingContext; } - @JsonProperty("PodScheduling") - public void setPodScheduling(PodScheduling podScheduling) { - this.podScheduling = podScheduling; + @JsonProperty("PodSchedulingContext") + public void setPodSchedulingContext(PodSchedulingContext podSchedulingContext) { + this.podSchedulingContext = podSchedulingContext; } - @JsonProperty("PodSchedulingList") - public PodSchedulingList getPodSchedulingList() { - return podSchedulingList; + @JsonProperty("PodSchedulingContextList") + public PodSchedulingContextList getPodSchedulingContextList() { + return podSchedulingContextList; } - @JsonProperty("PodSchedulingList") - public void setPodSchedulingList(PodSchedulingList podSchedulingList) { - this.podSchedulingList = podSchedulingList; + @JsonProperty("PodSchedulingContextList") + public void setPodSchedulingContextList(PodSchedulingContextList podSchedulingContextList) { + this.podSchedulingContextList = podSchedulingContextList; } @JsonProperty("ResourceClaim") diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/AllocationResult.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/AllocationResult.java similarity index 82% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/AllocationResult.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/AllocationResult.java index afbabdd6220..9329891b05a 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/AllocationResult.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/AllocationResult.java @@ -1,7 +1,9 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; +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; @@ -35,7 +37,7 @@ "kind", "metadata", "availableOnNodes", - "resourceHandle", + "resourceHandles", "shareable" }) @ToString @@ -61,8 +63,9 @@ public class AllocationResult implements KubernetesResource @JsonProperty("availableOnNodes") private NodeSelector availableOnNodes; - @JsonProperty("resourceHandle") - private String resourceHandle; + @JsonProperty("resourceHandles") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List resourceHandles = new ArrayList(); @JsonProperty("shareable") private Boolean shareable; @JsonIgnore @@ -78,13 +81,13 @@ public AllocationResult() { /** * * @param shareable - * @param resourceHandle * @param availableOnNodes + * @param resourceHandles */ - public AllocationResult(NodeSelector availableOnNodes, String resourceHandle, Boolean shareable) { + public AllocationResult(NodeSelector availableOnNodes, List resourceHandles, Boolean shareable) { super(); this.availableOnNodes = availableOnNodes; - this.resourceHandle = resourceHandle; + this.resourceHandles = resourceHandles; this.shareable = shareable; } @@ -98,14 +101,14 @@ public void setAvailableOnNodes(NodeSelector availableOnNodes) { this.availableOnNodes = availableOnNodes; } - @JsonProperty("resourceHandle") - public String getResourceHandle() { - return resourceHandle; + @JsonProperty("resourceHandles") + public List getResourceHandles() { + return resourceHandles; } - @JsonProperty("resourceHandle") - public void setResourceHandle(String resourceHandle) { - this.resourceHandle = resourceHandle; + @JsonProperty("resourceHandles") + public void setResourceHandles(List resourceHandles) { + this.resourceHandles = resourceHandles; } @JsonProperty("shareable") diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContext.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContext.java new file mode 100644 index 00000000000..ed367689211 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContext.java @@ -0,0 +1,196 @@ + +package io.fabric8.kubernetes.api.model.resource.v1alpha2; + +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) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1alpha2") +@Group("resource.k8s.io") +public class PodSchedulingContext implements HasMetadata, Namespaced +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "resource.k8s.io/v1alpha2"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "PodSchedulingContext"; + @JsonProperty("metadata") + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + @JsonProperty("spec") + private PodSchedulingContextSpec spec; + @JsonProperty("status") + private PodSchedulingContextStatus status; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PodSchedulingContext() { + } + + /** + * + * @param metadata + * @param apiVersion + * @param kind + * @param spec + * @param status + */ + public PodSchedulingContext(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, PodSchedulingContextSpec spec, PodSchedulingContextStatus 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 PodSchedulingContextSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(PodSchedulingContextSpec spec) { + this.spec = spec; + } + + @JsonProperty("status") + public PodSchedulingContextStatus getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(PodSchedulingContextStatus 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-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodSchedulingList.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContextList.java similarity index 86% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodSchedulingList.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContextList.java index 70e8e797afc..27af0d0e131 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodSchedulingList.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContextList.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.ArrayList; import java.util.HashMap; @@ -64,9 +64,9 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1alpha1") +@Version("v1alpha2") @Group("resource.k8s.io") -public class PodSchedulingList implements KubernetesResource, KubernetesResourceList +public class PodSchedulingContextList implements KubernetesResource, KubernetesResourceList { /** @@ -75,16 +75,16 @@ public class PodSchedulingList implements KubernetesResource, KubernetesResource * */ @JsonProperty("apiVersion") - private String apiVersion = "resource.k8s.io/v1alpha1"; + private String apiVersion = "resource.k8s.io/v1alpha2"; @JsonProperty("items") - private List items = new ArrayList(); + private List items = new ArrayList(); /** * * (Required) * */ @JsonProperty("kind") - private String kind = "PodSchedulingList"; + private String kind = "PodSchedulingContextList"; @JsonProperty("metadata") private ListMeta metadata; @JsonIgnore @@ -94,7 +94,7 @@ public class PodSchedulingList implements KubernetesResource, KubernetesResource * No args constructor for use in serialization * */ - public PodSchedulingList() { + public PodSchedulingContextList() { } /** @@ -104,7 +104,7 @@ public PodSchedulingList() { * @param kind * @param items */ - public PodSchedulingList(String apiVersion, List items, String kind, ListMeta metadata) { + public PodSchedulingContextList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -133,12 +133,12 @@ public void setApiVersion(String apiVersion) { } @JsonProperty("items") - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodSchedulingSpec.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContextSpec.java similarity index 93% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodSchedulingSpec.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContextSpec.java index 60579241c4d..84b3f10b80d 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodSchedulingSpec.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContextSpec.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.ArrayList; import java.util.HashMap; @@ -56,7 +56,7 @@ @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) -public class PodSchedulingSpec implements KubernetesResource +public class PodSchedulingContextSpec implements KubernetesResource { @JsonProperty("potentialNodes") @@ -71,7 +71,7 @@ public class PodSchedulingSpec implements KubernetesResource * No args constructor for use in serialization * */ - public PodSchedulingSpec() { + public PodSchedulingContextSpec() { } /** @@ -79,7 +79,7 @@ public PodSchedulingSpec() { * @param potentialNodes * @param selectedNode */ - public PodSchedulingSpec(List potentialNodes, String selectedNode) { + public PodSchedulingContextSpec(List potentialNodes, String selectedNode) { super(); this.potentialNodes = potentialNodes; this.selectedNode = selectedNode; diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodSchedulingStatus.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContextStatus.java similarity index 92% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodSchedulingStatus.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContextStatus.java index ca02ae3cb94..197b5c26b8a 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodSchedulingStatus.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContextStatus.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.ArrayList; import java.util.HashMap; @@ -55,7 +55,7 @@ @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) -public class PodSchedulingStatus implements KubernetesResource +public class PodSchedulingContextStatus implements KubernetesResource { @JsonProperty("resourceClaims") @@ -68,14 +68,14 @@ public class PodSchedulingStatus implements KubernetesResource * No args constructor for use in serialization * */ - public PodSchedulingStatus() { + public PodSchedulingContextStatus() { } /** * * @param resourceClaims */ - public PodSchedulingStatus(List resourceClaims) { + public PodSchedulingContextStatus(List resourceClaims) { super(); this.resourceClaims = resourceClaims; } diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaim.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaim.java similarity index 97% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaim.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaim.java index 5f9f96937bf..4ff639a1049 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaim.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaim.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.HashMap; import java.util.Map; @@ -61,7 +61,7 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1alpha1") +@Version("v1alpha2") @Group("resource.k8s.io") public class ResourceClaim implements HasMetadata, Namespaced { @@ -72,7 +72,7 @@ public class ResourceClaim implements HasMetadata, Namespaced * */ @JsonProperty("apiVersion") - private String apiVersion = "resource.k8s.io/v1alpha1"; + private String apiVersion = "resource.k8s.io/v1alpha2"; /** * * (Required) diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimConsumerReference.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimConsumerReference.java similarity index 98% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimConsumerReference.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimConsumerReference.java index 80c53df04d5..da2d324dfe2 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimConsumerReference.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimConsumerReference.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.HashMap; import java.util.Map; diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimList.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimList.java similarity index 92% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimList.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimList.java index 84186ba0bf5..5d65eb36638 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimList.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimList.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.ArrayList; import java.util.HashMap; @@ -64,9 +64,9 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1alpha1") +@Version("v1alpha2") @Group("resource.k8s.io") -public class ResourceClaimList implements KubernetesResource, KubernetesResourceList +public class ResourceClaimList implements KubernetesResource, KubernetesResourceList { /** @@ -75,9 +75,9 @@ public class ResourceClaimList implements KubernetesResource, KubernetesResource * */ @JsonProperty("apiVersion") - private String apiVersion = "resource.k8s.io/v1alpha1"; + private String apiVersion = "resource.k8s.io/v1alpha2"; @JsonProperty("items") - private List items = new ArrayList(); + private List items = new ArrayList(); /** * * (Required) @@ -104,7 +104,7 @@ public ResourceClaimList() { * @param kind * @param items */ - public ResourceClaimList(String apiVersion, List items, String kind, ListMeta metadata) { + public ResourceClaimList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -133,12 +133,12 @@ public void setApiVersion(String apiVersion) { } @JsonProperty("items") - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimParametersReference.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimParametersReference.java similarity index 98% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimParametersReference.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimParametersReference.java index 7e6d12232d6..7b6e2d0ec04 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimParametersReference.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimParametersReference.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.HashMap; import java.util.Map; diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimSchedulingStatus.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimSchedulingStatus.java similarity index 98% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimSchedulingStatus.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimSchedulingStatus.java index e5b5319b740..368f4504880 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimSchedulingStatus.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimSchedulingStatus.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.ArrayList; import java.util.HashMap; diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimSpec.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimSpec.java similarity index 98% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimSpec.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimSpec.java index c74a16bd8c3..3d42ffac447 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimSpec.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimSpec.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.HashMap; import java.util.Map; diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimStatus.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimStatus.java similarity index 98% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimStatus.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimStatus.java index 8631823f223..ff48570bf24 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimStatus.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimStatus.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.ArrayList; import java.util.HashMap; diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTemplate.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTemplate.java similarity index 97% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTemplate.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTemplate.java index 0676e21c105..15c262a02a2 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTemplate.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTemplate.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.HashMap; import java.util.Map; @@ -60,7 +60,7 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1alpha1") +@Version("v1alpha2") @Group("resource.k8s.io") public class ResourceClaimTemplate implements HasMetadata, Namespaced { @@ -71,7 +71,7 @@ public class ResourceClaimTemplate implements HasMetadata, Namespaced * */ @JsonProperty("apiVersion") - private String apiVersion = "resource.k8s.io/v1alpha1"; + private String apiVersion = "resource.k8s.io/v1alpha2"; /** * * (Required) diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTemplateList.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTemplateList.java similarity index 91% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTemplateList.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTemplateList.java index 89a8e0a7858..e83d10f9728 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTemplateList.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTemplateList.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.ArrayList; import java.util.HashMap; @@ -64,9 +64,9 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1alpha1") +@Version("v1alpha2") @Group("resource.k8s.io") -public class ResourceClaimTemplateList implements KubernetesResource, KubernetesResourceList +public class ResourceClaimTemplateList implements KubernetesResource, KubernetesResourceList { /** @@ -75,9 +75,9 @@ public class ResourceClaimTemplateList implements KubernetesResource, Kubernetes * */ @JsonProperty("apiVersion") - private String apiVersion = "resource.k8s.io/v1alpha1"; + private String apiVersion = "resource.k8s.io/v1alpha2"; @JsonProperty("items") - private List items = new ArrayList(); + private List items = new ArrayList(); /** * * (Required) @@ -104,7 +104,7 @@ public ResourceClaimTemplateList() { * @param kind * @param items */ - public ResourceClaimTemplateList(String apiVersion, List items, String kind, ListMeta metadata) { + public ResourceClaimTemplateList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -133,12 +133,12 @@ public void setApiVersion(String apiVersion) { } @JsonProperty("items") - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTemplateSpec.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTemplateSpec.java similarity index 98% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTemplateSpec.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTemplateSpec.java index 698b50f8af2..fd07d2a32ae 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTemplateSpec.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTemplateSpec.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.HashMap; import java.util.Map; diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClass.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClass.java similarity index 97% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClass.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClass.java index b1f5cf32212..5e3a2fb7f70 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClass.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClass.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.HashMap; import java.util.Map; @@ -62,7 +62,7 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1alpha1") +@Version("v1alpha2") @Group("resource.k8s.io") public class ResourceClass implements HasMetadata { @@ -73,7 +73,7 @@ public class ResourceClass implements HasMetadata * */ @JsonProperty("apiVersion") - private String apiVersion = "resource.k8s.io/v1alpha1"; + private String apiVersion = "resource.k8s.io/v1alpha2"; @JsonProperty("driverName") private String driverName; /** diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClassList.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClassList.java similarity index 92% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClassList.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClassList.java index d087da64ed9..c3642611aea 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClassList.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClassList.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.ArrayList; import java.util.HashMap; @@ -64,9 +64,9 @@ @TemplateTransformations({ @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) }) -@Version("v1alpha1") +@Version("v1alpha2") @Group("resource.k8s.io") -public class ResourceClassList implements KubernetesResource, KubernetesResourceList +public class ResourceClassList implements KubernetesResource, KubernetesResourceList { /** @@ -75,9 +75,9 @@ public class ResourceClassList implements KubernetesResource, KubernetesResource * */ @JsonProperty("apiVersion") - private String apiVersion = "resource.k8s.io/v1alpha1"; + private String apiVersion = "resource.k8s.io/v1alpha2"; @JsonProperty("items") - private List items = new ArrayList(); + private List items = new ArrayList(); /** * * (Required) @@ -104,7 +104,7 @@ public ResourceClassList() { * @param kind * @param items */ - public ResourceClassList(String apiVersion, List items, String kind, ListMeta metadata) { + public ResourceClassList(String apiVersion, List items, String kind, ListMeta metadata) { super(); this.apiVersion = apiVersion; this.items = items; @@ -133,12 +133,12 @@ public void setApiVersion(String apiVersion) { } @JsonProperty("items") - public List getItems() { + public List getItems() { return items; } @JsonProperty("items") - public void setItems(List items) { + public void setItems(List items) { this.items = items; } diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClassParametersReference.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClassParametersReference.java similarity index 98% rename from kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClassParametersReference.java rename to kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClassParametersReference.java index 7224a4845e2..cf278045d9e 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClassParametersReference.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClassParametersReference.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import java.util.HashMap; import java.util.Map; diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceHandle.java b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceHandle.java new file mode 100644 index 00000000000..63bea5f55ed --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-resource/src/generated/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceHandle.java @@ -0,0 +1,115 @@ + +package io.fabric8.kubernetes.api.model.resource.v1alpha2; + +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", + "data", + "driverName" +}) +@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 ResourceHandle implements KubernetesResource +{ + + @JsonProperty("data") + private String data; + @JsonProperty("driverName") + private String driverName; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ResourceHandle() { + } + + /** + * + * @param data + * @param driverName + */ + public ResourceHandle(String data, String driverName) { + super(); + this.data = data; + this.driverName = driverName; + } + + @JsonProperty("data") + public String getData() { + return data; + } + + @JsonProperty("data") + public void setData(String data) { + this.data = data; + } + + @JsonProperty("driverName") + public String getDriverName() { + return driverName; + } + + @JsonProperty("driverName") + public void setDriverName(String driverName) { + this.driverName = driverName; + } + + @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-resource/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/kube-schema.json index 2e35491600a..2ee0a6acfbd 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/kube-schema.json @@ -273,37 +273,42 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_AllocationResult": { + "kubernetes_resource_v1alpha2_AllocationResult": { "type": "object", "properties": { "availableOnNodes": { "$ref": "#/definitions/kubernetes_core_NodeSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelector" }, - "resourceHandle": { - "type": "string" + "resourceHandles": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceHandle", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceHandle" + } }, "shareable": { "type": "boolean" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.AllocationResult", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.AllocationResult", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_PodScheduling": { + "kubernetes_resource_v1alpha2_PodSchedulingContext": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "kind": { "type": "string", - "default": "PodScheduling", + "default": "PodSchedulingContext", "required": true }, "metadata": { @@ -311,39 +316,39 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_PodSchedulingSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingSpec" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_PodSchedulingContextSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextSpec" }, "status": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_PodSchedulingStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingStatus" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_PodSchedulingContextStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextStatus" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_resource_v1alpha1_PodSchedulingList": { + "kubernetes_resource_v1alpha2_PodSchedulingContextList": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_PodScheduling", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_PodSchedulingContext", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext" } }, "kind": { "type": "string", - "default": "PodSchedulingList", + "default": "PodSchedulingContextList", "required": true }, "metadata": { @@ -352,13 +357,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingList", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext\u003e" ] }, - "kubernetes_resource_v1alpha1_PodSchedulingSpec": { + "kubernetes_resource_v1alpha2_PodSchedulingContextSpec": { "type": "object", "properties": { "potentialNodes": { @@ -373,35 +378,35 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingSpec", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_PodSchedulingStatus": { + "kubernetes_resource_v1alpha2_PodSchedulingContextStatus": { "type": "object", "properties": { "resourceClaims": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimSchedulingStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimSchedulingStatus" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimSchedulingStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimSchedulingStatus" } } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingStatus", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClaim": { + "kubernetes_resource_v1alpha2_ResourceClaim": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "kind": { @@ -414,22 +419,22 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimSpec" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimSpec" }, "status": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimStatus" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimStatus" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimConsumerReference": { + "kubernetes_resource_v1alpha2_ResourceClaimConsumerReference": { "type": "object", "properties": { "apiGroup": { @@ -446,24 +451,24 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimConsumerReference", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimConsumerReference", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimList": { + "kubernetes_resource_v1alpha2_ResourceClaimList": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaim", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaim", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim" } }, "kind": { @@ -477,13 +482,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimList", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim\u003e" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimParametersReference": { + "kubernetes_resource_v1alpha2_ResourceClaimParametersReference": { "type": "object", "properties": { "apiGroup": { @@ -497,12 +502,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimParametersReference", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimParametersReference", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimSchedulingStatus": { + "kubernetes_resource_v1alpha2_ResourceClaimSchedulingStatus": { "type": "object", "properties": { "name": { @@ -517,37 +522,37 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimSchedulingStatus", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimSchedulingStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimSpec": { + "kubernetes_resource_v1alpha2_ResourceClaimSpec": { "type": "object", "properties": { "allocationMode": { "type": "string" }, "parametersRef": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimParametersReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimParametersReference" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimParametersReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimParametersReference" }, "resourceClassName": { "type": "string" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimSpec", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimStatus": { + "kubernetes_resource_v1alpha2_ResourceClaimStatus": { "type": "object", "properties": { "allocation": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_AllocationResult", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.AllocationResult" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_AllocationResult", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.AllocationResult" }, "deallocationRequested": { "type": "boolean" @@ -559,23 +564,23 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimConsumerReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimConsumerReference" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimConsumerReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimConsumerReference" } } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimStatus", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimTemplate": { + "kubernetes_resource_v1alpha2_ResourceClaimTemplate": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "kind": { @@ -588,30 +593,30 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimTemplateSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateSpec" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimTemplateSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateSpec" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimTemplateList": { + "kubernetes_resource_v1alpha2_ResourceClaimTemplateList": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimTemplate", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimTemplate", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate" } }, "kind": { @@ -625,13 +630,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateList", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate\u003e" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimTemplateSpec": { + "kubernetes_resource_v1alpha2_ResourceClaimTemplateSpec": { "type": "object", "properties": { "metadata": { @@ -639,22 +644,22 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimSpec" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimSpec" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateSpec", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClass": { + "kubernetes_resource_v1alpha2_ResourceClass": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "driverName": { @@ -670,8 +675,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "parametersRef": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClassParametersReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassParametersReference" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClassParametersReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassParametersReference" }, "suitableNodes": { "$ref": "#/definitions/kubernetes_core_NodeSelector", @@ -679,24 +684,24 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClass", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClass", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata" ] }, - "kubernetes_resource_v1alpha1_ResourceClassList": { + "kubernetes_resource_v1alpha2_ResourceClassList": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClass" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClass" } }, "kind": { @@ -710,13 +715,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassList", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClass\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClass\u003e" ] }, - "kubernetes_resource_v1alpha1_ResourceClassParametersReference": { + "kubernetes_resource_v1alpha2_ResourceClassParametersReference": { "type": "object", "properties": { "apiGroup": { @@ -733,7 +738,23 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassParametersReference", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassParametersReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_resource_v1alpha2_ResourceHandle": { + "type": "object", + "properties": { + "data": { + "type": "string" + }, + "driverName": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceHandle", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -741,37 +762,37 @@ }, "type": "object", "properties": { - "PodScheduling": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_PodScheduling", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling" + "PodSchedulingContext": { + "$ref": "#/definitions/kubernetes_resource_v1alpha2_PodSchedulingContext", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext" }, - "PodSchedulingList": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_PodSchedulingList", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingList" + "PodSchedulingContextList": { + "$ref": "#/definitions/kubernetes_resource_v1alpha2_PodSchedulingContextList", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextList" }, "ResourceClaim": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaim", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaim", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim" }, "ResourceClaimList": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimList", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimList" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimList", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimList" }, "ResourceClaimTemplate": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimTemplate", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimTemplate", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate" }, "ResourceClaimTemplateList": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimTemplateList", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateList" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimTemplateList", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateList" }, "ResourceClass": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaim", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaim", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim" }, "ResourceClassList": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClassList", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassList" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClassList", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassList" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/validation-schema.json index 062d6d00421..e989e72ac90 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/validation-schema.json @@ -273,37 +273,42 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_AllocationResult": { + "kubernetes_resource_v1alpha2_AllocationResult": { "type": "object", "properties": { "availableOnNodes": { "$ref": "#/definitions/kubernetes_core_NodeSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelector" }, - "resourceHandle": { - "type": "string" + "resourceHandles": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceHandle", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceHandle" + } }, "shareable": { "type": "boolean" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.AllocationResult", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.AllocationResult", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_PodScheduling": { + "kubernetes_resource_v1alpha2_PodSchedulingContext": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "kind": { "type": "string", - "default": "PodScheduling", + "default": "PodSchedulingContext", "required": true }, "metadata": { @@ -311,39 +316,39 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_PodSchedulingSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingSpec" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_PodSchedulingContextSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextSpec" }, "status": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_PodSchedulingStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingStatus" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_PodSchedulingContextStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextStatus" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_resource_v1alpha1_PodSchedulingList": { + "kubernetes_resource_v1alpha2_PodSchedulingContextList": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_PodScheduling", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_PodSchedulingContext", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext" } }, "kind": { "type": "string", - "default": "PodSchedulingList", + "default": "PodSchedulingContextList", "required": true }, "metadata": { @@ -352,13 +357,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingList", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext\u003e" ] }, - "kubernetes_resource_v1alpha1_PodSchedulingSpec": { + "kubernetes_resource_v1alpha2_PodSchedulingContextSpec": { "type": "object", "properties": { "potentialNodes": { @@ -373,35 +378,35 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingSpec", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_PodSchedulingStatus": { + "kubernetes_resource_v1alpha2_PodSchedulingContextStatus": { "type": "object", "properties": { "resourceClaims": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimSchedulingStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimSchedulingStatus" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimSchedulingStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimSchedulingStatus" } } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingStatus", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClaim": { + "kubernetes_resource_v1alpha2_ResourceClaim": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "kind": { @@ -414,22 +419,22 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimSpec" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimSpec" }, "status": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimStatus" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimStatus" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimConsumerReference": { + "kubernetes_resource_v1alpha2_ResourceClaimConsumerReference": { "type": "object", "properties": { "apiGroup": { @@ -446,24 +451,24 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimConsumerReference", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimConsumerReference", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimList": { + "kubernetes_resource_v1alpha2_ResourceClaimList": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaim", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaim", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim" } }, "kind": { @@ -477,13 +482,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimList", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim\u003e" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimParametersReference": { + "kubernetes_resource_v1alpha2_ResourceClaimParametersReference": { "type": "object", "properties": { "apiGroup": { @@ -497,12 +502,12 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimParametersReference", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimParametersReference", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimSchedulingStatus": { + "kubernetes_resource_v1alpha2_ResourceClaimSchedulingStatus": { "type": "object", "properties": { "name": { @@ -517,37 +522,37 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimSchedulingStatus", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimSchedulingStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimSpec": { + "kubernetes_resource_v1alpha2_ResourceClaimSpec": { "type": "object", "properties": { "allocationMode": { "type": "string" }, "parametersRef": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimParametersReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimParametersReference" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimParametersReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimParametersReference" }, "resourceClassName": { "type": "string" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimSpec", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimStatus": { + "kubernetes_resource_v1alpha2_ResourceClaimStatus": { "type": "object", "properties": { "allocation": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_AllocationResult", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.AllocationResult" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_AllocationResult", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.AllocationResult" }, "deallocationRequested": { "type": "boolean" @@ -559,23 +564,23 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimConsumerReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimConsumerReference" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimConsumerReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimConsumerReference" } } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimStatus", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimTemplate": { + "kubernetes_resource_v1alpha2_ResourceClaimTemplate": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "kind": { @@ -588,30 +593,30 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimTemplateSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateSpec" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimTemplateSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateSpec" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata", "io.fabric8.kubernetes.api.model.Namespaced" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimTemplateList": { + "kubernetes_resource_v1alpha2_ResourceClaimTemplateList": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimTemplate", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimTemplate", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate" } }, "kind": { @@ -625,13 +630,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateList", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate\u003e" ] }, - "kubernetes_resource_v1alpha1_ResourceClaimTemplateSpec": { + "kubernetes_resource_v1alpha2_ResourceClaimTemplateSpec": { "type": "object", "properties": { "metadata": { @@ -639,22 +644,22 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimSpec" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimSpec" } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateSpec", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateSpec", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_resource_v1alpha1_ResourceClass": { + "kubernetes_resource_v1alpha2_ResourceClass": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "driverName": { @@ -670,8 +675,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "parametersRef": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClassParametersReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassParametersReference" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClassParametersReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassParametersReference" }, "suitableNodes": { "$ref": "#/definitions/kubernetes_core_NodeSelector", @@ -679,24 +684,24 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClass", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClass", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.HasMetadata" ] }, - "kubernetes_resource_v1alpha1_ResourceClassList": { + "kubernetes_resource_v1alpha2_ResourceClassList": { "type": "object", "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClass" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClass" } }, "kind": { @@ -710,13 +715,13 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassList", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClass\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClass\u003e" ] }, - "kubernetes_resource_v1alpha1_ResourceClassParametersReference": { + "kubernetes_resource_v1alpha2_ResourceClassParametersReference": { "type": "object", "properties": { "apiGroup": { @@ -733,7 +738,23 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassParametersReference", + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassParametersReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_resource_v1alpha2_ResourceHandle": { + "type": "object", + "properties": { + "data": { + "type": "string" + }, + "driverName": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceHandle", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -741,37 +762,37 @@ }, "type": "object", "properties": { - "PodScheduling": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_PodScheduling", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling" + "PodSchedulingContext": { + "$ref": "#/definitions/kubernetes_resource_v1alpha2_PodSchedulingContext", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext" }, - "PodSchedulingList": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_PodSchedulingList", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingList" + "PodSchedulingContextList": { + "$ref": "#/definitions/kubernetes_resource_v1alpha2_PodSchedulingContextList", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextList" }, "ResourceClaim": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaim", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaim", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim" }, "ResourceClaimList": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimList", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimList" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimList", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimList" }, "ResourceClaimTemplate": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimTemplate", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimTemplate", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate" }, "ResourceClaimTemplateList": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimTemplateList", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateList" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimTemplateList", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateList" }, "ResourceClass": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaim", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaim", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim" }, "ResourceClassList": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClassList", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassList" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClassList", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassList" } }, "additionalProperties": true, @@ -782,8 +803,13 @@ "$ref": "#/definitions/kubernetes_core_NodeSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.NodeSelector" }, - "resourceHandle": { - "type": "string" + "resourceHandles": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceHandle", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceHandle" + } }, "shareable": { "type": "boolean" @@ -992,16 +1018,16 @@ }, "additionalProperties": true }, - "podscheduling": { + "podschedulingcontext": { "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "kind": { "type": "string", - "default": "PodScheduling", + "default": "PodSchedulingContext", "required": true }, "metadata": { @@ -1009,33 +1035,33 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_PodSchedulingSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingSpec" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_PodSchedulingContextSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextSpec" }, "status": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_PodSchedulingStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingStatus" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_PodSchedulingContextStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextStatus" } }, "additionalProperties": true }, - "podschedulinglist": { + "podschedulingcontextlist": { "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_PodScheduling", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_PodSchedulingContext", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext" } }, "kind": { "type": "string", - "default": "PodSchedulingList", + "default": "PodSchedulingContextList", "required": true }, "metadata": { @@ -1045,7 +1071,7 @@ }, "additionalProperties": true }, - "podschedulingspec": { + "podschedulingcontextspec": { "properties": { "potentialNodes": { "type": "array", @@ -1060,14 +1086,14 @@ }, "additionalProperties": true }, - "podschedulingstatus": { + "podschedulingcontextstatus": { "properties": { "resourceClaims": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimSchedulingStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimSchedulingStatus" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimSchedulingStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimSchedulingStatus" } } }, @@ -1077,7 +1103,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "kind": { @@ -1090,12 +1116,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimSpec" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimSpec" }, "status": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimStatus" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimStatus" } }, "additionalProperties": true @@ -1121,14 +1147,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaim", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaim", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim" } }, "kind": { @@ -1178,8 +1204,8 @@ "type": "string" }, "parametersRef": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimParametersReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimParametersReference" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimParametersReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimParametersReference" }, "resourceClassName": { "type": "string" @@ -1190,8 +1216,8 @@ "resourceclaimstatus": { "properties": { "allocation": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_AllocationResult", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.AllocationResult" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_AllocationResult", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.AllocationResult" }, "deallocationRequested": { "type": "boolean" @@ -1203,8 +1229,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimConsumerReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimConsumerReference" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimConsumerReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimConsumerReference" } } }, @@ -1214,7 +1240,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "kind": { @@ -1227,8 +1253,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimTemplateSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateSpec" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimTemplateSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateSpec" } }, "additionalProperties": true @@ -1237,14 +1263,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimTemplate", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimTemplate", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate" } }, "kind": { @@ -1266,8 +1292,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClaimSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimSpec" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClaimSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimSpec" } }, "additionalProperties": true @@ -1276,7 +1302,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "driverName": { @@ -1292,8 +1318,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "parametersRef": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClassParametersReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassParametersReference" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClassParametersReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassParametersReference" }, "suitableNodes": { "$ref": "#/definitions/kubernetes_core_NodeSelector", @@ -1306,14 +1332,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "resource.k8s.io/v1alpha1", + "default": "resource.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_resource_v1alpha1_ResourceClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClass" + "$ref": "#/definitions/kubernetes_resource_v1alpha2_ResourceClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClass" } }, "kind": { @@ -1345,6 +1371,17 @@ }, "additionalProperties": true }, + "resourcehandle": { + "properties": { + "data": { + "type": "string" + }, + "driverName": { + "type": "string" + } + }, + "additionalProperties": true + }, "time": { "properties": { "Time": { diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodSchedulingTest.java b/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContextTest.java similarity index 82% rename from kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodSchedulingTest.java rename to kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContextTest.java index a1984a299ea..e69e7008171 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/PodSchedulingTest.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/PodSchedulingContextTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; -class PodSchedulingTest { +class PodSchedulingContextTest { private final ObjectMapper mapper = new ObjectMapper(); @Test @@ -35,12 +35,12 @@ void deserializationAndSerializationShouldWorkAsExpected() throws IOException { .next(); // When - final PodScheduling podScheduling = mapper.readValue(originalJson, PodScheduling.class); - final String serializedJson = mapper.writeValueAsString(podScheduling); + final PodSchedulingContext podSchedulingContext = mapper.readValue(originalJson, PodSchedulingContext.class); + final String serializedJson = mapper.writeValueAsString(podSchedulingContext); // Then assertThat(serializedJson).isNotNull(); - assertThat(podScheduling) + assertThat(podSchedulingContext) .isNotNull() .hasFieldOrPropertyWithValue("metadata.name", "test-podscheduling") .hasFieldOrPropertyWithValue("spec.potentialNodes", Collections.singletonList("potential-nodes-value")) @@ -50,7 +50,7 @@ void deserializationAndSerializationShouldWorkAsExpected() throws IOException { @Test void builderShouldCreateObject() { // Given - PodSchedulingBuilder podSchedulingBuilder = new PodSchedulingBuilder() + PodSchedulingContextBuilder podSchedulingBuilder = new PodSchedulingContextBuilder() .withNewMetadata() .withName("test-podscheduling") .endMetadata() @@ -60,10 +60,10 @@ void builderShouldCreateObject() { .endSpec(); // When - PodScheduling podScheduling = podSchedulingBuilder.build(); + PodSchedulingContext podSchedulingContext = podSchedulingBuilder.build(); // Then - assertThat(podScheduling) + assertThat(podSchedulingContext) .isNotNull() .hasFieldOrPropertyWithValue("metadata.name", "test-podscheduling") .hasFieldOrPropertyWithValue("spec.potentialNodes", Collections.singletonList("potential-nodes-value")) diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTemplateTest.java b/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTemplateTest.java similarity index 98% rename from kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTemplateTest.java rename to kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTemplateTest.java index 464bd602f4e..f14556572d3 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTemplateTest.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTemplateTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTest.java b/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTest.java similarity index 98% rename from kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTest.java rename to kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTest.java index b1bdcce85b1..d70f07e8d19 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClaimTest.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClaimTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClassTest.java b/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClassTest.java similarity index 98% rename from kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClassTest.java rename to kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClassTest.java index 4c636cabd27..e5b8b3f21cf 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha1/ResourceClassTest.java +++ b/kubernetes-model-generator/kubernetes-model-resource/src/test/java/io/fabric8/kubernetes/api/model/resource/v1alpha2/ResourceClassTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.fabric8.kubernetes.api.model.resource.v1alpha1; +package io.fabric8.kubernetes.api.model.resource.v1alpha2; import com.fasterxml.jackson.databind.ObjectMapper; import io.fabric8.kubernetes.api.model.NodeSelectorBuilder; diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-podscheduling.json b/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-podscheduling.json index 430141fe59f..11fb5f7b138 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-podscheduling.json +++ b/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-podscheduling.json @@ -1,5 +1,5 @@ { - "apiVersion": "resource.k8s.io/v1alpha1", + "apiVersion": "resource.k8s.io/v1alpha2", "kind": "PodScheduling", "metadata": { "name": "test-podscheduling" diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-resourceclaim.json b/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-resourceclaim.json index 2a38fca06b2..d51f72e9cdd 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-resourceclaim.json +++ b/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-resourceclaim.json @@ -1,5 +1,5 @@ { - "apiVersion": "resource.k8s.io/v1alpha1", + "apiVersion": "resource.k8s.io/v1alpha2", "kind": "ResourceClaim", "metadata": { "name": "test-resourceclaim" diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-resourceclaimtemplate.json b/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-resourceclaimtemplate.json index d18013070cc..6267fa7ad5e 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-resourceclaimtemplate.json +++ b/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-resourceclaimtemplate.json @@ -1,5 +1,5 @@ { - "apiVersion": "resource.k8s.io/v1alpha1", + "apiVersion": "resource.k8s.io/v1alpha2", "kind": "ResourceClaimTemplate", "metadata": { "name": "test-resourceclaimtemplate" diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-resourceclass.json b/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-resourceclass.json index 6a90f967e29..ae784d822e9 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-resourceclass.json +++ b/kubernetes-model-generator/kubernetes-model-resource/src/test/resources/valid-resourceclass.json @@ -1,5 +1,5 @@ { - "apiVersion": "resource.k8s.io/v1alpha1", + "apiVersion": "resource.k8s.io/v1alpha2", "driverName": "driverNameValue", "kind": "ResourceClass", "metadata": { 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 161d7bdc58f..f9dcfdb0d2d 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 @@ -296,6 +296,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" 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 318cfbade93..c7722ee5b0e 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 @@ -296,6 +296,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1271,6 +1274,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1485,7 +1491,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "scheduling.k8s.io/v1", + "default": "scheduling.k8s.io/v1beta1", "required": true }, "description": { @@ -1516,14 +1522,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "scheduling.k8s.io/v1beta1", + "default": "scheduling.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_scheduling_v1beta1_PriorityClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass" + "$ref": "#/definitions/kubernetes_scheduling_v1_PriorityClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/kube-schema.json index e2b81606325..6b8a220fc30 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 @@ -331,6 +331,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" 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 f16118ea7b8..1d2537d01d5 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 @@ -331,6 +331,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -2967,7 +2970,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1", + "default": "storage.k8s.io/v1beta1", "required": true }, "kind": { @@ -2980,8 +2983,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_storageclass_CSIDriverSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSIDriverSpec" + "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSIDriverSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverSpec" } }, "additionalProperties": true @@ -2990,14 +2993,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_CSIDriver", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver" + "$ref": "#/definitions/kubernetes_storageclass_CSIDriver", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSIDriver" } }, "kind": { @@ -3036,8 +3039,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_TokenRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.TokenRequest" + "$ref": "#/definitions/kubernetes_storageclass_TokenRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.TokenRequest" } }, "volumeLifecycleModes": { @@ -3054,7 +3057,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "kind": { @@ -3067,8 +3070,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 @@ -3098,14 +3101,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1", + "default": "storage.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_storageclass_CSINode", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSINode" + "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSINode", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode" } }, "kind": { @@ -3180,7 +3183,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1", + "default": "storage.k8s.io/v1beta1", "required": true }, "capacity": { @@ -3604,6 +3607,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSDNSSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSDNSSpec.java new file mode 100644 index 00000000000..9dd290c9b65 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSDNSSpec.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.config.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", + "privateZoneIAMRole" +}) +@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 AWSDNSSpec implements KubernetesResource +{ + + @JsonProperty("privateZoneIAMRole") + private String privateZoneIAMRole; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AWSDNSSpec() { + } + + /** + * + * @param privateZoneIAMRole + */ + public AWSDNSSpec(String privateZoneIAMRole) { + super(); + this.privateZoneIAMRole = privateZoneIAMRole; + } + + @JsonProperty("privateZoneIAMRole") + public String getPrivateZoneIAMRole() { + return privateZoneIAMRole; + } + + @JsonProperty("privateZoneIAMRole") + public void setPrivateZoneIAMRole(String privateZoneIAMRole) { + this.privateZoneIAMRole = privateZoneIAMRole; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSIngressSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSIngressSpec.java new file mode 100644 index 00000000000..77b6a8e8d1b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSIngressSpec.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.config.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", + "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 AWSIngressSpec implements KubernetesResource +{ + + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AWSIngressSpec() { + } + + /** + * + * @param type + */ + public AWSIngressSpec(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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzurePlatformStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzurePlatformStatus.java index 2f768e8005f..aa84996922b 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzurePlatformStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzurePlatformStatus.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.config.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; @@ -36,7 +38,8 @@ "armEndpoint", "cloudName", "networkResourceGroupName", - "resourceGroupName" + "resourceGroupName", + "resourceTags" }) @ToString @EqualsAndHashCode @@ -67,6 +70,9 @@ public class AzurePlatformStatus implements KubernetesResource private String networkResourceGroupName; @JsonProperty("resourceGroupName") private String resourceGroupName; + @JsonProperty("resourceTags") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List resourceTags = new ArrayList(); @JsonIgnore private Map additionalProperties = new HashMap(); @@ -80,16 +86,18 @@ public AzurePlatformStatus() { /** * * @param armEndpoint + * @param resourceTags * @param resourceGroupName * @param cloudName * @param networkResourceGroupName */ - public AzurePlatformStatus(String armEndpoint, String cloudName, String networkResourceGroupName, String resourceGroupName) { + public AzurePlatformStatus(String armEndpoint, String cloudName, String networkResourceGroupName, String resourceGroupName, List resourceTags) { super(); this.armEndpoint = armEndpoint; this.cloudName = cloudName; this.networkResourceGroupName = networkResourceGroupName; this.resourceGroupName = resourceGroupName; + this.resourceTags = resourceTags; } @JsonProperty("armEndpoint") @@ -132,6 +140,16 @@ public void setResourceGroupName(String resourceGroupName) { this.resourceGroupName = resourceGroupName; } + @JsonProperty("resourceTags") + public List getResourceTags() { + return resourceTags; + } + + @JsonProperty("resourceTags") + public void setResourceTags(List resourceTags) { + this.resourceTags = resourceTags; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzureResourceTag.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzureResourceTag.java new file mode 100644 index 00000000000..06ef1651ec0 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzureResourceTag.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.config.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", + "key", + "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 AzureResourceTag implements KubernetesResource +{ + + @JsonProperty("key") + private String key; + @JsonProperty("value") + private String value; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AzureResourceTag() { + } + + /** + * + * @param value + * @param key + */ + public AzureResourceTag(String key, String value) { + super(); + this.key = key; + this.value = value; + } + + @JsonProperty("key") + public String getKey() { + return key; + } + + @JsonProperty("key") + public void setKey(String key) { + this.key = key; + } + + @JsonProperty("value") + public String getValue() { + return value; + } + + @JsonProperty("value") + public void setValue(String 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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BareMetalPlatformLoadBalancer.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BareMetalPlatformLoadBalancer.java new file mode 100644 index 00000000000..c38797a15ae --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BareMetalPlatformLoadBalancer.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.config.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", + "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 BareMetalPlatformLoadBalancer implements KubernetesResource +{ + + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BareMetalPlatformLoadBalancer() { + } + + /** + * + * @param type + */ + public BareMetalPlatformLoadBalancer(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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BareMetalPlatformStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BareMetalPlatformStatus.java index 425fb02198b..dd19491597c 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BareMetalPlatformStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BareMetalPlatformStatus.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.config.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; @@ -34,7 +36,10 @@ "kind", "metadata", "apiServerInternalIP", + "apiServerInternalIPs", "ingressIP", + "ingressIPs", + "loadBalancer", "nodeDNSIP" }) @ToString @@ -60,8 +65,14 @@ public class BareMetalPlatformStatus implements KubernetesResource @JsonProperty("apiServerInternalIP") private String apiServerInternalIP; + @JsonProperty("apiServerInternalIPs") + private List apiServerInternalIPs = new ArrayList(); @JsonProperty("ingressIP") private String ingressIP; + @JsonProperty("ingressIPs") + private List ingressIPs = new ArrayList(); + @JsonProperty("loadBalancer") + private BareMetalPlatformLoadBalancer loadBalancer; @JsonProperty("nodeDNSIP") private String nodeDNSIP; @JsonIgnore @@ -76,14 +87,20 @@ public BareMetalPlatformStatus() { /** * + * @param apiServerInternalIPs + * @param loadBalancer * @param apiServerInternalIP * @param nodeDNSIP * @param ingressIP + * @param ingressIPs */ - public BareMetalPlatformStatus(String apiServerInternalIP, String ingressIP, String nodeDNSIP) { + public BareMetalPlatformStatus(String apiServerInternalIP, List apiServerInternalIPs, String ingressIP, List ingressIPs, BareMetalPlatformLoadBalancer loadBalancer, String nodeDNSIP) { super(); this.apiServerInternalIP = apiServerInternalIP; + this.apiServerInternalIPs = apiServerInternalIPs; this.ingressIP = ingressIP; + this.ingressIPs = ingressIPs; + this.loadBalancer = loadBalancer; this.nodeDNSIP = nodeDNSIP; } @@ -97,6 +114,16 @@ public void setApiServerInternalIP(String apiServerInternalIP) { this.apiServerInternalIP = apiServerInternalIP; } + @JsonProperty("apiServerInternalIPs") + public List getApiServerInternalIPs() { + return apiServerInternalIPs; + } + + @JsonProperty("apiServerInternalIPs") + public void setApiServerInternalIPs(List apiServerInternalIPs) { + this.apiServerInternalIPs = apiServerInternalIPs; + } + @JsonProperty("ingressIP") public String getIngressIP() { return ingressIP; @@ -107,6 +134,26 @@ public void setIngressIP(String ingressIP) { this.ingressIP = ingressIP; } + @JsonProperty("ingressIPs") + public List getIngressIPs() { + return ingressIPs; + } + + @JsonProperty("ingressIPs") + public void setIngressIPs(List ingressIPs) { + this.ingressIPs = ingressIPs; + } + + @JsonProperty("loadBalancer") + public BareMetalPlatformLoadBalancer getLoadBalancer() { + return loadBalancer; + } + + @JsonProperty("loadBalancer") + public void setLoadBalancer(BareMetalPlatformLoadBalancer loadBalancer) { + this.loadBalancer = loadBalancer; + } + @JsonProperty("nodeDNSIP") public String getNodeDNSIP() { return nodeDNSIP; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CloudControllerManagerStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CloudControllerManagerStatus.java new file mode 100644 index 00000000000..69f71d481ba --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CloudControllerManagerStatus.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.config.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", + "state" +}) +@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 CloudControllerManagerStatus implements KubernetesResource +{ + + @JsonProperty("state") + private String state; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CloudControllerManagerStatus() { + } + + /** + * + * @param state + */ + public CloudControllerManagerStatus(String state) { + super(); + this.state = state; + } + + @JsonProperty("state") + public String getState() { + return state; + } + + @JsonProperty("state") + public void setState(String state) { + this.state = state; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionCapabilitiesSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionCapabilitiesSpec.java new file mode 100644 index 00000000000..7226fbc4379 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionCapabilitiesSpec.java @@ -0,0 +1,118 @@ + +package io.fabric8.openshift.api.model.config.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", + "additionalEnabledCapabilities", + "baselineCapabilitySet" +}) +@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 ClusterVersionCapabilitiesSpec implements KubernetesResource +{ + + @JsonProperty("additionalEnabledCapabilities") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List additionalEnabledCapabilities = new ArrayList(); + @JsonProperty("baselineCapabilitySet") + private String baselineCapabilitySet; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ClusterVersionCapabilitiesSpec() { + } + + /** + * + * @param additionalEnabledCapabilities + * @param baselineCapabilitySet + */ + public ClusterVersionCapabilitiesSpec(List additionalEnabledCapabilities, String baselineCapabilitySet) { + super(); + this.additionalEnabledCapabilities = additionalEnabledCapabilities; + this.baselineCapabilitySet = baselineCapabilitySet; + } + + @JsonProperty("additionalEnabledCapabilities") + public List getAdditionalEnabledCapabilities() { + return additionalEnabledCapabilities; + } + + @JsonProperty("additionalEnabledCapabilities") + public void setAdditionalEnabledCapabilities(List additionalEnabledCapabilities) { + this.additionalEnabledCapabilities = additionalEnabledCapabilities; + } + + @JsonProperty("baselineCapabilitySet") + public String getBaselineCapabilitySet() { + return baselineCapabilitySet; + } + + @JsonProperty("baselineCapabilitySet") + public void setBaselineCapabilitySet(String baselineCapabilitySet) { + this.baselineCapabilitySet = baselineCapabilitySet; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionCapabilitiesStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionCapabilitiesStatus.java new file mode 100644 index 00000000000..f4d88433187 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionCapabilitiesStatus.java @@ -0,0 +1,119 @@ + +package io.fabric8.openshift.api.model.config.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", + "enabledCapabilities", + "knownCapabilities" +}) +@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 ClusterVersionCapabilitiesStatus implements KubernetesResource +{ + + @JsonProperty("enabledCapabilities") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List enabledCapabilities = new ArrayList(); + @JsonProperty("knownCapabilities") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List knownCapabilities = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ClusterVersionCapabilitiesStatus() { + } + + /** + * + * @param enabledCapabilities + * @param knownCapabilities + */ + public ClusterVersionCapabilitiesStatus(List enabledCapabilities, List knownCapabilities) { + super(); + this.enabledCapabilities = enabledCapabilities; + this.knownCapabilities = knownCapabilities; + } + + @JsonProperty("enabledCapabilities") + public List getEnabledCapabilities() { + return enabledCapabilities; + } + + @JsonProperty("enabledCapabilities") + public void setEnabledCapabilities(List enabledCapabilities) { + this.enabledCapabilities = enabledCapabilities; + } + + @JsonProperty("knownCapabilities") + public List getKnownCapabilities() { + return knownCapabilities; + } + + @JsonProperty("knownCapabilities") + public void setKnownCapabilities(List knownCapabilities) { + this.knownCapabilities = knownCapabilities; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpec.java index 200b375edaf..91c8dbf5490 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpec.java @@ -35,6 +35,7 @@ "apiVersion", "kind", "metadata", + "capabilities", "channel", "clusterID", "desiredUpdate", @@ -62,6 +63,8 @@ public class ClusterVersionSpec implements KubernetesResource { + @JsonProperty("capabilities") + private ClusterVersionCapabilitiesSpec capabilities; @JsonProperty("channel") private String channel; @JsonProperty("clusterID") @@ -85,14 +88,16 @@ public ClusterVersionSpec() { /** * + * @param capabilities * @param upstream * @param desiredUpdate * @param channel * @param clusterID * @param overrides */ - public ClusterVersionSpec(String channel, String clusterID, Update desiredUpdate, List overrides, String upstream) { + public ClusterVersionSpec(ClusterVersionCapabilitiesSpec capabilities, String channel, String clusterID, Update desiredUpdate, List overrides, String upstream) { super(); + this.capabilities = capabilities; this.channel = channel; this.clusterID = clusterID; this.desiredUpdate = desiredUpdate; @@ -100,6 +105,16 @@ public ClusterVersionSpec(String channel, String clusterID, Update desiredUpdate this.upstream = upstream; } + @JsonProperty("capabilities") + public ClusterVersionCapabilitiesSpec getCapabilities() { + return capabilities; + } + + @JsonProperty("capabilities") + public void setCapabilities(ClusterVersionCapabilitiesSpec capabilities) { + this.capabilities = capabilities; + } + @JsonProperty("channel") public String getChannel() { return channel; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatus.java index da226381100..2db48f23d69 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatus.java @@ -36,6 +36,7 @@ "kind", "metadata", "availableUpdates", + "capabilities", "conditionalUpdates", "conditions", "desired", @@ -66,6 +67,8 @@ public class ClusterVersionStatus implements KubernetesResource @JsonProperty("availableUpdates") private List availableUpdates = new ArrayList(); + @JsonProperty("capabilities") + private ClusterVersionCapabilitiesStatus capabilities; @JsonProperty("conditionalUpdates") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List conditionalUpdates = new ArrayList(); @@ -93,6 +96,7 @@ public ClusterVersionStatus() { /** * + * @param capabilities * @param desired * @param conditionalUpdates * @param availableUpdates @@ -101,9 +105,10 @@ public ClusterVersionStatus() { * @param conditions * @param observedGeneration */ - public ClusterVersionStatus(List availableUpdates, List conditionalUpdates, List conditions, Release desired, List history, Long observedGeneration, String versionHash) { + public ClusterVersionStatus(List availableUpdates, ClusterVersionCapabilitiesStatus capabilities, List conditionalUpdates, List conditions, Release desired, List history, Long observedGeneration, String versionHash) { super(); this.availableUpdates = availableUpdates; + this.capabilities = capabilities; this.conditionalUpdates = conditionalUpdates; this.conditions = conditions; this.desired = desired; @@ -122,6 +127,16 @@ public void setAvailableUpdates(List availableUpdates) { this.availableUpdates = availableUpdates; } + @JsonProperty("capabilities") + public ClusterVersionCapabilitiesStatus getCapabilities() { + return capabilities; + } + + @JsonProperty("capabilities") + public void setCapabilities(ClusterVersionCapabilitiesStatus capabilities) { + this.capabilities = capabilities; + } + @JsonProperty("conditionalUpdates") public List getConditionalUpdates() { return conditionalUpdates; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSPlatformSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSPlatformSpec.java new file mode 100644 index 00000000000..857b25c58cb --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSPlatformSpec.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.config.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", + "aws", + "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 DNSPlatformSpec implements KubernetesResource +{ + + @JsonProperty("aws") + private AWSDNSSpec aws; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DNSPlatformSpec() { + } + + /** + * + * @param aws + * @param type + */ + public DNSPlatformSpec(AWSDNSSpec aws, String type) { + super(); + this.aws = aws; + this.type = type; + } + + @JsonProperty("aws") + public AWSDNSSpec getAws() { + return aws; + } + + @JsonProperty("aws") + public void setAws(AWSDNSSpec aws) { + this.aws = aws; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpec.java index 29355312c7d..2f22f258440 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpec.java @@ -34,6 +34,7 @@ "kind", "metadata", "baseDomain", + "platform", "privateZone", "publicZone" }) @@ -60,6 +61,8 @@ public class DNSSpec implements KubernetesResource @JsonProperty("baseDomain") private String baseDomain; + @JsonProperty("platform") + private DNSPlatformSpec platform; @JsonProperty("privateZone") private DNSZone privateZone; @JsonProperty("publicZone") @@ -79,10 +82,12 @@ public DNSSpec() { * @param publicZone * @param baseDomain * @param privateZone + * @param platform */ - public DNSSpec(String baseDomain, DNSZone privateZone, DNSZone publicZone) { + public DNSSpec(String baseDomain, DNSPlatformSpec platform, DNSZone privateZone, DNSZone publicZone) { super(); this.baseDomain = baseDomain; + this.platform = platform; this.privateZone = privateZone; this.publicZone = publicZone; } @@ -97,6 +102,16 @@ public void setBaseDomain(String baseDomain) { this.baseDomain = baseDomain; } + @JsonProperty("platform") + public DNSPlatformSpec getPlatform() { + return platform; + } + + @JsonProperty("platform") + public void setPlatform(DNSPlatformSpec platform) { + this.platform = platform; + } + @JsonProperty("privateZone") public DNSZone getPrivateZone() { return privateZone; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalPlatformSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalPlatformSpec.java new file mode 100644 index 00000000000..f43ae4bc1c2 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalPlatformSpec.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.config.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", + "platformName" +}) +@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 ExternalPlatformSpec implements KubernetesResource +{ + + @JsonProperty("platformName") + private String platformName; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ExternalPlatformSpec() { + } + + /** + * + * @param platformName + */ + public ExternalPlatformSpec(String platformName) { + super(); + this.platformName = platformName; + } + + @JsonProperty("platformName") + public String getPlatformName() { + return platformName; + } + + @JsonProperty("platformName") + public void setPlatformName(String platformName) { + this.platformName = platformName; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalPlatformStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalPlatformStatus.java new file mode 100644 index 00000000000..65d2eee1bdd --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalPlatformStatus.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.config.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", + "cloudControllerManager" +}) +@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 ExternalPlatformStatus implements KubernetesResource +{ + + @JsonProperty("cloudControllerManager") + private CloudControllerManagerStatus cloudControllerManager; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ExternalPlatformStatus() { + } + + /** + * + * @param cloudControllerManager + */ + public ExternalPlatformStatus(CloudControllerManagerStatus cloudControllerManager) { + super(); + this.cloudControllerManager = cloudControllerManager; + } + + @JsonProperty("cloudControllerManager") + public CloudControllerManagerStatus getCloudControllerManager() { + return cloudControllerManager; + } + + @JsonProperty("cloudControllerManager") + public void setCloudControllerManager(CloudControllerManagerStatus cloudControllerManager) { + this.cloudControllerManager = cloudControllerManager; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateAttributes.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateAttributes.java new file mode 100644 index 00000000000..dbeadc09314 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateAttributes.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.config.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", + "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 FeatureGateAttributes implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FeatureGateAttributes() { + } + + /** + * + * @param name + */ + public FeatureGateAttributes(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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateDetails.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateDetails.java new file mode 100644 index 00000000000..ee8f65525e8 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateDetails.java @@ -0,0 +1,132 @@ + +package io.fabric8.openshift.api.model.config.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", + "disabled", + "enabled", + "version" +}) +@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 FeatureGateDetails implements KubernetesResource +{ + + @JsonProperty("disabled") + private List disabled = new ArrayList(); + @JsonProperty("enabled") + private List enabled = new ArrayList(); + @JsonProperty("version") + private String version; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FeatureGateDetails() { + } + + /** + * + * @param disabled + * @param version + * @param enabled + */ + public FeatureGateDetails(List disabled, List enabled, String version) { + super(); + this.disabled = disabled; + this.enabled = enabled; + this.version = version; + } + + @JsonProperty("disabled") + public List getDisabled() { + return disabled; + } + + @JsonProperty("disabled") + public void setDisabled(List disabled) { + this.disabled = disabled; + } + + @JsonProperty("enabled") + public List getEnabled() { + return enabled; + } + + @JsonProperty("enabled") + public void setEnabled(List enabled) { + this.enabled = enabled; + } + + @JsonProperty("version") + public String getVersion() { + return version; + } + + @JsonProperty("version") + public void setVersion(String version) { + this.version = version; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatus.java index f135ca42043..afbdac513d2 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatus.java @@ -1,14 +1,18 @@ package io.fabric8.openshift.api.model.config.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.Condition; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; @@ -31,7 +35,9 @@ @JsonPropertyOrder({ "apiVersion", "kind", - "metadata" + "metadata", + "conditions", + "featureGates" }) @ToString @EqualsAndHashCode @@ -54,9 +60,52 @@ public class FeatureGateStatus implements KubernetesResource { + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList(); + @JsonProperty("featureGates") + private List featureGates = new ArrayList(); @JsonIgnore private Map additionalProperties = new HashMap(); + /** + * No args constructor for use in serialization + * + */ + public FeatureGateStatus() { + } + + /** + * + * @param featureGates + * @param conditions + */ + public FeatureGateStatus(List conditions, List featureGates) { + super(); + this.conditions = conditions; + this.featureGates = featureGates; + } + + @JsonProperty("conditions") + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("featureGates") + public List getFeatureGates() { + return featureGates; + } + + @JsonProperty("featureGates") + public void setFeatureGates(List featureGates) { + this.featureGates = featureGates; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IBMCloudPlatformStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IBMCloudPlatformStatus.java index 54213246b97..3f5beba6b69 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IBMCloudPlatformStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IBMCloudPlatformStatus.java @@ -34,6 +34,7 @@ "kind", "metadata", "cisInstanceCRN", + "dnsInstanceCRN", "location", "providerType", "resourceGroupName" @@ -61,6 +62,8 @@ public class IBMCloudPlatformStatus implements KubernetesResource @JsonProperty("cisInstanceCRN") private String cisInstanceCRN; + @JsonProperty("dnsInstanceCRN") + private String dnsInstanceCRN; @JsonProperty("location") private String location; @JsonProperty("providerType") @@ -82,11 +85,13 @@ public IBMCloudPlatformStatus() { * @param cisInstanceCRN * @param resourceGroupName * @param location + * @param dnsInstanceCRN * @param providerType */ - public IBMCloudPlatformStatus(String cisInstanceCRN, String location, String providerType, String resourceGroupName) { + public IBMCloudPlatformStatus(String cisInstanceCRN, String dnsInstanceCRN, String location, String providerType, String resourceGroupName) { super(); this.cisInstanceCRN = cisInstanceCRN; + this.dnsInstanceCRN = dnsInstanceCRN; this.location = location; this.providerType = providerType; this.resourceGroupName = resourceGroupName; @@ -102,6 +107,16 @@ public void setCisInstanceCRN(String cisInstanceCRN) { this.cisInstanceCRN = cisInstanceCRN; } + @JsonProperty("dnsInstanceCRN") + public String getDnsInstanceCRN() { + return dnsInstanceCRN; + } + + @JsonProperty("dnsInstanceCRN") + public void setDnsInstanceCRN(String dnsInstanceCRN) { + this.dnsInstanceCRN = dnsInstanceCRN; + } + @JsonProperty("location") public String getLocation() { return location; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatus.java index b1b159107c1..8f764ec0caf 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatus.java @@ -36,6 +36,7 @@ "apiServerInternalURI", "apiServerURL", "controlPlaneTopology", + "cpuPartitioning", "etcdDiscoveryDomain", "infrastructureName", "infrastructureTopology", @@ -69,6 +70,8 @@ public class InfrastructureStatus implements KubernetesResource private String apiServerURL; @JsonProperty("controlPlaneTopology") private String controlPlaneTopology; + @JsonProperty("cpuPartitioning") + private String cpuPartitioning; @JsonProperty("etcdDiscoveryDomain") private String etcdDiscoveryDomain; @JsonProperty("infrastructureName") @@ -92,6 +95,7 @@ public InfrastructureStatus() { /** * * @param apiServerInternalURI + * @param cpuPartitioning * @param infrastructureTopology * @param etcdDiscoveryDomain * @param infrastructureName @@ -100,11 +104,12 @@ public InfrastructureStatus() { * @param platformStatus * @param platform */ - public InfrastructureStatus(String apiServerInternalURI, String apiServerURL, String controlPlaneTopology, String etcdDiscoveryDomain, String infrastructureName, String infrastructureTopology, String platform, PlatformStatus platformStatus) { + public InfrastructureStatus(String apiServerInternalURI, String apiServerURL, String controlPlaneTopology, String cpuPartitioning, String etcdDiscoveryDomain, String infrastructureName, String infrastructureTopology, String platform, PlatformStatus platformStatus) { super(); this.apiServerInternalURI = apiServerInternalURI; this.apiServerURL = apiServerURL; this.controlPlaneTopology = controlPlaneTopology; + this.cpuPartitioning = cpuPartitioning; this.etcdDiscoveryDomain = etcdDiscoveryDomain; this.infrastructureName = infrastructureName; this.infrastructureTopology = infrastructureTopology; @@ -142,6 +147,16 @@ public void setControlPlaneTopology(String controlPlaneTopology) { this.controlPlaneTopology = controlPlaneTopology; } + @JsonProperty("cpuPartitioning") + public String getCpuPartitioning() { + return cpuPartitioning; + } + + @JsonProperty("cpuPartitioning") + public void setCpuPartitioning(String cpuPartitioning) { + this.cpuPartitioning = cpuPartitioning; + } + @JsonProperty("etcdDiscoveryDomain") public String getEtcdDiscoveryDomain() { return etcdDiscoveryDomain; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressPlatformSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressPlatformSpec.java new file mode 100644 index 00000000000..7bfb4229dd4 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressPlatformSpec.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.config.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", + "aws", + "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 IngressPlatformSpec implements KubernetesResource +{ + + @JsonProperty("aws") + private AWSIngressSpec aws; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public IngressPlatformSpec() { + } + + /** + * + * @param aws + * @param type + */ + public IngressPlatformSpec(AWSIngressSpec aws, String type) { + super(); + this.aws = aws; + this.type = type; + } + + @JsonProperty("aws") + public AWSIngressSpec getAws() { + return aws; + } + + @JsonProperty("aws") + public void setAws(AWSIngressSpec aws) { + this.aws = aws; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpec.java index 76e9ae7421f..7b728cefe0d 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpec.java @@ -38,6 +38,7 @@ "appsDomain", "componentRoutes", "domain", + "loadBalancer", "requiredHSTSPolicies" }) @ToString @@ -68,6 +69,8 @@ public class IngressSpec implements KubernetesResource private List componentRoutes = new ArrayList(); @JsonProperty("domain") private String domain; + @JsonProperty("loadBalancer") + private LoadBalancer loadBalancer; @JsonProperty("requiredHSTSPolicies") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List requiredHSTSPolicies = new ArrayList(); @@ -84,15 +87,17 @@ public IngressSpec() { /** * * @param componentRoutes + * @param loadBalancer * @param domain * @param appsDomain * @param requiredHSTSPolicies */ - public IngressSpec(String appsDomain, List componentRoutes, String domain, List requiredHSTSPolicies) { + public IngressSpec(String appsDomain, List componentRoutes, String domain, LoadBalancer loadBalancer, List requiredHSTSPolicies) { super(); this.appsDomain = appsDomain; this.componentRoutes = componentRoutes; this.domain = domain; + this.loadBalancer = loadBalancer; this.requiredHSTSPolicies = requiredHSTSPolicies; } @@ -126,6 +131,16 @@ public void setDomain(String domain) { this.domain = domain; } + @JsonProperty("loadBalancer") + public LoadBalancer getLoadBalancer() { + return loadBalancer; + } + + @JsonProperty("loadBalancer") + public void setLoadBalancer(LoadBalancer loadBalancer) { + this.loadBalancer = loadBalancer; + } + @JsonProperty("requiredHSTSPolicies") public List getRequiredHSTSPolicies() { return requiredHSTSPolicies; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatus.java index 33a0fbbd370..aceb04f90a5 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatus.java @@ -35,7 +35,8 @@ "apiVersion", "kind", "metadata", - "componentRoutes" + "componentRoutes", + "defaultPlacement" }) @ToString @EqualsAndHashCode @@ -61,6 +62,8 @@ public class IngressStatus implements KubernetesResource @JsonProperty("componentRoutes") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List componentRoutes = new ArrayList(); + @JsonProperty("defaultPlacement") + private String defaultPlacement; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -74,10 +77,12 @@ public IngressStatus() { /** * * @param componentRoutes + * @param defaultPlacement */ - public IngressStatus(List componentRoutes) { + public IngressStatus(List componentRoutes, String defaultPlacement) { super(); this.componentRoutes = componentRoutes; + this.defaultPlacement = defaultPlacement; } @JsonProperty("componentRoutes") @@ -90,6 +95,16 @@ public void setComponentRoutes(List componentRoutes) { this.componentRoutes = componentRoutes; } + @JsonProperty("defaultPlacement") + public String getDefaultPlacement() { + return defaultPlacement; + } + + @JsonProperty("defaultPlacement") + public void setDefaultPlacement(String defaultPlacement) { + this.defaultPlacement = defaultPlacement; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/LoadBalancer.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/LoadBalancer.java new file mode 100644 index 00000000000..7f73f9af209 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/LoadBalancer.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.config.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", + "platform" +}) +@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 LoadBalancer implements KubernetesResource +{ + + @JsonProperty("platform") + private IngressPlatformSpec platform; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public LoadBalancer() { + } + + /** + * + * @param platform + */ + public LoadBalancer(IngressPlatformSpec platform) { + super(); + this.platform = platform; + } + + @JsonProperty("platform") + public IngressPlatformSpec getPlatform() { + return platform; + } + + @JsonProperty("platform") + public void setPlatform(IngressPlatformSpec platform) { + this.platform = platform; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/MTUMigration.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/MTUMigration.java new file mode 100644 index 00000000000..a3c51fe47a3 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/MTUMigration.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.config.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", + "machine", + "network" +}) +@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 MTUMigration implements KubernetesResource +{ + + @JsonProperty("machine") + private MTUMigrationValues machine; + @JsonProperty("network") + private MTUMigrationValues network; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MTUMigration() { + } + + /** + * + * @param machine + * @param network + */ + public MTUMigration(MTUMigrationValues machine, MTUMigrationValues network) { + super(); + this.machine = machine; + this.network = network; + } + + @JsonProperty("machine") + public MTUMigrationValues getMachine() { + return machine; + } + + @JsonProperty("machine") + public void setMachine(MTUMigrationValues machine) { + this.machine = machine; + } + + @JsonProperty("network") + public MTUMigrationValues getNetwork() { + return network; + } + + @JsonProperty("network") + public void setNetwork(MTUMigrationValues network) { + this.network = network; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/MTUMigrationValues.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/MTUMigrationValues.java new file mode 100644 index 00000000000..491d2708dcb --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/MTUMigrationValues.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.config.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", + "from", + "to" +}) +@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 MTUMigrationValues implements KubernetesResource +{ + + @JsonProperty("from") + private Integer from; + @JsonProperty("to") + private Integer to; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MTUMigrationValues() { + } + + /** + * + * @param from + * @param to + */ + public MTUMigrationValues(Integer from, Integer to) { + super(); + this.from = from; + this.to = to; + } + + @JsonProperty("from") + public Integer getFrom() { + return from; + } + + @JsonProperty("from") + public void setFrom(Integer from) { + this.from = from; + } + + @JsonProperty("to") + public Integer getTo() { + return to; + } + + @JsonProperty("to") + public void setTo(Integer to) { + this.to = to; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkMigration.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkMigration.java index 68edd0afa3d..5b47df7d959 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkMigration.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkMigration.java @@ -33,6 +33,7 @@ "apiVersion", "kind", "metadata", + "mtu", "networkType" }) @ToString @@ -56,6 +57,8 @@ public class NetworkMigration implements KubernetesResource { + @JsonProperty("mtu") + private MTUMigration mtu; @JsonProperty("networkType") private String networkType; @JsonIgnore @@ -71,12 +74,24 @@ public NetworkMigration() { /** * * @param networkType + * @param mtu */ - public NetworkMigration(String networkType) { + public NetworkMigration(MTUMigration mtu, String networkType) { super(); + this.mtu = mtu; this.networkType = networkType; } + @JsonProperty("mtu") + public MTUMigration getMtu() { + return mtu; + } + + @JsonProperty("mtu") + public void setMtu(MTUMigration mtu) { + this.mtu = mtu; + } + @JsonProperty("networkType") public String getNetworkType() { return networkType; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformLoadBalancer.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformLoadBalancer.java new file mode 100644 index 00000000000..f7be8f625ad --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformLoadBalancer.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.config.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", + "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 NutanixPlatformLoadBalancer implements KubernetesResource +{ + + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixPlatformLoadBalancer() { + } + + /** + * + * @param type + */ + public NutanixPlatformLoadBalancer(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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformSpec.java new file mode 100644 index 00000000000..29e6d7b5153 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformSpec.java @@ -0,0 +1,117 @@ + +package io.fabric8.openshift.api.model.config.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", + "prismCentral", + "prismElements" +}) +@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 NutanixPlatformSpec implements KubernetesResource +{ + + @JsonProperty("prismCentral") + private NutanixPrismEndpoint prismCentral; + @JsonProperty("prismElements") + private List prismElements = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixPlatformSpec() { + } + + /** + * + * @param prismElements + * @param prismCentral + */ + public NutanixPlatformSpec(NutanixPrismEndpoint prismCentral, List prismElements) { + super(); + this.prismCentral = prismCentral; + this.prismElements = prismElements; + } + + @JsonProperty("prismCentral") + public NutanixPrismEndpoint getPrismCentral() { + return prismCentral; + } + + @JsonProperty("prismCentral") + public void setPrismCentral(NutanixPrismEndpoint prismCentral) { + this.prismCentral = prismCentral; + } + + @JsonProperty("prismElements") + public List getPrismElements() { + return prismElements; + } + + @JsonProperty("prismElements") + public void setPrismElements(List prismElements) { + this.prismElements = prismElements; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformStatus.java new file mode 100644 index 00000000000..5429e74148f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformStatus.java @@ -0,0 +1,162 @@ + +package io.fabric8.openshift.api.model.config.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", + "apiServerInternalIP", + "apiServerInternalIPs", + "ingressIP", + "ingressIPs", + "loadBalancer" +}) +@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 NutanixPlatformStatus implements KubernetesResource +{ + + @JsonProperty("apiServerInternalIP") + private String apiServerInternalIP; + @JsonProperty("apiServerInternalIPs") + private List apiServerInternalIPs = new ArrayList(); + @JsonProperty("ingressIP") + private String ingressIP; + @JsonProperty("ingressIPs") + private List ingressIPs = new ArrayList(); + @JsonProperty("loadBalancer") + private NutanixPlatformLoadBalancer loadBalancer; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixPlatformStatus() { + } + + /** + * + * @param apiServerInternalIPs + * @param loadBalancer + * @param apiServerInternalIP + * @param ingressIP + * @param ingressIPs + */ + public NutanixPlatformStatus(String apiServerInternalIP, List apiServerInternalIPs, String ingressIP, List ingressIPs, NutanixPlatformLoadBalancer loadBalancer) { + super(); + this.apiServerInternalIP = apiServerInternalIP; + this.apiServerInternalIPs = apiServerInternalIPs; + this.ingressIP = ingressIP; + this.ingressIPs = ingressIPs; + this.loadBalancer = loadBalancer; + } + + @JsonProperty("apiServerInternalIP") + public String getApiServerInternalIP() { + return apiServerInternalIP; + } + + @JsonProperty("apiServerInternalIP") + public void setApiServerInternalIP(String apiServerInternalIP) { + this.apiServerInternalIP = apiServerInternalIP; + } + + @JsonProperty("apiServerInternalIPs") + public List getApiServerInternalIPs() { + return apiServerInternalIPs; + } + + @JsonProperty("apiServerInternalIPs") + public void setApiServerInternalIPs(List apiServerInternalIPs) { + this.apiServerInternalIPs = apiServerInternalIPs; + } + + @JsonProperty("ingressIP") + public String getIngressIP() { + return ingressIP; + } + + @JsonProperty("ingressIP") + public void setIngressIP(String ingressIP) { + this.ingressIP = ingressIP; + } + + @JsonProperty("ingressIPs") + public List getIngressIPs() { + return ingressIPs; + } + + @JsonProperty("ingressIPs") + public void setIngressIPs(List ingressIPs) { + this.ingressIPs = ingressIPs; + } + + @JsonProperty("loadBalancer") + public NutanixPlatformLoadBalancer getLoadBalancer() { + return loadBalancer; + } + + @JsonProperty("loadBalancer") + public void setLoadBalancer(NutanixPlatformLoadBalancer loadBalancer) { + this.loadBalancer = loadBalancer; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPrismElementEndpoint.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPrismElementEndpoint.java new file mode 100644 index 00000000000..db566940919 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPrismElementEndpoint.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.config.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", + "endpoint", + "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 NutanixPrismElementEndpoint implements KubernetesResource +{ + + @JsonProperty("endpoint") + private NutanixPrismEndpoint endpoint; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixPrismElementEndpoint() { + } + + /** + * + * @param endpoint + * @param name + */ + public NutanixPrismElementEndpoint(NutanixPrismEndpoint endpoint, String name) { + super(); + this.endpoint = endpoint; + this.name = name; + } + + @JsonProperty("endpoint") + public NutanixPrismEndpoint getEndpoint() { + return endpoint; + } + + @JsonProperty("endpoint") + public void setEndpoint(NutanixPrismEndpoint endpoint) { + this.endpoint = endpoint; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPrismEndpoint.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPrismEndpoint.java new file mode 100644 index 00000000000..ac95365990a --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPrismEndpoint.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.config.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", + "address", + "port" +}) +@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 NutanixPrismEndpoint implements KubernetesResource +{ + + @JsonProperty("address") + private String address; + @JsonProperty("port") + private Integer port; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixPrismEndpoint() { + } + + /** + * + * @param address + * @param port + */ + public NutanixPrismEndpoint(String address, Integer port) { + super(); + this.address = address; + this.port = port; + } + + @JsonProperty("address") + public String getAddress() { + return address; + } + + @JsonProperty("address") + public void setAddress(String address) { + this.address = address; + } + + @JsonProperty("port") + public Integer getPort() { + return port; + } + + @JsonProperty("port") + public void setPort(Integer port) { + this.port = port; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformLoadBalancer.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformLoadBalancer.java new file mode 100644 index 00000000000..6a1ad1e47cf --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformLoadBalancer.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.config.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", + "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 OpenStackPlatformLoadBalancer implements KubernetesResource +{ + + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OpenStackPlatformLoadBalancer() { + } + + /** + * + * @param type + */ + public OpenStackPlatformLoadBalancer(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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformStatus.java index eabc4c8324e..fe23f76b3ed 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformStatus.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.config.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; @@ -34,8 +36,11 @@ "kind", "metadata", "apiServerInternalIP", + "apiServerInternalIPs", "cloudName", "ingressIP", + "ingressIPs", + "loadBalancer", "nodeDNSIP" }) @ToString @@ -61,10 +66,16 @@ public class OpenStackPlatformStatus implements KubernetesResource @JsonProperty("apiServerInternalIP") private String apiServerInternalIP; + @JsonProperty("apiServerInternalIPs") + private List apiServerInternalIPs = new ArrayList(); @JsonProperty("cloudName") private String cloudName; @JsonProperty("ingressIP") private String ingressIP; + @JsonProperty("ingressIPs") + private List ingressIPs = new ArrayList(); + @JsonProperty("loadBalancer") + private OpenStackPlatformLoadBalancer loadBalancer; @JsonProperty("nodeDNSIP") private String nodeDNSIP; @JsonIgnore @@ -79,16 +90,22 @@ public OpenStackPlatformStatus() { /** * + * @param apiServerInternalIPs * @param cloudName + * @param loadBalancer * @param apiServerInternalIP * @param nodeDNSIP * @param ingressIP + * @param ingressIPs */ - public OpenStackPlatformStatus(String apiServerInternalIP, String cloudName, String ingressIP, String nodeDNSIP) { + public OpenStackPlatformStatus(String apiServerInternalIP, List apiServerInternalIPs, String cloudName, String ingressIP, List ingressIPs, OpenStackPlatformLoadBalancer loadBalancer, String nodeDNSIP) { super(); this.apiServerInternalIP = apiServerInternalIP; + this.apiServerInternalIPs = apiServerInternalIPs; this.cloudName = cloudName; this.ingressIP = ingressIP; + this.ingressIPs = ingressIPs; + this.loadBalancer = loadBalancer; this.nodeDNSIP = nodeDNSIP; } @@ -102,6 +119,16 @@ public void setApiServerInternalIP(String apiServerInternalIP) { this.apiServerInternalIP = apiServerInternalIP; } + @JsonProperty("apiServerInternalIPs") + public List getApiServerInternalIPs() { + return apiServerInternalIPs; + } + + @JsonProperty("apiServerInternalIPs") + public void setApiServerInternalIPs(List apiServerInternalIPs) { + this.apiServerInternalIPs = apiServerInternalIPs; + } + @JsonProperty("cloudName") public String getCloudName() { return cloudName; @@ -122,6 +149,26 @@ public void setIngressIP(String ingressIP) { this.ingressIP = ingressIP; } + @JsonProperty("ingressIPs") + public List getIngressIPs() { + return ingressIPs; + } + + @JsonProperty("ingressIPs") + public void setIngressIPs(List ingressIPs) { + this.ingressIPs = ingressIPs; + } + + @JsonProperty("loadBalancer") + public OpenStackPlatformLoadBalancer getLoadBalancer() { + return loadBalancer; + } + + @JsonProperty("loadBalancer") + public void setLoadBalancer(OpenStackPlatformLoadBalancer loadBalancer) { + this.loadBalancer = loadBalancer; + } + @JsonProperty("nodeDNSIP") public String getNodeDNSIP() { return nodeDNSIP; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformLoadBalancer.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformLoadBalancer.java new file mode 100644 index 00000000000..8b937c33442 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformLoadBalancer.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.config.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", + "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 OvirtPlatformLoadBalancer implements KubernetesResource +{ + + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OvirtPlatformLoadBalancer() { + } + + /** + * + * @param type + */ + public OvirtPlatformLoadBalancer(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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformStatus.java index 996efb211ec..44ecddba267 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformStatus.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.config.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; @@ -34,7 +36,10 @@ "kind", "metadata", "apiServerInternalIP", + "apiServerInternalIPs", "ingressIP", + "ingressIPs", + "loadBalancer", "nodeDNSIP" }) @ToString @@ -60,8 +65,14 @@ public class OvirtPlatformStatus implements KubernetesResource @JsonProperty("apiServerInternalIP") private String apiServerInternalIP; + @JsonProperty("apiServerInternalIPs") + private List apiServerInternalIPs = new ArrayList(); @JsonProperty("ingressIP") private String ingressIP; + @JsonProperty("ingressIPs") + private List ingressIPs = new ArrayList(); + @JsonProperty("loadBalancer") + private OvirtPlatformLoadBalancer loadBalancer; @JsonProperty("nodeDNSIP") private String nodeDNSIP; @JsonIgnore @@ -76,14 +87,20 @@ public OvirtPlatformStatus() { /** * + * @param apiServerInternalIPs + * @param loadBalancer * @param apiServerInternalIP * @param nodeDNSIP * @param ingressIP + * @param ingressIPs */ - public OvirtPlatformStatus(String apiServerInternalIP, String ingressIP, String nodeDNSIP) { + public OvirtPlatformStatus(String apiServerInternalIP, List apiServerInternalIPs, String ingressIP, List ingressIPs, OvirtPlatformLoadBalancer loadBalancer, String nodeDNSIP) { super(); this.apiServerInternalIP = apiServerInternalIP; + this.apiServerInternalIPs = apiServerInternalIPs; this.ingressIP = ingressIP; + this.ingressIPs = ingressIPs; + this.loadBalancer = loadBalancer; this.nodeDNSIP = nodeDNSIP; } @@ -97,6 +114,16 @@ public void setApiServerInternalIP(String apiServerInternalIP) { this.apiServerInternalIP = apiServerInternalIP; } + @JsonProperty("apiServerInternalIPs") + public List getApiServerInternalIPs() { + return apiServerInternalIPs; + } + + @JsonProperty("apiServerInternalIPs") + public void setApiServerInternalIPs(List apiServerInternalIPs) { + this.apiServerInternalIPs = apiServerInternalIPs; + } + @JsonProperty("ingressIP") public String getIngressIP() { return ingressIP; @@ -107,6 +134,26 @@ public void setIngressIP(String ingressIP) { this.ingressIP = ingressIP; } + @JsonProperty("ingressIPs") + public List getIngressIPs() { + return ingressIPs; + } + + @JsonProperty("ingressIPs") + public void setIngressIPs(List ingressIPs) { + this.ingressIPs = ingressIPs; + } + + @JsonProperty("loadBalancer") + public OvirtPlatformLoadBalancer getLoadBalancer() { + return loadBalancer; + } + + @JsonProperty("loadBalancer") + public void setLoadBalancer(OvirtPlatformLoadBalancer loadBalancer) { + this.loadBalancer = loadBalancer; + } + @JsonProperty("nodeDNSIP") public String getNodeDNSIP() { return nodeDNSIP; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PlatformSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PlatformSpec.java index 9e69f86da16..d87483345a3 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PlatformSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PlatformSpec.java @@ -38,9 +38,11 @@ "azure", "baremetal", "equinixMetal", + "external", "gcp", "ibmcloud", "kubevirt", + "nutanix", "openstack", "ovirt", "powervs", @@ -78,12 +80,16 @@ public class PlatformSpec implements KubernetesResource private BareMetalPlatformSpec baremetal; @JsonProperty("equinixMetal") private EquinixMetalPlatformSpec equinixMetal; + @JsonProperty("external") + private ExternalPlatformSpec external; @JsonProperty("gcp") private GCPPlatformSpec gcp; @JsonProperty("ibmcloud") private IBMCloudPlatformSpec ibmcloud; @JsonProperty("kubevirt") private KubevirtPlatformSpec kubevirt; + @JsonProperty("nutanix") + private NutanixPlatformSpec nutanix; @JsonProperty("openstack") private OpenStackPlatformSpec openstack; @JsonProperty("ovirt") @@ -112,6 +118,8 @@ public PlatformSpec() { * @param ibmcloud * @param equinixMetal * @param type + * @param nutanix + * @param external * @param vsphere * @param gcp * @param ovirt @@ -120,16 +128,18 @@ public PlatformSpec() { * @param aws * @param azure */ - public PlatformSpec(AlibabaCloudPlatformSpec alibabaCloud, AWSPlatformSpec aws, AzurePlatformSpec azure, BareMetalPlatformSpec baremetal, EquinixMetalPlatformSpec equinixMetal, GCPPlatformSpec gcp, IBMCloudPlatformSpec ibmcloud, KubevirtPlatformSpec kubevirt, OpenStackPlatformSpec openstack, OvirtPlatformSpec ovirt, PowerVSPlatformSpec powervs, String type, VSpherePlatformSpec vsphere) { + public PlatformSpec(AlibabaCloudPlatformSpec alibabaCloud, AWSPlatformSpec aws, AzurePlatformSpec azure, BareMetalPlatformSpec baremetal, EquinixMetalPlatformSpec equinixMetal, ExternalPlatformSpec external, GCPPlatformSpec gcp, IBMCloudPlatformSpec ibmcloud, KubevirtPlatformSpec kubevirt, NutanixPlatformSpec nutanix, OpenStackPlatformSpec openstack, OvirtPlatformSpec ovirt, PowerVSPlatformSpec powervs, String type, VSpherePlatformSpec vsphere) { super(); this.alibabaCloud = alibabaCloud; this.aws = aws; this.azure = azure; this.baremetal = baremetal; this.equinixMetal = equinixMetal; + this.external = external; this.gcp = gcp; this.ibmcloud = ibmcloud; this.kubevirt = kubevirt; + this.nutanix = nutanix; this.openstack = openstack; this.ovirt = ovirt; this.powervs = powervs; @@ -187,6 +197,16 @@ public void setEquinixMetal(EquinixMetalPlatformSpec equinixMetal) { this.equinixMetal = equinixMetal; } + @JsonProperty("external") + public ExternalPlatformSpec getExternal() { + return external; + } + + @JsonProperty("external") + public void setExternal(ExternalPlatformSpec external) { + this.external = external; + } + @JsonProperty("gcp") public GCPPlatformSpec getGcp() { return gcp; @@ -217,6 +237,16 @@ public void setKubevirt(KubevirtPlatformSpec kubevirt) { this.kubevirt = kubevirt; } + @JsonProperty("nutanix") + public NutanixPlatformSpec getNutanix() { + return nutanix; + } + + @JsonProperty("nutanix") + public void setNutanix(NutanixPlatformSpec nutanix) { + this.nutanix = nutanix; + } + @JsonProperty("openstack") public OpenStackPlatformSpec getOpenstack() { return openstack; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PlatformStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PlatformStatus.java index 2d35ca02411..b9253906557 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PlatformStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PlatformStatus.java @@ -38,9 +38,11 @@ "azure", "baremetal", "equinixMetal", + "external", "gcp", "ibmcloud", "kubevirt", + "nutanix", "openstack", "ovirt", "powervs", @@ -78,12 +80,16 @@ public class PlatformStatus implements KubernetesResource private BareMetalPlatformStatus baremetal; @JsonProperty("equinixMetal") private EquinixMetalPlatformStatus equinixMetal; + @JsonProperty("external") + private ExternalPlatformStatus external; @JsonProperty("gcp") private GCPPlatformStatus gcp; @JsonProperty("ibmcloud") private IBMCloudPlatformStatus ibmcloud; @JsonProperty("kubevirt") private KubevirtPlatformStatus kubevirt; + @JsonProperty("nutanix") + private NutanixPlatformStatus nutanix; @JsonProperty("openstack") private OpenStackPlatformStatus openstack; @JsonProperty("ovirt") @@ -112,6 +118,8 @@ public PlatformStatus() { * @param ibmcloud * @param equinixMetal * @param type + * @param nutanix + * @param external * @param vsphere * @param gcp * @param ovirt @@ -120,16 +128,18 @@ public PlatformStatus() { * @param aws * @param azure */ - public PlatformStatus(AlibabaCloudPlatformStatus alibabaCloud, AWSPlatformStatus aws, AzurePlatformStatus azure, BareMetalPlatformStatus baremetal, EquinixMetalPlatformStatus equinixMetal, GCPPlatformStatus gcp, IBMCloudPlatformStatus ibmcloud, KubevirtPlatformStatus kubevirt, OpenStackPlatformStatus openstack, OvirtPlatformStatus ovirt, PowerVSPlatformStatus powervs, String type, VSpherePlatformStatus vsphere) { + public PlatformStatus(AlibabaCloudPlatformStatus alibabaCloud, AWSPlatformStatus aws, AzurePlatformStatus azure, BareMetalPlatformStatus baremetal, EquinixMetalPlatformStatus equinixMetal, ExternalPlatformStatus external, GCPPlatformStatus gcp, IBMCloudPlatformStatus ibmcloud, KubevirtPlatformStatus kubevirt, NutanixPlatformStatus nutanix, OpenStackPlatformStatus openstack, OvirtPlatformStatus ovirt, PowerVSPlatformStatus powervs, String type, VSpherePlatformStatus vsphere) { super(); this.alibabaCloud = alibabaCloud; this.aws = aws; this.azure = azure; this.baremetal = baremetal; this.equinixMetal = equinixMetal; + this.external = external; this.gcp = gcp; this.ibmcloud = ibmcloud; this.kubevirt = kubevirt; + this.nutanix = nutanix; this.openstack = openstack; this.ovirt = ovirt; this.powervs = powervs; @@ -187,6 +197,16 @@ public void setEquinixMetal(EquinixMetalPlatformStatus equinixMetal) { this.equinixMetal = equinixMetal; } + @JsonProperty("external") + public ExternalPlatformStatus getExternal() { + return external; + } + + @JsonProperty("external") + public void setExternal(ExternalPlatformStatus external) { + this.external = external; + } + @JsonProperty("gcp") public GCPPlatformStatus getGcp() { return gcp; @@ -217,6 +237,16 @@ public void setKubevirt(KubevirtPlatformStatus kubevirt) { this.kubevirt = kubevirt; } + @JsonProperty("nutanix") + public NutanixPlatformStatus getNutanix() { + return nutanix; + } + + @JsonProperty("nutanix") + public void setNutanix(NutanixPlatformStatus nutanix) { + this.nutanix = nutanix; + } + @JsonProperty("openstack") public OpenStackPlatformStatus getOpenstack() { return openstack; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PowerVSPlatformStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PowerVSPlatformStatus.java index e3d9f14e185..4417eb0d039 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PowerVSPlatformStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PowerVSPlatformStatus.java @@ -36,7 +36,9 @@ "kind", "metadata", "cisInstanceCRN", + "dnsInstanceCRN", "region", + "resourceGroup", "serviceEndpoints", "zone" }) @@ -63,8 +65,12 @@ public class PowerVSPlatformStatus implements KubernetesResource @JsonProperty("cisInstanceCRN") private String cisInstanceCRN; + @JsonProperty("dnsInstanceCRN") + private String dnsInstanceCRN; @JsonProperty("region") private String region; + @JsonProperty("resourceGroup") + private String resourceGroup; @JsonProperty("serviceEndpoints") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List serviceEndpoints = new ArrayList(); @@ -82,15 +88,19 @@ public PowerVSPlatformStatus() { /** * + * @param resourceGroup * @param cisInstanceCRN * @param zone * @param region + * @param dnsInstanceCRN * @param serviceEndpoints */ - public PowerVSPlatformStatus(String cisInstanceCRN, String region, List serviceEndpoints, String zone) { + public PowerVSPlatformStatus(String cisInstanceCRN, String dnsInstanceCRN, String region, String resourceGroup, List serviceEndpoints, String zone) { super(); this.cisInstanceCRN = cisInstanceCRN; + this.dnsInstanceCRN = dnsInstanceCRN; this.region = region; + this.resourceGroup = resourceGroup; this.serviceEndpoints = serviceEndpoints; this.zone = zone; } @@ -105,6 +115,16 @@ public void setCisInstanceCRN(String cisInstanceCRN) { this.cisInstanceCRN = cisInstanceCRN; } + @JsonProperty("dnsInstanceCRN") + public String getDnsInstanceCRN() { + return dnsInstanceCRN; + } + + @JsonProperty("dnsInstanceCRN") + public void setDnsInstanceCRN(String dnsInstanceCRN) { + this.dnsInstanceCRN = dnsInstanceCRN; + } + @JsonProperty("region") public String getRegion() { return region; @@ -115,6 +135,16 @@ public void setRegion(String region) { this.region = region; } + @JsonProperty("resourceGroup") + public String getResourceGroup() { + return resourceGroup; + } + + @JsonProperty("resourceGroup") + public void setResourceGroup(String resourceGroup) { + this.resourceGroup = resourceGroup; + } + @JsonProperty("serviceEndpoints") public List getServiceEndpoints() { return serviceEndpoints; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Update.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Update.java index eec268425df..e543f838714 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Update.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Update.java @@ -33,6 +33,7 @@ "apiVersion", "kind", "metadata", + "architecture", "force", "image", "version" @@ -58,6 +59,8 @@ public class Update implements KubernetesResource { + @JsonProperty("architecture") + private String architecture; @JsonProperty("force") private Boolean force; @JsonProperty("image") @@ -79,14 +82,26 @@ public Update() { * @param image * @param force * @param version + * @param architecture */ - public Update(Boolean force, String image, String version) { + public Update(String architecture, Boolean force, String image, String version) { super(); + this.architecture = architecture; this.force = force; this.image = image; this.version = version; } + @JsonProperty("architecture") + public String getArchitecture() { + return architecture; + } + + @JsonProperty("architecture") + public void setArchitecture(String architecture) { + this.architecture = architecture; + } + @JsonProperty("force") public Boolean getForce() { return force; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformFailureDomainSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformFailureDomainSpec.java new file mode 100644 index 00000000000..e93a18a0eb5 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformFailureDomainSpec.java @@ -0,0 +1,160 @@ + +package io.fabric8.openshift.api.model.config.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", + "name", + "region", + "server", + "topology", + "zone" +}) +@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 VSpherePlatformFailureDomainSpec implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("region") + private String region; + @JsonProperty("server") + private String server; + @JsonProperty("topology") + private VSpherePlatformTopology topology; + @JsonProperty("zone") + private String zone; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public VSpherePlatformFailureDomainSpec() { + } + + /** + * + * @param server + * @param zone + * @param topology + * @param name + * @param region + */ + public VSpherePlatformFailureDomainSpec(String name, String region, String server, VSpherePlatformTopology topology, String zone) { + super(); + this.name = name; + this.region = region; + this.server = server; + this.topology = topology; + this.zone = zone; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("region") + public String getRegion() { + return region; + } + + @JsonProperty("region") + public void setRegion(String region) { + this.region = region; + } + + @JsonProperty("server") + public String getServer() { + return server; + } + + @JsonProperty("server") + public void setServer(String server) { + this.server = server; + } + + @JsonProperty("topology") + public VSpherePlatformTopology getTopology() { + return topology; + } + + @JsonProperty("topology") + public void setTopology(VSpherePlatformTopology topology) { + this.topology = topology; + } + + @JsonProperty("zone") + public String getZone() { + return zone; + } + + @JsonProperty("zone") + public void setZone(String zone) { + this.zone = zone; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformLoadBalancer.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformLoadBalancer.java new file mode 100644 index 00000000000..3e52c187e7a --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformLoadBalancer.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.config.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", + "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 VSpherePlatformLoadBalancer implements KubernetesResource +{ + + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public VSpherePlatformLoadBalancer() { + } + + /** + * + * @param type + */ + public VSpherePlatformLoadBalancer(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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformNodeNetworking.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformNodeNetworking.java new file mode 100644 index 00000000000..4d1d9967f64 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformNodeNetworking.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.config.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", + "external", + "internal" +}) +@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 VSpherePlatformNodeNetworking implements KubernetesResource +{ + + @JsonProperty("external") + private VSpherePlatformNodeNetworkingSpec external; + @JsonProperty("internal") + private VSpherePlatformNodeNetworkingSpec internal; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public VSpherePlatformNodeNetworking() { + } + + /** + * + * @param external + * @param internal + */ + public VSpherePlatformNodeNetworking(VSpherePlatformNodeNetworkingSpec external, VSpherePlatformNodeNetworkingSpec internal) { + super(); + this.external = external; + this.internal = internal; + } + + @JsonProperty("external") + public VSpherePlatformNodeNetworkingSpec getExternal() { + return external; + } + + @JsonProperty("external") + public void setExternal(VSpherePlatformNodeNetworkingSpec external) { + this.external = external; + } + + @JsonProperty("internal") + public VSpherePlatformNodeNetworkingSpec getInternal() { + return internal; + } + + @JsonProperty("internal") + public void setInternal(VSpherePlatformNodeNetworkingSpec internal) { + this.internal = internal; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformNodeNetworkingSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformNodeNetworkingSpec.java new file mode 100644 index 00000000000..559273cd43f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformNodeNetworkingSpec.java @@ -0,0 +1,134 @@ + +package io.fabric8.openshift.api.model.config.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", + "excludeNetworkSubnetCidr", + "network", + "networkSubnetCidr" +}) +@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 VSpherePlatformNodeNetworkingSpec implements KubernetesResource +{ + + @JsonProperty("excludeNetworkSubnetCidr") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List excludeNetworkSubnetCidr = new ArrayList(); + @JsonProperty("network") + private String network; + @JsonProperty("networkSubnetCidr") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List networkSubnetCidr = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public VSpherePlatformNodeNetworkingSpec() { + } + + /** + * + * @param excludeNetworkSubnetCidr + * @param networkSubnetCidr + * @param network + */ + public VSpherePlatformNodeNetworkingSpec(List excludeNetworkSubnetCidr, String network, List networkSubnetCidr) { + super(); + this.excludeNetworkSubnetCidr = excludeNetworkSubnetCidr; + this.network = network; + this.networkSubnetCidr = networkSubnetCidr; + } + + @JsonProperty("excludeNetworkSubnetCidr") + public List getExcludeNetworkSubnetCidr() { + return excludeNetworkSubnetCidr; + } + + @JsonProperty("excludeNetworkSubnetCidr") + public void setExcludeNetworkSubnetCidr(List excludeNetworkSubnetCidr) { + this.excludeNetworkSubnetCidr = excludeNetworkSubnetCidr; + } + + @JsonProperty("network") + public String getNetwork() { + return network; + } + + @JsonProperty("network") + public void setNetwork(String network) { + this.network = network; + } + + @JsonProperty("networkSubnetCidr") + public List getNetworkSubnetCidr() { + return networkSubnetCidr; + } + + @JsonProperty("networkSubnetCidr") + public void setNetworkSubnetCidr(List networkSubnetCidr) { + this.networkSubnetCidr = networkSubnetCidr; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformSpec.java index baf8404c663..c023e3a5449 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformSpec.java @@ -1,12 +1,15 @@ package io.fabric8.openshift.api.model.config.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; @@ -31,7 +34,10 @@ @JsonPropertyOrder({ "apiVersion", "kind", - "metadata" + "metadata", + "failureDomains", + "nodeNetworking", + "vcenters" }) @ToString @EqualsAndHashCode @@ -54,9 +60,67 @@ public class VSpherePlatformSpec implements KubernetesResource { + @JsonProperty("failureDomains") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List failureDomains = new ArrayList(); + @JsonProperty("nodeNetworking") + private VSpherePlatformNodeNetworking nodeNetworking; + @JsonProperty("vcenters") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List vcenters = new ArrayList(); @JsonIgnore private Map additionalProperties = new HashMap(); + /** + * No args constructor for use in serialization + * + */ + public VSpherePlatformSpec() { + } + + /** + * + * @param failureDomains + * @param vcenters + * @param nodeNetworking + */ + public VSpherePlatformSpec(List failureDomains, VSpherePlatformNodeNetworking nodeNetworking, List vcenters) { + super(); + this.failureDomains = failureDomains; + this.nodeNetworking = nodeNetworking; + this.vcenters = vcenters; + } + + @JsonProperty("failureDomains") + public List getFailureDomains() { + return failureDomains; + } + + @JsonProperty("failureDomains") + public void setFailureDomains(List failureDomains) { + this.failureDomains = failureDomains; + } + + @JsonProperty("nodeNetworking") + public VSpherePlatformNodeNetworking getNodeNetworking() { + return nodeNetworking; + } + + @JsonProperty("nodeNetworking") + public void setNodeNetworking(VSpherePlatformNodeNetworking nodeNetworking) { + this.nodeNetworking = nodeNetworking; + } + + @JsonProperty("vcenters") + public List getVcenters() { + return vcenters; + } + + @JsonProperty("vcenters") + public void setVcenters(List vcenters) { + this.vcenters = vcenters; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformStatus.java index df0138b6ead..a643c5d0cf4 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformStatus.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.config.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; @@ -34,7 +36,10 @@ "kind", "metadata", "apiServerInternalIP", + "apiServerInternalIPs", "ingressIP", + "ingressIPs", + "loadBalancer", "nodeDNSIP" }) @ToString @@ -60,8 +65,14 @@ public class VSpherePlatformStatus implements KubernetesResource @JsonProperty("apiServerInternalIP") private String apiServerInternalIP; + @JsonProperty("apiServerInternalIPs") + private List apiServerInternalIPs = new ArrayList(); @JsonProperty("ingressIP") private String ingressIP; + @JsonProperty("ingressIPs") + private List ingressIPs = new ArrayList(); + @JsonProperty("loadBalancer") + private VSpherePlatformLoadBalancer loadBalancer; @JsonProperty("nodeDNSIP") private String nodeDNSIP; @JsonIgnore @@ -76,14 +87,20 @@ public VSpherePlatformStatus() { /** * + * @param apiServerInternalIPs + * @param loadBalancer * @param apiServerInternalIP * @param nodeDNSIP * @param ingressIP + * @param ingressIPs */ - public VSpherePlatformStatus(String apiServerInternalIP, String ingressIP, String nodeDNSIP) { + public VSpherePlatformStatus(String apiServerInternalIP, List apiServerInternalIPs, String ingressIP, List ingressIPs, VSpherePlatformLoadBalancer loadBalancer, String nodeDNSIP) { super(); this.apiServerInternalIP = apiServerInternalIP; + this.apiServerInternalIPs = apiServerInternalIPs; this.ingressIP = ingressIP; + this.ingressIPs = ingressIPs; + this.loadBalancer = loadBalancer; this.nodeDNSIP = nodeDNSIP; } @@ -97,6 +114,16 @@ public void setApiServerInternalIP(String apiServerInternalIP) { this.apiServerInternalIP = apiServerInternalIP; } + @JsonProperty("apiServerInternalIPs") + public List getApiServerInternalIPs() { + return apiServerInternalIPs; + } + + @JsonProperty("apiServerInternalIPs") + public void setApiServerInternalIPs(List apiServerInternalIPs) { + this.apiServerInternalIPs = apiServerInternalIPs; + } + @JsonProperty("ingressIP") public String getIngressIP() { return ingressIP; @@ -107,6 +134,26 @@ public void setIngressIP(String ingressIP) { this.ingressIP = ingressIP; } + @JsonProperty("ingressIPs") + public List getIngressIPs() { + return ingressIPs; + } + + @JsonProperty("ingressIPs") + public void setIngressIPs(List ingressIPs) { + this.ingressIPs = ingressIPs; + } + + @JsonProperty("loadBalancer") + public VSpherePlatformLoadBalancer getLoadBalancer() { + return loadBalancer; + } + + @JsonProperty("loadBalancer") + public void setLoadBalancer(VSpherePlatformLoadBalancer loadBalancer) { + this.loadBalancer = loadBalancer; + } + @JsonProperty("nodeDNSIP") public String getNodeDNSIP() { return nodeDNSIP; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformTopology.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformTopology.java new file mode 100644 index 00000000000..32f685c0428 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformTopology.java @@ -0,0 +1,177 @@ + +package io.fabric8.openshift.api.model.config.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", + "computeCluster", + "datacenter", + "datastore", + "folder", + "networks", + "resourcePool" +}) +@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 VSpherePlatformTopology implements KubernetesResource +{ + + @JsonProperty("computeCluster") + private String computeCluster; + @JsonProperty("datacenter") + private String datacenter; + @JsonProperty("datastore") + private String datastore; + @JsonProperty("folder") + private String folder; + @JsonProperty("networks") + private List networks = new ArrayList(); + @JsonProperty("resourcePool") + private String resourcePool; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public VSpherePlatformTopology() { + } + + /** + * + * @param computeCluster + * @param folder + * @param datastore + * @param datacenter + * @param networks + * @param resourcePool + */ + public VSpherePlatformTopology(String computeCluster, String datacenter, String datastore, String folder, List networks, String resourcePool) { + super(); + this.computeCluster = computeCluster; + this.datacenter = datacenter; + this.datastore = datastore; + this.folder = folder; + this.networks = networks; + this.resourcePool = resourcePool; + } + + @JsonProperty("computeCluster") + public String getComputeCluster() { + return computeCluster; + } + + @JsonProperty("computeCluster") + public void setComputeCluster(String computeCluster) { + this.computeCluster = computeCluster; + } + + @JsonProperty("datacenter") + public String getDatacenter() { + return datacenter; + } + + @JsonProperty("datacenter") + public void setDatacenter(String datacenter) { + this.datacenter = datacenter; + } + + @JsonProperty("datastore") + public String getDatastore() { + return datastore; + } + + @JsonProperty("datastore") + public void setDatastore(String datastore) { + this.datastore = datastore; + } + + @JsonProperty("folder") + public String getFolder() { + return folder; + } + + @JsonProperty("folder") + public void setFolder(String folder) { + this.folder = folder; + } + + @JsonProperty("networks") + public List getNetworks() { + return networks; + } + + @JsonProperty("networks") + public void setNetworks(List networks) { + this.networks = networks; + } + + @JsonProperty("resourcePool") + public String getResourcePool() { + return resourcePool; + } + + @JsonProperty("resourcePool") + public void setResourcePool(String resourcePool) { + this.resourcePool = resourcePool; + } + + @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/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformVCenterSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformVCenterSpec.java new file mode 100644 index 00000000000..faabba116ec --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformVCenterSpec.java @@ -0,0 +1,132 @@ + +package io.fabric8.openshift.api.model.config.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", + "datacenters", + "port", + "server" +}) +@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 VSpherePlatformVCenterSpec implements KubernetesResource +{ + + @JsonProperty("datacenters") + private List datacenters = new ArrayList(); + @JsonProperty("port") + private Integer port; + @JsonProperty("server") + private String server; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public VSpherePlatformVCenterSpec() { + } + + /** + * + * @param datacenters + * @param server + * @param port + */ + public VSpherePlatformVCenterSpec(List datacenters, Integer port, String server) { + super(); + this.datacenters = datacenters; + this.port = port; + this.server = server; + } + + @JsonProperty("datacenters") + public List getDatacenters() { + return datacenters; + } + + @JsonProperty("datacenters") + public void setDatacenters(List datacenters) { + this.datacenters = datacenters; + } + + @JsonProperty("port") + public Integer getPort() { + return port; + } + + @JsonProperty("port") + public void setPort(Integer port) { + this.port = port; + } + + @JsonProperty("server") + public String getServer() { + return server; + } + + @JsonProperty("server") + public void setServer(String server) { + this.server = server; + } + + @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/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 aede0e4e269..42a1819287a 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 @@ -989,6 +989,32 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_AWSDNSSpec": { + "type": "object", + "properties": { + "privateZoneIAMRole": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.AWSDNSSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_AWSIngressSpec": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.AWSIngressSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_AWSPlatformSpec": { "type": "object", "properties": { @@ -1285,6 +1311,14 @@ }, "resourceGroupName": { "type": "string" + }, + "resourceTags": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_AzureResourceTag", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AzureResourceTag" + } } }, "additionalProperties": true, @@ -1293,6 +1327,35 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_AzureResourceTag": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.AzureResourceTag", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_BareMetalPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_BareMetalPlatformSpec": { "type": "object", "additionalProperties": true, @@ -1307,9 +1370,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_BareMetalPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -1501,6 +1580,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_CloudControllerManagerStatus": { + "type": "object", + "properties": { + "state": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.CloudControllerManagerStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_ClusterCondition": { "type": "object", "properties": { @@ -1701,6 +1793,50 @@ "io.fabric8.kubernetes.api.model.HasMetadata" ] }, + "os_config_v1_ClusterVersionCapabilitiesSpec": { + "type": "object", + "properties": { + "additionalEnabledCapabilities": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "baselineCapabilitySet": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.ClusterVersionCapabilitiesSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_ClusterVersionCapabilitiesStatus": { + "type": "object", + "properties": { + "enabledCapabilities": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "knownCapabilities": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.ClusterVersionCapabilitiesStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_ClusterVersionList": { "type": "object", "properties": { @@ -1736,6 +1872,10 @@ "os_config_v1_ClusterVersionSpec": { "type": "object", "properties": { + "capabilities": { + "$ref": "#/definitions/os_config_v1_ClusterVersionCapabilitiesSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterVersionCapabilitiesSpec" + }, "channel": { "type": "string" }, @@ -1774,6 +1914,10 @@ "existingJavaType": "io.fabric8.openshift.api.model.config.v1.Release" } }, + "capabilities": { + "$ref": "#/definitions/os_config_v1_ClusterVersionCapabilitiesStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterVersionCapabilitiesStatus" + }, "conditionalUpdates": { "type": "array", "javaOmitEmpty": true, @@ -2207,12 +2351,33 @@ "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.openshift.api.model.config.v1.DNS\u003e" ] }, + "os_config_v1_DNSPlatformSpec": { + "type": "object", + "properties": { + "aws": { + "$ref": "#/definitions/os_config_v1_AWSDNSSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AWSDNSSpec" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.DNSPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_DNSSpec": { "type": "object", "properties": { "baseDomain": { "type": "string" }, + "platform": { + "$ref": "#/definitions/os_config_v1_DNSPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSPlatformSpec" + }, "privateZone": { "$ref": "#/definitions/os_config_v1_DNSZone", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSZone" @@ -2339,6 +2504,33 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_ExternalPlatformSpec": { + "type": "object", + "properties": { + "platformName": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_ExternalPlatformStatus": { + "type": "object", + "properties": { + "cloudControllerManager": { + "$ref": "#/definitions/os_config_v1_CloudControllerManagerStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.CloudControllerManagerStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_FeatureGate": { "type": "object", "properties": { @@ -2371,6 +2563,46 @@ "io.fabric8.kubernetes.api.model.HasMetadata" ] }, + "os_config_v1_FeatureGateAttributes": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateAttributes", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_FeatureGateDetails": { + "type": "object", + "properties": { + "disabled": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_FeatureGateAttributes", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateAttributes" + } + }, + "enabled": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_FeatureGateAttributes", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateAttributes" + } + }, + "version": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateDetails", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_FeatureGateList": { "type": "object", "properties": { @@ -2439,6 +2671,23 @@ }, "os_config_v1_FeatureGateStatus": { "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apimachinery_Condition", + "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" + } + }, + "featureGates": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_FeatureGateDetails", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateDetails" + } + } + }, "additionalProperties": true, "javaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateStatus", "javaInterfaces": [ @@ -2617,6 +2866,9 @@ "cisInstanceCRN": { "type": "string" }, + "dnsInstanceCRN": { + "type": "string" + }, "location": { "type": "string" }, @@ -3041,6 +3293,9 @@ "controlPlaneTopology": { "type": "string" }, + "cpuPartitioning": { + "type": "string" + }, "etcdDiscoveryDomain": { "type": "string" }, @@ -3128,6 +3383,23 @@ "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.openshift.api.model.config.v1.Ingress\u003e" ] }, + "os_config_v1_IngressPlatformSpec": { + "type": "object", + "properties": { + "aws": { + "$ref": "#/definitions/os_config_v1_AWSIngressSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AWSIngressSpec" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.IngressPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_IngressSpec": { "type": "object", "properties": { @@ -3145,6 +3417,10 @@ "domain": { "type": "string" }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_LoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.LoadBalancer" + }, "requiredHSTSPolicies": { "type": "array", "javaOmitEmpty": true, @@ -3170,6 +3446,9 @@ "$ref": "#/definitions/os_config_v1_ComponentRouteStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ComponentRouteStatus" } + }, + "defaultPlacement": { + "type": "string" } }, "additionalProperties": true, @@ -3306,6 +3585,54 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_LoadBalancer": { + "type": "object", + "properties": { + "platform": { + "$ref": "#/definitions/os_config_v1_IngressPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IngressPlatformSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.LoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_MTUMigration": { + "type": "object", + "properties": { + "machine": { + "$ref": "#/definitions/os_config_v1_MTUMigrationValues", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.MTUMigrationValues" + }, + "network": { + "$ref": "#/definitions/os_config_v1_MTUMigrationValues", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.MTUMigrationValues" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.MTUMigration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_MTUMigrationValues": { + "type": "object", + "properties": { + "from": { + "type": "integer" + }, + "to": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.MTUMigrationValues", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_MaxAgePolicy": { "type": "object", "properties": { @@ -3397,6 +3724,10 @@ "os_config_v1_NetworkMigration": { "type": "object", "properties": { + "mtu": { + "$ref": "#/definitions/os_config_v1_MTUMigration", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.MTUMigration" + }, "networkType": { "type": "string" } @@ -3475,6 +3806,105 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_NutanixPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPlatformSpec": { + "type": "object", + "properties": { + "prismCentral": { + "$ref": "#/definitions/os_config_v1_NutanixPrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint" + }, + "prismElements": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_NutanixPrismElementEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismElementEndpoint" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPlatformStatus": { + "type": "object", + "properties": { + "apiServerInternalIP": { + "type": "string" + }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "ingressIP": { + "type": "string" + }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPrismElementEndpoint": { + "type": "object", + "properties": { + "endpoint": { + "$ref": "#/definitions/os_config_v1_NutanixPrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismElementEndpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPrismEndpoint": { + "type": "object", + "properties": { + "address": { + "type": "string" + }, + "port": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_OAuth": { "type": "object", "properties": { @@ -3730,6 +4160,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_OpenStackPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_OpenStackPlatformSpec": { "type": "object", "additionalProperties": true, @@ -3744,12 +4187,28 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "cloudName": { "type": "string" }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OpenStackPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -3879,6 +4338,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_OvirtPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_OvirtPlatformSpec": { "type": "object", "additionalProperties": true, @@ -3893,9 +4365,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OvirtPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -3929,6 +4417,10 @@ "$ref": "#/definitions/os_config_v1_EquinixMetalPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.EquinixMetalPlatformSpec" }, + "external": { + "$ref": "#/definitions/os_config_v1_ExternalPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformSpec" + }, "gcp": { "$ref": "#/definitions/os_config_v1_GCPPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.GCPPlatformSpec" @@ -3941,6 +4433,10 @@ "$ref": "#/definitions/os_config_v1_KubevirtPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.KubevirtPlatformSpec" }, + "nutanix": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformSpec" + }, "openstack": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformSpec" @@ -3990,6 +4486,10 @@ "$ref": "#/definitions/os_config_v1_EquinixMetalPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.EquinixMetalPlatformStatus" }, + "external": { + "$ref": "#/definitions/os_config_v1_ExternalPlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformStatus" + }, "gcp": { "$ref": "#/definitions/os_config_v1_GCPPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.GCPPlatformStatus" @@ -4002,6 +4502,10 @@ "$ref": "#/definitions/os_config_v1_KubevirtPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.KubevirtPlatformStatus" }, + "nutanix": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformStatus" + }, "openstack": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformStatus" @@ -4052,9 +4556,15 @@ "cisInstanceCRN": { "type": "string" }, + "dnsInstanceCRN": { + "type": "string" + }, "region": { "type": "string" }, + "resourceGroup": { + "type": "string" + }, "serviceEndpoints": { "type": "array", "javaOmitEmpty": true, @@ -4680,6 +5190,9 @@ "os_config_v1_Update": { "type": "object", "properties": { + "architecture": { + "type": "string" + }, "force": { "type": "boolean" }, @@ -4729,8 +5242,114 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_VSpherePlatformFailureDomainSpec": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "server": { + "type": "string" + }, + "topology": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformTopology", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformTopology" + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformFailureDomainSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformNodeNetworking": { + "type": "object", + "properties": { + "external": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworkingSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec" + }, + "internal": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworkingSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworking", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformNodeNetworkingSpec": { + "type": "object", + "properties": { + "excludeNetworkSubnetCidr": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "network": { + "type": "string" + }, + "networkSubnetCidr": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_VSpherePlatformSpec": { "type": "object", + "properties": { + "failureDomains": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformFailureDomainSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformFailureDomainSpec" + } + }, + "nodeNetworking": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworking", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworking" + }, + "vcenters": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformVCenterSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformVCenterSpec" + } + } + }, "additionalProperties": true, "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformSpec", "javaInterfaces": [ @@ -4743,9 +5362,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -4756,6 +5391,59 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_VSpherePlatformTopology": { + "type": "object", + "properties": { + "computeCluster": { + "type": "string" + }, + "datacenter": { + "type": "string" + }, + "datastore": { + "type": "string" + }, + "folder": { + "type": "string" + }, + "networks": { + "type": "array", + "items": { + "type": "string" + } + }, + "resourcePool": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformTopology", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformVCenterSpec": { + "type": "object", + "properties": { + "datacenters": { + "type": "array", + "items": { + "type": "string" + } + }, + "port": { + "type": "integer" + }, + "server": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformVCenterSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_WebhookTokenAuthenticator": { "type": "object", "properties": { 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 2d835f2d540..c6c2d008044 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 @@ -989,6 +989,32 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_AWSDNSSpec": { + "type": "object", + "properties": { + "privateZoneIAMRole": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.AWSDNSSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_AWSIngressSpec": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.AWSIngressSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_AWSPlatformSpec": { "type": "object", "properties": { @@ -1285,6 +1311,14 @@ }, "resourceGroupName": { "type": "string" + }, + "resourceTags": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_AzureResourceTag", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AzureResourceTag" + } } }, "additionalProperties": true, @@ -1293,6 +1327,35 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_AzureResourceTag": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.AzureResourceTag", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_BareMetalPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_BareMetalPlatformSpec": { "type": "object", "additionalProperties": true, @@ -1307,9 +1370,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_BareMetalPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -1501,6 +1580,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_CloudControllerManagerStatus": { + "type": "object", + "properties": { + "state": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.CloudControllerManagerStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_ClusterCondition": { "type": "object", "properties": { @@ -1701,6 +1793,50 @@ "io.fabric8.kubernetes.api.model.HasMetadata" ] }, + "os_config_v1_ClusterVersionCapabilitiesSpec": { + "type": "object", + "properties": { + "additionalEnabledCapabilities": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "baselineCapabilitySet": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.ClusterVersionCapabilitiesSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_ClusterVersionCapabilitiesStatus": { + "type": "object", + "properties": { + "enabledCapabilities": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "knownCapabilities": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.ClusterVersionCapabilitiesStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_ClusterVersionList": { "type": "object", "properties": { @@ -1736,6 +1872,10 @@ "os_config_v1_ClusterVersionSpec": { "type": "object", "properties": { + "capabilities": { + "$ref": "#/definitions/os_config_v1_ClusterVersionCapabilitiesSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterVersionCapabilitiesSpec" + }, "channel": { "type": "string" }, @@ -1774,6 +1914,10 @@ "existingJavaType": "io.fabric8.openshift.api.model.config.v1.Release" } }, + "capabilities": { + "$ref": "#/definitions/os_config_v1_ClusterVersionCapabilitiesStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterVersionCapabilitiesStatus" + }, "conditionalUpdates": { "type": "array", "javaOmitEmpty": true, @@ -2207,12 +2351,33 @@ "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.openshift.api.model.config.v1.DNS\u003e" ] }, + "os_config_v1_DNSPlatformSpec": { + "type": "object", + "properties": { + "aws": { + "$ref": "#/definitions/os_config_v1_AWSDNSSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AWSDNSSpec" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.DNSPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_DNSSpec": { "type": "object", "properties": { "baseDomain": { "type": "string" }, + "platform": { + "$ref": "#/definitions/os_config_v1_DNSPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSPlatformSpec" + }, "privateZone": { "$ref": "#/definitions/os_config_v1_DNSZone", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSZone" @@ -2339,6 +2504,33 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_ExternalPlatformSpec": { + "type": "object", + "properties": { + "platformName": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_ExternalPlatformStatus": { + "type": "object", + "properties": { + "cloudControllerManager": { + "$ref": "#/definitions/os_config_v1_CloudControllerManagerStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.CloudControllerManagerStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_FeatureGate": { "type": "object", "properties": { @@ -2371,6 +2563,46 @@ "io.fabric8.kubernetes.api.model.HasMetadata" ] }, + "os_config_v1_FeatureGateAttributes": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateAttributes", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_FeatureGateDetails": { + "type": "object", + "properties": { + "disabled": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_FeatureGateAttributes", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateAttributes" + } + }, + "enabled": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_FeatureGateAttributes", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateAttributes" + } + }, + "version": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateDetails", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_FeatureGateList": { "type": "object", "properties": { @@ -2439,6 +2671,23 @@ }, "os_config_v1_FeatureGateStatus": { "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apimachinery_Condition", + "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" + } + }, + "featureGates": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_FeatureGateDetails", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateDetails" + } + } + }, "additionalProperties": true, "javaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateStatus", "javaInterfaces": [ @@ -2617,6 +2866,9 @@ "cisInstanceCRN": { "type": "string" }, + "dnsInstanceCRN": { + "type": "string" + }, "location": { "type": "string" }, @@ -3041,6 +3293,9 @@ "controlPlaneTopology": { "type": "string" }, + "cpuPartitioning": { + "type": "string" + }, "etcdDiscoveryDomain": { "type": "string" }, @@ -3128,6 +3383,23 @@ "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.openshift.api.model.config.v1.Ingress\u003e" ] }, + "os_config_v1_IngressPlatformSpec": { + "type": "object", + "properties": { + "aws": { + "$ref": "#/definitions/os_config_v1_AWSIngressSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AWSIngressSpec" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.IngressPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_IngressSpec": { "type": "object", "properties": { @@ -3145,6 +3417,10 @@ "domain": { "type": "string" }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_LoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.LoadBalancer" + }, "requiredHSTSPolicies": { "type": "array", "javaOmitEmpty": true, @@ -3170,6 +3446,9 @@ "$ref": "#/definitions/os_config_v1_ComponentRouteStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ComponentRouteStatus" } + }, + "defaultPlacement": { + "type": "string" } }, "additionalProperties": true, @@ -3306,6 +3585,54 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_LoadBalancer": { + "type": "object", + "properties": { + "platform": { + "$ref": "#/definitions/os_config_v1_IngressPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IngressPlatformSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.LoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_MTUMigration": { + "type": "object", + "properties": { + "machine": { + "$ref": "#/definitions/os_config_v1_MTUMigrationValues", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.MTUMigrationValues" + }, + "network": { + "$ref": "#/definitions/os_config_v1_MTUMigrationValues", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.MTUMigrationValues" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.MTUMigration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_MTUMigrationValues": { + "type": "object", + "properties": { + "from": { + "type": "integer" + }, + "to": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.MTUMigrationValues", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_MaxAgePolicy": { "type": "object", "properties": { @@ -3397,6 +3724,10 @@ "os_config_v1_NetworkMigration": { "type": "object", "properties": { + "mtu": { + "$ref": "#/definitions/os_config_v1_MTUMigration", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.MTUMigration" + }, "networkType": { "type": "string" } @@ -3475,19 +3806,118 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_config_v1_OAuth": { + "os_config_v1_NutanixPlatformLoadBalancer": { "type": "object", "properties": { - "apiVersion": { - "type": "string", - "default": "config.openshift.io/v1", - "required": true - }, - "kind": { - "type": "string", - "default": "OAuth", - "required": true - }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPlatformSpec": { + "type": "object", + "properties": { + "prismCentral": { + "$ref": "#/definitions/os_config_v1_NutanixPrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint" + }, + "prismElements": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_NutanixPrismElementEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismElementEndpoint" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPlatformStatus": { + "type": "object", + "properties": { + "apiServerInternalIP": { + "type": "string" + }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "ingressIP": { + "type": "string" + }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPrismElementEndpoint": { + "type": "object", + "properties": { + "endpoint": { + "$ref": "#/definitions/os_config_v1_NutanixPrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismElementEndpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPrismEndpoint": { + "type": "object", + "properties": { + "address": { + "type": "string" + }, + "port": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_OAuth": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "config.openshift.io/v1", + "required": true + }, + "kind": { + "type": "string", + "default": "OAuth", + "required": true + }, "metadata": { "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" @@ -3730,6 +4160,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_OpenStackPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_OpenStackPlatformSpec": { "type": "object", "additionalProperties": true, @@ -3744,12 +4187,28 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "cloudName": { "type": "string" }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OpenStackPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -3879,6 +4338,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_OvirtPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_OvirtPlatformSpec": { "type": "object", "additionalProperties": true, @@ -3893,9 +4365,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OvirtPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -3929,6 +4417,10 @@ "$ref": "#/definitions/os_config_v1_EquinixMetalPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.EquinixMetalPlatformSpec" }, + "external": { + "$ref": "#/definitions/os_config_v1_ExternalPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformSpec" + }, "gcp": { "$ref": "#/definitions/os_config_v1_GCPPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.GCPPlatformSpec" @@ -3941,6 +4433,10 @@ "$ref": "#/definitions/os_config_v1_KubevirtPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.KubevirtPlatformSpec" }, + "nutanix": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformSpec" + }, "openstack": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformSpec" @@ -3990,6 +4486,10 @@ "$ref": "#/definitions/os_config_v1_EquinixMetalPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.EquinixMetalPlatformStatus" }, + "external": { + "$ref": "#/definitions/os_config_v1_ExternalPlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformStatus" + }, "gcp": { "$ref": "#/definitions/os_config_v1_GCPPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.GCPPlatformStatus" @@ -4002,6 +4502,10 @@ "$ref": "#/definitions/os_config_v1_KubevirtPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.KubevirtPlatformStatus" }, + "nutanix": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformStatus" + }, "openstack": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformStatus" @@ -4052,9 +4556,15 @@ "cisInstanceCRN": { "type": "string" }, + "dnsInstanceCRN": { + "type": "string" + }, "region": { "type": "string" }, + "resourceGroup": { + "type": "string" + }, "serviceEndpoints": { "type": "array", "javaOmitEmpty": true, @@ -4680,6 +5190,9 @@ "os_config_v1_Update": { "type": "object", "properties": { + "architecture": { + "type": "string" + }, "force": { "type": "boolean" }, @@ -4729,8 +5242,114 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_VSpherePlatformFailureDomainSpec": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "server": { + "type": "string" + }, + "topology": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformTopology", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformTopology" + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformFailureDomainSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformNodeNetworking": { + "type": "object", + "properties": { + "external": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworkingSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec" + }, + "internal": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworkingSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworking", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformNodeNetworkingSpec": { + "type": "object", + "properties": { + "excludeNetworkSubnetCidr": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "network": { + "type": "string" + }, + "networkSubnetCidr": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_VSpherePlatformSpec": { "type": "object", + "properties": { + "failureDomains": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformFailureDomainSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformFailureDomainSpec" + } + }, + "nodeNetworking": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworking", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworking" + }, + "vcenters": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformVCenterSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformVCenterSpec" + } + } + }, "additionalProperties": true, "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformSpec", "javaInterfaces": [ @@ -4743,9 +5362,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -4756,6 +5391,59 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_VSpherePlatformTopology": { + "type": "object", + "properties": { + "computeCluster": { + "type": "string" + }, + "datacenter": { + "type": "string" + }, + "datastore": { + "type": "string" + }, + "folder": { + "type": "string" + }, + "networks": { + "type": "array", + "items": { + "type": "string" + } + }, + "resourcePool": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformTopology", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformVCenterSpec": { + "type": "object", + "properties": { + "datacenters": { + "type": "array", + "items": { + "type": "string" + } + }, + "port": { + "type": "integer" + }, + "server": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformVCenterSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_WebhookTokenAuthenticator": { "type": "object", "properties": { @@ -5309,6 +5997,22 @@ }, "additionalProperties": true }, + "awsdnsspec": { + "properties": { + "privateZoneIAMRole": { + "type": "string" + } + }, + "additionalProperties": true + }, + "awsingressspec": { + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, "awsplatformspec": { "properties": { "serviceEndpoints": { @@ -5384,6 +6088,33 @@ }, "resourceGroupName": { "type": "string" + }, + "resourceTags": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_AzureResourceTag", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AzureResourceTag" + } + } + }, + "additionalProperties": true + }, + "azureresourcetag": { + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + } + }, + "additionalProperties": true + }, + "baremetalplatformloadbalancer": { + "properties": { + "type": { + "type": "string" } }, "additionalProperties": true @@ -5396,9 +6127,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_BareMetalPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -5555,6 +6302,14 @@ }, "additionalProperties": true }, + "cloudcontrollermanagerstatus": { + "properties": { + "state": { + "type": "string" + } + }, + "additionalProperties": true + }, "clustercondition": { "properties": { "promql": { @@ -5714,6 +6469,40 @@ }, "additionalProperties": true }, + "clusterversioncapabilitiesspec": { + "properties": { + "additionalEnabledCapabilities": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "baselineCapabilitySet": { + "type": "string" + } + }, + "additionalProperties": true + }, + "clusterversioncapabilitiesstatus": { + "properties": { + "enabledCapabilities": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "knownCapabilities": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true + }, "clusterversionlist": { "properties": { "apiVersion": { @@ -5742,6 +6531,10 @@ }, "clusterversionspec": { "properties": { + "capabilities": { + "$ref": "#/definitions/os_config_v1_ClusterVersionCapabilitiesSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterVersionCapabilitiesSpec" + }, "channel": { "type": "string" }, @@ -5775,6 +6568,10 @@ "existingJavaType": "io.fabric8.openshift.api.model.config.v1.Release" } }, + "capabilities": { + "$ref": "#/definitions/os_config_v1_ClusterVersionCapabilitiesStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterVersionCapabilitiesStatus" + }, "conditionalUpdates": { "type": "array", "javaOmitEmpty": true, @@ -6170,11 +6967,27 @@ }, "additionalProperties": true }, + "dnsplatformspec": { + "properties": { + "aws": { + "$ref": "#/definitions/os_config_v1_AWSDNSSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AWSDNSSpec" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, "dnsspec": { "properties": { "baseDomain": { "type": "string" }, + "platform": { + "$ref": "#/definitions/os_config_v1_DNSPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSPlatformSpec" + }, "privateZone": { "$ref": "#/definitions/os_config_v1_DNSZone", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSZone" @@ -6299,6 +7112,23 @@ }, "additionalProperties": true }, + "externalplatformspec": { + "properties": { + "platformName": { + "type": "string" + } + }, + "additionalProperties": true + }, + "externalplatformstatus": { + "properties": { + "cloudControllerManager": { + "$ref": "#/definitions/os_config_v1_CloudControllerManagerStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.CloudControllerManagerStatus" + } + }, + "additionalProperties": true + }, "featuregate": { "properties": { "apiVersion": { @@ -6326,6 +7156,36 @@ }, "additionalProperties": true }, + "featuregateattributes": { + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true + }, + "featuregatedetails": { + "properties": { + "disabled": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_FeatureGateAttributes", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateAttributes" + } + }, + "enabled": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_FeatureGateAttributes", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateAttributes" + } + }, + "version": { + "type": "string" + } + }, + "additionalProperties": true + }, "featuregatelist": { "properties": { "apiVersion": { @@ -6377,6 +7237,23 @@ "additionalProperties": true }, "featuregatestatus": { + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apimachinery_Condition", + "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" + } + }, + "featureGates": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_FeatureGateDetails", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.FeatureGateDetails" + } + } + }, "additionalProperties": true }, "fieldsv1": { @@ -6519,6 +7396,9 @@ "cisInstanceCRN": { "type": "string" }, + "dnsInstanceCRN": { + "type": "string" + }, "location": { "type": "string" }, @@ -6902,6 +7782,9 @@ "controlPlaneTopology": { "type": "string" }, + "cpuPartitioning": { + "type": "string" + }, "etcdDiscoveryDomain": { "type": "string" }, @@ -6974,6 +7857,18 @@ }, "additionalProperties": true }, + "ingressplatformspec": { + "properties": { + "aws": { + "$ref": "#/definitions/os_config_v1_AWSIngressSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AWSIngressSpec" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, "ingressspec": { "properties": { "appsDomain": { @@ -6990,6 +7885,10 @@ "domain": { "type": "string" }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_LoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.LoadBalancer" + }, "requiredHSTSPolicies": { "type": "array", "javaOmitEmpty": true, @@ -7010,6 +7909,9 @@ "$ref": "#/definitions/os_config_v1_ComponentRouteStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ComponentRouteStatus" } + }, + "defaultPlacement": { + "type": "string" } }, "additionalProperties": true @@ -7194,6 +8096,15 @@ }, "additionalProperties": true }, + "loadbalancer": { + "properties": { + "platform": { + "$ref": "#/definitions/os_config_v1_IngressPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IngressPlatformSpec" + } + }, + "additionalProperties": true + }, "localobjectreference": { "properties": { "name": { @@ -7244,6 +8155,30 @@ "moderntlsprofile": { "additionalProperties": true }, + "mtumigration": { + "properties": { + "machine": { + "$ref": "#/definitions/os_config_v1_MTUMigrationValues", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.MTUMigrationValues" + }, + "network": { + "$ref": "#/definitions/os_config_v1_MTUMigrationValues", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.MTUMigrationValues" + } + }, + "additionalProperties": true + }, + "mtumigrationvalues": { + "properties": { + "from": { + "type": "integer" + }, + "to": { + "type": "integer" + } + }, + "additionalProperties": true + }, "network": { "properties": { "apiVersion": { @@ -7299,6 +8234,10 @@ }, "networkmigration": { "properties": { + "mtu": { + "$ref": "#/definitions/os_config_v1_MTUMigration", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.MTUMigration" + }, "networkType": { "type": "string" } @@ -7363,6 +8302,80 @@ }, "additionalProperties": true }, + "nutanixplatformloadbalancer": { + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, + "nutanixplatformspec": { + "properties": { + "prismCentral": { + "$ref": "#/definitions/os_config_v1_NutanixPrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint" + }, + "prismElements": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_NutanixPrismElementEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismElementEndpoint" + } + } + }, + "additionalProperties": true + }, + "nutanixplatformstatus": { + "properties": { + "apiServerInternalIP": { + "type": "string" + }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "ingressIP": { + "type": "string" + }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer" + } + }, + "additionalProperties": true + }, + "nutanixprismelementendpoint": { + "properties": { + "endpoint": { + "$ref": "#/definitions/os_config_v1_NutanixPrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true + }, + "nutanixprismendpoint": { + "properties": { + "address": { + "type": "string" + }, + "port": { + "type": "integer" + } + }, + "additionalProperties": true + }, "oauth": { "properties": { "apiVersion": { @@ -7656,6 +8669,14 @@ }, "additionalProperties": true }, + "openstackplatformloadbalancer": { + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, "openstackplatformspec": { "additionalProperties": true }, @@ -7664,12 +8685,28 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "cloudName": { "type": "string" }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OpenStackPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -7769,6 +8806,14 @@ }, "additionalProperties": true }, + "ovirtplatformloadbalancer": { + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, "ovirtplatformspec": { "additionalProperties": true }, @@ -7777,9 +8822,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OvirtPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -7834,6 +8895,10 @@ "$ref": "#/definitions/os_config_v1_EquinixMetalPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.EquinixMetalPlatformSpec" }, + "external": { + "$ref": "#/definitions/os_config_v1_ExternalPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformSpec" + }, "gcp": { "$ref": "#/definitions/os_config_v1_GCPPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.GCPPlatformSpec" @@ -7846,6 +8911,10 @@ "$ref": "#/definitions/os_config_v1_KubevirtPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.KubevirtPlatformSpec" }, + "nutanix": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformSpec" + }, "openstack": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformSpec" @@ -7890,6 +8959,10 @@ "$ref": "#/definitions/os_config_v1_EquinixMetalPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.EquinixMetalPlatformStatus" }, + "external": { + "$ref": "#/definitions/os_config_v1_ExternalPlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformStatus" + }, "gcp": { "$ref": "#/definitions/os_config_v1_GCPPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.GCPPlatformStatus" @@ -7902,6 +8975,10 @@ "$ref": "#/definitions/os_config_v1_KubevirtPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.KubevirtPlatformStatus" }, + "nutanix": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformStatus" + }, "openstack": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformStatus" @@ -7942,9 +9019,15 @@ "cisInstanceCRN": { "type": "string" }, + "dnsInstanceCRN": { + "type": "string" + }, "region": { "type": "string" }, + "resourceGroup": { + "type": "string" + }, "serviceEndpoints": { "type": "array", "javaOmitEmpty": true, @@ -8668,6 +9751,9 @@ }, "update": { "properties": { + "architecture": { + "type": "string" + }, "force": { "type": "boolean" }, @@ -8708,7 +9794,93 @@ }, "additionalProperties": true }, + "vsphereplatformfailuredomainspec": { + "properties": { + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "server": { + "type": "string" + }, + "topology": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformTopology", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformTopology" + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": true + }, + "vsphereplatformloadbalancer": { + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, + "vsphereplatformnodenetworking": { + "properties": { + "external": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworkingSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec" + }, + "internal": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworkingSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec" + } + }, + "additionalProperties": true + }, + "vsphereplatformnodenetworkingspec": { + "properties": { + "excludeNetworkSubnetCidr": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "network": { + "type": "string" + }, + "networkSubnetCidr": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true + }, "vsphereplatformspec": { + "properties": { + "failureDomains": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformFailureDomainSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformFailureDomainSpec" + } + }, + "nodeNetworking": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworking", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworking" + }, + "vcenters": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformVCenterSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformVCenterSpec" + } + } + }, "additionalProperties": true }, "vsphereplatformstatus": { @@ -8716,15 +9888,74 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } }, "additionalProperties": true }, + "vsphereplatformtopology": { + "properties": { + "computeCluster": { + "type": "string" + }, + "datacenter": { + "type": "string" + }, + "datastore": { + "type": "string" + }, + "folder": { + "type": "string" + }, + "networks": { + "type": "array", + "items": { + "type": "string" + } + }, + "resourcePool": { + "type": "string" + } + }, + "additionalProperties": true + }, + "vsphereplatformvcenterspec": { + "properties": { + "datacenters": { + "type": "array", + "items": { + "type": "string" + } + }, + "port": { + "type": "integer" + }, + "server": { + "type": "string" + } + }, + "additionalProperties": true + }, "webhooktokenauthenticator": { "properties": { "kubeConfig": { diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginProxy.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginProxy.java index b1dec3c8e13..e63e427f03c 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginProxy.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginProxy.java @@ -1,9 +1,7 @@ package io.fabric8.openshift.api.model.console.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; @@ -35,7 +33,11 @@ "apiVersion", "kind", "metadata", - "services" + "alias", + "authorize", + "caCertificate", + "service", + "type" }) @ToString @EqualsAndHashCode @@ -58,8 +60,16 @@ public class ConsolePluginProxy implements KubernetesResource { - @JsonProperty("services") - private List services = new ArrayList(); + @JsonProperty("alias") + private String alias; + @JsonProperty("authorize") + private Boolean authorize; + @JsonProperty("caCertificate") + private String caCertificate; + @JsonProperty("service") + private ConsolePluginProxyServiceConfig service; + @JsonProperty("type") + private String type; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -72,21 +82,69 @@ public ConsolePluginProxy() { /** * - * @param services + * @param service + * @param alias + * @param type + * @param authorize + * @param caCertificate */ - public ConsolePluginProxy(List services) { + public ConsolePluginProxy(String alias, Boolean authorize, String caCertificate, ConsolePluginProxyServiceConfig service, String type) { super(); - this.services = services; + this.alias = alias; + this.authorize = authorize; + this.caCertificate = caCertificate; + this.service = service; + this.type = type; } - @JsonProperty("services") - public List getServices() { - return services; + @JsonProperty("alias") + public String getAlias() { + return alias; } - @JsonProperty("services") - public void setServices(List services) { - this.services = services; + @JsonProperty("alias") + public void setAlias(String alias) { + this.alias = alias; + } + + @JsonProperty("authorize") + public Boolean getAuthorize() { + return authorize; + } + + @JsonProperty("authorize") + public void setAuthorize(Boolean authorize) { + this.authorize = authorize; + } + + @JsonProperty("caCertificate") + public String getCaCertificate() { + return caCertificate; + } + + @JsonProperty("caCertificate") + public void setCaCertificate(String caCertificate) { + this.caCertificate = caCertificate; + } + + @JsonProperty("service") + public ConsolePluginProxyServiceConfig getService() { + return service; + } + + @JsonProperty("service") + public void setService(ConsolePluginProxyServiceConfig service) { + this.service = service; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; } @JsonAnyGetter diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginProxyService.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginProxyServiceConfig.java similarity index 78% rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginProxyService.java rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginProxyServiceConfig.java index 5ef9c05032a..b43331077ff 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginProxyService.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginProxyServiceConfig.java @@ -33,8 +33,6 @@ "apiVersion", "kind", "metadata", - "authorize", - "caCertificate", "name", "namespace", "port" @@ -57,13 +55,9 @@ @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) -public class ConsolePluginProxyService implements KubernetesResource +public class ConsolePluginProxyServiceConfig implements KubernetesResource { - @JsonProperty("authorize") - private Boolean authorize; - @JsonProperty("caCertificate") - private String caCertificate; @JsonProperty("name") private String name; @JsonProperty("namespace") @@ -77,7 +71,7 @@ public class ConsolePluginProxyService implements KubernetesResource * No args constructor for use in serialization * */ - public ConsolePluginProxyService() { + public ConsolePluginProxyServiceConfig() { } /** @@ -85,38 +79,14 @@ public ConsolePluginProxyService() { * @param port * @param name * @param namespace - * @param authorize - * @param caCertificate */ - public ConsolePluginProxyService(Boolean authorize, String caCertificate, String name, String namespace, Integer port) { + public ConsolePluginProxyServiceConfig(String name, String namespace, Integer port) { super(); - this.authorize = authorize; - this.caCertificate = caCertificate; this.name = name; this.namespace = namespace; this.port = port; } - @JsonProperty("authorize") - public Boolean getAuthorize() { - return authorize; - } - - @JsonProperty("authorize") - public void setAuthorize(Boolean authorize) { - this.authorize = authorize; - } - - @JsonProperty("caCertificate") - public String getCaCertificate() { - return caCertificate; - } - - @JsonProperty("caCertificate") - public void setCaCertificate(String caCertificate) { - this.caCertificate = caCertificate; - } - @JsonProperty("name") public String getName() { return name; diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpec.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpec.java index b06326ff3ee..a94f675ca32 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpec.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpec.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.console.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; @@ -61,7 +63,8 @@ public class ConsolePluginSpec implements KubernetesResource @JsonProperty("displayName") private String displayName; @JsonProperty("proxy") - private ConsolePluginProxy proxy; + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List proxy = new ArrayList(); @JsonProperty("service") private ConsolePluginService service; @JsonIgnore @@ -80,7 +83,7 @@ public ConsolePluginSpec() { * @param displayName * @param service */ - public ConsolePluginSpec(String displayName, ConsolePluginProxy proxy, ConsolePluginService service) { + public ConsolePluginSpec(String displayName, List proxy, ConsolePluginService service) { super(); this.displayName = displayName; this.proxy = proxy; @@ -98,12 +101,12 @@ public void setDisplayName(String displayName) { } @JsonProperty("proxy") - public ConsolePluginProxy getProxy() { + public List getProxy() { return proxy; } @JsonProperty("proxy") - public void setProxy(ConsolePluginProxy proxy) { + public void setProxy(List proxy) { this.proxy = proxy; } 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 b1f08e963b7..32fbd69f420 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 @@ -1297,12 +1297,21 @@ "os_console_v1alpha1_ConsolePluginProxy": { "type": "object", "properties": { - "services": { - "type": "array", - "items": { - "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginProxyService", - "existingJavaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxyService" - } + "alias": { + "type": "string" + }, + "authorize": { + "type": "boolean" + }, + "caCertificate": { + "type": "string" + }, + "service": { + "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginProxyServiceConfig", + "existingJavaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxyServiceConfig" + }, + "type": { + "type": "string" } }, "additionalProperties": true, @@ -1311,15 +1320,9 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_console_v1alpha1_ConsolePluginProxyService": { + "os_console_v1alpha1_ConsolePluginProxyServiceConfig": { "type": "object", "properties": { - "authorize": { - "type": "boolean" - }, - "caCertificate": { - "type": "string" - }, "name": { "type": "string" }, @@ -1331,7 +1334,7 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxyService", + "javaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxyServiceConfig", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -1365,8 +1368,12 @@ "type": "string" }, "proxy": { - "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginProxy", - "existingJavaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxy" + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginProxy", + "existingJavaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxy" + } }, "service": { "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginService", 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 d798c4cf781..2e56d94273e 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 @@ -1297,12 +1297,21 @@ "os_console_v1alpha1_ConsolePluginProxy": { "type": "object", "properties": { - "services": { - "type": "array", - "items": { - "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginProxyService", - "existingJavaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxyService" - } + "alias": { + "type": "string" + }, + "authorize": { + "type": "boolean" + }, + "caCertificate": { + "type": "string" + }, + "service": { + "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginProxyServiceConfig", + "existingJavaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxyServiceConfig" + }, + "type": { + "type": "string" } }, "additionalProperties": true, @@ -1311,15 +1320,9 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_console_v1alpha1_ConsolePluginProxyService": { + "os_console_v1alpha1_ConsolePluginProxyServiceConfig": { "type": "object", "properties": { - "authorize": { - "type": "boolean" - }, - "caCertificate": { - "type": "string" - }, "name": { "type": "string" }, @@ -1331,7 +1334,7 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxyService", + "javaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxyServiceConfig", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -1365,8 +1368,12 @@ "type": "string" }, "proxy": { - "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginProxy", - "existingJavaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxy" + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginProxy", + "existingJavaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxy" + } }, "service": { "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginService", @@ -1884,24 +1891,27 @@ }, "consolepluginproxy": { "properties": { - "services": { - "type": "array", - "items": { - "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginProxyService", - "existingJavaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxyService" - } - } - }, - "additionalProperties": true - }, - "consolepluginproxyservice": { - "properties": { + "alias": { + "type": "string" + }, "authorize": { "type": "boolean" }, "caCertificate": { "type": "string" }, + "service": { + "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginProxyServiceConfig", + "existingJavaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxyServiceConfig" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, + "consolepluginproxyserviceconfig": { + "properties": { "name": { "type": "string" }, @@ -1937,8 +1947,12 @@ "type": "string" }, "proxy": { - "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginProxy", - "existingJavaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxy" + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginProxy", + "existingJavaType": "io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginProxy" + } }, "service": { "$ref": "#/definitions/os_console_v1alpha1_ConsolePluginService", diff --git a/kubernetes-model-generator/openshift-model-hive/cmd/generate/generate.go b/kubernetes-model-generator/openshift-model-hive/cmd/generate/generate.go index 32de3caaa37..231e0a80ccc 100644 --- a/kubernetes-model-generator/openshift-model-hive/cmd/generate/generate.go +++ b/kubernetes-model-generator/openshift-model-hive/cmd/generate/generate.go @@ -95,6 +95,8 @@ func main() { {"k8s.io/api/rbac/v1", "", "io.fabric8.kubernetes.api.model.rbac", "kubernetes_rbac_", false}, {"github.com/openshift/api/config/v1", "", "io.fabric8.openshift.api.model.config.v1", "os_config_v1_", false}, {"github.com/openshift/hive/apis/hive/v1", "hive", "io.fabric8.openshift.api.model.hive.v1", "os_hive_v1_", true}, + {"github.com/openshift/hive/apis/hive/v1/alibabacloud", "hive", "io.fabric8.openshift.api.model.hive.alibabacloud.v1", "os_hive_alibabacloud_v1_", true}, + {"github.com/openshift/hive/apis/hive/v1/ibmcloud", "hive", "io.fabric8.openshift.api.model.hive.ibmcloud.v1", "os_hive_ibmcloud_v1_", true}, {"github.com/openshift/hive/apis/hive/v1/aws", "hive", "io.fabric8.openshift.api.model.hive.aws.v1", "os_hive_aws_v1_", true}, {"github.com/openshift/hive/apis/hive/v1/azure", "hive", "io.fabric8.openshift.api.model.hive.azure.v1", "os_hive_azure_v1_", true}, {"github.com/openshift/hive/apis/hive/v1/baremetal", "hive", "io.fabric8.openshift.api.model.hive.baremetal.v1", "os_hive_baremetal_v1_", true}, diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/BootVolume.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/BootVolume.java new file mode 100644 index 00000000000..91d3e7ea0fc --- /dev/null +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/BootVolume.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.hive.ibmcloud.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", + "encryptionKey" +}) +@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 BootVolume implements KubernetesResource +{ + + @JsonProperty("encryptionKey") + private String encryptionKey; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public BootVolume() { + } + + /** + * + * @param encryptionKey + */ + public BootVolume(String encryptionKey) { + super(); + this.encryptionKey = encryptionKey; + } + + @JsonProperty("encryptionKey") + public String getEncryptionKey() { + return encryptionKey; + } + + @JsonProperty("encryptionKey") + public void setEncryptionKey(String encryptionKey) { + this.encryptionKey = encryptionKey; + } + + @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/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/DedicatedHost.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/DedicatedHost.java new file mode 100644 index 00000000000..616ad1c08db --- /dev/null +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/DedicatedHost.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.hive.ibmcloud.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", + "name", + "profile" +}) +@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 DedicatedHost implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("profile") + private String profile; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DedicatedHost() { + } + + /** + * + * @param profile + * @param name + */ + public DedicatedHost(String name, String profile) { + super(); + this.name = name; + this.profile = profile; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("profile") + public String getProfile() { + return profile; + } + + @JsonProperty("profile") + public void setProfile(String profile) { + this.profile = profile; + } + + @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/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/MachinePool.java new file mode 100644 index 00000000000..a1b0245998d --- /dev/null +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/MachinePool.java @@ -0,0 +1,149 @@ + +package io.fabric8.openshift.api.model.hive.ibmcloud.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", + "bootVolume", + "dedicatedHosts", + "type", + "zones" +}) +@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 MachinePool implements KubernetesResource +{ + + @JsonProperty("bootVolume") + private BootVolume bootVolume; + @JsonProperty("dedicatedHosts") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List dedicatedHosts = new ArrayList(); + @JsonProperty("type") + private String type; + @JsonProperty("zones") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List zones = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachinePool() { + } + + /** + * + * @param bootVolume + * @param dedicatedHosts + * @param type + * @param zones + */ + public MachinePool(BootVolume bootVolume, List dedicatedHosts, String type, List zones) { + super(); + this.bootVolume = bootVolume; + this.dedicatedHosts = dedicatedHosts; + this.type = type; + this.zones = zones; + } + + @JsonProperty("bootVolume") + public BootVolume getBootVolume() { + return bootVolume; + } + + @JsonProperty("bootVolume") + public void setBootVolume(BootVolume bootVolume) { + this.bootVolume = bootVolume; + } + + @JsonProperty("dedicatedHosts") + public List getDedicatedHosts() { + return dedicatedHosts; + } + + @JsonProperty("dedicatedHosts") + public void setDedicatedHosts(List dedicatedHosts) { + this.dedicatedHosts = dedicatedHosts; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonProperty("zones") + public List getZones() { + return zones; + } + + @JsonProperty("zones") + public void setZones(List zones) { + this.zones = zones; + } + + @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/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/Platform.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/Platform.java new file mode 100644 index 00000000000..96d0eefe8c1 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/ibmcloud/v1/Platform.java @@ -0,0 +1,144 @@ + +package io.fabric8.openshift.api.model.hive.ibmcloud.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.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", + "accountID", + "cisInstanceCRN", + "credentialsSecretRef", + "region" +}) +@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(io.fabric8.kubernetes.api.model.LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class Platform implements KubernetesResource +{ + + @JsonProperty("accountID") + private String accountID; + @JsonProperty("cisInstanceCRN") + private String cisInstanceCRN; + @JsonProperty("credentialsSecretRef") + private io.fabric8.kubernetes.api.model.LocalObjectReference credentialsSecretRef; + @JsonProperty("region") + private String region; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Platform() { + } + + /** + * + * @param accountID + * @param cisInstanceCRN + * @param credentialsSecretRef + * @param region + */ + public Platform(String accountID, String cisInstanceCRN, io.fabric8.kubernetes.api.model.LocalObjectReference credentialsSecretRef, String region) { + super(); + this.accountID = accountID; + this.cisInstanceCRN = cisInstanceCRN; + this.credentialsSecretRef = credentialsSecretRef; + this.region = region; + } + + @JsonProperty("accountID") + public String getAccountID() { + return accountID; + } + + @JsonProperty("accountID") + public void setAccountID(String accountID) { + this.accountID = accountID; + } + + @JsonProperty("cisInstanceCRN") + public String getCisInstanceCRN() { + return cisInstanceCRN; + } + + @JsonProperty("cisInstanceCRN") + public void setCisInstanceCRN(String cisInstanceCRN) { + this.cisInstanceCRN = cisInstanceCRN; + } + + @JsonProperty("credentialsSecretRef") + public io.fabric8.kubernetes.api.model.LocalObjectReference getCredentialsSecretRef() { + return credentialsSecretRef; + } + + @JsonProperty("credentialsSecretRef") + public void setCredentialsSecretRef(io.fabric8.kubernetes.api.model.LocalObjectReference credentialsSecretRef) { + this.credentialsSecretRef = credentialsSecretRef; + } + + @JsonProperty("region") + public String getRegion() { + return region; + } + + @JsonProperty("region") + public void setRegion(String region) { + this.region = region; + } + + @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/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeprovisionPlatform.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeprovisionPlatform.java index c0c0c4964a6..6f4b8d32bc4 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeprovisionPlatform.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeprovisionPlatform.java @@ -36,6 +36,7 @@ "aws", "azure", "gcp", + "ibmcloud", "openstack", "ovirt", "vsphere" @@ -67,6 +68,8 @@ public class ClusterDeprovisionPlatform implements KubernetesResource private AzureClusterDeprovision azure; @JsonProperty("gcp") private GCPClusterDeprovision gcp; + @JsonProperty("ibmcloud") + private IBMClusterDeprovision ibmcloud; @JsonProperty("openstack") private OpenStackClusterDeprovision openstack; @JsonProperty("ovirt") @@ -87,16 +90,18 @@ public ClusterDeprovisionPlatform() { * * @param vsphere * @param gcp + * @param ibmcloud * @param ovirt * @param openstack * @param aws * @param azure */ - public ClusterDeprovisionPlatform(AWSClusterDeprovision aws, AzureClusterDeprovision azure, GCPClusterDeprovision gcp, OpenStackClusterDeprovision openstack, OvirtClusterDeprovision ovirt, VSphereClusterDeprovision vsphere) { + public ClusterDeprovisionPlatform(AWSClusterDeprovision aws, AzureClusterDeprovision azure, GCPClusterDeprovision gcp, IBMClusterDeprovision ibmcloud, OpenStackClusterDeprovision openstack, OvirtClusterDeprovision ovirt, VSphereClusterDeprovision vsphere) { super(); this.aws = aws; this.azure = azure; this.gcp = gcp; + this.ibmcloud = ibmcloud; this.openstack = openstack; this.ovirt = ovirt; this.vsphere = vsphere; @@ -132,6 +137,16 @@ public void setGcp(GCPClusterDeprovision gcp) { this.gcp = gcp; } + @JsonProperty("ibmcloud") + public IBMClusterDeprovision getIbmcloud() { + return ibmcloud; + } + + @JsonProperty("ibmcloud") + public void setIbmcloud(IBMClusterDeprovision ibmcloud) { + this.ibmcloud = ibmcloud; + } + @JsonProperty("openstack") public OpenStackClusterDeprovision getOpenstack() { return openstack; diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolSpec.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolSpec.java index 7ab03199579..bc5d16c1d25 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolSpec.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolSpec.java @@ -38,6 +38,7 @@ "baseDomain", "claimLifetime", "hibernateAfter", + "hibernationConfig", "imageSetRef", "installAttemptsLimit", "installConfigSecretTemplateRef", @@ -80,6 +81,8 @@ public class ClusterPoolSpec implements KubernetesResource private ClusterPoolClaimLifetime claimLifetime; @JsonProperty("hibernateAfter") private Duration hibernateAfter; + @JsonProperty("hibernationConfig") + private HibernationConfig hibernationConfig; @JsonProperty("imageSetRef") private ClusterImageSetReference imageSetRef; @JsonProperty("installAttemptsLimit") @@ -123,6 +126,7 @@ public ClusterPoolSpec() { * @param maxSize * @param installAttemptsLimit * @param platform + * @param hibernationConfig * @param labels * @param size * @param baseDomain @@ -131,12 +135,13 @@ public ClusterPoolSpec() { * @param imageSetRef * @param hibernateAfter */ - public ClusterPoolSpec(Map annotations, java.lang.String baseDomain, ClusterPoolClaimLifetime claimLifetime, Duration hibernateAfter, ClusterImageSetReference imageSetRef, Integer installAttemptsLimit, io.fabric8.kubernetes.api.model.LocalObjectReference installConfigSecretTemplateRef, Map labels, Integer maxConcurrent, Integer maxSize, Platform platform, io.fabric8.kubernetes.api.model.LocalObjectReference pullSecretRef, Integer runningCount, Integer size, Boolean skipMachinePools) { + public ClusterPoolSpec(Map annotations, java.lang.String baseDomain, ClusterPoolClaimLifetime claimLifetime, Duration hibernateAfter, HibernationConfig hibernationConfig, ClusterImageSetReference imageSetRef, Integer installAttemptsLimit, io.fabric8.kubernetes.api.model.LocalObjectReference installConfigSecretTemplateRef, Map labels, Integer maxConcurrent, Integer maxSize, Platform platform, io.fabric8.kubernetes.api.model.LocalObjectReference pullSecretRef, Integer runningCount, Integer size, Boolean skipMachinePools) { super(); this.annotations = annotations; this.baseDomain = baseDomain; this.claimLifetime = claimLifetime; this.hibernateAfter = hibernateAfter; + this.hibernationConfig = hibernationConfig; this.imageSetRef = imageSetRef; this.installAttemptsLimit = installAttemptsLimit; this.installConfigSecretTemplateRef = installConfigSecretTemplateRef; @@ -190,6 +195,16 @@ public void setHibernateAfter(Duration hibernateAfter) { this.hibernateAfter = hibernateAfter; } + @JsonProperty("hibernationConfig") + public HibernationConfig getHibernationConfig() { + return hibernationConfig; + } + + @JsonProperty("hibernationConfig") + public void setHibernationConfig(HibernationConfig hibernationConfig) { + this.hibernationConfig = hibernationConfig; + } + @JsonProperty("imageSetRef") public ClusterImageSetReference getImageSetRef() { return imageSetRef; diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolStatus.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolStatus.java index 557c245ed44..09a8e424ced 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolStatus.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolStatus.java @@ -37,7 +37,8 @@ "metadata", "conditions", "ready", - "size" + "size", + "standby" }) @ToString @EqualsAndHashCode @@ -67,6 +68,8 @@ public class ClusterPoolStatus implements KubernetesResource private Integer ready; @JsonProperty("size") private Integer size; + @JsonProperty("standby") + private Integer standby; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -80,14 +83,16 @@ public ClusterPoolStatus() { /** * * @param size + * @param standby * @param ready * @param conditions */ - public ClusterPoolStatus(List conditions, Integer ready, Integer size) { + public ClusterPoolStatus(List conditions, Integer ready, Integer size, Integer standby) { super(); this.conditions = conditions; this.ready = ready; this.size = size; + this.standby = standby; } @JsonProperty("conditions") @@ -120,6 +125,16 @@ public void setSize(Integer size) { this.size = size; } + @JsonProperty("standby") + public Integer getStandby() { + return standby; + } + + @JsonProperty("standby") + public void setStandby(Integer standby) { + this.standby = standby; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterProvisionSpec.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterProvisionSpec.java index 28c917e2b29..459b59857bd 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterProvisionSpec.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterProvisionSpec.java @@ -44,6 +44,7 @@ "podSpec", "prevClusterID", "prevInfraID", + "prevProvisionName", "stage" }) @ToString @@ -90,6 +91,8 @@ public class ClusterProvisionSpec implements KubernetesResource private java.lang.String prevClusterID; @JsonProperty("prevInfraID") private java.lang.String prevInfraID; + @JsonProperty("prevProvisionName") + private java.lang.String prevProvisionName; @JsonProperty("stage") private java.lang.String stage; @JsonIgnore @@ -104,20 +107,21 @@ public ClusterProvisionSpec() { /** * - * @param prevClusterID * @param installLog * @param metadata * @param prevInfraID - * @param stage - * @param clusterDeploymentRef + * @param prevProvisionName * @param clusterID * @param adminKubeconfigSecretRef - * @param adminPasswordSecretRef * @param podSpec * @param attempt + * @param prevClusterID + * @param stage + * @param clusterDeploymentRef + * @param adminPasswordSecretRef * @param infraID */ - public ClusterProvisionSpec(io.fabric8.kubernetes.api.model.LocalObjectReference adminKubeconfigSecretRef, io.fabric8.kubernetes.api.model.LocalObjectReference adminPasswordSecretRef, Integer attempt, io.fabric8.kubernetes.api.model.LocalObjectReference clusterDeploymentRef, java.lang.String clusterID, java.lang.String infraID, java.lang.String installLog, Map metadata, PodSpec podSpec, java.lang.String prevClusterID, java.lang.String prevInfraID, java.lang.String stage) { + public ClusterProvisionSpec(io.fabric8.kubernetes.api.model.LocalObjectReference adminKubeconfigSecretRef, io.fabric8.kubernetes.api.model.LocalObjectReference adminPasswordSecretRef, Integer attempt, io.fabric8.kubernetes.api.model.LocalObjectReference clusterDeploymentRef, java.lang.String clusterID, java.lang.String infraID, java.lang.String installLog, Map metadata, PodSpec podSpec, java.lang.String prevClusterID, java.lang.String prevInfraID, java.lang.String prevProvisionName, java.lang.String stage) { super(); this.adminKubeconfigSecretRef = adminKubeconfigSecretRef; this.adminPasswordSecretRef = adminPasswordSecretRef; @@ -130,6 +134,7 @@ public ClusterProvisionSpec(io.fabric8.kubernetes.api.model.LocalObjectReference this.podSpec = podSpec; this.prevClusterID = prevClusterID; this.prevInfraID = prevInfraID; + this.prevProvisionName = prevProvisionName; this.stage = stage; } @@ -243,6 +248,16 @@ public void setPrevInfraID(java.lang.String prevInfraID) { this.prevInfraID = prevInfraID; } + @JsonProperty("prevProvisionName") + public java.lang.String getPrevProvisionName() { + return prevProvisionName; + } + + @JsonProperty("prevProvisionName") + public void setPrevProvisionName(java.lang.String prevProvisionName) { + this.prevProvisionName = prevProvisionName; + } + @JsonProperty("stage") public java.lang.String getStage() { return stage; diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/HibernationConfig.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/HibernationConfig.java new file mode 100644 index 00000000000..5ac59a23ddf --- /dev/null +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/HibernationConfig.java @@ -0,0 +1,101 @@ + +package io.fabric8.openshift.api.model.hive.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.Duration; +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", + "resumeTimeout" +}) +@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 HibernationConfig implements KubernetesResource +{ + + @JsonProperty("resumeTimeout") + private Duration resumeTimeout; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HibernationConfig() { + } + + /** + * + * @param resumeTimeout + */ + public HibernationConfig(Duration resumeTimeout) { + super(); + this.resumeTimeout = resumeTimeout; + } + + @JsonProperty("resumeTimeout") + public Duration getResumeTimeout() { + return resumeTimeout; + } + + @JsonProperty("resumeTimeout") + public void setResumeTimeout(Duration resumeTimeout) { + this.resumeTimeout = resumeTimeout; + } + + @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/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/IBMClusterDeprovision.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/IBMClusterDeprovision.java new file mode 100644 index 00000000000..e16fdcbd601 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/IBMClusterDeprovision.java @@ -0,0 +1,159 @@ + +package io.fabric8.openshift.api.model.hive.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.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", + "accountID", + "baseDomain", + "cisInstanceCRN", + "credentialsSecretRef", + "region" +}) +@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(io.fabric8.kubernetes.api.model.LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class IBMClusterDeprovision implements KubernetesResource +{ + + @JsonProperty("accountID") + private String accountID; + @JsonProperty("baseDomain") + private String baseDomain; + @JsonProperty("cisInstanceCRN") + private String cisInstanceCRN; + @JsonProperty("credentialsSecretRef") + private io.fabric8.kubernetes.api.model.LocalObjectReference credentialsSecretRef; + @JsonProperty("region") + private String region; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public IBMClusterDeprovision() { + } + + /** + * + * @param accountID + * @param cisInstanceCRN + * @param credentialsSecretRef + * @param baseDomain + * @param region + */ + public IBMClusterDeprovision(String accountID, String baseDomain, String cisInstanceCRN, io.fabric8.kubernetes.api.model.LocalObjectReference credentialsSecretRef, String region) { + super(); + this.accountID = accountID; + this.baseDomain = baseDomain; + this.cisInstanceCRN = cisInstanceCRN; + this.credentialsSecretRef = credentialsSecretRef; + this.region = region; + } + + @JsonProperty("accountID") + public String getAccountID() { + return accountID; + } + + @JsonProperty("accountID") + public void setAccountID(String accountID) { + this.accountID = accountID; + } + + @JsonProperty("baseDomain") + public String getBaseDomain() { + return baseDomain; + } + + @JsonProperty("baseDomain") + public void setBaseDomain(String baseDomain) { + this.baseDomain = baseDomain; + } + + @JsonProperty("cisInstanceCRN") + public String getCisInstanceCRN() { + return cisInstanceCRN; + } + + @JsonProperty("cisInstanceCRN") + public void setCisInstanceCRN(String cisInstanceCRN) { + this.cisInstanceCRN = cisInstanceCRN; + } + + @JsonProperty("credentialsSecretRef") + public io.fabric8.kubernetes.api.model.LocalObjectReference getCredentialsSecretRef() { + return credentialsSecretRef; + } + + @JsonProperty("credentialsSecretRef") + public void setCredentialsSecretRef(io.fabric8.kubernetes.api.model.LocalObjectReference credentialsSecretRef) { + this.credentialsSecretRef = credentialsSecretRef; + } + + @JsonProperty("region") + public String getRegion() { + return region; + } + + @JsonProperty("region") + public void setRegion(String region) { + this.region = region; + } + + @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/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePoolPlatform.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePoolPlatform.java index 9acd70b8129..9b8fbc1388c 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePoolPlatform.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePoolPlatform.java @@ -36,6 +36,7 @@ "aws", "azure", "gcp", + "ibmcloud", "openstack", "ovirt", "vsphere" @@ -67,6 +68,8 @@ public class MachinePoolPlatform implements KubernetesResource private io.fabric8.openshift.api.model.hive.azure.v1.MachinePool azure; @JsonProperty("gcp") private io.fabric8.openshift.api.model.hive.gcp.v1.MachinePool gcp; + @JsonProperty("ibmcloud") + private io.fabric8.openshift.api.model.hive.ibmcloud.v1.MachinePool ibmcloud; @JsonProperty("openstack") private io.fabric8.openshift.api.model.hive.openstack.v1.MachinePool openstack; @JsonProperty("ovirt") @@ -87,16 +90,18 @@ public MachinePoolPlatform() { * * @param vsphere * @param gcp + * @param ibmcloud * @param ovirt * @param openstack * @param aws * @param azure */ - public MachinePoolPlatform(io.fabric8.openshift.api.model.hive.aws.v1.MachinePoolPlatform aws, io.fabric8.openshift.api.model.hive.azure.v1.MachinePool azure, io.fabric8.openshift.api.model.hive.gcp.v1.MachinePool gcp, io.fabric8.openshift.api.model.hive.openstack.v1.MachinePool openstack, io.fabric8.openshift.api.model.hive.ovirt.v1.MachinePool ovirt, io.fabric8.openshift.api.model.hive.vsphere.v1.MachinePool vsphere) { + public MachinePoolPlatform(io.fabric8.openshift.api.model.hive.aws.v1.MachinePoolPlatform aws, io.fabric8.openshift.api.model.hive.azure.v1.MachinePool azure, io.fabric8.openshift.api.model.hive.gcp.v1.MachinePool gcp, io.fabric8.openshift.api.model.hive.ibmcloud.v1.MachinePool ibmcloud, io.fabric8.openshift.api.model.hive.openstack.v1.MachinePool openstack, io.fabric8.openshift.api.model.hive.ovirt.v1.MachinePool ovirt, io.fabric8.openshift.api.model.hive.vsphere.v1.MachinePool vsphere) { super(); this.aws = aws; this.azure = azure; this.gcp = gcp; + this.ibmcloud = ibmcloud; this.openstack = openstack; this.ovirt = ovirt; this.vsphere = vsphere; @@ -132,6 +137,16 @@ public void setGcp(io.fabric8.openshift.api.model.hive.gcp.v1.MachinePool gcp) { this.gcp = gcp; } + @JsonProperty("ibmcloud") + public io.fabric8.openshift.api.model.hive.ibmcloud.v1.MachinePool getIbmcloud() { + return ibmcloud; + } + + @JsonProperty("ibmcloud") + public void setIbmcloud(io.fabric8.openshift.api.model.hive.ibmcloud.v1.MachinePool ibmcloud) { + this.ibmcloud = ibmcloud; + } + @JsonProperty("openstack") public io.fabric8.openshift.api.model.hive.openstack.v1.MachinePool getOpenstack() { return openstack; diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/Platform.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/Platform.java index 4ad6ddbccab..7ae479a2c6a 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/Platform.java @@ -39,6 +39,7 @@ "azure", "baremetal", "gcp", + "ibmcloud", "openstack", "ovirt", "vsphere" @@ -74,6 +75,8 @@ public class Platform implements KubernetesResource private io.fabric8.openshift.api.model.hive.baremetal.v1.Platform baremetal; @JsonProperty("gcp") private io.fabric8.openshift.api.model.hive.gcp.v1.Platform gcp; + @JsonProperty("ibmcloud") + private io.fabric8.openshift.api.model.hive.ibmcloud.v1.Platform ibmcloud; @JsonProperty("openstack") private io.fabric8.openshift.api.model.hive.openstack.v1.Platform openstack; @JsonProperty("ovirt") @@ -95,19 +98,21 @@ public Platform() { * @param baremetal * @param vsphere * @param gcp + * @param ibmcloud * @param agentBareMetal * @param ovirt * @param openstack * @param aws * @param azure */ - public Platform(BareMetalPlatform agentBareMetal, io.fabric8.openshift.api.model.hive.aws.v1.Platform aws, io.fabric8.openshift.api.model.hive.azure.v1.Platform azure, io.fabric8.openshift.api.model.hive.baremetal.v1.Platform baremetal, io.fabric8.openshift.api.model.hive.gcp.v1.Platform gcp, io.fabric8.openshift.api.model.hive.openstack.v1.Platform openstack, io.fabric8.openshift.api.model.hive.ovirt.v1.Platform ovirt, io.fabric8.openshift.api.model.hive.vsphere.v1.Platform vsphere) { + public Platform(BareMetalPlatform agentBareMetal, io.fabric8.openshift.api.model.hive.aws.v1.Platform aws, io.fabric8.openshift.api.model.hive.azure.v1.Platform azure, io.fabric8.openshift.api.model.hive.baremetal.v1.Platform baremetal, io.fabric8.openshift.api.model.hive.gcp.v1.Platform gcp, io.fabric8.openshift.api.model.hive.ibmcloud.v1.Platform ibmcloud, io.fabric8.openshift.api.model.hive.openstack.v1.Platform openstack, io.fabric8.openshift.api.model.hive.ovirt.v1.Platform ovirt, io.fabric8.openshift.api.model.hive.vsphere.v1.Platform vsphere) { super(); this.agentBareMetal = agentBareMetal; this.aws = aws; this.azure = azure; this.baremetal = baremetal; this.gcp = gcp; + this.ibmcloud = ibmcloud; this.openstack = openstack; this.ovirt = ovirt; this.vsphere = vsphere; @@ -163,6 +168,16 @@ public void setGcp(io.fabric8.openshift.api.model.hive.gcp.v1.Platform gcp) { this.gcp = gcp; } + @JsonProperty("ibmcloud") + public io.fabric8.openshift.api.model.hive.ibmcloud.v1.Platform getIbmcloud() { + return ibmcloud; + } + + @JsonProperty("ibmcloud") + public void setIbmcloud(io.fabric8.openshift.api.model.hive.ibmcloud.v1.Platform ibmcloud) { + this.ibmcloud = ibmcloud; + } + @JsonProperty("openstack") public io.fabric8.openshift.api.model.hive.openstack.v1.Platform getOpenstack() { return openstack; 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 55f070afe48..eb1e46e14e3 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 @@ -909,6 +909,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -989,6 +997,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_DownwardAPIProjection": { "type": "object", "properties": { @@ -1199,6 +1223,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1317,6 +1349,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -4401,6 +4441,90 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_hive_ibmcloud_v1_BootVolume": { + "type": "object", + "properties": { + "encryptionKey": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.BootVolume", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_hive_ibmcloud_v1_DedicatedHost": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "profile": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.DedicatedHost", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_hive_ibmcloud_v1_MachinePool": { + "type": "object", + "properties": { + "bootVolume": { + "$ref": "#/definitions/os_hive_ibmcloud_v1_BootVolume", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.BootVolume" + }, + "dedicatedHosts": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_hive_ibmcloud_v1_DedicatedHost", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.DedicatedHost" + } + }, + "type": { + "type": "string" + }, + "zones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.MachinePool", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_hive_ibmcloud_v1_Platform": { + "type": "object", + "properties": { + "accountID": { + "type": "string" + }, + "cisInstanceCRN": { + "type": "string" + }, + "credentialsSecretRef": { + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" + }, + "region": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.Platform", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_hive_openstack_v1_MachinePool": { "type": "object", "properties": { @@ -5460,6 +5584,10 @@ "$ref": "#/definitions/os_hive_v1_GCPClusterDeprovision", "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.GCPClusterDeprovision" }, + "ibmcloud": { + "$ref": "#/definitions/os_hive_v1_IBMClusterDeprovision", + "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.IBMClusterDeprovision" + }, "openstack": { "$ref": "#/definitions/os_hive_v1_OpenStackClusterDeprovision", "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.OpenStackClusterDeprovision" @@ -5869,6 +5997,10 @@ "$ref": "#/definitions/kubernetes_apimachinery_Duration", "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" }, + "hibernationConfig": { + "$ref": "#/definitions/os_hive_v1_HibernationConfig", + "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.HibernationConfig" + }, "imageSetRef": { "$ref": "#/definitions/os_hive_v1_ClusterImageSetReference", "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.ClusterImageSetReference" @@ -5933,6 +6065,9 @@ }, "size": { "type": "integer" + }, + "standby": { + "type": "integer" } }, "additionalProperties": true, @@ -6077,6 +6212,9 @@ "prevInfraID": { "type": "string" }, + "prevProvisionName": { + "type": "string" + }, "stage": { "type": "string" } @@ -6695,6 +6833,20 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_hive_v1_HibernationConfig": { + "type": "object", + "properties": { + "resumeTimeout": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.hive.v1.HibernationConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_hive_v1_HiveConfig": { "type": "object", "properties": { @@ -6907,6 +7059,32 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_hive_v1_IBMClusterDeprovision": { + "type": "object", + "properties": { + "accountID": { + "type": "string" + }, + "baseDomain": { + "type": "string" + }, + "cisInstanceCRN": { + "type": "string" + }, + "credentialsSecretRef": { + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" + }, + "region": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.hive.v1.IBMClusterDeprovision", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_hive_v1_IdentityProviderStatus": { "type": "object", "additionalProperties": true, @@ -7138,6 +7316,10 @@ "$ref": "#/definitions/os_hive_gcp_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.MachinePool" }, + "ibmcloud": { + "$ref": "#/definitions/os_hive_ibmcloud_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.MachinePool" + }, "openstack": { "$ref": "#/definitions/os_hive_openstack_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.hive.openstack.v1.MachinePool" @@ -7405,6 +7587,10 @@ "$ref": "#/definitions/os_hive_gcp_v1_Platform", "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.Platform" }, + "ibmcloud": { + "$ref": "#/definitions/os_hive_ibmcloud_v1_Platform", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.Platform" + }, "openstack": { "$ref": "#/definitions/os_hive_openstack_v1_Platform", "existingJavaType": "io.fabric8.openshift.api.model.hive.openstack.v1.Platform" 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 ca2a328be15..124fc775aaa 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 @@ -909,6 +909,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -989,6 +997,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_DownwardAPIProjection": { "type": "object", "properties": { @@ -1199,6 +1223,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1317,6 +1349,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -4401,6 +4441,90 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_hive_ibmcloud_v1_BootVolume": { + "type": "object", + "properties": { + "encryptionKey": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.BootVolume", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_hive_ibmcloud_v1_DedicatedHost": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "profile": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.DedicatedHost", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_hive_ibmcloud_v1_MachinePool": { + "type": "object", + "properties": { + "bootVolume": { + "$ref": "#/definitions/os_hive_ibmcloud_v1_BootVolume", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.BootVolume" + }, + "dedicatedHosts": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_hive_ibmcloud_v1_DedicatedHost", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.DedicatedHost" + } + }, + "type": { + "type": "string" + }, + "zones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.MachinePool", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_hive_ibmcloud_v1_Platform": { + "type": "object", + "properties": { + "accountID": { + "type": "string" + }, + "cisInstanceCRN": { + "type": "string" + }, + "credentialsSecretRef": { + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" + }, + "region": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.Platform", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_hive_openstack_v1_MachinePool": { "type": "object", "properties": { @@ -5460,6 +5584,10 @@ "$ref": "#/definitions/os_hive_v1_GCPClusterDeprovision", "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.GCPClusterDeprovision" }, + "ibmcloud": { + "$ref": "#/definitions/os_hive_v1_IBMClusterDeprovision", + "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.IBMClusterDeprovision" + }, "openstack": { "$ref": "#/definitions/os_hive_v1_OpenStackClusterDeprovision", "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.OpenStackClusterDeprovision" @@ -5869,6 +5997,10 @@ "$ref": "#/definitions/kubernetes_apimachinery_Duration", "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" }, + "hibernationConfig": { + "$ref": "#/definitions/os_hive_v1_HibernationConfig", + "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.HibernationConfig" + }, "imageSetRef": { "$ref": "#/definitions/os_hive_v1_ClusterImageSetReference", "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.ClusterImageSetReference" @@ -5933,6 +6065,9 @@ }, "size": { "type": "integer" + }, + "standby": { + "type": "integer" } }, "additionalProperties": true, @@ -6077,6 +6212,9 @@ "prevInfraID": { "type": "string" }, + "prevProvisionName": { + "type": "string" + }, "stage": { "type": "string" } @@ -6695,6 +6833,20 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_hive_v1_HibernationConfig": { + "type": "object", + "properties": { + "resumeTimeout": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.hive.v1.HibernationConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_hive_v1_HiveConfig": { "type": "object", "properties": { @@ -6907,6 +7059,32 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_hive_v1_IBMClusterDeprovision": { + "type": "object", + "properties": { + "accountID": { + "type": "string" + }, + "baseDomain": { + "type": "string" + }, + "cisInstanceCRN": { + "type": "string" + }, + "credentialsSecretRef": { + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" + }, + "region": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.hive.v1.IBMClusterDeprovision", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_hive_v1_IdentityProviderStatus": { "type": "object", "additionalProperties": true, @@ -7138,6 +7316,10 @@ "$ref": "#/definitions/os_hive_gcp_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.MachinePool" }, + "ibmcloud": { + "$ref": "#/definitions/os_hive_ibmcloud_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.MachinePool" + }, "openstack": { "$ref": "#/definitions/os_hive_openstack_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.hive.openstack.v1.MachinePool" @@ -7405,6 +7587,10 @@ "$ref": "#/definitions/os_hive_gcp_v1_Platform", "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.Platform" }, + "ibmcloud": { + "$ref": "#/definitions/os_hive_ibmcloud_v1_Platform", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.Platform" + }, "openstack": { "$ref": "#/definitions/os_hive_openstack_v1_Platform", "existingJavaType": "io.fabric8.openshift.api.model.hive.openstack.v1.Platform" @@ -8750,6 +8936,14 @@ }, "additionalProperties": true }, + "bootvolume": { + "properties": { + "encryptionKey": { + "type": "string" + } + }, + "additionalProperties": true + }, "capabilities": { "properties": { "add": { @@ -9347,6 +9541,10 @@ "$ref": "#/definitions/os_hive_v1_GCPClusterDeprovision", "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.GCPClusterDeprovision" }, + "ibmcloud": { + "$ref": "#/definitions/os_hive_v1_IBMClusterDeprovision", + "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.IBMClusterDeprovision" + }, "openstack": { "$ref": "#/definitions/os_hive_v1_OpenStackClusterDeprovision", "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.OpenStackClusterDeprovision" @@ -9689,6 +9887,10 @@ "$ref": "#/definitions/kubernetes_apimachinery_Duration", "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" }, + "hibernationConfig": { + "$ref": "#/definitions/os_hive_v1_HibernationConfig", + "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.HibernationConfig" + }, "imageSetRef": { "$ref": "#/definitions/os_hive_v1_ClusterImageSetReference", "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.ClusterImageSetReference" @@ -9748,6 +9950,9 @@ }, "size": { "type": "integer" + }, + "standby": { + "type": "integer" } }, "additionalProperties": true @@ -9870,6 +10075,9 @@ "prevInfraID": { "type": "string" }, + "prevProvisionName": { + "type": "string" + }, "stage": { "type": "string" } @@ -10172,6 +10380,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -10243,6 +10459,17 @@ }, "additionalProperties": true }, + "containerresizepolicy": { + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true + }, "controllerconfig": { "properties": { "clientBurst": { @@ -10358,6 +10585,17 @@ }, "additionalProperties": true }, + "dedicatedhost": { + "properties": { + "name": { + "type": "string" + }, + "profile": { + "type": "string" + } + }, + "additionalProperties": true + }, "disk": { "properties": { "sizeGB": { @@ -10723,6 +10961,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -10836,6 +11082,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -11197,6 +11451,15 @@ }, "additionalProperties": true }, + "hibernationconfig": { + "properties": { + "resumeTimeout": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + } + }, + "additionalProperties": true + }, "hiveconfig": { "properties": { "apiVersion": { @@ -11455,6 +11718,27 @@ }, "additionalProperties": true }, + "ibmclusterdeprovision": { + "properties": { + "accountID": { + "type": "string" + }, + "baseDomain": { + "type": "string" + }, + "cisInstanceCRN": { + "type": "string" + }, + "credentialsSecretRef": { + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" + }, + "region": { + "type": "string" + } + }, + "additionalProperties": true + }, "identityprovider": { "properties": { "basicAuth": { @@ -11856,8 +12140,8 @@ "machinepool": { "properties": { "osDisk": { - "$ref": "#/definitions/os_hive_azure_v1_OSDisk", - "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.OSDisk" + "$ref": "#/definitions/os_hive_gcp_v1_OSDisk", + "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk" }, "type": { "type": "string" @@ -11995,29 +12279,30 @@ }, "machinepoolplatform": { "properties": { - "aws": { - "$ref": "#/definitions/os_hive_aws_v1_MachinePoolPlatform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.MachinePoolPlatform" - }, - "azure": { - "$ref": "#/definitions/os_hive_azure_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.MachinePool" + "rootVolume": { + "$ref": "#/definitions/os_hive_aws_v1_EC2RootVolume", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.EC2RootVolume" }, - "gcp": { - "$ref": "#/definitions/os_hive_gcp_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.MachinePool" + "spotMarketOptions": { + "$ref": "#/definitions/os_hive_aws_v1_SpotMarketOptions", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.SpotMarketOptions" }, - "openstack": { - "$ref": "#/definitions/os_hive_openstack_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.openstack.v1.MachinePool" + "subnets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "ovirt": { - "$ref": "#/definitions/os_hive_ovirt_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.MachinePool" + "type": { + "type": "string" }, - "vsphere": { - "$ref": "#/definitions/os_hive_vsphere_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.vsphere.v1.MachinePool" + "zones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true @@ -12599,17 +12884,21 @@ }, "platform": { "properties": { - "baseDomainResourceGroupName": { - "type": "string" - }, - "cloudName": { - "type": "string" + "certificatesSecretRef": { + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" }, "credentialsSecretRef": { "$ref": "#/definitions/kubernetes_core_LocalObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" }, - "region": { + "ovirt_cluster_id": { + "type": "string" + }, + "ovirt_network_name": { + "type": "string" + }, + "storage_domain_id": { "type": "string" } }, diff --git a/kubernetes-model-generator/openshift-model-installer/cmd/generate/generate.go b/kubernetes-model-generator/openshift-model-installer/cmd/generate/generate.go index 3c52b49ad98..6f76069295c 100644 --- a/kubernetes-model-generator/openshift-model-installer/cmd/generate/generate.go +++ b/kubernetes-model-generator/openshift-model-installer/cmd/generate/generate.go @@ -39,6 +39,8 @@ import ( ovirt "github.com/openshift/installer/pkg/types/ovirt" vsphere "github.com/openshift/installer/pkg/types/vsphere" ipnet "github.com/openshift/installer/pkg/ipnet" + intstr "k8s.io/apimachinery/pkg/util/intstr" + v1apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/pkg/schemagen" ) @@ -68,6 +70,9 @@ type Schema struct { func main() { packages := []schemagen.PackageDescriptor{ {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, + {"github.com/openshift/api/config/v1", "", "io.fabric8.openshift.api.model.config.v1", "os_config_v1_", false}, + {"github.com/openshift/api/machine/v1alpha1", "", "io.fabric8.openshift.api.model.machine.v1alpha1", "os_machine_v1alpha1_", false}, + {"github.com/openshift/api/machine/v1", "", "io.fabric8.openshift.api.model.machine.v1", "os_machine_v1_", false}, {"github.com/openshift/installer/pkg/types", "install", "io.fabric8.openshift.api.model.installer.v1", "os_installer_v1_", true}, {"github.com/openshift/installer/pkg/ipnet", "", "io.fabric8.openshift.api.model.installer.ipnet.v1", "os_installer_ipnet_v1_", true}, {"github.com/openshift/installer/pkg/types/alibabacloud", "", "io.fabric8.openshift.api.model.installer.alibabacloud.v1", "os_installer_alibabacloud_v1_", true}, @@ -81,6 +86,9 @@ func main() { {"github.com/openshift/installer/pkg/types/vsphere", "", "io.fabric8.openshift.api.model.installer.vsphere.v1", "os_installer_vsphere_v1_", true}, {"github.com/openshift/installer/pkg/types/ovirt", "", "io.fabric8.openshift.api.model.installer.ovirt.v1", "os_installer_ovirt_v1_", true}, {"github.com/openshift/installer/pkg/types/none", "", "io.fabric8.openshift.api.model.installer.none.v1", "os_installer_none_v1_", true}, + {"github.com/openshift/installer/pkg/asset/installconfig", "", "io.fabric8.openshift.api.model.installer.asset.installconfig", "os_installer_asset_installconfig_", true}, + {"github.com/openshift/installer/pkg/types/powervs", "", "io.fabric8.openshift.api.model.installer.powervs.v1", "os_installer_powervs_v1_", true}, + {"github.com/openshift/installer/pkg/types/nutanix", "", "io.fabric8.openshift.api.model.installer.nutanix.v1", "os_installer_nutanix_v1_", true}, } typeMap := map[reflect.Type]reflect.Type{ @@ -90,6 +98,8 @@ func main() { } manualTypeMap := map[reflect.Type]string { reflect.TypeOf(runtime.RawExtension{}): "java.util.Map", + reflect.TypeOf(v1apiextensions.JSON{}): "com.fasterxml.jackson.databind.JsonNode", + reflect.TypeOf(intstr.IntOrString{}): "io.fabric8.kubernetes.api.model.IntOrString", } schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, manualTypeMap,"installer") if err != nil { diff --git a/kubernetes-model-generator/openshift-model-installer/pom.xml b/kubernetes-model-generator/openshift-model-installer/pom.xml index e48b2d30df8..d1bee23adb5 100644 --- a/kubernetes-model-generator/openshift-model-installer/pom.xml +++ b/kubernetes-model-generator/openshift-model-installer/pom.xml @@ -50,6 +50,18 @@ io.fabric8 kubernetes-model-common + + io.fabric8 + kubernetes-model-apiextensions + + + io.fabric8 + openshift-model-config + + + io.fabric8 + openshift-model-machine + io.fabric8 kubernetes-model-admissionregistration diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/EC2Metadata.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/EC2Metadata.java new file mode 100644 index 00000000000..63d2a1da921 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/EC2Metadata.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.installer.aws.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", + "authentication" +}) +@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 EC2Metadata implements KubernetesResource +{ + + @JsonProperty("authentication") + private String authentication; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public EC2Metadata() { + } + + /** + * + * @param authentication + */ + public EC2Metadata(String authentication) { + super(); + this.authentication = authentication; + } + + @JsonProperty("authentication") + public String getAuthentication() { + return authentication; + } + + @JsonProperty("authentication") + public void setAuthentication(String authentication) { + this.authentication = authentication; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/MachinePool.java index 6eebc5caa2e..bc9d09caca4 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/MachinePool.java @@ -37,6 +37,7 @@ "metadata", "amiID", "iamRole", + "metadataService", "rootVolume", "type", "zones" @@ -66,6 +67,8 @@ public class MachinePool implements KubernetesResource private String amiID; @JsonProperty("iamRole") private String iamRole; + @JsonProperty("metadataService") + private EC2Metadata metadataService; @JsonProperty("rootVolume") private EC2RootVolume rootVolume; @JsonProperty("type") @@ -87,14 +90,16 @@ public MachinePool() { * * @param iamRole * @param amiID + * @param metadataService * @param rootVolume * @param type * @param zones */ - public MachinePool(String amiID, String iamRole, EC2RootVolume rootVolume, String type, List zones) { + public MachinePool(String amiID, String iamRole, EC2Metadata metadataService, EC2RootVolume rootVolume, String type, List zones) { super(); this.amiID = amiID; this.iamRole = iamRole; + this.metadataService = metadataService; this.rootVolume = rootVolume; this.type = type; this.zones = zones; @@ -120,6 +125,16 @@ public void setIamRole(String iamRole) { this.iamRole = iamRole; } + @JsonProperty("metadataService") + public EC2Metadata getMetadataService() { + return metadataService; + } + + @JsonProperty("metadataService") + public void setMetadataService(EC2Metadata metadataService) { + this.metadataService = metadataService; + } + @JsonProperty("rootVolume") public EC2RootVolume getRootVolume() { return rootVolume; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/Platform.java index 7fc642743ea..9f2db40ba50 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/aws/v1/Platform.java @@ -40,6 +40,8 @@ "defaultMachinePlatform", "experimentalPropagateUserTags", "hostedZone", + "lbType", + "propagateUserTags", "region", "serviceEndpoints", "subnets", @@ -74,6 +76,10 @@ public class Platform implements KubernetesResource private Boolean experimentalPropagateUserTags; @JsonProperty("hostedZone") private java.lang.String hostedZone; + @JsonProperty("lbType") + private java.lang.String lbType; + @JsonProperty("propagateUserTags") + private Boolean propagateUserTags; @JsonProperty("region") private java.lang.String region; @JsonProperty("serviceEndpoints") @@ -101,17 +107,21 @@ public Platform() { * @param hostedZone * @param experimentalPropagateUserTags * @param defaultMachinePlatform + * @param lbType * @param userTags + * @param propagateUserTags * @param subnets * @param region * @param serviceEndpoints */ - public Platform(java.lang.String amiID, MachinePool defaultMachinePlatform, Boolean experimentalPropagateUserTags, java.lang.String hostedZone, java.lang.String region, List serviceEndpoints, List subnets, Map userTags) { + public Platform(java.lang.String amiID, MachinePool defaultMachinePlatform, Boolean experimentalPropagateUserTags, java.lang.String hostedZone, java.lang.String lbType, Boolean propagateUserTags, java.lang.String region, List serviceEndpoints, List subnets, Map userTags) { super(); this.amiID = amiID; this.defaultMachinePlatform = defaultMachinePlatform; this.experimentalPropagateUserTags = experimentalPropagateUserTags; this.hostedZone = hostedZone; + this.lbType = lbType; + this.propagateUserTags = propagateUserTags; this.region = region; this.serviceEndpoints = serviceEndpoints; this.subnets = subnets; @@ -158,6 +168,26 @@ public void setHostedZone(java.lang.String hostedZone) { this.hostedZone = hostedZone; } + @JsonProperty("lbType") + public java.lang.String getLbType() { + return lbType; + } + + @JsonProperty("lbType") + public void setLbType(java.lang.String lbType) { + this.lbType = lbType; + } + + @JsonProperty("propagateUserTags") + public Boolean getPropagateUserTags() { + return propagateUserTags; + } + + @JsonProperty("propagateUserTags") + public void setPropagateUserTags(Boolean propagateUserTags) { + this.propagateUserTags = propagateUserTags; + } + @JsonProperty("region") public java.lang.String getRegion() { return region; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/DiskEncryptionSet.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/DiskEncryptionSet.java new file mode 100644 index 00000000000..8f77a1f99c9 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/DiskEncryptionSet.java @@ -0,0 +1,130 @@ + +package io.fabric8.openshift.api.model.installer.azure.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", + "name", + "resourceGroup", + "subscriptionId" +}) +@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 DiskEncryptionSet implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("resourceGroup") + private String resourceGroup; + @JsonProperty("subscriptionId") + private String subscriptionId; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DiskEncryptionSet() { + } + + /** + * + * @param resourceGroup + * @param name + * @param subscriptionId + */ + public DiskEncryptionSet(String name, String resourceGroup, String subscriptionId) { + super(); + this.name = name; + this.resourceGroup = resourceGroup; + this.subscriptionId = subscriptionId; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("resourceGroup") + public String getResourceGroup() { + return resourceGroup; + } + + @JsonProperty("resourceGroup") + public void setResourceGroup(String resourceGroup) { + this.resourceGroup = resourceGroup; + } + + @JsonProperty("subscriptionId") + public String getSubscriptionId() { + return subscriptionId; + } + + @JsonProperty("subscriptionId") + public void setSubscriptionId(String subscriptionId) { + this.subscriptionId = subscriptionId; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/MachinePool.java index 30a41297f60..d521287801e 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/MachinePool.java @@ -35,8 +35,12 @@ "apiVersion", "kind", "metadata", + "encryptionAtHost", "osDisk", + "osImage", "type", + "ultraSSDCapability", + "vmNetworkingType", "zones" }) @ToString @@ -60,10 +64,18 @@ public class MachinePool implements KubernetesResource { + @JsonProperty("encryptionAtHost") + private Boolean encryptionAtHost; @JsonProperty("osDisk") private OSDisk osDisk; + @JsonProperty("osImage") + private OSImage osImage; @JsonProperty("type") private String type; + @JsonProperty("ultraSSDCapability") + private String ultraSSDCapability; + @JsonProperty("vmNetworkingType") + private String vmNetworkingType; @JsonProperty("zones") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List zones = new ArrayList(); @@ -79,17 +91,35 @@ public MachinePool() { /** * + * @param vmNetworkingType * @param type + * @param ultraSSDCapability * @param zones + * @param encryptionAtHost * @param osDisk + * @param osImage */ - public MachinePool(OSDisk osDisk, String type, List zones) { + public MachinePool(Boolean encryptionAtHost, OSDisk osDisk, OSImage osImage, String type, String ultraSSDCapability, String vmNetworkingType, List zones) { super(); + this.encryptionAtHost = encryptionAtHost; this.osDisk = osDisk; + this.osImage = osImage; this.type = type; + this.ultraSSDCapability = ultraSSDCapability; + this.vmNetworkingType = vmNetworkingType; this.zones = zones; } + @JsonProperty("encryptionAtHost") + public Boolean getEncryptionAtHost() { + return encryptionAtHost; + } + + @JsonProperty("encryptionAtHost") + public void setEncryptionAtHost(Boolean encryptionAtHost) { + this.encryptionAtHost = encryptionAtHost; + } + @JsonProperty("osDisk") public OSDisk getOsDisk() { return osDisk; @@ -100,6 +130,16 @@ public void setOsDisk(OSDisk osDisk) { this.osDisk = osDisk; } + @JsonProperty("osImage") + public OSImage getOsImage() { + return osImage; + } + + @JsonProperty("osImage") + public void setOsImage(OSImage osImage) { + this.osImage = osImage; + } + @JsonProperty("type") public String getType() { return type; @@ -110,6 +150,26 @@ public void setType(String type) { this.type = type; } + @JsonProperty("ultraSSDCapability") + public String getUltraSSDCapability() { + return ultraSSDCapability; + } + + @JsonProperty("ultraSSDCapability") + public void setUltraSSDCapability(String ultraSSDCapability) { + this.ultraSSDCapability = ultraSSDCapability; + } + + @JsonProperty("vmNetworkingType") + public String getVmNetworkingType() { + return vmNetworkingType; + } + + @JsonProperty("vmNetworkingType") + public void setVmNetworkingType(String vmNetworkingType) { + this.vmNetworkingType = vmNetworkingType; + } + @JsonProperty("zones") public List getZones() { return zones; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSDisk.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSDisk.java index 5e428fbc1e4..43f20fc4c60 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSDisk.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSDisk.java @@ -33,6 +33,7 @@ "apiVersion", "kind", "metadata", + "diskEncryptionSet", "diskSizeGB", "diskType" }) @@ -57,6 +58,8 @@ public class OSDisk implements KubernetesResource { + @JsonProperty("diskEncryptionSet") + private DiskEncryptionSet diskEncryptionSet; @JsonProperty("diskSizeGB") private Integer diskSizeGB; @JsonProperty("diskType") @@ -73,15 +76,27 @@ public OSDisk() { /** * + * @param diskEncryptionSet * @param diskType * @param diskSizeGB */ - public OSDisk(Integer diskSizeGB, String diskType) { + public OSDisk(DiskEncryptionSet diskEncryptionSet, Integer diskSizeGB, String diskType) { super(); + this.diskEncryptionSet = diskEncryptionSet; this.diskSizeGB = diskSizeGB; this.diskType = diskType; } + @JsonProperty("diskEncryptionSet") + public DiskEncryptionSet getDiskEncryptionSet() { + return diskEncryptionSet; + } + + @JsonProperty("diskEncryptionSet") + public void setDiskEncryptionSet(DiskEncryptionSet diskEncryptionSet) { + this.diskEncryptionSet = diskEncryptionSet; + } + @JsonProperty("diskSizeGB") public Integer getDiskSizeGB() { return diskSizeGB; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSImage.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSImage.java new file mode 100644 index 00000000000..c32f0971708 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/OSImage.java @@ -0,0 +1,145 @@ + +package io.fabric8.openshift.api.model.installer.azure.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", + "offer", + "publisher", + "sku", + "version" +}) +@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 OSImage implements KubernetesResource +{ + + @JsonProperty("offer") + private String offer; + @JsonProperty("publisher") + private String publisher; + @JsonProperty("sku") + private String sku; + @JsonProperty("version") + private String version; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OSImage() { + } + + /** + * + * @param offer + * @param publisher + * @param sku + * @param version + */ + public OSImage(String offer, String publisher, String sku, String version) { + super(); + this.offer = offer; + this.publisher = publisher; + this.sku = sku; + this.version = version; + } + + @JsonProperty("offer") + public String getOffer() { + return offer; + } + + @JsonProperty("offer") + public void setOffer(String offer) { + this.offer = offer; + } + + @JsonProperty("publisher") + public String getPublisher() { + return publisher; + } + + @JsonProperty("publisher") + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + @JsonProperty("sku") + public String getSku() { + return sku; + } + + @JsonProperty("sku") + public void setSku(String sku) { + this.sku = sku; + } + + @JsonProperty("version") + public String getVersion() { + return version; + } + + @JsonProperty("version") + public void setVersion(String version) { + this.version = version; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/Platform.java index ca6ae20ba56..6abb4261a62 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/azure/v1/Platform.java @@ -2,6 +2,7 @@ package io.fabric8.openshift.api.model.installer.azure.v1; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -44,6 +45,7 @@ "outboundType", "region", "resourceGroupName", + "userTags", "virtualNetwork" }) @ToString @@ -68,31 +70,34 @@ public class Platform implements KubernetesResource { @JsonProperty("armEndpoint") - private String armEndpoint; + private java.lang.String armEndpoint; @JsonProperty("baseDomainResourceGroupName") - private String baseDomainResourceGroupName; + private java.lang.String baseDomainResourceGroupName; @JsonProperty("cloudName") - private String cloudName; + private java.lang.String cloudName; @JsonProperty("clusterOSImage") - private String clusterOSImage; + private java.lang.String clusterOSImage; @JsonProperty("computeSubnet") - private String computeSubnet; + private java.lang.String computeSubnet; @JsonProperty("controlPlaneSubnet") - private String controlPlaneSubnet; + private java.lang.String controlPlaneSubnet; @JsonProperty("defaultMachinePlatform") private MachinePool defaultMachinePlatform; @JsonProperty("networkResourceGroupName") - private String networkResourceGroupName; + private java.lang.String networkResourceGroupName; @JsonProperty("outboundType") - private String outboundType; + private java.lang.String outboundType; @JsonProperty("region") - private String region; + private java.lang.String region; @JsonProperty("resourceGroupName") - private String resourceGroupName; + private java.lang.String resourceGroupName; + @JsonProperty("userTags") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map userTags = new LinkedHashMap(); @JsonProperty("virtualNetwork") - private String virtualNetwork; + private java.lang.String virtualNetwork; @JsonIgnore - private Map additionalProperties = new HashMap(); + private Map additionalProperties = new HashMap(); /** * No args constructor for use in serialization @@ -103,20 +108,21 @@ public Platform() { /** * - * @param armEndpoint * @param resourceGroupName - * @param outboundType * @param baseDomainResourceGroupName + * @param computeSubnet + * @param virtualNetwork + * @param armEndpoint + * @param outboundType * @param cloudName * @param clusterOSImage * @param controlPlaneSubnet * @param networkResourceGroupName * @param defaultMachinePlatform + * @param userTags * @param region - * @param computeSubnet - * @param virtualNetwork */ - public Platform(String armEndpoint, String baseDomainResourceGroupName, String cloudName, String clusterOSImage, String computeSubnet, String controlPlaneSubnet, MachinePool defaultMachinePlatform, String networkResourceGroupName, String outboundType, String region, String resourceGroupName, String virtualNetwork) { + public Platform(java.lang.String armEndpoint, java.lang.String baseDomainResourceGroupName, java.lang.String cloudName, java.lang.String clusterOSImage, java.lang.String computeSubnet, java.lang.String controlPlaneSubnet, MachinePool defaultMachinePlatform, java.lang.String networkResourceGroupName, java.lang.String outboundType, java.lang.String region, java.lang.String resourceGroupName, Map userTags, java.lang.String virtualNetwork) { super(); this.armEndpoint = armEndpoint; this.baseDomainResourceGroupName = baseDomainResourceGroupName; @@ -129,66 +135,67 @@ public Platform(String armEndpoint, String baseDomainResourceGroupName, String c this.outboundType = outboundType; this.region = region; this.resourceGroupName = resourceGroupName; + this.userTags = userTags; this.virtualNetwork = virtualNetwork; } @JsonProperty("armEndpoint") - public String getArmEndpoint() { + public java.lang.String getArmEndpoint() { return armEndpoint; } @JsonProperty("armEndpoint") - public void setArmEndpoint(String armEndpoint) { + public void setArmEndpoint(java.lang.String armEndpoint) { this.armEndpoint = armEndpoint; } @JsonProperty("baseDomainResourceGroupName") - public String getBaseDomainResourceGroupName() { + public java.lang.String getBaseDomainResourceGroupName() { return baseDomainResourceGroupName; } @JsonProperty("baseDomainResourceGroupName") - public void setBaseDomainResourceGroupName(String baseDomainResourceGroupName) { + public void setBaseDomainResourceGroupName(java.lang.String baseDomainResourceGroupName) { this.baseDomainResourceGroupName = baseDomainResourceGroupName; } @JsonProperty("cloudName") - public String getCloudName() { + public java.lang.String getCloudName() { return cloudName; } @JsonProperty("cloudName") - public void setCloudName(String cloudName) { + public void setCloudName(java.lang.String cloudName) { this.cloudName = cloudName; } @JsonProperty("clusterOSImage") - public String getClusterOSImage() { + public java.lang.String getClusterOSImage() { return clusterOSImage; } @JsonProperty("clusterOSImage") - public void setClusterOSImage(String clusterOSImage) { + public void setClusterOSImage(java.lang.String clusterOSImage) { this.clusterOSImage = clusterOSImage; } @JsonProperty("computeSubnet") - public String getComputeSubnet() { + public java.lang.String getComputeSubnet() { return computeSubnet; } @JsonProperty("computeSubnet") - public void setComputeSubnet(String computeSubnet) { + public void setComputeSubnet(java.lang.String computeSubnet) { this.computeSubnet = computeSubnet; } @JsonProperty("controlPlaneSubnet") - public String getControlPlaneSubnet() { + public java.lang.String getControlPlaneSubnet() { return controlPlaneSubnet; } @JsonProperty("controlPlaneSubnet") - public void setControlPlaneSubnet(String controlPlaneSubnet) { + public void setControlPlaneSubnet(java.lang.String controlPlaneSubnet) { this.controlPlaneSubnet = controlPlaneSubnet; } @@ -203,62 +210,72 @@ public void setDefaultMachinePlatform(MachinePool defaultMachinePlatform) { } @JsonProperty("networkResourceGroupName") - public String getNetworkResourceGroupName() { + public java.lang.String getNetworkResourceGroupName() { return networkResourceGroupName; } @JsonProperty("networkResourceGroupName") - public void setNetworkResourceGroupName(String networkResourceGroupName) { + public void setNetworkResourceGroupName(java.lang.String networkResourceGroupName) { this.networkResourceGroupName = networkResourceGroupName; } @JsonProperty("outboundType") - public String getOutboundType() { + public java.lang.String getOutboundType() { return outboundType; } @JsonProperty("outboundType") - public void setOutboundType(String outboundType) { + public void setOutboundType(java.lang.String outboundType) { this.outboundType = outboundType; } @JsonProperty("region") - public String getRegion() { + public java.lang.String getRegion() { return region; } @JsonProperty("region") - public void setRegion(String region) { + public void setRegion(java.lang.String region) { this.region = region; } @JsonProperty("resourceGroupName") - public String getResourceGroupName() { + public java.lang.String getResourceGroupName() { return resourceGroupName; } @JsonProperty("resourceGroupName") - public void setResourceGroupName(String resourceGroupName) { + public void setResourceGroupName(java.lang.String resourceGroupName) { this.resourceGroupName = resourceGroupName; } + @JsonProperty("userTags") + public Map getUserTags() { + return userTags; + } + + @JsonProperty("userTags") + public void setUserTags(Map userTags) { + this.userTags = userTags; + } + @JsonProperty("virtualNetwork") - public String getVirtualNetwork() { + public java.lang.String getVirtualNetwork() { return virtualNetwork; } @JsonProperty("virtualNetwork") - public void setVirtualNetwork(String virtualNetwork) { + public void setVirtualNetwork(java.lang.String virtualNetwork) { this.virtualNetwork = virtualNetwork; } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { + public void setAdditionalProperty(java.lang.String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Host.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Host.java index df1de8c456c..58c83326f81 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Host.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Host.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; @@ -74,7 +75,7 @@ public class Host implements KubernetesResource @JsonProperty("name") private String name; @JsonProperty("networkConfig") - private String networkConfig; + private JsonNode networkConfig; @JsonProperty("role") private String role; @JsonProperty("rootDeviceHints") @@ -100,7 +101,7 @@ public Host() { * @param rootDeviceHints * @param bootMode */ - public Host(BMC bmc, String bootMACAddress, String bootMode, String hardwareProfile, String name, String networkConfig, String role, RootDeviceHints rootDeviceHints) { + public Host(BMC bmc, String bootMACAddress, String bootMode, String hardwareProfile, String name, JsonNode networkConfig, String role, RootDeviceHints rootDeviceHints) { super(); this.bmc = bmc; this.bootMACAddress = bootMACAddress; @@ -163,12 +164,12 @@ public void setName(String name) { } @JsonProperty("networkConfig") - public String getNetworkConfig() { + public JsonNode getNetworkConfig() { return networkConfig; } @JsonProperty("networkConfig") - public void setNetworkConfig(String networkConfig) { + public void setNetworkConfig(JsonNode networkConfig) { this.networkConfig = networkConfig; } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java index 41f56719b89..ad40f2a4a0c 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java @@ -22,6 +22,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -36,6 +37,9 @@ "kind", "metadata", "apiVIP", + "apiVIPs", + "bootstrapExternalStaticGateway", + "bootstrapExternalStaticIP", "bootstrapOSImage", "bootstrapProvisioningIP", "clusterOSImage", @@ -45,7 +49,9 @@ "externalMACAddress", "hosts", "ingressVIP", + "ingressVIPs", "libvirtURI", + "loadBalancer", "provisioningBridge", "provisioningDHCPExternal", "provisioningDHCPRange", @@ -78,6 +84,13 @@ public class Platform implements KubernetesResource @JsonProperty("apiVIP") private String apiVIP; + @JsonProperty("apiVIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List apiVIPs = new ArrayList(); + @JsonProperty("bootstrapExternalStaticGateway") + private String bootstrapExternalStaticGateway; + @JsonProperty("bootstrapExternalStaticIP") + private String bootstrapExternalStaticIP; @JsonProperty("bootstrapOSImage") private String bootstrapOSImage; @JsonProperty("bootstrapProvisioningIP") @@ -96,8 +109,13 @@ public class Platform implements KubernetesResource private List hosts = new ArrayList(); @JsonProperty("ingressVIP") private String ingressVIP; + @JsonProperty("ingressVIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List ingressVIPs = new ArrayList(); @JsonProperty("libvirtURI") private String libvirtURI; + @JsonProperty("loadBalancer") + private BareMetalPlatformLoadBalancer loadBalancer; @JsonProperty("provisioningBridge") private String provisioningBridge; @JsonProperty("provisioningDHCPExternal") @@ -131,24 +149,32 @@ public Platform() { * @param apiVIP * @param ingressVIP * @param provisioningDHCPExternal + * @param bootstrapExternalStaticGateway * @param hosts * @param provisioningNetwork * @param provisioningNetworkCIDR + * @param bootstrapExternalStaticIP * @param clusterProvisioningIP + * @param ingressVIPs * @param bootstrapOSImage * @param provisioningDHCPRange * @param clusterOSImage + * @param loadBalancer * @param defaultMachinePlatform * @param provisioningBridge * @param externalMACAddress * @param provisioningHostIP * @param provisioningMACAddress + * @param apiVIPs * @param libvirtURI * @param externalBridge */ - public Platform(String apiVIP, String bootstrapOSImage, String bootstrapProvisioningIP, String clusterOSImage, String clusterProvisioningIP, MachinePool defaultMachinePlatform, String externalBridge, String externalMACAddress, List hosts, String ingressVIP, String libvirtURI, String provisioningBridge, Boolean provisioningDHCPExternal, String provisioningDHCPRange, String provisioningHostIP, String provisioningMACAddress, String provisioningNetwork, String provisioningNetworkCIDR, String provisioningNetworkInterface) { + public Platform(String apiVIP, List apiVIPs, String bootstrapExternalStaticGateway, String bootstrapExternalStaticIP, String bootstrapOSImage, String bootstrapProvisioningIP, String clusterOSImage, String clusterProvisioningIP, MachinePool defaultMachinePlatform, String externalBridge, String externalMACAddress, List hosts, String ingressVIP, List ingressVIPs, String libvirtURI, BareMetalPlatformLoadBalancer loadBalancer, String provisioningBridge, Boolean provisioningDHCPExternal, String provisioningDHCPRange, String provisioningHostIP, String provisioningMACAddress, String provisioningNetwork, String provisioningNetworkCIDR, String provisioningNetworkInterface) { super(); this.apiVIP = apiVIP; + this.apiVIPs = apiVIPs; + this.bootstrapExternalStaticGateway = bootstrapExternalStaticGateway; + this.bootstrapExternalStaticIP = bootstrapExternalStaticIP; this.bootstrapOSImage = bootstrapOSImage; this.bootstrapProvisioningIP = bootstrapProvisioningIP; this.clusterOSImage = clusterOSImage; @@ -158,7 +184,9 @@ public Platform(String apiVIP, String bootstrapOSImage, String bootstrapProvisio this.externalMACAddress = externalMACAddress; this.hosts = hosts; this.ingressVIP = ingressVIP; + this.ingressVIPs = ingressVIPs; this.libvirtURI = libvirtURI; + this.loadBalancer = loadBalancer; this.provisioningBridge = provisioningBridge; this.provisioningDHCPExternal = provisioningDHCPExternal; this.provisioningDHCPRange = provisioningDHCPRange; @@ -179,6 +207,36 @@ public void setApiVIP(String apiVIP) { this.apiVIP = apiVIP; } + @JsonProperty("apiVIPs") + public List getApiVIPs() { + return apiVIPs; + } + + @JsonProperty("apiVIPs") + public void setApiVIPs(List apiVIPs) { + this.apiVIPs = apiVIPs; + } + + @JsonProperty("bootstrapExternalStaticGateway") + public String getBootstrapExternalStaticGateway() { + return bootstrapExternalStaticGateway; + } + + @JsonProperty("bootstrapExternalStaticGateway") + public void setBootstrapExternalStaticGateway(String bootstrapExternalStaticGateway) { + this.bootstrapExternalStaticGateway = bootstrapExternalStaticGateway; + } + + @JsonProperty("bootstrapExternalStaticIP") + public String getBootstrapExternalStaticIP() { + return bootstrapExternalStaticIP; + } + + @JsonProperty("bootstrapExternalStaticIP") + public void setBootstrapExternalStaticIP(String bootstrapExternalStaticIP) { + this.bootstrapExternalStaticIP = bootstrapExternalStaticIP; + } + @JsonProperty("bootstrapOSImage") public String getBootstrapOSImage() { return bootstrapOSImage; @@ -269,6 +327,16 @@ public void setIngressVIP(String ingressVIP) { this.ingressVIP = ingressVIP; } + @JsonProperty("ingressVIPs") + public List getIngressVIPs() { + return ingressVIPs; + } + + @JsonProperty("ingressVIPs") + public void setIngressVIPs(List ingressVIPs) { + this.ingressVIPs = ingressVIPs; + } + @JsonProperty("libvirtURI") public String getLibvirtURI() { return libvirtURI; @@ -279,6 +347,16 @@ public void setLibvirtURI(String libvirtURI) { this.libvirtURI = libvirtURI; } + @JsonProperty("loadBalancer") + public BareMetalPlatformLoadBalancer getLoadBalancer() { + return loadBalancer; + } + + @JsonProperty("loadBalancer") + public void setLoadBalancer(BareMetalPlatformLoadBalancer loadBalancer) { + this.loadBalancer = loadBalancer; + } + @JsonProperty("provisioningBridge") public String getProvisioningBridge() { return provisioningBridge; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/MachinePool.java index f1c773c26bc..04a40c5ea77 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/MachinePool.java @@ -35,7 +35,11 @@ "apiVersion", "kind", "metadata", + "confidentialCompute", + "onHostMaintenance", "osDisk", + "secureBoot", + "tags", "type", "zones" }) @@ -60,8 +64,17 @@ public class MachinePool implements KubernetesResource { + @JsonProperty("confidentialCompute") + private String confidentialCompute; + @JsonProperty("onHostMaintenance") + private String onHostMaintenance; @JsonProperty("osDisk") private OSDisk osDisk; + @JsonProperty("secureBoot") + private String secureBoot; + @JsonProperty("tags") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List tags = new ArrayList(); @JsonProperty("type") private String type; @JsonProperty("zones") @@ -79,17 +92,45 @@ public MachinePool() { /** * + * @param onHostMaintenance + * @param confidentialCompute + * @param secureBoot * @param type * @param zones * @param osDisk + * @param tags */ - public MachinePool(OSDisk osDisk, String type, List zones) { + public MachinePool(String confidentialCompute, String onHostMaintenance, OSDisk osDisk, String secureBoot, List tags, String type, List zones) { super(); + this.confidentialCompute = confidentialCompute; + this.onHostMaintenance = onHostMaintenance; this.osDisk = osDisk; + this.secureBoot = secureBoot; + this.tags = tags; this.type = type; this.zones = zones; } + @JsonProperty("confidentialCompute") + public String getConfidentialCompute() { + return confidentialCompute; + } + + @JsonProperty("confidentialCompute") + public void setConfidentialCompute(String confidentialCompute) { + this.confidentialCompute = confidentialCompute; + } + + @JsonProperty("onHostMaintenance") + public String getOnHostMaintenance() { + return onHostMaintenance; + } + + @JsonProperty("onHostMaintenance") + public void setOnHostMaintenance(String onHostMaintenance) { + this.onHostMaintenance = onHostMaintenance; + } + @JsonProperty("osDisk") public OSDisk getOsDisk() { return osDisk; @@ -100,6 +141,26 @@ public void setOsDisk(OSDisk osDisk) { this.osDisk = osDisk; } + @JsonProperty("secureBoot") + public String getSecureBoot() { + return secureBoot; + } + + @JsonProperty("secureBoot") + public void setSecureBoot(String secureBoot) { + this.secureBoot = secureBoot; + } + + @JsonProperty("tags") + public List getTags() { + return tags; + } + + @JsonProperty("tags") + public void setTags(List tags) { + this.tags = tags; + } + @JsonProperty("type") public String getType() { return type; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/OSDisk.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/OSDisk.java index 953480155ab..a597f29c758 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/OSDisk.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/OSDisk.java @@ -34,7 +34,7 @@ "kind", "metadata", "DiskSizeGB", - "DiskType", + "diskType", "encryptionKey" }) @ToString @@ -60,7 +60,7 @@ public class OSDisk implements KubernetesResource @JsonProperty("DiskSizeGB") private Long diskSizeGB; - @JsonProperty("DiskType") + @JsonProperty("diskType") private String diskType; @JsonProperty("encryptionKey") private EncryptionKeyReference encryptionKey; @@ -97,12 +97,12 @@ public void setDiskSizeGB(Long diskSizeGB) { this.diskSizeGB = diskSizeGB; } - @JsonProperty("DiskType") + @JsonProperty("diskType") public String getDiskType() { return diskType; } - @JsonProperty("DiskType") + @JsonProperty("diskType") public void setDiskType(String diskType) { this.diskType = diskType; } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Platform.java index b2929ee16ea..f2f604a58ea 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/gcp/v1/Platform.java @@ -40,6 +40,7 @@ "defaultMachinePlatform", "licenses", "network", + "networkProjectID", "projectID", "region" }) @@ -75,6 +76,8 @@ public class Platform implements KubernetesResource private List licenses = new ArrayList(); @JsonProperty("network") private String network; + @JsonProperty("networkProjectID") + private String networkProjectID; @JsonProperty("projectID") private String projectID; @JsonProperty("region") @@ -92,6 +95,7 @@ public Platform() { /** * * @param licenses + * @param networkProjectID * @param controlPlaneSubnet * @param defaultMachinePlatform * @param region @@ -99,13 +103,14 @@ public Platform() { * @param projectID * @param network */ - public Platform(String computeSubnet, String controlPlaneSubnet, MachinePool defaultMachinePlatform, List licenses, String network, String projectID, String region) { + public Platform(String computeSubnet, String controlPlaneSubnet, MachinePool defaultMachinePlatform, List licenses, String network, String networkProjectID, String projectID, String region) { super(); this.computeSubnet = computeSubnet; this.controlPlaneSubnet = controlPlaneSubnet; this.defaultMachinePlatform = defaultMachinePlatform; this.licenses = licenses; this.network = network; + this.networkProjectID = networkProjectID; this.projectID = projectID; this.region = region; } @@ -160,6 +165,16 @@ public void setNetwork(String network) { this.network = network; } + @JsonProperty("networkProjectID") + public String getNetworkProjectID() { + return networkProjectID; + } + + @JsonProperty("networkProjectID") + public void setNetworkProjectID(String networkProjectID) { + this.networkProjectID = networkProjectID; + } + @JsonProperty("projectID") public String getProjectID() { return projectID; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/Platform.java index 426d7a3e5f6..4530322085d 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ibmcloud/v1/Platform.java @@ -35,12 +35,13 @@ "apiVersion", "kind", "metadata", + "computeSubnets", + "controlPlaneSubnets", "defaultMachinePlatform", + "networkResourceGroupName", "region", "resourceGroupName", - "subnets", - "vpc", - "vpcResourceGroupName" + "vpcName" }) @ToString @EqualsAndHashCode @@ -63,19 +64,22 @@ public class Platform implements KubernetesResource { + @JsonProperty("computeSubnets") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List computeSubnets = new ArrayList(); + @JsonProperty("controlPlaneSubnets") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List controlPlaneSubnets = new ArrayList(); @JsonProperty("defaultMachinePlatform") private MachinePool defaultMachinePlatform; + @JsonProperty("networkResourceGroupName") + private String networkResourceGroupName; @JsonProperty("region") private String region; @JsonProperty("resourceGroupName") private String resourceGroupName; - @JsonProperty("subnets") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List subnets = new ArrayList(); - @JsonProperty("vpc") - private String vpc; - @JsonProperty("vpcResourceGroupName") - private String vpcResourceGroupName; + @JsonProperty("vpcName") + private String vpcName; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -88,21 +92,43 @@ public Platform() { /** * - * @param vpcResourceGroupName + * @param controlPlaneSubnets + * @param vpcName * @param resourceGroupName + * @param networkResourceGroupName * @param defaultMachinePlatform - * @param vpc - * @param subnets + * @param computeSubnets * @param region */ - public Platform(MachinePool defaultMachinePlatform, String region, String resourceGroupName, List subnets, String vpc, String vpcResourceGroupName) { + public Platform(List computeSubnets, List controlPlaneSubnets, MachinePool defaultMachinePlatform, String networkResourceGroupName, String region, String resourceGroupName, String vpcName) { super(); + this.computeSubnets = computeSubnets; + this.controlPlaneSubnets = controlPlaneSubnets; this.defaultMachinePlatform = defaultMachinePlatform; + this.networkResourceGroupName = networkResourceGroupName; this.region = region; this.resourceGroupName = resourceGroupName; - this.subnets = subnets; - this.vpc = vpc; - this.vpcResourceGroupName = vpcResourceGroupName; + this.vpcName = vpcName; + } + + @JsonProperty("computeSubnets") + public List getComputeSubnets() { + return computeSubnets; + } + + @JsonProperty("computeSubnets") + public void setComputeSubnets(List computeSubnets) { + this.computeSubnets = computeSubnets; + } + + @JsonProperty("controlPlaneSubnets") + public List getControlPlaneSubnets() { + return controlPlaneSubnets; + } + + @JsonProperty("controlPlaneSubnets") + public void setControlPlaneSubnets(List controlPlaneSubnets) { + this.controlPlaneSubnets = controlPlaneSubnets; } @JsonProperty("defaultMachinePlatform") @@ -115,6 +141,16 @@ public void setDefaultMachinePlatform(MachinePool defaultMachinePlatform) { this.defaultMachinePlatform = defaultMachinePlatform; } + @JsonProperty("networkResourceGroupName") + public String getNetworkResourceGroupName() { + return networkResourceGroupName; + } + + @JsonProperty("networkResourceGroupName") + public void setNetworkResourceGroupName(String networkResourceGroupName) { + this.networkResourceGroupName = networkResourceGroupName; + } + @JsonProperty("region") public String getRegion() { return region; @@ -135,34 +171,14 @@ public void setResourceGroupName(String resourceGroupName) { this.resourceGroupName = resourceGroupName; } - @JsonProperty("subnets") - public List getSubnets() { - return subnets; - } - - @JsonProperty("subnets") - public void setSubnets(List subnets) { - this.subnets = subnets; - } - - @JsonProperty("vpc") - public String getVpc() { - return vpc; - } - - @JsonProperty("vpc") - public void setVpc(String vpc) { - this.vpc = vpc; - } - - @JsonProperty("vpcResourceGroupName") - public String getVpcResourceGroupName() { - return vpcResourceGroupName; + @JsonProperty("vpcName") + public String getVpcName() { + return vpcName; } - @JsonProperty("vpcResourceGroupName") - public void setVpcResourceGroupName(String vpcResourceGroupName) { - this.vpcResourceGroupName = vpcResourceGroupName; + @JsonProperty("vpcName") + public void setVpcName(String vpcName) { + this.vpcName = vpcName; } @JsonAnyGetter diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/MachinePool.java new file mode 100644 index 00000000000..54ac0d1afba --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/MachinePool.java @@ -0,0 +1,195 @@ + +package io.fabric8.openshift.api.model.installer.nutanix.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.fabric8.openshift.api.model.machine.v1.NutanixCategory; +import io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier; +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", + "bootType", + "categories", + "coresPerSocket", + "cpus", + "memoryMiB", + "osDisk", + "project" +}) +@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 MachinePool implements KubernetesResource +{ + + @JsonProperty("bootType") + private String bootType; + @JsonProperty("categories") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List categories = new ArrayList(); + @JsonProperty("coresPerSocket") + private Long coresPerSocket; + @JsonProperty("cpus") + private Long cpus; + @JsonProperty("memoryMiB") + private Long memoryMiB; + @JsonProperty("osDisk") + private OSDisk osDisk; + @JsonProperty("project") + private NutanixResourceIdentifier project; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachinePool() { + } + + /** + * + * @param cpus + * @param bootType + * @param coresPerSocket + * @param project + * @param categories + * @param memoryMiB + * @param osDisk + */ + public MachinePool(String bootType, List categories, Long coresPerSocket, Long cpus, Long memoryMiB, OSDisk osDisk, NutanixResourceIdentifier project) { + super(); + this.bootType = bootType; + this.categories = categories; + this.coresPerSocket = coresPerSocket; + this.cpus = cpus; + this.memoryMiB = memoryMiB; + this.osDisk = osDisk; + this.project = project; + } + + @JsonProperty("bootType") + public String getBootType() { + return bootType; + } + + @JsonProperty("bootType") + public void setBootType(String bootType) { + this.bootType = bootType; + } + + @JsonProperty("categories") + public List getCategories() { + return categories; + } + + @JsonProperty("categories") + public void setCategories(List categories) { + this.categories = categories; + } + + @JsonProperty("coresPerSocket") + public Long getCoresPerSocket() { + return coresPerSocket; + } + + @JsonProperty("coresPerSocket") + public void setCoresPerSocket(Long coresPerSocket) { + this.coresPerSocket = coresPerSocket; + } + + @JsonProperty("cpus") + public Long getCpus() { + return cpus; + } + + @JsonProperty("cpus") + public void setCpus(Long cpus) { + this.cpus = cpus; + } + + @JsonProperty("memoryMiB") + public Long getMemoryMiB() { + return memoryMiB; + } + + @JsonProperty("memoryMiB") + public void setMemoryMiB(Long memoryMiB) { + this.memoryMiB = memoryMiB; + } + + @JsonProperty("osDisk") + public OSDisk getOsDisk() { + return osDisk; + } + + @JsonProperty("osDisk") + public void setOsDisk(OSDisk osDisk) { + this.osDisk = osDisk; + } + + @JsonProperty("project") + public NutanixResourceIdentifier getProject() { + return project; + } + + @JsonProperty("project") + public void setProject(NutanixResourceIdentifier project) { + this.project = project; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/OSDisk.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/OSDisk.java new file mode 100644 index 00000000000..37c7e95ff1f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/OSDisk.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.installer.nutanix.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", + "diskSizeGiB" +}) +@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 OSDisk implements KubernetesResource +{ + + @JsonProperty("diskSizeGiB") + private Long diskSizeGiB; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OSDisk() { + } + + /** + * + * @param diskSizeGiB + */ + public OSDisk(Long diskSizeGiB) { + super(); + this.diskSizeGiB = diskSizeGiB; + } + + @JsonProperty("diskSizeGiB") + public Long getDiskSizeGiB() { + return diskSizeGiB; + } + + @JsonProperty("diskSizeGiB") + public void setDiskSizeGiB(Long diskSizeGiB) { + this.diskSizeGiB = diskSizeGiB; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Platform.java new file mode 100644 index 00000000000..633ae8214a8 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Platform.java @@ -0,0 +1,240 @@ + +package io.fabric8.openshift.api.model.installer.nutanix.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.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer; +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", + "apiVIP", + "apiVIPs", + "clusterOSImage", + "defaultMachinePlatform", + "ingressVIP", + "ingressVIPs", + "loadBalancer", + "prismCentral", + "prismElements", + "subnetUUIDs" +}) +@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 Platform implements KubernetesResource +{ + + @JsonProperty("apiVIP") + private String apiVIP; + @JsonProperty("apiVIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List apiVIPs = new ArrayList(); + @JsonProperty("clusterOSImage") + private String clusterOSImage; + @JsonProperty("defaultMachinePlatform") + private MachinePool defaultMachinePlatform; + @JsonProperty("ingressVIP") + private String ingressVIP; + @JsonProperty("ingressVIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List ingressVIPs = new ArrayList(); + @JsonProperty("loadBalancer") + private NutanixPlatformLoadBalancer loadBalancer; + @JsonProperty("prismCentral") + private PrismCentral prismCentral; + @JsonProperty("prismElements") + private List prismElements = new ArrayList(); + @JsonProperty("subnetUUIDs") + private List subnetUUIDs = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Platform() { + } + + /** + * + * @param prismElements + * @param ingressVIPs + * @param apiVIP + * @param ingressVIP + * @param clusterOSImage + * @param loadBalancer + * @param subnetUUIDs + * @param defaultMachinePlatform + * @param prismCentral + * @param apiVIPs + */ + public Platform(String apiVIP, List apiVIPs, String clusterOSImage, MachinePool defaultMachinePlatform, String ingressVIP, List ingressVIPs, NutanixPlatformLoadBalancer loadBalancer, PrismCentral prismCentral, List prismElements, List subnetUUIDs) { + super(); + this.apiVIP = apiVIP; + this.apiVIPs = apiVIPs; + this.clusterOSImage = clusterOSImage; + this.defaultMachinePlatform = defaultMachinePlatform; + this.ingressVIP = ingressVIP; + this.ingressVIPs = ingressVIPs; + this.loadBalancer = loadBalancer; + this.prismCentral = prismCentral; + this.prismElements = prismElements; + this.subnetUUIDs = subnetUUIDs; + } + + @JsonProperty("apiVIP") + public String getApiVIP() { + return apiVIP; + } + + @JsonProperty("apiVIP") + public void setApiVIP(String apiVIP) { + this.apiVIP = apiVIP; + } + + @JsonProperty("apiVIPs") + public List getApiVIPs() { + return apiVIPs; + } + + @JsonProperty("apiVIPs") + public void setApiVIPs(List apiVIPs) { + this.apiVIPs = apiVIPs; + } + + @JsonProperty("clusterOSImage") + public String getClusterOSImage() { + return clusterOSImage; + } + + @JsonProperty("clusterOSImage") + public void setClusterOSImage(String clusterOSImage) { + this.clusterOSImage = clusterOSImage; + } + + @JsonProperty("defaultMachinePlatform") + public MachinePool getDefaultMachinePlatform() { + return defaultMachinePlatform; + } + + @JsonProperty("defaultMachinePlatform") + public void setDefaultMachinePlatform(MachinePool defaultMachinePlatform) { + this.defaultMachinePlatform = defaultMachinePlatform; + } + + @JsonProperty("ingressVIP") + public String getIngressVIP() { + return ingressVIP; + } + + @JsonProperty("ingressVIP") + public void setIngressVIP(String ingressVIP) { + this.ingressVIP = ingressVIP; + } + + @JsonProperty("ingressVIPs") + public List getIngressVIPs() { + return ingressVIPs; + } + + @JsonProperty("ingressVIPs") + public void setIngressVIPs(List ingressVIPs) { + this.ingressVIPs = ingressVIPs; + } + + @JsonProperty("loadBalancer") + public NutanixPlatformLoadBalancer getLoadBalancer() { + return loadBalancer; + } + + @JsonProperty("loadBalancer") + public void setLoadBalancer(NutanixPlatformLoadBalancer loadBalancer) { + this.loadBalancer = loadBalancer; + } + + @JsonProperty("prismCentral") + public PrismCentral getPrismCentral() { + return prismCentral; + } + + @JsonProperty("prismCentral") + public void setPrismCentral(PrismCentral prismCentral) { + this.prismCentral = prismCentral; + } + + @JsonProperty("prismElements") + public List getPrismElements() { + return prismElements; + } + + @JsonProperty("prismElements") + public void setPrismElements(List prismElements) { + this.prismElements = prismElements; + } + + @JsonProperty("subnetUUIDs") + public List getSubnetUUIDs() { + return subnetUUIDs; + } + + @JsonProperty("subnetUUIDs") + public void setSubnetUUIDs(List subnetUUIDs) { + this.subnetUUIDs = subnetUUIDs; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/PrismCentral.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/PrismCentral.java new file mode 100644 index 00000000000..d207042a404 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/PrismCentral.java @@ -0,0 +1,130 @@ + +package io.fabric8.openshift.api.model.installer.nutanix.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", + "endpoint", + "password", + "username" +}) +@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 PrismCentral implements KubernetesResource +{ + + @JsonProperty("endpoint") + private PrismEndpoint endpoint; + @JsonProperty("password") + private String password; + @JsonProperty("username") + private String username; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PrismCentral() { + } + + /** + * + * @param endpoint + * @param password + * @param username + */ + public PrismCentral(PrismEndpoint endpoint, String password, String username) { + super(); + this.endpoint = endpoint; + this.password = password; + this.username = username; + } + + @JsonProperty("endpoint") + public PrismEndpoint getEndpoint() { + return endpoint; + } + + @JsonProperty("endpoint") + public void setEndpoint(PrismEndpoint endpoint) { + this.endpoint = endpoint; + } + + @JsonProperty("password") + public String getPassword() { + return password; + } + + @JsonProperty("password") + public void setPassword(String password) { + this.password = password; + } + + @JsonProperty("username") + public String getUsername() { + return username; + } + + @JsonProperty("username") + public void setUsername(String username) { + this.username = username; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/PrismElement.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/PrismElement.java new file mode 100644 index 00000000000..4ce9e7024c3 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/PrismElement.java @@ -0,0 +1,130 @@ + +package io.fabric8.openshift.api.model.installer.nutanix.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", + "endpoint", + "name", + "uuid" +}) +@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 PrismElement implements KubernetesResource +{ + + @JsonProperty("endpoint") + private PrismEndpoint endpoint; + @JsonProperty("name") + private String name; + @JsonProperty("uuid") + private String uuid; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PrismElement() { + } + + /** + * + * @param endpoint + * @param name + * @param uuid + */ + public PrismElement(PrismEndpoint endpoint, String name, String uuid) { + super(); + this.endpoint = endpoint; + this.name = name; + this.uuid = uuid; + } + + @JsonProperty("endpoint") + public PrismEndpoint getEndpoint() { + return endpoint; + } + + @JsonProperty("endpoint") + public void setEndpoint(PrismEndpoint endpoint) { + this.endpoint = endpoint; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("uuid") + public String getUuid() { + return uuid; + } + + @JsonProperty("uuid") + public void setUuid(String uuid) { + this.uuid = uuid; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/PrismEndpoint.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/PrismEndpoint.java new file mode 100644 index 00000000000..aa85ec67949 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/PrismEndpoint.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.installer.nutanix.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", + "address", + "port" +}) +@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 PrismEndpoint implements KubernetesResource +{ + + @JsonProperty("address") + private String address; + @JsonProperty("port") + private Integer port; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PrismEndpoint() { + } + + /** + * + * @param address + * @param port + */ + public PrismEndpoint(String address, Integer port) { + super(); + this.address = address; + this.port = port; + } + + @JsonProperty("address") + public String getAddress() { + return address; + } + + @JsonProperty("address") + public void setAddress(String address) { + this.address = address; + } + + @JsonProperty("port") + public Integer getPort() { + return port; + } + + @JsonProperty("port") + public void setPort(Integer port) { + this.port = port; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FailureDomain.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FailureDomain.java new file mode 100644 index 00000000000..26248784d85 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FailureDomain.java @@ -0,0 +1,132 @@ + +package io.fabric8.openshift.api.model.installer.openstack.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", + "computeAvailabilityZone", + "portTargets", + "storageAvailabilityZone" +}) +@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 FailureDomain implements KubernetesResource +{ + + @JsonProperty("computeAvailabilityZone") + private String computeAvailabilityZone; + @JsonProperty("portTargets") + private List portTargets = new ArrayList(); + @JsonProperty("storageAvailabilityZone") + private String storageAvailabilityZone; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FailureDomain() { + } + + /** + * + * @param portTargets + * @param storageAvailabilityZone + * @param computeAvailabilityZone + */ + public FailureDomain(String computeAvailabilityZone, List portTargets, String storageAvailabilityZone) { + super(); + this.computeAvailabilityZone = computeAvailabilityZone; + this.portTargets = portTargets; + this.storageAvailabilityZone = storageAvailabilityZone; + } + + @JsonProperty("computeAvailabilityZone") + public String getComputeAvailabilityZone() { + return computeAvailabilityZone; + } + + @JsonProperty("computeAvailabilityZone") + public void setComputeAvailabilityZone(String computeAvailabilityZone) { + this.computeAvailabilityZone = computeAvailabilityZone; + } + + @JsonProperty("portTargets") + public List getPortTargets() { + return portTargets; + } + + @JsonProperty("portTargets") + public void setPortTargets(List portTargets) { + this.portTargets = portTargets; + } + + @JsonProperty("storageAvailabilityZone") + public String getStorageAvailabilityZone() { + return storageAvailabilityZone; + } + + @JsonProperty("storageAvailabilityZone") + public void setStorageAvailabilityZone(String storageAvailabilityZone) { + this.storageAvailabilityZone = storageAvailabilityZone; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FixedIP.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FixedIP.java new file mode 100644 index 00000000000..35e4d6c252a --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/FixedIP.java @@ -0,0 +1,101 @@ + +package io.fabric8.openshift.api.model.installer.openstack.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.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter; +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", + "subnet" +}) +@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 FixedIP implements KubernetesResource +{ + + @JsonProperty("subnet") + private SubnetFilter subnet; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FixedIP() { + } + + /** + * + * @param subnet + */ + public FixedIP(SubnetFilter subnet) { + super(); + this.subnet = subnet; + } + + @JsonProperty("subnet") + public SubnetFilter getSubnet() { + return subnet; + } + + @JsonProperty("subnet") + public void setSubnet(SubnetFilter subnet) { + this.subnet = subnet; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/MachinePool.java index b2b5918372d..f59209084ed 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/MachinePool.java @@ -37,6 +37,7 @@ "metadata", "additionalNetworkIDs", "additionalSecurityGroupIDs", + "failureDomains", "rootVolume", "serverGroupPolicy", "type", @@ -69,6 +70,9 @@ public class MachinePool implements KubernetesResource @JsonProperty("additionalSecurityGroupIDs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List additionalSecurityGroupIDs = new ArrayList(); + @JsonProperty("failureDomains") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List failureDomains = new ArrayList(); @JsonProperty("rootVolume") private RootVolume rootVolume; @JsonProperty("serverGroupPolicy") @@ -93,14 +97,16 @@ public MachinePool() { * @param serverGroupPolicy * @param additionalNetworkIDs * @param additionalSecurityGroupIDs + * @param failureDomains * @param rootVolume * @param type * @param zones */ - public MachinePool(List additionalNetworkIDs, List additionalSecurityGroupIDs, RootVolume rootVolume, String serverGroupPolicy, String type, List zones) { + public MachinePool(List additionalNetworkIDs, List additionalSecurityGroupIDs, List failureDomains, RootVolume rootVolume, String serverGroupPolicy, String type, List zones) { super(); this.additionalNetworkIDs = additionalNetworkIDs; this.additionalSecurityGroupIDs = additionalSecurityGroupIDs; + this.failureDomains = failureDomains; this.rootVolume = rootVolume; this.serverGroupPolicy = serverGroupPolicy; this.type = type; @@ -127,6 +133,16 @@ public void setAdditionalSecurityGroupIDs(List additionalSecurityGroupID this.additionalSecurityGroupIDs = additionalSecurityGroupIDs; } + @JsonProperty("failureDomains") + public List getFailureDomains() { + return failureDomains; + } + + @JsonProperty("failureDomains") + public void setFailureDomains(List failureDomains) { + this.failureDomains = failureDomains; + } + @JsonProperty("rootVolume") public RootVolume getRootVolume() { return rootVolume; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/NamedPortTarget.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/NamedPortTarget.java new file mode 100644 index 00000000000..d20324f7fa1 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/NamedPortTarget.java @@ -0,0 +1,133 @@ + +package io.fabric8.openshift.api.model.installer.openstack.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", + "fixedIPs", + "id", + "network" +}) +@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 NamedPortTarget implements KubernetesResource +{ + + @JsonProperty("fixedIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List fixedIPs = new ArrayList(); + @JsonProperty("id") + private String id; + @JsonProperty("network") + private NetworkFilter network; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NamedPortTarget() { + } + + /** + * + * @param fixedIPs + * @param id + * @param network + */ + public NamedPortTarget(List fixedIPs, String id, NetworkFilter network) { + super(); + this.fixedIPs = fixedIPs; + this.id = id; + this.network = network; + } + + @JsonProperty("fixedIPs") + public List getFixedIPs() { + return fixedIPs; + } + + @JsonProperty("fixedIPs") + public void setFixedIPs(List fixedIPs) { + this.fixedIPs = fixedIPs; + } + + @JsonProperty("id") + public String getId() { + return id; + } + + @JsonProperty("id") + public void setId(String id) { + this.id = id; + } + + @JsonProperty("network") + public NetworkFilter getNetwork() { + return network; + } + + @JsonProperty("network") + public void setNetwork(NetworkFilter network) { + this.network = network; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/NetworkFilter.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/NetworkFilter.java new file mode 100644 index 00000000000..b3d00e0fb1a --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/NetworkFilter.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.installer.openstack.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", + "id", + "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 NetworkFilter implements KubernetesResource +{ + + @JsonProperty("id") + private String id; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NetworkFilter() { + } + + /** + * + * @param name + * @param id + */ + public NetworkFilter(String id, String name) { + super(); + this.id = id; + this.name = name; + } + + @JsonProperty("id") + public String getId() { + return id; + } + + @JsonProperty("id") + public void setId(String id) { + this.id = id; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Platform.java index 463da9c8baf..0a335fe3f54 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Platform.java @@ -23,6 +23,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -38,6 +39,7 @@ "metadata", "apiFloatingIP", "apiVIP", + "apiVIPs", "cloud", "clusterOSImage", "clusterOSImageProperties", @@ -47,7 +49,9 @@ "externalNetwork", "ingressFloatingIP", "ingressVIP", + "ingressVIPs", "lbFloatingIP", + "loadBalancer", "machinesSubnet", "octaviaSupport", "region", @@ -78,6 +82,9 @@ public class Platform implements KubernetesResource private java.lang.String apiFloatingIP; @JsonProperty("apiVIP") private java.lang.String apiVIP; + @JsonProperty("apiVIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List apiVIPs = new ArrayList(); @JsonProperty("cloud") private java.lang.String cloud; @JsonProperty("clusterOSImage") @@ -97,8 +104,13 @@ public class Platform implements KubernetesResource private java.lang.String ingressFloatingIP; @JsonProperty("ingressVIP") private java.lang.String ingressVIP; + @JsonProperty("ingressVIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List ingressVIPs = new ArrayList(); @JsonProperty("lbFloatingIP") private java.lang.String lbFloatingIP; + @JsonProperty("loadBalancer") + private OpenStackPlatformLoadBalancer loadBalancer; @JsonProperty("machinesSubnet") private java.lang.String machinesSubnet; @JsonProperty("octaviaSupport") @@ -127,19 +139,23 @@ public Platform() { * @param apiFloatingIP * @param trunkSupport * @param cloud + * @param ingressVIPs * @param machinesSubnet * @param clusterOSImage + * @param loadBalancer * @param defaultMachinePlatform + * @param apiVIPs * @param externalDNS * @param region * @param lbFloatingIP * @param computeFlavor * @param clusterOSImageProperties */ - public Platform(java.lang.String apiFloatingIP, java.lang.String apiVIP, java.lang.String cloud, java.lang.String clusterOSImage, Map clusterOSImageProperties, java.lang.String computeFlavor, MachinePool defaultMachinePlatform, List externalDNS, java.lang.String externalNetwork, java.lang.String ingressFloatingIP, java.lang.String ingressVIP, java.lang.String lbFloatingIP, java.lang.String machinesSubnet, java.lang.String octaviaSupport, java.lang.String region, java.lang.String trunkSupport) { + public Platform(java.lang.String apiFloatingIP, java.lang.String apiVIP, List apiVIPs, java.lang.String cloud, java.lang.String clusterOSImage, Map clusterOSImageProperties, java.lang.String computeFlavor, MachinePool defaultMachinePlatform, List externalDNS, java.lang.String externalNetwork, java.lang.String ingressFloatingIP, java.lang.String ingressVIP, List ingressVIPs, java.lang.String lbFloatingIP, OpenStackPlatformLoadBalancer loadBalancer, java.lang.String machinesSubnet, java.lang.String octaviaSupport, java.lang.String region, java.lang.String trunkSupport) { super(); this.apiFloatingIP = apiFloatingIP; this.apiVIP = apiVIP; + this.apiVIPs = apiVIPs; this.cloud = cloud; this.clusterOSImage = clusterOSImage; this.clusterOSImageProperties = clusterOSImageProperties; @@ -149,7 +165,9 @@ public Platform(java.lang.String apiFloatingIP, java.lang.String apiVIP, java.la this.externalNetwork = externalNetwork; this.ingressFloatingIP = ingressFloatingIP; this.ingressVIP = ingressVIP; + this.ingressVIPs = ingressVIPs; this.lbFloatingIP = lbFloatingIP; + this.loadBalancer = loadBalancer; this.machinesSubnet = machinesSubnet; this.octaviaSupport = octaviaSupport; this.region = region; @@ -176,6 +194,16 @@ public void setApiVIP(java.lang.String apiVIP) { this.apiVIP = apiVIP; } + @JsonProperty("apiVIPs") + public List getApiVIPs() { + return apiVIPs; + } + + @JsonProperty("apiVIPs") + public void setApiVIPs(List apiVIPs) { + this.apiVIPs = apiVIPs; + } + @JsonProperty("cloud") public java.lang.String getCloud() { return cloud; @@ -266,6 +294,16 @@ public void setIngressVIP(java.lang.String ingressVIP) { this.ingressVIP = ingressVIP; } + @JsonProperty("ingressVIPs") + public List getIngressVIPs() { + return ingressVIPs; + } + + @JsonProperty("ingressVIPs") + public void setIngressVIPs(List ingressVIPs) { + this.ingressVIPs = ingressVIPs; + } + @JsonProperty("lbFloatingIP") public java.lang.String getLbFloatingIP() { return lbFloatingIP; @@ -276,6 +314,16 @@ public void setLbFloatingIP(java.lang.String lbFloatingIP) { this.lbFloatingIP = lbFloatingIP; } + @JsonProperty("loadBalancer") + public OpenStackPlatformLoadBalancer getLoadBalancer() { + return loadBalancer; + } + + @JsonProperty("loadBalancer") + public void setLoadBalancer(OpenStackPlatformLoadBalancer loadBalancer) { + this.loadBalancer = loadBalancer; + } + @JsonProperty("machinesSubnet") public java.lang.String getMachinesSubnet() { return machinesSubnet; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/CPU.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/CPU.java index 19384e6e479..5b8a9257b89 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/CPU.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/CPU.java @@ -34,7 +34,8 @@ "kind", "metadata", "cores", - "sockets" + "sockets", + "threads" }) @ToString @EqualsAndHashCode @@ -61,6 +62,8 @@ public class CPU implements KubernetesResource private Integer cores; @JsonProperty("sockets") private Integer sockets; + @JsonProperty("threads") + private Integer threads; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -74,12 +77,14 @@ public CPU() { /** * * @param cores + * @param threads * @param sockets */ - public CPU(Integer cores, Integer sockets) { + public CPU(Integer cores, Integer sockets, Integer threads) { super(); this.cores = cores; this.sockets = sockets; + this.threads = threads; } @JsonProperty("cores") @@ -102,6 +107,16 @@ public void setSockets(Integer sockets) { this.sockets = sockets; } + @JsonProperty("threads") + public Integer getThreads() { + return threads; + } + + @JsonProperty("threads") + public void setThreads(Integer threads) { + this.threads = threads; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/MachinePool.java index a50e54a65db..15aa6fba729 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/MachinePool.java @@ -37,11 +37,14 @@ "metadata", "affinityGroupsNames", "autoPinningPolicy", + "clone", "cpu", + "format", "hugepages", "instanceTypeID", "memoryMB", "osDisk", + "sparse", "vmType" }) @ToString @@ -69,8 +72,12 @@ public class MachinePool implements KubernetesResource private List affinityGroupsNames = new ArrayList(); @JsonProperty("autoPinningPolicy") private String autoPinningPolicy; + @JsonProperty("clone") + private Boolean clone; @JsonProperty("cpu") private CPU cpu; + @JsonProperty("format") + private String format; @JsonProperty("hugepages") private Integer hugepages; @JsonProperty("instanceTypeID") @@ -79,6 +86,8 @@ public class MachinePool implements KubernetesResource private Integer memoryMB; @JsonProperty("osDisk") private Disk osDisk; + @JsonProperty("sparse") + private Boolean sparse; @JsonProperty("vmType") private String vmType; @JsonIgnore @@ -97,20 +106,26 @@ public MachinePool() { * @param memoryMB * @param affinityGroupsNames * @param vmType + * @param sparse * @param instanceTypeID + * @param clone + * @param format * @param cpu * @param autoPinningPolicy * @param osDisk */ - public MachinePool(List affinityGroupsNames, String autoPinningPolicy, CPU cpu, Integer hugepages, String instanceTypeID, Integer memoryMB, Disk osDisk, String vmType) { + public MachinePool(List affinityGroupsNames, String autoPinningPolicy, Boolean clone, CPU cpu, String format, Integer hugepages, String instanceTypeID, Integer memoryMB, Disk osDisk, Boolean sparse, String vmType) { super(); this.affinityGroupsNames = affinityGroupsNames; this.autoPinningPolicy = autoPinningPolicy; + this.clone = clone; this.cpu = cpu; + this.format = format; this.hugepages = hugepages; this.instanceTypeID = instanceTypeID; this.memoryMB = memoryMB; this.osDisk = osDisk; + this.sparse = sparse; this.vmType = vmType; } @@ -134,6 +149,16 @@ public void setAutoPinningPolicy(String autoPinningPolicy) { this.autoPinningPolicy = autoPinningPolicy; } + @JsonProperty("clone") + public Boolean getClone() { + return clone; + } + + @JsonProperty("clone") + public void setClone(Boolean clone) { + this.clone = clone; + } + @JsonProperty("cpu") public CPU getCpu() { return cpu; @@ -144,6 +169,16 @@ public void setCpu(CPU cpu) { this.cpu = cpu; } + @JsonProperty("format") + public String getFormat() { + return format; + } + + @JsonProperty("format") + public void setFormat(String format) { + this.format = format; + } + @JsonProperty("hugepages") public Integer getHugepages() { return hugepages; @@ -184,6 +219,16 @@ public void setOsDisk(Disk osDisk) { this.osDisk = osDisk; } + @JsonProperty("sparse") + public Boolean getSparse() { + return sparse; + } + + @JsonProperty("sparse") + public void setSparse(Boolean sparse) { + this.sparse = sparse; + } + @JsonProperty("vmType") public String getVmType() { return vmType; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java index 99f76bc2164..aa24bc7a7d1 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java @@ -22,6 +22,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -37,8 +38,11 @@ "metadata", "affinityGroups", "api_vip", + "api_vips", "defaultMachinePlatform", "ingress_vip", + "ingress_vips", + "loadBalancer", "ovirt_cluster_id", "ovirt_network_name", "ovirt_storage_domain_id", @@ -69,10 +73,18 @@ public class Platform implements KubernetesResource private List affinityGroups = new ArrayList(); @JsonProperty("api_vip") private String apiVip; + @JsonProperty("api_vips") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List apiVips = new ArrayList(); @JsonProperty("defaultMachinePlatform") private MachinePool defaultMachinePlatform; @JsonProperty("ingress_vip") private String ingressVip; + @JsonProperty("ingress_vips") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List ingressVips = new ArrayList(); + @JsonProperty("loadBalancer") + private OvirtPlatformLoadBalancer loadBalancer; @JsonProperty("ovirt_cluster_id") private String ovirtClusterId; @JsonProperty("ovirt_network_name") @@ -94,20 +106,26 @@ public Platform() { /** * * @param ovirtStorageDomainId + * @param ingressVips * @param vnicProfileID * @param apiVip * @param ingressVip + * @param loadBalancer * @param defaultMachinePlatform * @param ovirtNetworkName * @param ovirtClusterId + * @param apiVips * @param affinityGroups */ - public Platform(List affinityGroups, String apiVip, MachinePool defaultMachinePlatform, String ingressVip, String ovirtClusterId, String ovirtNetworkName, String ovirtStorageDomainId, String vnicProfileID) { + public Platform(List affinityGroups, String apiVip, List apiVips, MachinePool defaultMachinePlatform, String ingressVip, List ingressVips, OvirtPlatformLoadBalancer loadBalancer, String ovirtClusterId, String ovirtNetworkName, String ovirtStorageDomainId, String vnicProfileID) { super(); this.affinityGroups = affinityGroups; this.apiVip = apiVip; + this.apiVips = apiVips; this.defaultMachinePlatform = defaultMachinePlatform; this.ingressVip = ingressVip; + this.ingressVips = ingressVips; + this.loadBalancer = loadBalancer; this.ovirtClusterId = ovirtClusterId; this.ovirtNetworkName = ovirtNetworkName; this.ovirtStorageDomainId = ovirtStorageDomainId; @@ -134,6 +152,16 @@ public void setApiVip(String apiVip) { this.apiVip = apiVip; } + @JsonProperty("api_vips") + public List getApiVips() { + return apiVips; + } + + @JsonProperty("api_vips") + public void setApiVips(List apiVips) { + this.apiVips = apiVips; + } + @JsonProperty("defaultMachinePlatform") public MachinePool getDefaultMachinePlatform() { return defaultMachinePlatform; @@ -154,6 +182,26 @@ public void setIngressVip(String ingressVip) { this.ingressVip = ingressVip; } + @JsonProperty("ingress_vips") + public List getIngressVips() { + return ingressVips; + } + + @JsonProperty("ingress_vips") + public void setIngressVips(List ingressVips) { + this.ingressVips = ingressVips; + } + + @JsonProperty("loadBalancer") + public OvirtPlatformLoadBalancer getLoadBalancer() { + return loadBalancer; + } + + @JsonProperty("loadBalancer") + public void setLoadBalancer(OvirtPlatformLoadBalancer loadBalancer) { + this.loadBalancer = loadBalancer; + } + @JsonProperty("ovirt_cluster_id") public String getOvirtClusterId() { return ovirtClusterId; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/MachinePool.java new file mode 100644 index 00000000000..9a6db2cb5c4 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/MachinePool.java @@ -0,0 +1,162 @@ + +package io.fabric8.openshift.api.model.installer.powervs.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.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", + "memoryGiB", + "procType", + "processors", + "sysType", + "volumeIDs" +}) +@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(io.fabric8.kubernetes.api.model.IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class MachinePool implements KubernetesResource +{ + + @JsonProperty("memoryGiB") + private Integer memoryGiB; + @JsonProperty("procType") + private String procType; + @JsonProperty("processors") + private io.fabric8.kubernetes.api.model.IntOrString processors; + @JsonProperty("sysType") + private String sysType; + @JsonProperty("volumeIDs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List volumeIDs = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MachinePool() { + } + + /** + * + * @param sysType + * @param memoryGiB + * @param volumeIDs + * @param processors + * @param procType + */ + public MachinePool(Integer memoryGiB, String procType, io.fabric8.kubernetes.api.model.IntOrString processors, String sysType, List volumeIDs) { + super(); + this.memoryGiB = memoryGiB; + this.procType = procType; + this.processors = processors; + this.sysType = sysType; + this.volumeIDs = volumeIDs; + } + + @JsonProperty("memoryGiB") + public Integer getMemoryGiB() { + return memoryGiB; + } + + @JsonProperty("memoryGiB") + public void setMemoryGiB(Integer memoryGiB) { + this.memoryGiB = memoryGiB; + } + + @JsonProperty("procType") + public String getProcType() { + return procType; + } + + @JsonProperty("procType") + public void setProcType(String procType) { + this.procType = procType; + } + + @JsonProperty("processors") + public io.fabric8.kubernetes.api.model.IntOrString getProcessors() { + return processors; + } + + @JsonProperty("processors") + public void setProcessors(io.fabric8.kubernetes.api.model.IntOrString processors) { + this.processors = processors; + } + + @JsonProperty("sysType") + public String getSysType() { + return sysType; + } + + @JsonProperty("sysType") + public void setSysType(String sysType) { + this.sysType = sysType; + } + + @JsonProperty("volumeIDs") + public List getVolumeIDs() { + return volumeIDs; + } + + @JsonProperty("volumeIDs") + public void setVolumeIDs(List volumeIDs) { + this.volumeIDs = volumeIDs; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Platform.java new file mode 100644 index 00000000000..349310d9bb8 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/powervs/v1/Platform.java @@ -0,0 +1,268 @@ + +package io.fabric8.openshift.api.model.installer.powervs.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", + "cloudConnectionName", + "clusterOSImage", + "defaultMachinePlatform", + "powervsResourceGroup", + "pvsNetworkName", + "region", + "serviceInstanceID", + "userID", + "vpcName", + "vpcRegion", + "vpcSubnets", + "zone" +}) +@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 Platform implements KubernetesResource +{ + + @JsonProperty("cloudConnectionName") + private String cloudConnectionName; + @JsonProperty("clusterOSImage") + private String clusterOSImage; + @JsonProperty("defaultMachinePlatform") + private MachinePool defaultMachinePlatform; + @JsonProperty("powervsResourceGroup") + private String powervsResourceGroup; + @JsonProperty("pvsNetworkName") + private String pvsNetworkName; + @JsonProperty("region") + private String region; + @JsonProperty("serviceInstanceID") + private String serviceInstanceID; + @JsonProperty("userID") + private String userID; + @JsonProperty("vpcName") + private String vpcName; + @JsonProperty("vpcRegion") + private String vpcRegion; + @JsonProperty("vpcSubnets") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List vpcSubnets = new ArrayList(); + @JsonProperty("zone") + private String zone; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Platform() { + } + + /** + * + * @param cloudConnectionName + * @param vpcName + * @param powervsResourceGroup + * @param zone + * @param clusterOSImage + * @param defaultMachinePlatform + * @param pvsNetworkName + * @param serviceInstanceID + * @param vpcRegion + * @param region + * @param userID + * @param vpcSubnets + */ + public Platform(String cloudConnectionName, String clusterOSImage, MachinePool defaultMachinePlatform, String powervsResourceGroup, String pvsNetworkName, String region, String serviceInstanceID, String userID, String vpcName, String vpcRegion, List vpcSubnets, String zone) { + super(); + this.cloudConnectionName = cloudConnectionName; + this.clusterOSImage = clusterOSImage; + this.defaultMachinePlatform = defaultMachinePlatform; + this.powervsResourceGroup = powervsResourceGroup; + this.pvsNetworkName = pvsNetworkName; + this.region = region; + this.serviceInstanceID = serviceInstanceID; + this.userID = userID; + this.vpcName = vpcName; + this.vpcRegion = vpcRegion; + this.vpcSubnets = vpcSubnets; + this.zone = zone; + } + + @JsonProperty("cloudConnectionName") + public String getCloudConnectionName() { + return cloudConnectionName; + } + + @JsonProperty("cloudConnectionName") + public void setCloudConnectionName(String cloudConnectionName) { + this.cloudConnectionName = cloudConnectionName; + } + + @JsonProperty("clusterOSImage") + public String getClusterOSImage() { + return clusterOSImage; + } + + @JsonProperty("clusterOSImage") + public void setClusterOSImage(String clusterOSImage) { + this.clusterOSImage = clusterOSImage; + } + + @JsonProperty("defaultMachinePlatform") + public MachinePool getDefaultMachinePlatform() { + return defaultMachinePlatform; + } + + @JsonProperty("defaultMachinePlatform") + public void setDefaultMachinePlatform(MachinePool defaultMachinePlatform) { + this.defaultMachinePlatform = defaultMachinePlatform; + } + + @JsonProperty("powervsResourceGroup") + public String getPowervsResourceGroup() { + return powervsResourceGroup; + } + + @JsonProperty("powervsResourceGroup") + public void setPowervsResourceGroup(String powervsResourceGroup) { + this.powervsResourceGroup = powervsResourceGroup; + } + + @JsonProperty("pvsNetworkName") + public String getPvsNetworkName() { + return pvsNetworkName; + } + + @JsonProperty("pvsNetworkName") + public void setPvsNetworkName(String pvsNetworkName) { + this.pvsNetworkName = pvsNetworkName; + } + + @JsonProperty("region") + public String getRegion() { + return region; + } + + @JsonProperty("region") + public void setRegion(String region) { + this.region = region; + } + + @JsonProperty("serviceInstanceID") + public String getServiceInstanceID() { + return serviceInstanceID; + } + + @JsonProperty("serviceInstanceID") + public void setServiceInstanceID(String serviceInstanceID) { + this.serviceInstanceID = serviceInstanceID; + } + + @JsonProperty("userID") + public String getUserID() { + return userID; + } + + @JsonProperty("userID") + public void setUserID(String userID) { + this.userID = userID; + } + + @JsonProperty("vpcName") + public String getVpcName() { + return vpcName; + } + + @JsonProperty("vpcName") + public void setVpcName(String vpcName) { + this.vpcName = vpcName; + } + + @JsonProperty("vpcRegion") + public String getVpcRegion() { + return vpcRegion; + } + + @JsonProperty("vpcRegion") + public void setVpcRegion(String vpcRegion) { + this.vpcRegion = vpcRegion; + } + + @JsonProperty("vpcSubnets") + public List getVpcSubnets() { + return vpcSubnets; + } + + @JsonProperty("vpcSubnets") + public void setVpcSubnets(List vpcSubnets) { + this.vpcSubnets = vpcSubnets; + } + + @JsonProperty("zone") + public String getZone() { + return zone; + } + + @JsonProperty("zone") + public void setZone(String zone) { + this.zone = zone; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Capabilities.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Capabilities.java new file mode 100644 index 00000000000..cbac94b84d4 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Capabilities.java @@ -0,0 +1,118 @@ + +package io.fabric8.openshift.api.model.installer.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", + "additionalEnabledCapabilities", + "baselineCapabilitySet" +}) +@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 Capabilities implements KubernetesResource +{ + + @JsonProperty("additionalEnabledCapabilities") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List additionalEnabledCapabilities = new ArrayList(); + @JsonProperty("baselineCapabilitySet") + private String baselineCapabilitySet; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Capabilities() { + } + + /** + * + * @param additionalEnabledCapabilities + * @param baselineCapabilitySet + */ + public Capabilities(List additionalEnabledCapabilities, String baselineCapabilitySet) { + super(); + this.additionalEnabledCapabilities = additionalEnabledCapabilities; + this.baselineCapabilitySet = baselineCapabilitySet; + } + + @JsonProperty("additionalEnabledCapabilities") + public List getAdditionalEnabledCapabilities() { + return additionalEnabledCapabilities; + } + + @JsonProperty("additionalEnabledCapabilities") + public void setAdditionalEnabledCapabilities(List additionalEnabledCapabilities) { + this.additionalEnabledCapabilities = additionalEnabledCapabilities; + } + + @JsonProperty("baselineCapabilitySet") + public String getBaselineCapabilitySet() { + return baselineCapabilitySet; + } + + @JsonProperty("baselineCapabilitySet") + public void setBaselineCapabilitySet(String baselineCapabilitySet) { + this.baselineCapabilitySet = baselineCapabilitySet; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/InstallConfig.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/InstallConfig.java index 4d105a0c29b..9b6a8548439 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/InstallConfig.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/InstallConfig.java @@ -40,11 +40,15 @@ "kind", "metadata", "additionalTrustBundle", + "additionalTrustBundlePolicy", "baseDomain", "bootstrapInPlace", + "capabilities", "compute", "controlPlane", + "cpuPartitioningMode", "credentialsMode", + "featureSet", "fips", "imageContentSources", "networking", @@ -82,6 +86,8 @@ public class InstallConfig implements HasMetadata, Namespaced @JsonProperty("additionalTrustBundle") private String additionalTrustBundle; + @JsonProperty("additionalTrustBundlePolicy") + private String additionalTrustBundlePolicy; /** * * (Required) @@ -93,13 +99,19 @@ public class InstallConfig implements HasMetadata, Namespaced private String baseDomain; @JsonProperty("bootstrapInPlace") private BootstrapInPlace bootstrapInPlace; + @JsonProperty("capabilities") + private Capabilities capabilities; @JsonProperty("compute") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List compute = new ArrayList(); @JsonProperty("controlPlane") private MachinePool controlPlane; + @JsonProperty("cpuPartitioningMode") + private String cpuPartitioningMode; @JsonProperty("credentialsMode") private String credentialsMode; + @JsonProperty("featureSet") + private String featureSet; @JsonProperty("fips") private Boolean fips; @JsonProperty("imageContentSources") @@ -138,13 +150,17 @@ public InstallConfig() { /** * + * @param additionalTrustBundlePolicy * @param metadata + * @param capabilities * @param credentialsMode * @param kind + * @param featureSet * @param fips * @param networking * @param platform * @param compute + * @param cpuPartitioningMode * @param proxy * @param apiVersion * @param controlPlane @@ -156,15 +172,19 @@ public InstallConfig() { * @param additionalTrustBundle * @param pullSecret */ - public InstallConfig(String additionalTrustBundle, String apiVersion, String baseDomain, BootstrapInPlace bootstrapInPlace, List compute, MachinePool controlPlane, String credentialsMode, Boolean fips, List imageContentSources, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, Networking networking, Platform platform, Proxy proxy, String publish, String pullSecret, String sshKey) { + public InstallConfig(String additionalTrustBundle, String additionalTrustBundlePolicy, String apiVersion, String baseDomain, BootstrapInPlace bootstrapInPlace, Capabilities capabilities, List compute, MachinePool controlPlane, String cpuPartitioningMode, String credentialsMode, String featureSet, Boolean fips, List imageContentSources, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, Networking networking, Platform platform, Proxy proxy, String publish, String pullSecret, String sshKey) { super(); this.additionalTrustBundle = additionalTrustBundle; + this.additionalTrustBundlePolicy = additionalTrustBundlePolicy; this.apiVersion = apiVersion; this.baseDomain = baseDomain; this.bootstrapInPlace = bootstrapInPlace; + this.capabilities = capabilities; this.compute = compute; this.controlPlane = controlPlane; + this.cpuPartitioningMode = cpuPartitioningMode; this.credentialsMode = credentialsMode; + this.featureSet = featureSet; this.fips = fips; this.imageContentSources = imageContentSources; this.kind = kind; @@ -187,6 +207,16 @@ public void setAdditionalTrustBundle(String additionalTrustBundle) { this.additionalTrustBundle = additionalTrustBundle; } + @JsonProperty("additionalTrustBundlePolicy") + public String getAdditionalTrustBundlePolicy() { + return additionalTrustBundlePolicy; + } + + @JsonProperty("additionalTrustBundlePolicy") + public void setAdditionalTrustBundlePolicy(String additionalTrustBundlePolicy) { + this.additionalTrustBundlePolicy = additionalTrustBundlePolicy; + } + /** * * (Required) @@ -227,6 +257,16 @@ public void setBootstrapInPlace(BootstrapInPlace bootstrapInPlace) { this.bootstrapInPlace = bootstrapInPlace; } + @JsonProperty("capabilities") + public Capabilities getCapabilities() { + return capabilities; + } + + @JsonProperty("capabilities") + public void setCapabilities(Capabilities capabilities) { + this.capabilities = capabilities; + } + @JsonProperty("compute") public List getCompute() { return compute; @@ -247,6 +287,16 @@ public void setControlPlane(MachinePool controlPlane) { this.controlPlane = controlPlane; } + @JsonProperty("cpuPartitioningMode") + public String getCpuPartitioningMode() { + return cpuPartitioningMode; + } + + @JsonProperty("cpuPartitioningMode") + public void setCpuPartitioningMode(String cpuPartitioningMode) { + this.cpuPartitioningMode = cpuPartitioningMode; + } + @JsonProperty("credentialsMode") public String getCredentialsMode() { return credentialsMode; @@ -257,6 +307,16 @@ public void setCredentialsMode(String credentialsMode) { this.credentialsMode = credentialsMode; } + @JsonProperty("featureSet") + public String getFeatureSet() { + return featureSet; + } + + @JsonProperty("featureSet") + public void setFeatureSet(String featureSet) { + this.featureSet = featureSet; + } + @JsonProperty("fips") public Boolean getFips() { return fips; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachinePoolPlatform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachinePoolPlatform.java index a5c7c170326..e74e44fb6a1 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachinePoolPlatform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/MachinePoolPlatform.java @@ -40,8 +40,10 @@ "gcp", "ibmcloud", "libvirt", + "nutanix", "openstack", "ovirt", + "powervs", "vsphere" }) @ToString @@ -79,10 +81,14 @@ public class MachinePoolPlatform implements KubernetesResource private io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool ibmcloud; @JsonProperty("libvirt") private io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirt; + @JsonProperty("nutanix") + private io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool nutanix; @JsonProperty("openstack") private io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openstack; @JsonProperty("ovirt") private io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirt; + @JsonProperty("powervs") + private io.fabric8.openshift.api.model.installer.powervs.v1.MachinePool powervs; @JsonProperty("vsphere") private io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vsphere; @JsonIgnore @@ -99,6 +105,7 @@ public MachinePoolPlatform() { * * @param libvirt * @param baremetal + * @param powervs * @param alibabacloud * @param vsphere * @param gcp @@ -106,9 +113,10 @@ public MachinePoolPlatform() { * @param ovirt * @param openstack * @param aws + * @param nutanix * @param azure */ - public MachinePoolPlatform(io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabacloud, io.fabric8.openshift.api.model.installer.aws.v1.MachinePool aws, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azure, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetal, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcp, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool ibmcloud, io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirt, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openstack, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirt, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vsphere) { + public MachinePoolPlatform(io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabacloud, io.fabric8.openshift.api.model.installer.aws.v1.MachinePool aws, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azure, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetal, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcp, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool ibmcloud, io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirt, io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool nutanix, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openstack, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirt, io.fabric8.openshift.api.model.installer.powervs.v1.MachinePool powervs, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vsphere) { super(); this.alibabacloud = alibabacloud; this.aws = aws; @@ -117,8 +125,10 @@ public MachinePoolPlatform(io.fabric8.openshift.api.model.installer.alibabacloud this.gcp = gcp; this.ibmcloud = ibmcloud; this.libvirt = libvirt; + this.nutanix = nutanix; this.openstack = openstack; this.ovirt = ovirt; + this.powervs = powervs; this.vsphere = vsphere; } @@ -192,6 +202,16 @@ public void setLibvirt(io.fabric8.openshift.api.model.installer.libvirt.v1.Machi this.libvirt = libvirt; } + @JsonProperty("nutanix") + public io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool getNutanix() { + return nutanix; + } + + @JsonProperty("nutanix") + public void setNutanix(io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool nutanix) { + this.nutanix = nutanix; + } + @JsonProperty("openstack") public io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool getOpenstack() { return openstack; @@ -212,6 +232,16 @@ public void setOvirt(io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePo this.ovirt = ovirt; } + @JsonProperty("powervs") + public io.fabric8.openshift.api.model.installer.powervs.v1.MachinePool getPowervs() { + return powervs; + } + + @JsonProperty("powervs") + public void setPowervs(io.fabric8.openshift.api.model.installer.powervs.v1.MachinePool powervs) { + this.powervs = powervs; + } + @JsonProperty("vsphere") public io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool getVsphere() { return vsphere; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Platform.java index 9995a18df11..c1e03baf73a 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/Platform.java @@ -41,8 +41,10 @@ "ibmcloud", "libvirt", "none", + "nutanix", "openstack", "ovirt", + "powervs", "vsphere" }) @ToString @@ -82,10 +84,14 @@ public class Platform implements KubernetesResource private io.fabric8.openshift.api.model.installer.libvirt.v1.Platform libvirt; @JsonProperty("none") private io.fabric8.openshift.api.model.installer.none.v1.Platform none; + @JsonProperty("nutanix") + private io.fabric8.openshift.api.model.installer.nutanix.v1.Platform nutanix; @JsonProperty("openstack") private io.fabric8.openshift.api.model.installer.openstack.v1.Platform openstack; @JsonProperty("ovirt") private io.fabric8.openshift.api.model.installer.ovirt.v1.Platform ovirt; + @JsonProperty("powervs") + private io.fabric8.openshift.api.model.installer.powervs.v1.Platform powervs; @JsonProperty("vsphere") private io.fabric8.openshift.api.model.installer.vsphere.v1.Platform vsphere; @JsonIgnore @@ -100,19 +106,21 @@ public Platform() { /** * - * @param libvirt * @param baremetal + * @param powervs * @param alibabacloud + * @param ibmcloud + * @param none + * @param nutanix + * @param libvirt * @param vsphere * @param gcp - * @param ibmcloud * @param ovirt * @param openstack - * @param none * @param aws * @param azure */ - public Platform(io.fabric8.openshift.api.model.installer.alibabacloud.v1.Platform alibabacloud, io.fabric8.openshift.api.model.installer.aws.v1.Platform aws, io.fabric8.openshift.api.model.installer.azure.v1.Platform azure, io.fabric8.openshift.api.model.installer.baremetal.v1.Platform baremetal, io.fabric8.openshift.api.model.installer.gcp.v1.Platform gcp, io.fabric8.openshift.api.model.installer.ibmcloud.v1.Platform ibmcloud, io.fabric8.openshift.api.model.installer.libvirt.v1.Platform libvirt, io.fabric8.openshift.api.model.installer.none.v1.Platform none, io.fabric8.openshift.api.model.installer.openstack.v1.Platform openstack, io.fabric8.openshift.api.model.installer.ovirt.v1.Platform ovirt, io.fabric8.openshift.api.model.installer.vsphere.v1.Platform vsphere) { + public Platform(io.fabric8.openshift.api.model.installer.alibabacloud.v1.Platform alibabacloud, io.fabric8.openshift.api.model.installer.aws.v1.Platform aws, io.fabric8.openshift.api.model.installer.azure.v1.Platform azure, io.fabric8.openshift.api.model.installer.baremetal.v1.Platform baremetal, io.fabric8.openshift.api.model.installer.gcp.v1.Platform gcp, io.fabric8.openshift.api.model.installer.ibmcloud.v1.Platform ibmcloud, io.fabric8.openshift.api.model.installer.libvirt.v1.Platform libvirt, io.fabric8.openshift.api.model.installer.none.v1.Platform none, io.fabric8.openshift.api.model.installer.nutanix.v1.Platform nutanix, io.fabric8.openshift.api.model.installer.openstack.v1.Platform openstack, io.fabric8.openshift.api.model.installer.ovirt.v1.Platform ovirt, io.fabric8.openshift.api.model.installer.powervs.v1.Platform powervs, io.fabric8.openshift.api.model.installer.vsphere.v1.Platform vsphere) { super(); this.alibabacloud = alibabacloud; this.aws = aws; @@ -122,8 +130,10 @@ public Platform(io.fabric8.openshift.api.model.installer.alibabacloud.v1.Platfor this.ibmcloud = ibmcloud; this.libvirt = libvirt; this.none = none; + this.nutanix = nutanix; this.openstack = openstack; this.ovirt = ovirt; + this.powervs = powervs; this.vsphere = vsphere; } @@ -207,6 +217,16 @@ public void setNone(io.fabric8.openshift.api.model.installer.none.v1.Platform no this.none = none; } + @JsonProperty("nutanix") + public io.fabric8.openshift.api.model.installer.nutanix.v1.Platform getNutanix() { + return nutanix; + } + + @JsonProperty("nutanix") + public void setNutanix(io.fabric8.openshift.api.model.installer.nutanix.v1.Platform nutanix) { + this.nutanix = nutanix; + } + @JsonProperty("openstack") public io.fabric8.openshift.api.model.installer.openstack.v1.Platform getOpenstack() { return openstack; @@ -227,6 +247,16 @@ public void setOvirt(io.fabric8.openshift.api.model.installer.ovirt.v1.Platform this.ovirt = ovirt; } + @JsonProperty("powervs") + public io.fabric8.openshift.api.model.installer.powervs.v1.Platform getPowervs() { + return powervs; + } + + @JsonProperty("powervs") + public void setPowervs(io.fabric8.openshift.api.model.installer.powervs.v1.Platform powervs) { + this.powervs = powervs; + } + @JsonProperty("vsphere") public io.fabric8.openshift.api.model.installer.vsphere.v1.Platform getVsphere() { return vsphere; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/FailureDomain.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/FailureDomain.java new file mode 100644 index 00000000000..f7c2fb723ec --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/FailureDomain.java @@ -0,0 +1,160 @@ + +package io.fabric8.openshift.api.model.installer.vsphere.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", + "name", + "region", + "server", + "topology", + "zone" +}) +@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 FailureDomain implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("region") + private String region; + @JsonProperty("server") + private String server; + @JsonProperty("topology") + private Topology topology; + @JsonProperty("zone") + private String zone; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FailureDomain() { + } + + /** + * + * @param server + * @param zone + * @param topology + * @param name + * @param region + */ + public FailureDomain(String name, String region, String server, Topology topology, String zone) { + super(); + this.name = name; + this.region = region; + this.server = server; + this.topology = topology; + this.zone = zone; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("region") + public String getRegion() { + return region; + } + + @JsonProperty("region") + public void setRegion(String region) { + this.region = region; + } + + @JsonProperty("server") + public String getServer() { + return server; + } + + @JsonProperty("server") + public void setServer(String server) { + this.server = server; + } + + @JsonProperty("topology") + public Topology getTopology() { + return topology; + } + + @JsonProperty("topology") + public void setTopology(Topology topology) { + this.topology = topology; + } + + @JsonProperty("zone") + public String getZone() { + return zone; + } + + @JsonProperty("zone") + public void setZone(String zone) { + this.zone = zone; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/MachinePool.java index 14a09146658..66aa6c5969c 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/MachinePool.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.installer.vsphere.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; @@ -36,7 +38,8 @@ "coresPerSocket", "cpus", "memoryMB", - "osDisk" + "osDisk", + "zones" }) @ToString @EqualsAndHashCode @@ -67,6 +70,9 @@ public class MachinePool implements KubernetesResource private Long memoryMB; @JsonProperty("osDisk") private OSDisk osDisk; + @JsonProperty("zones") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List zones = new ArrayList(); @JsonIgnore private Map additionalProperties = new HashMap(); @@ -82,14 +88,16 @@ public MachinePool() { * @param memoryMB * @param cpus * @param coresPerSocket + * @param zones * @param osDisk */ - public MachinePool(Integer coresPerSocket, Integer cpus, Long memoryMB, OSDisk osDisk) { + public MachinePool(Integer coresPerSocket, Integer cpus, Long memoryMB, OSDisk osDisk, List zones) { super(); this.coresPerSocket = coresPerSocket; this.cpus = cpus; this.memoryMB = memoryMB; this.osDisk = osDisk; + this.zones = zones; } @JsonProperty("coresPerSocket") @@ -132,6 +140,16 @@ public void setOsDisk(OSDisk osDisk) { this.osDisk = osDisk; } + @JsonProperty("zones") + public List getZones() { + return zones; + } + + @JsonProperty("zones") + public void setZones(List zones) { + this.zones = zones; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Platform.java index 695d23b5e7e..5c7a850b183 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Platform.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.installer.vsphere.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; @@ -20,6 +22,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -34,19 +37,24 @@ "kind", "metadata", "apiVIP", + "apiVIPs", "cluster", "clusterOSImage", "datacenter", "defaultDatastore", "defaultMachinePlatform", "diskType", + "failureDomains", "folder", "ingressVIP", + "ingressVIPs", + "loadBalancer", "network", "password", "resourcePool", "username", - "vCenter" + "vCenter", + "vcenters" }) @ToString @EqualsAndHashCode @@ -71,6 +79,9 @@ public class Platform implements KubernetesResource @JsonProperty("apiVIP") private String apiVIP; + @JsonProperty("apiVIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List apiVIPs = new ArrayList(); @JsonProperty("cluster") private String cluster; @JsonProperty("clusterOSImage") @@ -83,10 +94,18 @@ public class Platform implements KubernetesResource private MachinePool defaultMachinePlatform; @JsonProperty("diskType") private String diskType; + @JsonProperty("failureDomains") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List failureDomains = new ArrayList(); @JsonProperty("folder") private String folder; @JsonProperty("ingressVIP") private String ingressVIP; + @JsonProperty("ingressVIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List ingressVIPs = new ArrayList(); + @JsonProperty("loadBalancer") + private VSpherePlatformLoadBalancer loadBalancer; @JsonProperty("network") private String network; @JsonProperty("password") @@ -97,6 +116,9 @@ public class Platform implements KubernetesResource private String username; @JsonProperty("vCenter") private String vCenter; + @JsonProperty("vcenters") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List vcenters = new ArrayList(); @JsonIgnore private Map additionalProperties = new HashMap(); @@ -115,31 +137,41 @@ public Platform() { * @param datacenter * @param network * @param defaultDatastore + * @param ingressVIPs * @param password * @param folder * @param clusterOSImage + * @param loadBalancer * @param defaultMachinePlatform + * @param failureDomains + * @param vcenters + * @param apiVIPs * @param diskType * @param vCenter * @param resourcePool * @param username */ - public Platform(String apiVIP, String cluster, String clusterOSImage, String datacenter, String defaultDatastore, MachinePool defaultMachinePlatform, String diskType, String folder, String ingressVIP, String network, String password, String resourcePool, String username, String vCenter) { + public Platform(String apiVIP, List apiVIPs, String cluster, String clusterOSImage, String datacenter, String defaultDatastore, MachinePool defaultMachinePlatform, String diskType, List failureDomains, String folder, String ingressVIP, List ingressVIPs, VSpherePlatformLoadBalancer loadBalancer, String network, String password, String resourcePool, String username, String vCenter, List vcenters) { super(); this.apiVIP = apiVIP; + this.apiVIPs = apiVIPs; this.cluster = cluster; this.clusterOSImage = clusterOSImage; this.datacenter = datacenter; this.defaultDatastore = defaultDatastore; this.defaultMachinePlatform = defaultMachinePlatform; this.diskType = diskType; + this.failureDomains = failureDomains; this.folder = folder; this.ingressVIP = ingressVIP; + this.ingressVIPs = ingressVIPs; + this.loadBalancer = loadBalancer; this.network = network; this.password = password; this.resourcePool = resourcePool; this.username = username; this.vCenter = vCenter; + this.vcenters = vcenters; } @JsonProperty("apiVIP") @@ -152,6 +184,16 @@ public void setApiVIP(String apiVIP) { this.apiVIP = apiVIP; } + @JsonProperty("apiVIPs") + public List getApiVIPs() { + return apiVIPs; + } + + @JsonProperty("apiVIPs") + public void setApiVIPs(List apiVIPs) { + this.apiVIPs = apiVIPs; + } + @JsonProperty("cluster") public String getCluster() { return cluster; @@ -212,6 +254,16 @@ public void setDiskType(String diskType) { this.diskType = diskType; } + @JsonProperty("failureDomains") + public List getFailureDomains() { + return failureDomains; + } + + @JsonProperty("failureDomains") + public void setFailureDomains(List failureDomains) { + this.failureDomains = failureDomains; + } + @JsonProperty("folder") public String getFolder() { return folder; @@ -232,6 +284,26 @@ public void setIngressVIP(String ingressVIP) { this.ingressVIP = ingressVIP; } + @JsonProperty("ingressVIPs") + public List getIngressVIPs() { + return ingressVIPs; + } + + @JsonProperty("ingressVIPs") + public void setIngressVIPs(List ingressVIPs) { + this.ingressVIPs = ingressVIPs; + } + + @JsonProperty("loadBalancer") + public VSpherePlatformLoadBalancer getLoadBalancer() { + return loadBalancer; + } + + @JsonProperty("loadBalancer") + public void setLoadBalancer(VSpherePlatformLoadBalancer loadBalancer) { + this.loadBalancer = loadBalancer; + } + @JsonProperty("network") public String getNetwork() { return network; @@ -282,6 +354,16 @@ public void setVCenter(String vCenter) { this.vCenter = vCenter; } + @JsonProperty("vcenters") + public List getVcenters() { + return vcenters; + } + + @JsonProperty("vcenters") + public void setVcenters(List vcenters) { + this.vcenters = vcenters; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Topology.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Topology.java new file mode 100644 index 00000000000..b300e721b4f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Topology.java @@ -0,0 +1,178 @@ + +package io.fabric8.openshift.api.model.installer.vsphere.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", + "computeCluster", + "datacenter", + "datastore", + "folder", + "networks", + "resourcePool" +}) +@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 Topology implements KubernetesResource +{ + + @JsonProperty("computeCluster") + private String computeCluster; + @JsonProperty("datacenter") + private String datacenter; + @JsonProperty("datastore") + private String datastore; + @JsonProperty("folder") + private String folder; + @JsonProperty("networks") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List networks = new ArrayList(); + @JsonProperty("resourcePool") + private String resourcePool; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Topology() { + } + + /** + * + * @param computeCluster + * @param folder + * @param datastore + * @param datacenter + * @param networks + * @param resourcePool + */ + public Topology(String computeCluster, String datacenter, String datastore, String folder, List networks, String resourcePool) { + super(); + this.computeCluster = computeCluster; + this.datacenter = datacenter; + this.datastore = datastore; + this.folder = folder; + this.networks = networks; + this.resourcePool = resourcePool; + } + + @JsonProperty("computeCluster") + public String getComputeCluster() { + return computeCluster; + } + + @JsonProperty("computeCluster") + public void setComputeCluster(String computeCluster) { + this.computeCluster = computeCluster; + } + + @JsonProperty("datacenter") + public String getDatacenter() { + return datacenter; + } + + @JsonProperty("datacenter") + public void setDatacenter(String datacenter) { + this.datacenter = datacenter; + } + + @JsonProperty("datastore") + public String getDatastore() { + return datastore; + } + + @JsonProperty("datastore") + public void setDatastore(String datastore) { + this.datastore = datastore; + } + + @JsonProperty("folder") + public String getFolder() { + return folder; + } + + @JsonProperty("folder") + public void setFolder(String folder) { + this.folder = folder; + } + + @JsonProperty("networks") + public List getNetworks() { + return networks; + } + + @JsonProperty("networks") + public void setNetworks(List networks) { + this.networks = networks; + } + + @JsonProperty("resourcePool") + public String getResourcePool() { + return resourcePool; + } + + @JsonProperty("resourcePool") + public void setResourcePool(String resourcePool) { + this.resourcePool = resourcePool; + } + + @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/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/VCenter.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/VCenter.java new file mode 100644 index 00000000000..14a433f475b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/VCenter.java @@ -0,0 +1,162 @@ + +package io.fabric8.openshift.api.model.installer.vsphere.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", + "datacenters", + "password", + "port", + "server", + "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 VCenter implements KubernetesResource +{ + + @JsonProperty("datacenters") + private List datacenters = new ArrayList(); + @JsonProperty("password") + private String password; + @JsonProperty("port") + private Integer port; + @JsonProperty("server") + private String server; + @JsonProperty("user") + private String user; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public VCenter() { + } + + /** + * + * @param datacenters + * @param server + * @param password + * @param port + * @param user + */ + public VCenter(List datacenters, String password, Integer port, String server, String user) { + super(); + this.datacenters = datacenters; + this.password = password; + this.port = port; + this.server = server; + this.user = user; + } + + @JsonProperty("datacenters") + public List getDatacenters() { + return datacenters; + } + + @JsonProperty("datacenters") + public void setDatacenters(List datacenters) { + this.datacenters = datacenters; + } + + @JsonProperty("password") + public String getPassword() { + return password; + } + + @JsonProperty("password") + public void setPassword(String password) { + this.password = password; + } + + @JsonProperty("port") + public Integer getPort() { + return port; + } + + @JsonProperty("port") + public void setPort(Integer port) { + this.port = port; + } + + @JsonProperty("server") + public String getServer() { + return server; + } + + @JsonProperty("server") + public void setServer(String server) { + this.server = server; + } + + @JsonProperty("user") + public String getUser() { + return user; + } + + @JsonProperty("user") + public void setUser(String 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/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 2b25fd26e7f..deef93e8966 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 @@ -3,6 +3,14 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$module": "installer", "definitions": { + "k8s_io_apiextensions_apiserver_pkg_apis_apiextensions_v1_JSON": { + "type": "object", + "additionalProperties": true, + "existingJavaType": "com.fasterxml.jackson.databind.JsonNode", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "k8s_io_apimachinery_pkg_runtime_RawExtension": { "type": "object", "additionalProperties": true, @@ -11,6 +19,26 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "k8s_io_apimachinery_pkg_util_intstr_IntOrString": { + "type": "object", + "properties": { + "IntVal": { + "type": "integer" + }, + "StrVal": { + "type": "string" + }, + "Type": { + "type": "integer", + "existingJavaType": "Long" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_apimachinery_APIGroup": { "type": "object", "properties": { @@ -448,6 +476,71 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_BareMetalPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_OpenStackPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_OvirtPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_alibabacloud_v1_MachinePool": { "type": "object", "properties": { @@ -517,6 +610,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_aws_v1_EC2Metadata": { + "type": "object", + "properties": { + "authentication": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.aws.v1.EC2Metadata", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_aws_v1_EC2RootVolume": { "type": "object", "properties": { @@ -548,6 +654,10 @@ "iamRole": { "type": "string" }, + "metadataService": { + "$ref": "#/definitions/os_installer_aws_v1_EC2Metadata", + "existingJavaType": "io.fabric8.openshift.api.model.installer.aws.v1.EC2Metadata" + }, "rootVolume": { "$ref": "#/definitions/os_installer_aws_v1_EC2RootVolume", "existingJavaType": "io.fabric8.openshift.api.model.installer.aws.v1.EC2RootVolume" @@ -585,6 +695,12 @@ "hostedZone": { "type": "string" }, + "lbType": { + "type": "string" + }, + "propagateUserTags": { + "type": "boolean" + }, "region": { "type": "string" }, @@ -633,16 +749,48 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_azure_v1_DiskEncryptionSet": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "resourceGroup": { + "type": "string" + }, + "subscriptionId": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.azure.v1.DiskEncryptionSet", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_azure_v1_MachinePool": { "type": "object", "properties": { + "encryptionAtHost": { + "type": "boolean" + }, "osDisk": { "$ref": "#/definitions/os_installer_azure_v1_OSDisk", "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.OSDisk" }, + "osImage": { + "$ref": "#/definitions/os_installer_azure_v1_OSImage", + "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.OSImage" + }, "type": { "type": "string" }, + "ultraSSDCapability": { + "type": "string" + }, + "vmNetworkingType": { + "type": "string" + }, "zones": { "type": "array", "javaOmitEmpty": true, @@ -660,6 +808,10 @@ "os_installer_azure_v1_OSDisk": { "type": "object", "properties": { + "diskEncryptionSet": { + "$ref": "#/definitions/os_installer_azure_v1_DiskEncryptionSet", + "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.DiskEncryptionSet" + }, "diskSizeGB": { "type": "integer" }, @@ -673,6 +825,28 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_azure_v1_OSImage": { + "type": "object", + "properties": { + "offer": { + "type": "string" + }, + "publisher": { + "type": "string" + }, + "sku": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.azure.v1.OSImage", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_azure_v1_Platform": { "type": "object", "properties": { @@ -710,6 +884,13 @@ "resourceGroupName": { "type": "string" }, + "userTags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "virtualNetwork": { "type": "string" } @@ -762,7 +943,8 @@ "type": "string" }, "networkConfig": { - "type": "string" + "$ref": "#/definitions/k8s_io_apiextensions_apiserver_pkg_apis_apiextensions_v1_JSON", + "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" }, "role": { "type": "string" @@ -792,6 +974,19 @@ "apiVIP": { "type": "string" }, + "apiVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "bootstrapExternalStaticGateway": { + "type": "string" + }, + "bootstrapExternalStaticIP": { + "type": "string" + }, "bootstrapOSImage": { "type": "string" }, @@ -824,9 +1019,20 @@ "ingressVIP": { "type": "string" }, + "ingressVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "libvirtURI": { "type": "string" }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_BareMetalPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer" + }, "provisioningBridge": { "type": "string" }, @@ -940,10 +1146,26 @@ "os_installer_gcp_v1_MachinePool": { "type": "object", "properties": { + "confidentialCompute": { + "type": "string" + }, + "onHostMaintenance": { + "type": "string" + }, "osDisk": { "$ref": "#/definitions/os_installer_gcp_v1_OSDisk", "existingJavaType": "io.fabric8.openshift.api.model.installer.gcp.v1.OSDisk" }, + "secureBoot": { + "type": "string" + }, + "tags": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "type": { "type": "string" }, @@ -968,7 +1190,7 @@ "type": "integer", "existingJavaType": "Long" }, - "DiskType": { + "diskType": { "type": "string" }, "encryptionKey": { @@ -1005,6 +1227,9 @@ "network": { "type": "string" }, + "networkProjectID": { + "type": "string" + }, "projectID": { "type": "string" }, @@ -1082,27 +1307,34 @@ "os_installer_ibmcloud_v1_Platform": { "type": "object", "properties": { + "computeSubnets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "controlPlaneSubnets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "defaultMachinePlatform": { "$ref": "#/definitions/os_installer_ibmcloud_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool" }, - "region": { + "networkResourceGroupName": { "type": "string" }, - "resourceGroupName": { + "region": { "type": "string" }, - "subnets": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } - }, - "vpc": { + "resourceGroupName": { "type": "string" }, - "vpcResourceGroupName": { + "vpcName": { "type": "string" } }, @@ -1186,66 +1418,328 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_installer_openstack_v1_MachinePool": { + "os_installer_nutanix_v1_MachinePool": { "type": "object", "properties": { - "additionalNetworkIDs": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "bootType": { + "type": "string" }, - "additionalSecurityGroupIDs": { + "categories": { "type": "array", "javaOmitEmpty": true, "items": { - "type": "string" + "$ref": "#/definitions/os_machine_v1_NutanixCategory", + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1.NutanixCategory" } }, - "rootVolume": { - "$ref": "#/definitions/os_installer_openstack_v1_RootVolume", - "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.RootVolume" + "coresPerSocket": { + "type": "integer", + "existingJavaType": "Long" }, - "serverGroupPolicy": { - "type": "string" + "cpus": { + "type": "integer", + "existingJavaType": "Long" }, - "type": { - "type": "string" + "memoryMiB": { + "type": "integer", + "existingJavaType": "Long" }, - "zones": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "osDisk": { + "$ref": "#/definitions/os_installer_nutanix_v1_OSDisk", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.OSDisk" + }, + "project": { + "$ref": "#/definitions/os_machine_v1_NutanixResourceIdentifier", + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier" } }, "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool", + "javaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_installer_openstack_v1_Platform": { + "os_installer_nutanix_v1_OSDisk": { + "type": "object", + "properties": { + "diskSizeGiB": { + "type": "integer", + "existingJavaType": "Long" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.OSDisk", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_nutanix_v1_Platform": { "type": "object", "properties": { - "apiFloatingIP": { - "type": "string" - }, "apiVIP": { "type": "string" }, - "cloud": { - "type": "string" + "apiVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, "clusterOSImage": { "type": "string" }, - "clusterOSImageProperties": { - "type": "object", - "additionalProperties": { - "type": "string" + "defaultMachinePlatform": { + "$ref": "#/definitions/os_installer_nutanix_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool" + }, + "ingressVIP": { + "type": "string" + }, + "ingressVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer" + }, + "prismCentral": { + "$ref": "#/definitions/os_installer_nutanix_v1_PrismCentral", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismCentral" + }, + "prismElements": { + "type": "array", + "items": { + "$ref": "#/definitions/os_installer_nutanix_v1_PrismElement", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismElement" + } + }, + "subnetUUIDs": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.Platform", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_nutanix_v1_PrismCentral": { + "type": "object", + "properties": { + "endpoint": { + "$ref": "#/definitions/os_installer_nutanix_v1_PrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismEndpoint" + }, + "password": { + "type": "string" + }, + "username": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismCentral", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_nutanix_v1_PrismElement": { + "type": "object", + "properties": { + "endpoint": { + "$ref": "#/definitions/os_installer_nutanix_v1_PrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismEndpoint" + }, + "name": { + "type": "string" + }, + "uuid": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismElement", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_nutanix_v1_PrismEndpoint": { + "type": "object", + "properties": { + "address": { + "type": "string" + }, + "port": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismEndpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_openstack_v1_FailureDomain": { + "type": "object", + "properties": { + "computeAvailabilityZone": { + "type": "string" + }, + "portTargets": { + "type": "array", + "items": { + "$ref": "#/definitions/os_installer_openstack_v1_NamedPortTarget", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NamedPortTarget" + } + }, + "storageAvailabilityZone": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FailureDomain", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_openstack_v1_FixedIP": { + "type": "object", + "properties": { + "subnet": { + "$ref": "#/definitions/os_machine_v1alpha1_SubnetFilter", + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FixedIP", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_openstack_v1_MachinePool": { + "type": "object", + "properties": { + "additionalNetworkIDs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "additionalSecurityGroupIDs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "failureDomains": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_openstack_v1_FailureDomain", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FailureDomain" + } + }, + "rootVolume": { + "$ref": "#/definitions/os_installer_openstack_v1_RootVolume", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.RootVolume" + }, + "serverGroupPolicy": { + "type": "string" + }, + "type": { + "type": "string" + }, + "zones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_openstack_v1_NamedPortTarget": { + "type": "object", + "properties": { + "fixedIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_openstack_v1_FixedIP", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FixedIP" + } + }, + "id": { + "type": "string" + }, + "network": { + "$ref": "#/definitions/os_installer_openstack_v1_NetworkFilter", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NetworkFilter" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NamedPortTarget", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_openstack_v1_NetworkFilter": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NetworkFilter", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_openstack_v1_Platform": { + "type": "object", + "properties": { + "apiFloatingIP": { + "type": "string" + }, + "apiVIP": { + "type": "string" + }, + "apiVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "cloud": { + "type": "string" + }, + "clusterOSImage": { + "type": "string" + }, + "clusterOSImageProperties": { + "type": "object", + "additionalProperties": { + "type": "string" }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, @@ -1271,9 +1765,20 @@ "ingressVIP": { "type": "string" }, + "ingressVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "lbFloatingIP": { "type": "string" }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OpenStackPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer" + }, "machinesSubnet": { "type": "string" }, @@ -1293,6 +1798,28 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_openstack_v1_PortTarget": { + "type": "object", + "properties": { + "fixedIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_openstack_v1_FixedIP", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FixedIP" + } + }, + "network": { + "$ref": "#/definitions/os_installer_openstack_v1_NetworkFilter", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NetworkFilter" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.PortTarget", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_openstack_v1_RootVolume": { "type": "object", "properties": { @@ -1346,6 +1873,9 @@ }, "sockets": { "type": "integer" + }, + "threads": { + "type": "integer" } }, "additionalProperties": true, @@ -1380,10 +1910,16 @@ "autoPinningPolicy": { "type": "string" }, + "clone": { + "type": "boolean" + }, "cpu": { "$ref": "#/definitions/os_installer_ovirt_v1_CPU", "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.CPU" }, + "format": { + "type": "string" + }, "hugepages": { "type": "integer" }, @@ -1397,6 +1933,9 @@ "$ref": "#/definitions/os_installer_ovirt_v1_Disk", "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.Disk" }, + "sparse": { + "type": "boolean" + }, "vmType": { "type": "string" } @@ -1420,6 +1959,13 @@ "api_vip": { "type": "string" }, + "api_vips": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "defaultMachinePlatform": { "$ref": "#/definitions/os_installer_ovirt_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool" @@ -1427,6 +1973,17 @@ "ingress_vip": { "type": "string" }, + "ingress_vips": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OvirtPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer" + }, "ovirt_cluster_id": { "type": "string" }, @@ -1446,6 +2003,87 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_powervs_v1_MachinePool": { + "type": "object", + "properties": { + "memoryGiB": { + "type": "integer" + }, + "procType": { + "type": "string" + }, + "processors": { + "$ref": "#/definitions/k8s_io_apimachinery_pkg_util_intstr_IntOrString", + "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" + }, + "sysType": { + "type": "string" + }, + "volumeIDs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.powervs.v1.MachinePool", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_powervs_v1_Platform": { + "type": "object", + "properties": { + "cloudConnectionName": { + "type": "string" + }, + "clusterOSImage": { + "type": "string" + }, + "defaultMachinePlatform": { + "$ref": "#/definitions/os_installer_powervs_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.powervs.v1.MachinePool" + }, + "powervsResourceGroup": { + "type": "string" + }, + "pvsNetworkName": { + "type": "string" + }, + "region": { + "type": "string" + }, + "serviceInstanceID": { + "type": "string" + }, + "userID": { + "type": "string" + }, + "vpcName": { + "type": "string" + }, + "vpcRegion": { + "type": "string" + }, + "vpcSubnets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.powervs.v1.Platform", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_v1_BootstrapInPlace": { "type": "object", "properties": { @@ -1459,6 +2097,26 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_v1_Capabilities": { + "type": "object", + "properties": { + "additionalEnabledCapabilities": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "baselineCapabilitySet": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.v1.Capabilities", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_v1_ClusterNetworkEntry": { "type": "object", "properties": { @@ -1504,6 +2162,9 @@ "additionalTrustBundle": { "type": "string" }, + "additionalTrustBundlePolicy": { + "type": "string" + }, "apiVersion": { "type": "string", "default": "install.openshift.io/v1", @@ -1516,6 +2177,10 @@ "$ref": "#/definitions/os_installer_v1_BootstrapInPlace", "existingJavaType": "io.fabric8.openshift.api.model.installer.v1.BootstrapInPlace" }, + "capabilities": { + "$ref": "#/definitions/os_installer_v1_Capabilities", + "existingJavaType": "io.fabric8.openshift.api.model.installer.v1.Capabilities" + }, "compute": { "type": "array", "javaOmitEmpty": true, @@ -1528,9 +2193,15 @@ "$ref": "#/definitions/os_installer_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.v1.MachinePool" }, + "cpuPartitioningMode": { + "type": "string" + }, "credentialsMode": { "type": "string" }, + "featureSet": { + "type": "string" + }, "fips": { "type": "boolean" }, @@ -1651,6 +2322,10 @@ "$ref": "#/definitions/os_installer_libvirt_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool" }, + "nutanix": { + "$ref": "#/definitions/os_installer_nutanix_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool" + }, "openstack": { "$ref": "#/definitions/os_installer_openstack_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool" @@ -1659,6 +2334,10 @@ "$ref": "#/definitions/os_installer_ovirt_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool" }, + "powervs": { + "$ref": "#/definitions/os_installer_powervs_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.powervs.v1.MachinePool" + }, "vsphere": { "$ref": "#/definitions/os_installer_vsphere_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool" @@ -1758,6 +2437,10 @@ "$ref": "#/definitions/os_installer_none_v1_Platform", "existingJavaType": "io.fabric8.openshift.api.model.installer.none.v1.Platform" }, + "nutanix": { + "$ref": "#/definitions/os_installer_nutanix_v1_Platform", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.Platform" + }, "openstack": { "$ref": "#/definitions/os_installer_openstack_v1_Platform", "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.Platform" @@ -1766,6 +2449,10 @@ "$ref": "#/definitions/os_installer_ovirt_v1_Platform", "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.Platform" }, + "powervs": { + "$ref": "#/definitions/os_installer_powervs_v1_Platform", + "existingJavaType": "io.fabric8.openshift.api.model.installer.powervs.v1.Platform" + }, "vsphere": { "$ref": "#/definitions/os_installer_vsphere_v1_Platform", "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.Platform" @@ -1796,6 +2483,32 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_vsphere_v1_FailureDomain": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "server": { + "type": "string" + }, + "topology": { + "$ref": "#/definitions/os_installer_vsphere_v1_Topology", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.Topology" + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.FailureDomain", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_vsphere_v1_MachinePool": { "type": "object", "properties": { @@ -1812,6 +2525,13 @@ "osDisk": { "$ref": "#/definitions/os_installer_vsphere_v1_OSDisk", "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.OSDisk" + }, + "zones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true, @@ -1839,6 +2559,13 @@ "apiVIP": { "type": "string" }, + "apiVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "cluster": { "type": "string" }, @@ -1858,12 +2585,31 @@ "diskType": { "type": "string" }, + "failureDomains": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_vsphere_v1_FailureDomain", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.FailureDomain" + } + }, "folder": { "type": "string" }, "ingressVIP": { "type": "string" }, + "ingressVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer" + }, "network": { "type": "string" }, @@ -1878,6 +2624,14 @@ }, "vCenter": { "type": "string" + }, + "vcenters": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_vsphere_v1_VCenter", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.VCenter" + } } }, "additionalProperties": true, @@ -1885,6 +2639,174 @@ "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] + }, + "os_installer_vsphere_v1_Topology": { + "type": "object", + "properties": { + "computeCluster": { + "type": "string" + }, + "datacenter": { + "type": "string" + }, + "datastore": { + "type": "string" + }, + "folder": { + "type": "string" + }, + "networks": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "resourcePool": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.Topology", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_vsphere_v1_VCenter": { + "type": "object", + "properties": { + "datacenters": { + "type": "array", + "items": { + "type": "string" + } + }, + "password": { + "type": "string" + }, + "port": { + "type": "integer" + }, + "server": { + "type": "string" + }, + "user": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.VCenter", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_machine_v1_NutanixCategory": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1.NutanixCategory", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_machine_v1_NutanixResourceIdentifier": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "uuid": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_machine_v1alpha1_SubnetFilter": { + "type": "object", + "properties": { + "cidr": { + "type": "string" + }, + "description": { + "type": "string" + }, + "enableDhcp": { + "type": "boolean" + }, + "gateway_ip": { + "type": "string" + }, + "id": { + "type": "string" + }, + "ipVersion": { + "type": "integer" + }, + "ipv6AddressMode": { + "type": "string" + }, + "ipv6RaMode": { + "type": "string" + }, + "limit": { + "type": "integer" + }, + "marker": { + "type": "string" + }, + "name": { + "type": "string" + }, + "networkId": { + "type": "string" + }, + "notTags": { + "type": "string" + }, + "notTagsAny": { + "type": "string" + }, + "projectId": { + "type": "string" + }, + "sortDir": { + "type": "string" + }, + "sortKey": { + "type": "string" + }, + "subnetpoolId": { + "type": "string" + }, + "tags": { + "type": "string" + }, + "tagsAny": { + "type": "string" + }, + "tenantId": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] } }, "type": "object", 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 08754454f5b..5faf14619f0 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 @@ -3,6 +3,14 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$module": "installer", "definitions": { + "k8s_io_apiextensions_apiserver_pkg_apis_apiextensions_v1_JSON": { + "type": "object", + "additionalProperties": true, + "existingJavaType": "com.fasterxml.jackson.databind.JsonNode", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "k8s_io_apimachinery_pkg_runtime_RawExtension": { "type": "object", "additionalProperties": true, @@ -11,6 +19,26 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "k8s_io_apimachinery_pkg_util_intstr_IntOrString": { + "type": "object", + "properties": { + "IntVal": { + "type": "integer" + }, + "StrVal": { + "type": "string" + }, + "Type": { + "type": "integer", + "existingJavaType": "Long" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_apimachinery_APIGroup": { "type": "object", "properties": { @@ -448,6 +476,71 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_BareMetalPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_OpenStackPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_OvirtPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_alibabacloud_v1_MachinePool": { "type": "object", "properties": { @@ -517,6 +610,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_aws_v1_EC2Metadata": { + "type": "object", + "properties": { + "authentication": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.aws.v1.EC2Metadata", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_aws_v1_EC2RootVolume": { "type": "object", "properties": { @@ -548,6 +654,10 @@ "iamRole": { "type": "string" }, + "metadataService": { + "$ref": "#/definitions/os_installer_aws_v1_EC2Metadata", + "existingJavaType": "io.fabric8.openshift.api.model.installer.aws.v1.EC2Metadata" + }, "rootVolume": { "$ref": "#/definitions/os_installer_aws_v1_EC2RootVolume", "existingJavaType": "io.fabric8.openshift.api.model.installer.aws.v1.EC2RootVolume" @@ -585,6 +695,12 @@ "hostedZone": { "type": "string" }, + "lbType": { + "type": "string" + }, + "propagateUserTags": { + "type": "boolean" + }, "region": { "type": "string" }, @@ -633,16 +749,48 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_azure_v1_DiskEncryptionSet": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "resourceGroup": { + "type": "string" + }, + "subscriptionId": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.azure.v1.DiskEncryptionSet", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_azure_v1_MachinePool": { "type": "object", "properties": { + "encryptionAtHost": { + "type": "boolean" + }, "osDisk": { "$ref": "#/definitions/os_installer_azure_v1_OSDisk", "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.OSDisk" }, + "osImage": { + "$ref": "#/definitions/os_installer_azure_v1_OSImage", + "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.OSImage" + }, "type": { "type": "string" }, + "ultraSSDCapability": { + "type": "string" + }, + "vmNetworkingType": { + "type": "string" + }, "zones": { "type": "array", "javaOmitEmpty": true, @@ -660,6 +808,10 @@ "os_installer_azure_v1_OSDisk": { "type": "object", "properties": { + "diskEncryptionSet": { + "$ref": "#/definitions/os_installer_azure_v1_DiskEncryptionSet", + "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.DiskEncryptionSet" + }, "diskSizeGB": { "type": "integer" }, @@ -673,6 +825,28 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_azure_v1_OSImage": { + "type": "object", + "properties": { + "offer": { + "type": "string" + }, + "publisher": { + "type": "string" + }, + "sku": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.azure.v1.OSImage", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_azure_v1_Platform": { "type": "object", "properties": { @@ -710,6 +884,13 @@ "resourceGroupName": { "type": "string" }, + "userTags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "virtualNetwork": { "type": "string" } @@ -762,7 +943,8 @@ "type": "string" }, "networkConfig": { - "type": "string" + "$ref": "#/definitions/k8s_io_apiextensions_apiserver_pkg_apis_apiextensions_v1_JSON", + "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" }, "role": { "type": "string" @@ -792,6 +974,19 @@ "apiVIP": { "type": "string" }, + "apiVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "bootstrapExternalStaticGateway": { + "type": "string" + }, + "bootstrapExternalStaticIP": { + "type": "string" + }, "bootstrapOSImage": { "type": "string" }, @@ -824,9 +1019,20 @@ "ingressVIP": { "type": "string" }, + "ingressVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "libvirtURI": { "type": "string" }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_BareMetalPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer" + }, "provisioningBridge": { "type": "string" }, @@ -940,10 +1146,26 @@ "os_installer_gcp_v1_MachinePool": { "type": "object", "properties": { + "confidentialCompute": { + "type": "string" + }, + "onHostMaintenance": { + "type": "string" + }, "osDisk": { "$ref": "#/definitions/os_installer_gcp_v1_OSDisk", "existingJavaType": "io.fabric8.openshift.api.model.installer.gcp.v1.OSDisk" }, + "secureBoot": { + "type": "string" + }, + "tags": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "type": { "type": "string" }, @@ -968,7 +1190,7 @@ "type": "integer", "existingJavaType": "Long" }, - "DiskType": { + "diskType": { "type": "string" }, "encryptionKey": { @@ -1005,6 +1227,9 @@ "network": { "type": "string" }, + "networkProjectID": { + "type": "string" + }, "projectID": { "type": "string" }, @@ -1082,27 +1307,34 @@ "os_installer_ibmcloud_v1_Platform": { "type": "object", "properties": { + "computeSubnets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "controlPlaneSubnets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "defaultMachinePlatform": { "$ref": "#/definitions/os_installer_ibmcloud_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool" }, - "region": { + "networkResourceGroupName": { "type": "string" }, - "resourceGroupName": { + "region": { "type": "string" }, - "subnets": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } - }, - "vpc": { + "resourceGroupName": { "type": "string" }, - "vpcResourceGroupName": { + "vpcName": { "type": "string" } }, @@ -1186,66 +1418,328 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_installer_openstack_v1_MachinePool": { + "os_installer_nutanix_v1_MachinePool": { "type": "object", "properties": { - "additionalNetworkIDs": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "bootType": { + "type": "string" }, - "additionalSecurityGroupIDs": { + "categories": { "type": "array", "javaOmitEmpty": true, "items": { - "type": "string" + "$ref": "#/definitions/os_machine_v1_NutanixCategory", + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1.NutanixCategory" } }, - "rootVolume": { - "$ref": "#/definitions/os_installer_openstack_v1_RootVolume", - "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.RootVolume" + "coresPerSocket": { + "type": "integer", + "existingJavaType": "Long" }, - "serverGroupPolicy": { - "type": "string" + "cpus": { + "type": "integer", + "existingJavaType": "Long" }, - "type": { - "type": "string" + "memoryMiB": { + "type": "integer", + "existingJavaType": "Long" }, - "zones": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "osDisk": { + "$ref": "#/definitions/os_installer_nutanix_v1_OSDisk", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.OSDisk" + }, + "project": { + "$ref": "#/definitions/os_machine_v1_NutanixResourceIdentifier", + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier" } }, "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool", + "javaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_installer_openstack_v1_Platform": { + "os_installer_nutanix_v1_OSDisk": { + "type": "object", + "properties": { + "diskSizeGiB": { + "type": "integer", + "existingJavaType": "Long" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.OSDisk", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_nutanix_v1_Platform": { "type": "object", "properties": { - "apiFloatingIP": { - "type": "string" - }, "apiVIP": { "type": "string" }, - "cloud": { - "type": "string" + "apiVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, "clusterOSImage": { "type": "string" }, - "clusterOSImageProperties": { - "type": "object", - "additionalProperties": { - "type": "string" + "defaultMachinePlatform": { + "$ref": "#/definitions/os_installer_nutanix_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool" + }, + "ingressVIP": { + "type": "string" + }, + "ingressVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer" + }, + "prismCentral": { + "$ref": "#/definitions/os_installer_nutanix_v1_PrismCentral", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismCentral" + }, + "prismElements": { + "type": "array", + "items": { + "$ref": "#/definitions/os_installer_nutanix_v1_PrismElement", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismElement" + } + }, + "subnetUUIDs": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.Platform", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_nutanix_v1_PrismCentral": { + "type": "object", + "properties": { + "endpoint": { + "$ref": "#/definitions/os_installer_nutanix_v1_PrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismEndpoint" + }, + "password": { + "type": "string" + }, + "username": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismCentral", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_nutanix_v1_PrismElement": { + "type": "object", + "properties": { + "endpoint": { + "$ref": "#/definitions/os_installer_nutanix_v1_PrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismEndpoint" + }, + "name": { + "type": "string" + }, + "uuid": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismElement", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_nutanix_v1_PrismEndpoint": { + "type": "object", + "properties": { + "address": { + "type": "string" + }, + "port": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismEndpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_openstack_v1_FailureDomain": { + "type": "object", + "properties": { + "computeAvailabilityZone": { + "type": "string" + }, + "portTargets": { + "type": "array", + "items": { + "$ref": "#/definitions/os_installer_openstack_v1_NamedPortTarget", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NamedPortTarget" + } + }, + "storageAvailabilityZone": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FailureDomain", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_openstack_v1_FixedIP": { + "type": "object", + "properties": { + "subnet": { + "$ref": "#/definitions/os_machine_v1alpha1_SubnetFilter", + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FixedIP", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_openstack_v1_MachinePool": { + "type": "object", + "properties": { + "additionalNetworkIDs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "additionalSecurityGroupIDs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "failureDomains": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_openstack_v1_FailureDomain", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FailureDomain" + } + }, + "rootVolume": { + "$ref": "#/definitions/os_installer_openstack_v1_RootVolume", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.RootVolume" + }, + "serverGroupPolicy": { + "type": "string" + }, + "type": { + "type": "string" + }, + "zones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_openstack_v1_NamedPortTarget": { + "type": "object", + "properties": { + "fixedIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_openstack_v1_FixedIP", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FixedIP" + } + }, + "id": { + "type": "string" + }, + "network": { + "$ref": "#/definitions/os_installer_openstack_v1_NetworkFilter", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NetworkFilter" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NamedPortTarget", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_openstack_v1_NetworkFilter": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NetworkFilter", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_openstack_v1_Platform": { + "type": "object", + "properties": { + "apiFloatingIP": { + "type": "string" + }, + "apiVIP": { + "type": "string" + }, + "apiVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "cloud": { + "type": "string" + }, + "clusterOSImage": { + "type": "string" + }, + "clusterOSImageProperties": { + "type": "object", + "additionalProperties": { + "type": "string" }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, @@ -1271,9 +1765,20 @@ "ingressVIP": { "type": "string" }, + "ingressVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "lbFloatingIP": { "type": "string" }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OpenStackPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer" + }, "machinesSubnet": { "type": "string" }, @@ -1293,6 +1798,28 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_openstack_v1_PortTarget": { + "type": "object", + "properties": { + "fixedIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_openstack_v1_FixedIP", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FixedIP" + } + }, + "network": { + "$ref": "#/definitions/os_installer_openstack_v1_NetworkFilter", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NetworkFilter" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.openstack.v1.PortTarget", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_openstack_v1_RootVolume": { "type": "object", "properties": { @@ -1346,6 +1873,9 @@ }, "sockets": { "type": "integer" + }, + "threads": { + "type": "integer" } }, "additionalProperties": true, @@ -1380,10 +1910,16 @@ "autoPinningPolicy": { "type": "string" }, + "clone": { + "type": "boolean" + }, "cpu": { "$ref": "#/definitions/os_installer_ovirt_v1_CPU", "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.CPU" }, + "format": { + "type": "string" + }, "hugepages": { "type": "integer" }, @@ -1397,6 +1933,9 @@ "$ref": "#/definitions/os_installer_ovirt_v1_Disk", "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.Disk" }, + "sparse": { + "type": "boolean" + }, "vmType": { "type": "string" } @@ -1420,6 +1959,13 @@ "api_vip": { "type": "string" }, + "api_vips": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "defaultMachinePlatform": { "$ref": "#/definitions/os_installer_ovirt_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool" @@ -1427,6 +1973,17 @@ "ingress_vip": { "type": "string" }, + "ingress_vips": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OvirtPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer" + }, "ovirt_cluster_id": { "type": "string" }, @@ -1446,6 +2003,87 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_powervs_v1_MachinePool": { + "type": "object", + "properties": { + "memoryGiB": { + "type": "integer" + }, + "procType": { + "type": "string" + }, + "processors": { + "$ref": "#/definitions/k8s_io_apimachinery_pkg_util_intstr_IntOrString", + "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" + }, + "sysType": { + "type": "string" + }, + "volumeIDs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.powervs.v1.MachinePool", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_powervs_v1_Platform": { + "type": "object", + "properties": { + "cloudConnectionName": { + "type": "string" + }, + "clusterOSImage": { + "type": "string" + }, + "defaultMachinePlatform": { + "$ref": "#/definitions/os_installer_powervs_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.powervs.v1.MachinePool" + }, + "powervsResourceGroup": { + "type": "string" + }, + "pvsNetworkName": { + "type": "string" + }, + "region": { + "type": "string" + }, + "serviceInstanceID": { + "type": "string" + }, + "userID": { + "type": "string" + }, + "vpcName": { + "type": "string" + }, + "vpcRegion": { + "type": "string" + }, + "vpcSubnets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.powervs.v1.Platform", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_v1_BootstrapInPlace": { "type": "object", "properties": { @@ -1459,6 +2097,26 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_v1_Capabilities": { + "type": "object", + "properties": { + "additionalEnabledCapabilities": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "baselineCapabilitySet": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.v1.Capabilities", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_v1_ClusterNetworkEntry": { "type": "object", "properties": { @@ -1504,6 +2162,9 @@ "additionalTrustBundle": { "type": "string" }, + "additionalTrustBundlePolicy": { + "type": "string" + }, "apiVersion": { "type": "string", "default": "install.openshift.io/v1", @@ -1516,6 +2177,10 @@ "$ref": "#/definitions/os_installer_v1_BootstrapInPlace", "existingJavaType": "io.fabric8.openshift.api.model.installer.v1.BootstrapInPlace" }, + "capabilities": { + "$ref": "#/definitions/os_installer_v1_Capabilities", + "existingJavaType": "io.fabric8.openshift.api.model.installer.v1.Capabilities" + }, "compute": { "type": "array", "javaOmitEmpty": true, @@ -1528,9 +2193,15 @@ "$ref": "#/definitions/os_installer_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.v1.MachinePool" }, + "cpuPartitioningMode": { + "type": "string" + }, "credentialsMode": { "type": "string" }, + "featureSet": { + "type": "string" + }, "fips": { "type": "boolean" }, @@ -1651,6 +2322,10 @@ "$ref": "#/definitions/os_installer_libvirt_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool" }, + "nutanix": { + "$ref": "#/definitions/os_installer_nutanix_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool" + }, "openstack": { "$ref": "#/definitions/os_installer_openstack_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool" @@ -1659,6 +2334,10 @@ "$ref": "#/definitions/os_installer_ovirt_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool" }, + "powervs": { + "$ref": "#/definitions/os_installer_powervs_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.powervs.v1.MachinePool" + }, "vsphere": { "$ref": "#/definitions/os_installer_vsphere_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool" @@ -1758,6 +2437,10 @@ "$ref": "#/definitions/os_installer_none_v1_Platform", "existingJavaType": "io.fabric8.openshift.api.model.installer.none.v1.Platform" }, + "nutanix": { + "$ref": "#/definitions/os_installer_nutanix_v1_Platform", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.Platform" + }, "openstack": { "$ref": "#/definitions/os_installer_openstack_v1_Platform", "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.Platform" @@ -1766,6 +2449,10 @@ "$ref": "#/definitions/os_installer_ovirt_v1_Platform", "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.Platform" }, + "powervs": { + "$ref": "#/definitions/os_installer_powervs_v1_Platform", + "existingJavaType": "io.fabric8.openshift.api.model.installer.powervs.v1.Platform" + }, "vsphere": { "$ref": "#/definitions/os_installer_vsphere_v1_Platform", "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.Platform" @@ -1796,6 +2483,32 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_installer_vsphere_v1_FailureDomain": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "server": { + "type": "string" + }, + "topology": { + "$ref": "#/definitions/os_installer_vsphere_v1_Topology", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.Topology" + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.FailureDomain", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_installer_vsphere_v1_MachinePool": { "type": "object", "properties": { @@ -1812,6 +2525,13 @@ "osDisk": { "$ref": "#/definitions/os_installer_vsphere_v1_OSDisk", "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.OSDisk" + }, + "zones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true, @@ -1839,6 +2559,13 @@ "apiVIP": { "type": "string" }, + "apiVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "cluster": { "type": "string" }, @@ -1858,12 +2585,31 @@ "diskType": { "type": "string" }, + "failureDomains": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_vsphere_v1_FailureDomain", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.FailureDomain" + } + }, "folder": { "type": "string" }, "ingressVIP": { "type": "string" }, + "ingressVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer" + }, "network": { "type": "string" }, @@ -1878,6 +2624,14 @@ }, "vCenter": { "type": "string" + }, + "vcenters": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_vsphere_v1_VCenter", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.VCenter" + } } }, "additionalProperties": true, @@ -1885,6 +2639,174 @@ "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] + }, + "os_installer_vsphere_v1_Topology": { + "type": "object", + "properties": { + "computeCluster": { + "type": "string" + }, + "datacenter": { + "type": "string" + }, + "datastore": { + "type": "string" + }, + "folder": { + "type": "string" + }, + "networks": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "resourcePool": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.Topology", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_installer_vsphere_v1_VCenter": { + "type": "object", + "properties": { + "datacenters": { + "type": "array", + "items": { + "type": "string" + } + }, + "password": { + "type": "string" + }, + "port": { + "type": "integer" + }, + "server": { + "type": "string" + }, + "user": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.VCenter", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_machine_v1_NutanixCategory": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1.NutanixCategory", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_machine_v1_NutanixResourceIdentifier": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "uuid": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_machine_v1alpha1_SubnetFilter": { + "type": "object", + "properties": { + "cidr": { + "type": "string" + }, + "description": { + "type": "string" + }, + "enableDhcp": { + "type": "boolean" + }, + "gateway_ip": { + "type": "string" + }, + "id": { + "type": "string" + }, + "ipVersion": { + "type": "integer" + }, + "ipv6AddressMode": { + "type": "string" + }, + "ipv6RaMode": { + "type": "string" + }, + "limit": { + "type": "integer" + }, + "marker": { + "type": "string" + }, + "name": { + "type": "string" + }, + "networkId": { + "type": "string" + }, + "notTags": { + "type": "string" + }, + "notTagsAny": { + "type": "string" + }, + "projectId": { + "type": "string" + }, + "sortDir": { + "type": "string" + }, + "sortKey": { + "type": "string" + }, + "subnetpoolId": { + "type": "string" + }, + "tags": { + "type": "string" + }, + "tagsAny": { + "type": "string" + }, + "tenantId": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] } }, "type": "object", @@ -2044,6 +2966,14 @@ }, "additionalProperties": true }, + "baremetalplatformloadbalancer": { + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, "bmc": { "properties": { "address": { @@ -2077,6 +3007,21 @@ }, "additionalProperties": true }, + "capabilities": { + "properties": { + "additionalEnabledCapabilities": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "baselineCapabilitySet": { + "type": "string" + } + }, + "additionalProperties": true + }, "clusternetworkentry": { "properties": { "cidr": { @@ -2098,6 +3043,9 @@ }, "sockets": { "type": "integer" + }, + "threads": { + "type": "integer" } }, "additionalProperties": true @@ -2122,6 +3070,20 @@ }, "additionalProperties": true }, + "diskencryptionset": { + "properties": { + "name": { + "type": "string" + }, + "resourceGroup": { + "type": "string" + }, + "subscriptionId": { + "type": "string" + } + }, + "additionalProperties": true + }, "dnsmasqoption": { "properties": { "name": { @@ -2133,6 +3095,14 @@ }, "additionalProperties": true }, + "ec2metadata": { + "properties": { + "authentication": { + "type": "string" + } + }, + "additionalProperties": true + }, "ec2rootvolume": { "properties": { "iops": { @@ -2162,9 +3132,36 @@ }, "additionalProperties": true }, + "failuredomain": { + "properties": { + "computeAvailabilityZone": { + "type": "string" + }, + "portTargets": { + "type": "array", + "items": { + "$ref": "#/definitions/os_installer_openstack_v1_NamedPortTarget", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NamedPortTarget" + } + }, + "storageAvailabilityZone": { + "type": "string" + } + }, + "additionalProperties": true + }, "fieldsv1": { "additionalProperties": true }, + "fixedip": { + "properties": { + "subnet": { + "$ref": "#/definitions/os_machine_v1alpha1_SubnetFilter", + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter" + } + }, + "additionalProperties": true + }, "groupversionfordiscovery": { "properties": { "groupVersion": { @@ -2195,7 +3192,8 @@ "type": "string" }, "networkConfig": { - "type": "string" + "$ref": "#/definitions/k8s_io_apiextensions_apiserver_pkg_apis_apiextensions_v1_JSON", + "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" }, "role": { "type": "string" @@ -2227,6 +3225,9 @@ "additionalTrustBundle": { "type": "string" }, + "additionalTrustBundlePolicy": { + "type": "string" + }, "apiVersion": { "type": "string", "default": "install.openshift.io/v1", @@ -2239,6 +3240,10 @@ "$ref": "#/definitions/os_installer_v1_BootstrapInPlace", "existingJavaType": "io.fabric8.openshift.api.model.installer.v1.BootstrapInPlace" }, + "capabilities": { + "$ref": "#/definitions/os_installer_v1_Capabilities", + "existingJavaType": "io.fabric8.openshift.api.model.installer.v1.Capabilities" + }, "compute": { "type": "array", "javaOmitEmpty": true, @@ -2251,9 +3256,15 @@ "$ref": "#/definitions/os_installer_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.v1.MachinePool" }, + "cpuPartitioningMode": { + "type": "string" + }, "credentialsMode": { "type": "string" }, + "featureSet": { + "type": "string" + }, "fips": { "type": "boolean" }, @@ -2298,6 +3309,24 @@ }, "additionalProperties": true }, + "intorstring": { + "properties": { + "IntVal": { + "type": "integer" + }, + "StrVal": { + "type": "string" + }, + "Type": { + "type": "integer", + "existingJavaType": "Long" + } + }, + "additionalProperties": true + }, + "json": { + "additionalProperties": true + }, "kmskeyreference": { "properties": { "keyRing": { @@ -2369,34 +3398,24 @@ }, "machinepool": { "properties": { - "affinityGroupsNames": { - "type": "array", - "items": { - "type": "string" - } - }, - "autoPinningPolicy": { + "imageID": { "type": "string" }, - "cpu": { - "$ref": "#/definitions/os_installer_ovirt_v1_CPU", - "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.CPU" - }, - "hugepages": { - "type": "integer" + "instanceType": { + "type": "string" }, - "instanceTypeID": { + "systemDiskCategory": { "type": "string" }, - "memoryMB": { + "systemDiskSize": { "type": "integer" }, - "osDisk": { - "$ref": "#/definitions/os_installer_ovirt_v1_Disk", - "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.Disk" - }, - "vmType": { - "type": "string" + "zones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true @@ -2431,6 +3450,10 @@ "$ref": "#/definitions/os_installer_libvirt_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool" }, + "nutanix": { + "$ref": "#/definitions/os_installer_nutanix_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.MachinePool" + }, "openstack": { "$ref": "#/definitions/os_installer_openstack_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool" @@ -2439,6 +3462,10 @@ "$ref": "#/definitions/os_installer_ovirt_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool" }, + "powervs": { + "$ref": "#/definitions/os_installer_powervs_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.powervs.v1.MachinePool" + }, "vsphere": { "$ref": "#/definitions/os_installer_vsphere_v1_MachinePool", "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool" @@ -2474,6 +3501,26 @@ }, "additionalProperties": true }, + "namedporttarget": { + "properties": { + "fixedIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_openstack_v1_FixedIP", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FixedIP" + } + }, + "id": { + "type": "string" + }, + "network": { + "$ref": "#/definitions/os_installer_openstack_v1_NetworkFilter", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NetworkFilter" + } + }, + "additionalProperties": true + }, "network": { "properties": { "dnsmasqOptions": { @@ -2490,6 +3537,17 @@ }, "additionalProperties": true }, + "networkfilter": { + "properties": { + "id": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true + }, "networking": { "properties": { "clusterNetwork": { @@ -2538,6 +3596,39 @@ }, "additionalProperties": true }, + "nutanixcategory": { + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + } + }, + "additionalProperties": true + }, + "nutanixplatformloadbalancer": { + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, + "nutanixresourceidentifier": { + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "uuid": { + "type": "string" + } + }, + "additionalProperties": true + }, "objectmeta": { "properties": { "annotations": { @@ -2616,10 +3707,50 @@ }, "additionalProperties": true }, + "openstackplatformloadbalancer": { + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, "osdisk": { "properties": { + "diskEncryptionSet": { + "$ref": "#/definitions/os_installer_azure_v1_DiskEncryptionSet", + "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.DiskEncryptionSet" + }, "diskSizeGB": { "type": "integer" + }, + "diskType": { + "type": "string" + } + }, + "additionalProperties": true + }, + "osimage": { + "properties": { + "offer": { + "type": "string" + }, + "publisher": { + "type": "string" + }, + "sku": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": true + }, + "ovirtplatformloadbalancer": { + "properties": { + "type": { + "type": "string" } }, "additionalProperties": true @@ -2685,6 +3816,64 @@ }, "additionalProperties": true }, + "porttarget": { + "properties": { + "fixedIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_openstack_v1_FixedIP", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FixedIP" + } + }, + "network": { + "$ref": "#/definitions/os_installer_openstack_v1_NetworkFilter", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NetworkFilter" + } + }, + "additionalProperties": true + }, + "prismcentral": { + "properties": { + "endpoint": { + "$ref": "#/definitions/os_installer_nutanix_v1_PrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismEndpoint" + }, + "password": { + "type": "string" + }, + "username": { + "type": "string" + } + }, + "additionalProperties": true + }, + "prismelement": { + "properties": { + "endpoint": { + "$ref": "#/definitions/os_installer_nutanix_v1_PrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.installer.nutanix.v1.PrismEndpoint" + }, + "name": { + "type": "string" + }, + "uuid": { + "type": "string" + } + }, + "additionalProperties": true + }, + "prismendpoint": { + "properties": { + "address": { + "type": "string" + }, + "port": { + "type": "integer" + } + }, + "additionalProperties": true + }, "proxy": { "properties": { "httpProxy": { @@ -2854,6 +4043,74 @@ }, "additionalProperties": true }, + "subnetfilter": { + "properties": { + "cidr": { + "type": "string" + }, + "description": { + "type": "string" + }, + "enableDhcp": { + "type": "boolean" + }, + "gateway_ip": { + "type": "string" + }, + "id": { + "type": "string" + }, + "ipVersion": { + "type": "integer" + }, + "ipv6AddressMode": { + "type": "string" + }, + "ipv6RaMode": { + "type": "string" + }, + "limit": { + "type": "integer" + }, + "marker": { + "type": "string" + }, + "name": { + "type": "string" + }, + "networkId": { + "type": "string" + }, + "notTags": { + "type": "string" + }, + "notTagsAny": { + "type": "string" + }, + "projectId": { + "type": "string" + }, + "sortDir": { + "type": "string" + }, + "sortKey": { + "type": "string" + }, + "subnetpoolId": { + "type": "string" + }, + "tags": { + "type": "string" + }, + "tagsAny": { + "type": "string" + }, + "tenantId": { + "type": "string" + } + }, + "additionalProperties": true + }, "time": { "properties": { "Time": { @@ -2862,6 +4119,33 @@ }, "additionalProperties": true }, + "topology": { + "properties": { + "computeCluster": { + "type": "string" + }, + "datacenter": { + "type": "string" + }, + "datastore": { + "type": "string" + }, + "folder": { + "type": "string" + }, + "networks": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "resourcePool": { + "type": "string" + } + }, + "additionalProperties": true + }, "typemeta": { "properties": { "apiVersion": { @@ -2872,6 +4156,37 @@ } }, "additionalProperties": true + }, + "vcenter": { + "properties": { + "datacenters": { + "type": "array", + "items": { + "type": "string" + } + }, + "password": { + "type": "string" + }, + "port": { + "type": "integer" + }, + "server": { + "type": "string" + }, + "user": { + "type": "string" + } + }, + "additionalProperties": true + }, + "vsphereplatformloadbalancer": { + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true } } } diff --git a/kubernetes-model-generator/openshift-model-machine/cmd/generate/generate.go b/kubernetes-model-generator/openshift-model-machine/cmd/generate/generate.go index 532eeef5b09..e18dd102825 100644 --- a/kubernetes-model-generator/openshift-model-machine/cmd/generate/generate.go +++ b/kubernetes-model-generator/openshift-model-machine/cmd/generate/generate.go @@ -27,6 +27,8 @@ import ( "strings" "time" machineapi "github.com/openshift/api/machine/v1beta1" + v1machineapi "github.com/openshift/api/machine/v1" + v1alpha1machineapi "github.com/openshift/api/machine/v1alpha1" "os" @@ -49,6 +51,9 @@ type Schema struct { MachineList machineapi.MachineList MachineSet machineapi.MachineSet MachineSetList machineapi.MachineSetList + V1NutanixCategory v1machineapi.NutanixCategory + V1NutanixResourceIdentifier v1machineapi.NutanixResourceIdentifier + V1Alpha1SubnetFilter v1alpha1machineapi.SubnetFilter } func main() { @@ -63,6 +68,8 @@ func main() { {"k8s.io/kubernetes/pkg/api/unversioned", "", "io.fabric8.kubernetes.api.model", "api_", false}, {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, {"github.com/openshift/api/machine/v1beta1", "", "io.fabric8.openshift.api.model.machine.v1beta1", "os_machine_v1beta1_", true}, + {"github.com/openshift/api/machine/v1alpha1", "", "io.fabric8.openshift.api.model.machine.v1alpha1", "os_machine_v1alpha1_", true}, + {"github.com/openshift/api/machine/v1", "", "io.fabric8.openshift.api.model.machine.v1", "os_machine_v1_", true}, } typeMap := map[reflect.Type]reflect.Type{ diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index b8f94e22436..f44e5f17be2 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -19,6 +19,9 @@ import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; +import io.fabric8.openshift.api.model.machine.v1.NutanixCategory; +import io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier; +import io.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter; import io.fabric8.openshift.api.model.machine.v1beta1.Machine; import io.fabric8.openshift.api.model.machine.v1beta1.MachineHealthCheck; import io.fabric8.openshift.api.model.machine.v1beta1.MachineHealthCheckList; @@ -52,7 +55,10 @@ "Patch", "Status", "Time", - "TypeMeta" + "TypeMeta", + "V1Alpha1SubnetFilter", + "V1NutanixCategory", + "V1NutanixResourceIdentifier" }) @ToString @EqualsAndHashCode @@ -104,6 +110,12 @@ public class KubeSchema { private String time; @JsonProperty("TypeMeta") private TypeMeta typeMeta; + @JsonProperty("V1Alpha1SubnetFilter") + private SubnetFilter v1Alpha1SubnetFilter; + @JsonProperty("V1NutanixCategory") + private NutanixCategory v1NutanixCategory; + @JsonProperty("V1NutanixResourceIdentifier") + private NutanixResourceIdentifier v1NutanixResourceIdentifier; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -122,17 +134,20 @@ public KubeSchema() { * @param machineHealthCheckList * @param baseKubernetesList * @param machineSetList + * @param v1NutanixResourceIdentifier * @param patch * @param aPIGroup * @param typeMeta + * @param v1Alpha1SubnetFilter * @param machine * @param objectMeta * @param time * @param machineList * @param info * @param status + * @param v1NutanixCategory */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, SubnetFilter v1Alpha1SubnetFilter, NutanixCategory v1NutanixCategory, NutanixResourceIdentifier v1NutanixResourceIdentifier) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -149,6 +164,9 @@ public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList b this.status = status; this.time = time; this.typeMeta = typeMeta; + this.v1Alpha1SubnetFilter = v1Alpha1SubnetFilter; + this.v1NutanixCategory = v1NutanixCategory; + this.v1NutanixResourceIdentifier = v1NutanixResourceIdentifier; } @JsonProperty("APIGroup") @@ -301,6 +319,36 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } + @JsonProperty("V1Alpha1SubnetFilter") + public SubnetFilter getV1Alpha1SubnetFilter() { + return v1Alpha1SubnetFilter; + } + + @JsonProperty("V1Alpha1SubnetFilter") + public void setV1Alpha1SubnetFilter(SubnetFilter v1Alpha1SubnetFilter) { + this.v1Alpha1SubnetFilter = v1Alpha1SubnetFilter; + } + + @JsonProperty("V1NutanixCategory") + public NutanixCategory getV1NutanixCategory() { + return v1NutanixCategory; + } + + @JsonProperty("V1NutanixCategory") + public void setV1NutanixCategory(NutanixCategory v1NutanixCategory) { + this.v1NutanixCategory = v1NutanixCategory; + } + + @JsonProperty("V1NutanixResourceIdentifier") + public NutanixResourceIdentifier getV1NutanixResourceIdentifier() { + return v1NutanixResourceIdentifier; + } + + @JsonProperty("V1NutanixResourceIdentifier") + public void setV1NutanixResourceIdentifier(NutanixResourceIdentifier v1NutanixResourceIdentifier) { + this.v1NutanixResourceIdentifier = v1NutanixResourceIdentifier; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index e6f7e69444a..568db0481da 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -19,6 +19,9 @@ import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.version.Info; +import io.fabric8.openshift.api.model.machine.v1.NutanixCategory; +import io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier; +import io.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter; import io.fabric8.openshift.api.model.machine.v1beta1.Machine; import io.fabric8.openshift.api.model.machine.v1beta1.MachineHealthCheck; import io.fabric8.openshift.api.model.machine.v1beta1.MachineHealthCheckList; @@ -52,7 +55,10 @@ "Patch", "Status", "Time", - "TypeMeta" + "TypeMeta", + "V1Alpha1SubnetFilter", + "V1NutanixCategory", + "V1NutanixResourceIdentifier" }) @ToString @EqualsAndHashCode @@ -104,6 +110,12 @@ public class ValidationSchema { private String time; @JsonProperty("TypeMeta") private TypeMeta typeMeta; + @JsonProperty("V1Alpha1SubnetFilter") + private SubnetFilter v1Alpha1SubnetFilter; + @JsonProperty("V1NutanixCategory") + private NutanixCategory v1NutanixCategory; + @JsonProperty("V1NutanixResourceIdentifier") + private NutanixResourceIdentifier v1NutanixResourceIdentifier; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -122,17 +134,20 @@ public ValidationSchema() { * @param machineHealthCheckList * @param baseKubernetesList * @param machineSetList + * @param v1NutanixResourceIdentifier * @param patch * @param aPIGroup * @param typeMeta + * @param v1Alpha1SubnetFilter * @param machine * @param objectMeta * @param time * @param machineList * @param info * @param status + * @param v1NutanixCategory */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, SubnetFilter v1Alpha1SubnetFilter, NutanixCategory v1NutanixCategory, NutanixResourceIdentifier v1NutanixResourceIdentifier) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -149,6 +164,9 @@ public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Kubernetes this.status = status; this.time = time; this.typeMeta = typeMeta; + this.v1Alpha1SubnetFilter = v1Alpha1SubnetFilter; + this.v1NutanixCategory = v1NutanixCategory; + this.v1NutanixResourceIdentifier = v1NutanixResourceIdentifier; } @JsonProperty("APIGroup") @@ -301,6 +319,36 @@ public void setTypeMeta(TypeMeta typeMeta) { this.typeMeta = typeMeta; } + @JsonProperty("V1Alpha1SubnetFilter") + public SubnetFilter getV1Alpha1SubnetFilter() { + return v1Alpha1SubnetFilter; + } + + @JsonProperty("V1Alpha1SubnetFilter") + public void setV1Alpha1SubnetFilter(SubnetFilter v1Alpha1SubnetFilter) { + this.v1Alpha1SubnetFilter = v1Alpha1SubnetFilter; + } + + @JsonProperty("V1NutanixCategory") + public NutanixCategory getV1NutanixCategory() { + return v1NutanixCategory; + } + + @JsonProperty("V1NutanixCategory") + public void setV1NutanixCategory(NutanixCategory v1NutanixCategory) { + this.v1NutanixCategory = v1NutanixCategory; + } + + @JsonProperty("V1NutanixResourceIdentifier") + public NutanixResourceIdentifier getV1NutanixResourceIdentifier() { + return v1NutanixResourceIdentifier; + } + + @JsonProperty("V1NutanixResourceIdentifier") + public void setV1NutanixResourceIdentifier(NutanixResourceIdentifier v1NutanixResourceIdentifier) { + this.v1NutanixResourceIdentifier = v1NutanixResourceIdentifier; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixCategory.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixCategory.java new file mode 100644 index 00000000000..9f27a6cb7ac --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixCategory.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.machine.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", + "key", + "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 NutanixCategory implements KubernetesResource +{ + + @JsonProperty("key") + private String key; + @JsonProperty("value") + private String value; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixCategory() { + } + + /** + * + * @param value + * @param key + */ + public NutanixCategory(String key, String value) { + super(); + this.key = key; + this.value = value; + } + + @JsonProperty("key") + public String getKey() { + return key; + } + + @JsonProperty("key") + public void setKey(String key) { + this.key = key; + } + + @JsonProperty("value") + public String getValue() { + return value; + } + + @JsonProperty("value") + public void setValue(String 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/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixResourceIdentifier.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixResourceIdentifier.java new file mode 100644 index 00000000000..63e876f1114 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1/NutanixResourceIdentifier.java @@ -0,0 +1,130 @@ + +package io.fabric8.openshift.api.model.machine.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", + "name", + "type", + "uuid" +}) +@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 NutanixResourceIdentifier implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("type") + private String type; + @JsonProperty("uuid") + private String uuid; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NutanixResourceIdentifier() { + } + + /** + * + * @param name + * @param type + * @param uuid + */ + public NutanixResourceIdentifier(String name, String type, String uuid) { + super(); + this.name = name; + this.type = type; + this.uuid = uuid; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonProperty("uuid") + public String getUuid() { + return uuid; + } + + @JsonProperty("uuid") + public void setUuid(String uuid) { + this.uuid = uuid; + } + + @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/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/SubnetFilter.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/SubnetFilter.java new file mode 100644 index 00000000000..7f0bb9a3076 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1alpha1/SubnetFilter.java @@ -0,0 +1,400 @@ + +package io.fabric8.openshift.api.model.machine.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.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", + "cidr", + "description", + "enableDhcp", + "gateway_ip", + "id", + "ipVersion", + "ipv6AddressMode", + "ipv6RaMode", + "limit", + "marker", + "name", + "networkId", + "notTags", + "notTagsAny", + "projectId", + "sortDir", + "sortKey", + "subnetpoolId", + "tags", + "tagsAny", + "tenantId" +}) +@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 SubnetFilter implements KubernetesResource +{ + + @JsonProperty("cidr") + private String cidr; + @JsonProperty("description") + private String description; + @JsonProperty("enableDhcp") + private Boolean enableDhcp; + @JsonProperty("gateway_ip") + private String gatewayIp; + @JsonProperty("id") + private String id; + @JsonProperty("ipVersion") + private Integer ipVersion; + @JsonProperty("ipv6AddressMode") + private String ipv6AddressMode; + @JsonProperty("ipv6RaMode") + private String ipv6RaMode; + @JsonProperty("limit") + private Integer limit; + @JsonProperty("marker") + private String marker; + @JsonProperty("name") + private String name; + @JsonProperty("networkId") + private String networkId; + @JsonProperty("notTags") + private String notTags; + @JsonProperty("notTagsAny") + private String notTagsAny; + @JsonProperty("projectId") + private String projectId; + @JsonProperty("sortDir") + private String sortDir; + @JsonProperty("sortKey") + private String sortKey; + @JsonProperty("subnetpoolId") + private String subnetpoolId; + @JsonProperty("tags") + private String tags; + @JsonProperty("tagsAny") + private String tagsAny; + @JsonProperty("tenantId") + private String tenantId; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public SubnetFilter() { + } + + /** + * + * @param ipv6AddressMode + * @param subnetpoolId + * @param enableDhcp + * @param description + * @param gatewayIp + * @param tagsAny + * @param ipv6RaMode + * @param notTags + * @param tags + * @param ipVersion + * @param sortKey + * @param notTagsAny + * @param marker + * @param limit + * @param name + * @param tenantId + * @param cidr + * @param networkId + * @param id + * @param projectId + * @param sortDir + */ + public SubnetFilter(String cidr, String description, Boolean enableDhcp, String gatewayIp, String id, Integer ipVersion, String ipv6AddressMode, String ipv6RaMode, Integer limit, String marker, String name, String networkId, String notTags, String notTagsAny, String projectId, String sortDir, String sortKey, String subnetpoolId, String tags, String tagsAny, String tenantId) { + super(); + this.cidr = cidr; + this.description = description; + this.enableDhcp = enableDhcp; + this.gatewayIp = gatewayIp; + this.id = id; + this.ipVersion = ipVersion; + this.ipv6AddressMode = ipv6AddressMode; + this.ipv6RaMode = ipv6RaMode; + this.limit = limit; + this.marker = marker; + this.name = name; + this.networkId = networkId; + this.notTags = notTags; + this.notTagsAny = notTagsAny; + this.projectId = projectId; + this.sortDir = sortDir; + this.sortKey = sortKey; + this.subnetpoolId = subnetpoolId; + this.tags = tags; + this.tagsAny = tagsAny; + this.tenantId = tenantId; + } + + @JsonProperty("cidr") + public String getCidr() { + return cidr; + } + + @JsonProperty("cidr") + public void setCidr(String cidr) { + this.cidr = cidr; + } + + @JsonProperty("description") + public String getDescription() { + return description; + } + + @JsonProperty("description") + public void setDescription(String description) { + this.description = description; + } + + @JsonProperty("enableDhcp") + public Boolean getEnableDhcp() { + return enableDhcp; + } + + @JsonProperty("enableDhcp") + public void setEnableDhcp(Boolean enableDhcp) { + this.enableDhcp = enableDhcp; + } + + @JsonProperty("gateway_ip") + public String getGatewayIp() { + return gatewayIp; + } + + @JsonProperty("gateway_ip") + public void setGatewayIp(String gatewayIp) { + this.gatewayIp = gatewayIp; + } + + @JsonProperty("id") + public String getId() { + return id; + } + + @JsonProperty("id") + public void setId(String id) { + this.id = id; + } + + @JsonProperty("ipVersion") + public Integer getIpVersion() { + return ipVersion; + } + + @JsonProperty("ipVersion") + public void setIpVersion(Integer ipVersion) { + this.ipVersion = ipVersion; + } + + @JsonProperty("ipv6AddressMode") + public String getIpv6AddressMode() { + return ipv6AddressMode; + } + + @JsonProperty("ipv6AddressMode") + public void setIpv6AddressMode(String ipv6AddressMode) { + this.ipv6AddressMode = ipv6AddressMode; + } + + @JsonProperty("ipv6RaMode") + public String getIpv6RaMode() { + return ipv6RaMode; + } + + @JsonProperty("ipv6RaMode") + public void setIpv6RaMode(String ipv6RaMode) { + this.ipv6RaMode = ipv6RaMode; + } + + @JsonProperty("limit") + public Integer getLimit() { + return limit; + } + + @JsonProperty("limit") + public void setLimit(Integer limit) { + this.limit = limit; + } + + @JsonProperty("marker") + public String getMarker() { + return marker; + } + + @JsonProperty("marker") + public void setMarker(String marker) { + this.marker = marker; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("networkId") + public String getNetworkId() { + return networkId; + } + + @JsonProperty("networkId") + public void setNetworkId(String networkId) { + this.networkId = networkId; + } + + @JsonProperty("notTags") + public String getNotTags() { + return notTags; + } + + @JsonProperty("notTags") + public void setNotTags(String notTags) { + this.notTags = notTags; + } + + @JsonProperty("notTagsAny") + public String getNotTagsAny() { + return notTagsAny; + } + + @JsonProperty("notTagsAny") + public void setNotTagsAny(String notTagsAny) { + this.notTagsAny = notTagsAny; + } + + @JsonProperty("projectId") + public String getProjectId() { + return projectId; + } + + @JsonProperty("projectId") + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + @JsonProperty("sortDir") + public String getSortDir() { + return sortDir; + } + + @JsonProperty("sortDir") + public void setSortDir(String sortDir) { + this.sortDir = sortDir; + } + + @JsonProperty("sortKey") + public String getSortKey() { + return sortKey; + } + + @JsonProperty("sortKey") + public void setSortKey(String sortKey) { + this.sortKey = sortKey; + } + + @JsonProperty("subnetpoolId") + public String getSubnetpoolId() { + return subnetpoolId; + } + + @JsonProperty("subnetpoolId") + public void setSubnetpoolId(String subnetpoolId) { + this.subnetpoolId = subnetpoolId; + } + + @JsonProperty("tags") + public String getTags() { + return tags; + } + + @JsonProperty("tags") + public void setTags(String tags) { + this.tags = tags; + } + + @JsonProperty("tagsAny") + public String getTagsAny() { + return tagsAny; + } + + @JsonProperty("tagsAny") + public void setTagsAny(String tagsAny) { + this.tagsAny = tagsAny; + } + + @JsonProperty("tenantId") + public String getTenantId() { + return tenantId; + } + + @JsonProperty("tenantId") + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + @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/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 8b87528ac6a..54617d2ff00 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 @@ -637,6 +637,114 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_machine_v1_NutanixCategory": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.machine.v1.NutanixCategory", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_machine_v1_NutanixResourceIdentifier": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "uuid": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_machine_v1alpha1_SubnetFilter": { + "type": "object", + "properties": { + "cidr": { + "type": "string" + }, + "description": { + "type": "string" + }, + "enableDhcp": { + "type": "boolean" + }, + "gateway_ip": { + "type": "string" + }, + "id": { + "type": "string" + }, + "ipVersion": { + "type": "integer" + }, + "ipv6AddressMode": { + "type": "string" + }, + "ipv6RaMode": { + "type": "string" + }, + "limit": { + "type": "integer" + }, + "marker": { + "type": "string" + }, + "name": { + "type": "string" + }, + "networkId": { + "type": "string" + }, + "notTags": { + "type": "string" + }, + "notTagsAny": { + "type": "string" + }, + "projectId": { + "type": "string" + }, + "sortDir": { + "type": "string" + }, + "sortKey": { + "type": "string" + }, + "subnetpoolId": { + "type": "string" + }, + "tags": { + "type": "string" + }, + "tagsAny": { + "type": "string" + }, + "tenantId": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_machine_v1beta1_Condition": { "type": "object", "properties": { @@ -1286,6 +1394,18 @@ "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", "existingJavaType": "io.fabric8.kubernetes.api.model.TypeMeta" + }, + "V1Alpha1SubnetFilter": { + "$ref": "#/definitions/os_machine_v1alpha1_SubnetFilter", + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter" + }, + "V1NutanixCategory": { + "$ref": "#/definitions/os_machine_v1_NutanixCategory", + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1.NutanixCategory" + }, + "V1NutanixResourceIdentifier": { + "$ref": "#/definitions/os_machine_v1_NutanixResourceIdentifier", + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier" } }, "additionalProperties": true 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 90726af89a3..e3fa3df43bc 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 @@ -637,6 +637,114 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_machine_v1_NutanixCategory": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.machine.v1.NutanixCategory", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_machine_v1_NutanixResourceIdentifier": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "uuid": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_machine_v1alpha1_SubnetFilter": { + "type": "object", + "properties": { + "cidr": { + "type": "string" + }, + "description": { + "type": "string" + }, + "enableDhcp": { + "type": "boolean" + }, + "gateway_ip": { + "type": "string" + }, + "id": { + "type": "string" + }, + "ipVersion": { + "type": "integer" + }, + "ipv6AddressMode": { + "type": "string" + }, + "ipv6RaMode": { + "type": "string" + }, + "limit": { + "type": "integer" + }, + "marker": { + "type": "string" + }, + "name": { + "type": "string" + }, + "networkId": { + "type": "string" + }, + "notTags": { + "type": "string" + }, + "notTagsAny": { + "type": "string" + }, + "projectId": { + "type": "string" + }, + "sortDir": { + "type": "string" + }, + "sortKey": { + "type": "string" + }, + "subnetpoolId": { + "type": "string" + }, + "tags": { + "type": "string" + }, + "tagsAny": { + "type": "string" + }, + "tenantId": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_machine_v1beta1_Condition": { "type": "object", "properties": { @@ -1286,6 +1394,18 @@ "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", "existingJavaType": "io.fabric8.kubernetes.api.model.TypeMeta" + }, + "V1Alpha1SubnetFilter": { + "$ref": "#/definitions/os_machine_v1alpha1_SubnetFilter", + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1alpha1.SubnetFilter" + }, + "V1NutanixCategory": { + "$ref": "#/definitions/os_machine_v1_NutanixCategory", + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1.NutanixCategory" + }, + "V1NutanixResourceIdentifier": { + "$ref": "#/definitions/os_machine_v1_NutanixResourceIdentifier", + "existingJavaType": "io.fabric8.openshift.api.model.machine.v1.NutanixResourceIdentifier" } }, "additionalProperties": true, @@ -1959,6 +2079,31 @@ }, "additionalProperties": true }, + "nutanixcategory": { + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + } + }, + "additionalProperties": true + }, + "nutanixresourceidentifier": { + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "uuid": { + "type": "string" + } + }, + "additionalProperties": true + }, "objectmeta": { "properties": { "annotations": { @@ -2189,6 +2334,74 @@ }, "additionalProperties": true }, + "subnetfilter": { + "properties": { + "cidr": { + "type": "string" + }, + "description": { + "type": "string" + }, + "enableDhcp": { + "type": "boolean" + }, + "gateway_ip": { + "type": "string" + }, + "id": { + "type": "string" + }, + "ipVersion": { + "type": "integer" + }, + "ipv6AddressMode": { + "type": "string" + }, + "ipv6RaMode": { + "type": "string" + }, + "limit": { + "type": "integer" + }, + "marker": { + "type": "string" + }, + "name": { + "type": "string" + }, + "networkId": { + "type": "string" + }, + "notTags": { + "type": "string" + }, + "notTagsAny": { + "type": "string" + }, + "projectId": { + "type": "string" + }, + "sortDir": { + "type": "string" + }, + "sortKey": { + "type": "string" + }, + "subnetpoolId": { + "type": "string" + }, + "tags": { + "type": "string" + }, + "tagsAny": { + "type": "string" + }, + "tenantId": { + "type": "string" + } + }, + "additionalProperties": true + }, "taint": { "properties": { "effect": { 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 4db72291dbc..7afaf70ac5f 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 @@ -597,6 +597,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_AWSDNSSpec": { + "type": "object", + "properties": { + "privateZoneIAMRole": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AWSDNSSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_AWSPlatformSpec": { "type": "object", "properties": { @@ -746,6 +759,14 @@ }, "resourceGroupName": { "type": "string" + }, + "resourceTags": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_AzureResourceTag", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AzureResourceTag" + } } }, "additionalProperties": true, @@ -754,6 +775,35 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_AzureResourceTag": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AzureResourceTag", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_BareMetalPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_BareMetalPlatformSpec": { "type": "object", "additionalProperties": true, @@ -768,9 +818,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_BareMetalPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -781,6 +847,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_CloudControllerManagerStatus": { + "type": "object", + "properties": { + "state": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.CloudControllerManagerStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_ConfigMapFileReference": { "type": "object", "properties": { @@ -848,12 +927,33 @@ "io.fabric8.kubernetes.api.model.HasMetadata" ] }, + "os_config_v1_DNSPlatformSpec": { + "type": "object", + "properties": { + "aws": { + "$ref": "#/definitions/os_config_v1_AWSDNSSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AWSDNSSpec" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_DNSSpec": { "type": "object", "properties": { "baseDomain": { "type": "string" }, + "platform": { + "$ref": "#/definitions/os_config_v1_DNSPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSPlatformSpec" + }, "privateZone": { "$ref": "#/definitions/os_config_v1_DNSZone", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSZone" @@ -921,6 +1021,33 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_ExternalPlatformSpec": { + "type": "object", + "properties": { + "platformName": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_ExternalPlatformStatus": { + "type": "object", + "properties": { + "cloudControllerManager": { + "$ref": "#/definitions/os_config_v1_CloudControllerManagerStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.CloudControllerManagerStatus" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_GCPPlatformSpec": { "type": "object", "additionalProperties": true, @@ -959,6 +1086,9 @@ "cisInstanceCRN": { "type": "string" }, + "dnsInstanceCRN": { + "type": "string" + }, "location": { "type": "string" }, @@ -1037,6 +1167,9 @@ "controlPlaneTopology": { "type": "string" }, + "cpuPartitioning": { + "type": "string" + }, "etcdDiscoveryDomain": { "type": "string" }, @@ -1100,6 +1233,105 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_NutanixPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPlatformSpec": { + "type": "object", + "properties": { + "prismCentral": { + "$ref": "#/definitions/os_config_v1_NutanixPrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint" + }, + "prismElements": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_NutanixPrismElementEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismElementEndpoint" + } + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPlatformStatus": { + "type": "object", + "properties": { + "apiServerInternalIP": { + "type": "string" + }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "ingressIP": { + "type": "string" + }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPrismElementEndpoint": { + "type": "object", + "properties": { + "endpoint": { + "$ref": "#/definitions/os_config_v1_NutanixPrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismElementEndpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPrismEndpoint": { + "type": "object", + "properties": { + "address": { + "type": "string" + }, + "port": { + "type": "integer" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_OldTLSProfile": { "type": "object", "additionalProperties": true, @@ -1108,6 +1340,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_OpenStackPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_OpenStackPlatformSpec": { "type": "object", "additionalProperties": true, @@ -1122,12 +1367,28 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "cloudName": { "type": "string" }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OpenStackPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -1138,6 +1399,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_OvirtPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_OvirtPlatformSpec": { "type": "object", "additionalProperties": true, @@ -1152,9 +1426,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OvirtPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -1188,6 +1478,10 @@ "$ref": "#/definitions/os_config_v1_EquinixMetalPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.EquinixMetalPlatformSpec" }, + "external": { + "$ref": "#/definitions/os_config_v1_ExternalPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformSpec" + }, "gcp": { "$ref": "#/definitions/os_config_v1_GCPPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.GCPPlatformSpec" @@ -1200,6 +1494,10 @@ "$ref": "#/definitions/os_config_v1_KubevirtPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.KubevirtPlatformSpec" }, + "nutanix": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformSpec" + }, "openstack": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformSpec" @@ -1249,6 +1547,10 @@ "$ref": "#/definitions/os_config_v1_EquinixMetalPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.EquinixMetalPlatformStatus" }, + "external": { + "$ref": "#/definitions/os_config_v1_ExternalPlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformStatus" + }, "gcp": { "$ref": "#/definitions/os_config_v1_GCPPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.GCPPlatformStatus" @@ -1261,6 +1563,10 @@ "$ref": "#/definitions/os_config_v1_KubevirtPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.KubevirtPlatformStatus" }, + "nutanix": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformStatus" + }, "openstack": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformStatus" @@ -1311,9 +1617,15 @@ "cisInstanceCRN": { "type": "string" }, + "dnsInstanceCRN": { + "type": "string" + }, "region": { "type": "string" }, + "resourceGroup": { + "type": "string" + }, "serviceEndpoints": { "type": "array", "javaOmitEmpty": true, @@ -1415,8 +1727,114 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_VSpherePlatformFailureDomainSpec": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "server": { + "type": "string" + }, + "topology": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformTopology", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformTopology" + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformFailureDomainSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformNodeNetworking": { + "type": "object", + "properties": { + "external": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworkingSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec" + }, + "internal": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworkingSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworking", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformNodeNetworkingSpec": { + "type": "object", + "properties": { + "excludeNetworkSubnetCidr": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "network": { + "type": "string" + }, + "networkSubnetCidr": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_VSpherePlatformSpec": { "type": "object", + "properties": { + "failureDomains": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformFailureDomainSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformFailureDomainSpec" + } + }, + "nodeNetworking": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworking", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworking" + }, + "vcenters": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformVCenterSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformVCenterSpec" + } + } + }, "additionalProperties": true, "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformSpec", "javaInterfaces": [ @@ -1429,9 +1847,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -1442,6 +1876,59 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_VSpherePlatformTopology": { + "type": "object", + "properties": { + "computeCluster": { + "type": "string" + }, + "datacenter": { + "type": "string" + }, + "datastore": { + "type": "string" + }, + "folder": { + "type": "string" + }, + "networks": { + "type": "array", + "items": { + "type": "string" + } + }, + "resourcePool": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformTopology", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformVCenterSpec": { + "type": "object", + "properties": { + "datacenters": { + "type": "array", + "items": { + "type": "string" + } + }, + "port": { + "type": "integer" + }, + "server": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformVCenterSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_machineconfig_v1_ContainerRuntimeConfig": { "type": "object", "properties": { 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 834cd51a325..18a8a90f1ce 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 @@ -597,6 +597,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_AWSDNSSpec": { + "type": "object", + "properties": { + "privateZoneIAMRole": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AWSDNSSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_AWSPlatformSpec": { "type": "object", "properties": { @@ -746,6 +759,14 @@ }, "resourceGroupName": { "type": "string" + }, + "resourceTags": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_AzureResourceTag", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AzureResourceTag" + } } }, "additionalProperties": true, @@ -754,6 +775,35 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_AzureResourceTag": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "value": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AzureResourceTag", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_BareMetalPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_BareMetalPlatformSpec": { "type": "object", "additionalProperties": true, @@ -768,9 +818,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_BareMetalPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -781,6 +847,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_CloudControllerManagerStatus": { + "type": "object", + "properties": { + "state": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.CloudControllerManagerStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_ConfigMapFileReference": { "type": "object", "properties": { @@ -848,12 +927,33 @@ "io.fabric8.kubernetes.api.model.HasMetadata" ] }, + "os_config_v1_DNSPlatformSpec": { + "type": "object", + "properties": { + "aws": { + "$ref": "#/definitions/os_config_v1_AWSDNSSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AWSDNSSpec" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_DNSSpec": { "type": "object", "properties": { "baseDomain": { "type": "string" }, + "platform": { + "$ref": "#/definitions/os_config_v1_DNSPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSPlatformSpec" + }, "privateZone": { "$ref": "#/definitions/os_config_v1_DNSZone", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSZone" @@ -921,6 +1021,33 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_ExternalPlatformSpec": { + "type": "object", + "properties": { + "platformName": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_ExternalPlatformStatus": { + "type": "object", + "properties": { + "cloudControllerManager": { + "$ref": "#/definitions/os_config_v1_CloudControllerManagerStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.CloudControllerManagerStatus" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_GCPPlatformSpec": { "type": "object", "additionalProperties": true, @@ -959,6 +1086,9 @@ "cisInstanceCRN": { "type": "string" }, + "dnsInstanceCRN": { + "type": "string" + }, "location": { "type": "string" }, @@ -1037,6 +1167,9 @@ "controlPlaneTopology": { "type": "string" }, + "cpuPartitioning": { + "type": "string" + }, "etcdDiscoveryDomain": { "type": "string" }, @@ -1100,6 +1233,105 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_NutanixPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPlatformSpec": { + "type": "object", + "properties": { + "prismCentral": { + "$ref": "#/definitions/os_config_v1_NutanixPrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint" + }, + "prismElements": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_NutanixPrismElementEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismElementEndpoint" + } + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPlatformStatus": { + "type": "object", + "properties": { + "apiServerInternalIP": { + "type": "string" + }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "ingressIP": { + "type": "string" + }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPrismElementEndpoint": { + "type": "object", + "properties": { + "endpoint": { + "$ref": "#/definitions/os_config_v1_NutanixPrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismElementEndpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_NutanixPrismEndpoint": { + "type": "object", + "properties": { + "address": { + "type": "string" + }, + "port": { + "type": "integer" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_OldTLSProfile": { "type": "object", "additionalProperties": true, @@ -1108,6 +1340,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_OpenStackPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_OpenStackPlatformSpec": { "type": "object", "additionalProperties": true, @@ -1122,12 +1367,28 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "cloudName": { "type": "string" }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OpenStackPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -1138,6 +1399,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_OvirtPlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_OvirtPlatformSpec": { "type": "object", "additionalProperties": true, @@ -1152,9 +1426,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OvirtPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -1188,6 +1478,10 @@ "$ref": "#/definitions/os_config_v1_EquinixMetalPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.EquinixMetalPlatformSpec" }, + "external": { + "$ref": "#/definitions/os_config_v1_ExternalPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformSpec" + }, "gcp": { "$ref": "#/definitions/os_config_v1_GCPPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.GCPPlatformSpec" @@ -1200,6 +1494,10 @@ "$ref": "#/definitions/os_config_v1_KubevirtPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.KubevirtPlatformSpec" }, + "nutanix": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformSpec" + }, "openstack": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformSpec" @@ -1249,6 +1547,10 @@ "$ref": "#/definitions/os_config_v1_EquinixMetalPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.EquinixMetalPlatformStatus" }, + "external": { + "$ref": "#/definitions/os_config_v1_ExternalPlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformStatus" + }, "gcp": { "$ref": "#/definitions/os_config_v1_GCPPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.GCPPlatformStatus" @@ -1261,6 +1563,10 @@ "$ref": "#/definitions/os_config_v1_KubevirtPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.KubevirtPlatformStatus" }, + "nutanix": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformStatus" + }, "openstack": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformStatus" @@ -1311,9 +1617,15 @@ "cisInstanceCRN": { "type": "string" }, + "dnsInstanceCRN": { + "type": "string" + }, "region": { "type": "string" }, + "resourceGroup": { + "type": "string" + }, "serviceEndpoints": { "type": "array", "javaOmitEmpty": true, @@ -1415,8 +1727,114 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_VSpherePlatformFailureDomainSpec": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "server": { + "type": "string" + }, + "topology": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformTopology", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformTopology" + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformFailureDomainSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformLoadBalancer": { + "type": "object", + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformNodeNetworking": { + "type": "object", + "properties": { + "external": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworkingSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec" + }, + "internal": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworkingSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworking", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformNodeNetworkingSpec": { + "type": "object", + "properties": { + "excludeNetworkSubnetCidr": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "network": { + "type": "string" + }, + "networkSubnetCidr": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_config_v1_VSpherePlatformSpec": { "type": "object", + "properties": { + "failureDomains": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformFailureDomainSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformFailureDomainSpec" + } + }, + "nodeNetworking": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworking", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworking" + }, + "vcenters": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformVCenterSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformVCenterSpec" + } + } + }, "additionalProperties": true, "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformSpec", "javaInterfaces": [ @@ -1429,9 +1847,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -1442,6 +1876,59 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_config_v1_VSpherePlatformTopology": { + "type": "object", + "properties": { + "computeCluster": { + "type": "string" + }, + "datacenter": { + "type": "string" + }, + "datastore": { + "type": "string" + }, + "folder": { + "type": "string" + }, + "networks": { + "type": "array", + "items": { + "type": "string" + } + }, + "resourcePool": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformTopology", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_config_v1_VSpherePlatformVCenterSpec": { + "type": "object", + "properties": { + "datacenters": { + "type": "array", + "items": { + "type": "string" + } + }, + "port": { + "type": "integer" + }, + "server": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformVCenterSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_machineconfig_v1_ContainerRuntimeConfig": { "type": "object", "properties": { @@ -2386,6 +2873,14 @@ }, "additionalProperties": true }, + "awsdnsspec": { + "properties": { + "privateZoneIAMRole": { + "type": "string" + } + }, + "additionalProperties": true + }, "awsplatformspec": { "properties": { "serviceEndpoints": { @@ -2456,10 +2951,37 @@ "cloudName": { "type": "string" }, - "networkResourceGroupName": { + "networkResourceGroupName": { + "type": "string" + }, + "resourceGroupName": { + "type": "string" + }, + "resourceTags": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_AzureResourceTag", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AzureResourceTag" + } + } + }, + "additionalProperties": true + }, + "azureresourcetag": { + "properties": { + "key": { + "type": "string" + }, + "value": { "type": "string" - }, - "resourceGroupName": { + } + }, + "additionalProperties": true + }, + "baremetalplatformloadbalancer": { + "properties": { + "type": { "type": "string" } }, @@ -2473,15 +2995,39 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_BareMetalPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } }, "additionalProperties": true }, + "cloudcontrollermanagerstatus": { + "properties": { + "state": { + "type": "string" + } + }, + "additionalProperties": true + }, "configmapfilereference": { "properties": { "key": { @@ -2811,11 +3357,27 @@ }, "additionalProperties": true }, + "dnsplatformspec": { + "properties": { + "aws": { + "$ref": "#/definitions/os_config_v1_AWSDNSSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.AWSDNSSpec" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, "dnsspec": { "properties": { "baseDomain": { "type": "string" }, + "platform": { + "$ref": "#/definitions/os_config_v1_DNSPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSPlatformSpec" + }, "privateZone": { "$ref": "#/definitions/os_config_v1_DNSZone", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.DNSZone" @@ -2859,6 +3421,23 @@ }, "additionalProperties": true }, + "externalplatformspec": { + "properties": { + "platformName": { + "type": "string" + } + }, + "additionalProperties": true + }, + "externalplatformstatus": { + "properties": { + "cloudControllerManager": { + "$ref": "#/definitions/os_config_v1_CloudControllerManagerStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.CloudControllerManagerStatus" + } + }, + "additionalProperties": true + }, "fieldsv1": { "additionalProperties": true }, @@ -2895,6 +3474,9 @@ "cisInstanceCRN": { "type": "string" }, + "dnsInstanceCRN": { + "type": "string" + }, "location": { "type": "string" }, @@ -2990,6 +3572,9 @@ "controlPlaneTopology": { "type": "string" }, + "cpuPartitioning": { + "type": "string" + }, "etcdDiscoveryDomain": { "type": "string" }, @@ -3517,6 +4102,80 @@ "moderntlsprofile": { "additionalProperties": true }, + "nutanixplatformloadbalancer": { + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, + "nutanixplatformspec": { + "properties": { + "prismCentral": { + "$ref": "#/definitions/os_config_v1_NutanixPrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint" + }, + "prismElements": { + "type": "array", + "items": { + "$ref": "#/definitions/os_config_v1_NutanixPrismElementEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismElementEndpoint" + } + } + }, + "additionalProperties": true + }, + "nutanixplatformstatus": { + "properties": { + "apiServerInternalIP": { + "type": "string" + }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "ingressIP": { + "type": "string" + }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer" + } + }, + "additionalProperties": true + }, + "nutanixprismelementendpoint": { + "properties": { + "endpoint": { + "$ref": "#/definitions/os_config_v1_NutanixPrismEndpoint", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPrismEndpoint" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true + }, + "nutanixprismendpoint": { + "properties": { + "address": { + "type": "string" + }, + "port": { + "type": "integer" + } + }, + "additionalProperties": true + }, "objectmeta": { "properties": { "annotations": { @@ -3624,6 +4283,14 @@ "oldtlsprofile": { "additionalProperties": true }, + "openstackplatformloadbalancer": { + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, "openstackplatformspec": { "additionalProperties": true }, @@ -3632,18 +4299,42 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "cloudName": { "type": "string" }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OpenStackPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } }, "additionalProperties": true }, + "ovirtplatformloadbalancer": { + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, "ovirtplatformspec": { "additionalProperties": true }, @@ -3652,9 +4343,25 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_OvirtPlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } @@ -3709,6 +4416,10 @@ "$ref": "#/definitions/os_config_v1_EquinixMetalPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.EquinixMetalPlatformSpec" }, + "external": { + "$ref": "#/definitions/os_config_v1_ExternalPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformSpec" + }, "gcp": { "$ref": "#/definitions/os_config_v1_GCPPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.GCPPlatformSpec" @@ -3721,6 +4432,10 @@ "$ref": "#/definitions/os_config_v1_KubevirtPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.KubevirtPlatformSpec" }, + "nutanix": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformSpec" + }, "openstack": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformSpec", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformSpec" @@ -3765,6 +4480,10 @@ "$ref": "#/definitions/os_config_v1_EquinixMetalPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.EquinixMetalPlatformStatus" }, + "external": { + "$ref": "#/definitions/os_config_v1_ExternalPlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ExternalPlatformStatus" + }, "gcp": { "$ref": "#/definitions/os_config_v1_GCPPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.GCPPlatformStatus" @@ -3777,6 +4496,10 @@ "$ref": "#/definitions/os_config_v1_KubevirtPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.KubevirtPlatformStatus" }, + "nutanix": { + "$ref": "#/definitions/os_config_v1_NutanixPlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformStatus" + }, "openstack": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformStatus", "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformStatus" @@ -3817,9 +4540,15 @@ "cisInstanceCRN": { "type": "string" }, + "dnsInstanceCRN": { + "type": "string" + }, "region": { "type": "string" }, + "resourceGroup": { + "type": "string" + }, "serviceEndpoints": { "type": "array", "javaOmitEmpty": true, @@ -4015,7 +4744,93 @@ }, "additionalProperties": true }, + "vsphereplatformfailuredomainspec": { + "properties": { + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "server": { + "type": "string" + }, + "topology": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformTopology", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformTopology" + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": true + }, + "vsphereplatformloadbalancer": { + "properties": { + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, + "vsphereplatformnodenetworking": { + "properties": { + "external": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworkingSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec" + }, + "internal": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworkingSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworkingSpec" + } + }, + "additionalProperties": true + }, + "vsphereplatformnodenetworkingspec": { + "properties": { + "excludeNetworkSubnetCidr": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "network": { + "type": "string" + }, + "networkSubnetCidr": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true + }, "vsphereplatformspec": { + "properties": { + "failureDomains": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformFailureDomainSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformFailureDomainSpec" + } + }, + "nodeNetworking": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformNodeNetworking", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformNodeNetworking" + }, + "vcenters": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformVCenterSpec", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformVCenterSpec" + } + } + }, "additionalProperties": true }, "vsphereplatformstatus": { @@ -4023,14 +4838,73 @@ "apiServerInternalIP": { "type": "string" }, + "apiServerInternalIPs": { + "type": "array", + "items": { + "type": "string" + } + }, "ingressIP": { "type": "string" }, + "ingressIPs": { + "type": "array", + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer" + }, "nodeDNSIP": { "type": "string" } }, "additionalProperties": true + }, + "vsphereplatformtopology": { + "properties": { + "computeCluster": { + "type": "string" + }, + "datacenter": { + "type": "string" + }, + "datastore": { + "type": "string" + }, + "folder": { + "type": "string" + }, + "networks": { + "type": "array", + "items": { + "type": "string" + } + }, + "resourcePool": { + "type": "string" + } + }, + "additionalProperties": true + }, + "vsphereplatformvcenterspec": { + "properties": { + "datacenters": { + "type": "array", + "items": { + "type": "string" + } + }, + "port": { + "type": "integer" + }, + "server": { + "type": "string" + } + }, + "additionalProperties": true } } } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/EncryptionAlibaba.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/EncryptionAlibaba.java new file mode 100644 index 00000000000..a5ecf7fe472 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/EncryptionAlibaba.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.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", + "kms", + "method" +}) +@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 EncryptionAlibaba implements KubernetesResource +{ + + @JsonProperty("kms") + private KMSEncryptionAlibaba kms; + @JsonProperty("method") + private String method; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public EncryptionAlibaba() { + } + + /** + * + * @param kms + * @param method + */ + public EncryptionAlibaba(KMSEncryptionAlibaba kms, String method) { + super(); + this.kms = kms; + this.method = method; + } + + @JsonProperty("kms") + public KMSEncryptionAlibaba getKms() { + return kms; + } + + @JsonProperty("kms") + public void setKms(KMSEncryptionAlibaba kms) { + this.kms = kms; + } + + @JsonProperty("method") + public String getMethod() { + return method; + } + + @JsonProperty("method") + public void setMethod(String method) { + this.method = method; + } + + @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/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorage.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorage.java index 7778045e3d6..2c84188373e 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorage.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorage.java @@ -38,6 +38,7 @@ "gcs", "ibmcos", "managementState", + "oss", "pvc", "s3", "swift" @@ -73,6 +74,8 @@ public class ImageRegistryConfigStorage implements KubernetesResource private ImageRegistryConfigStorageIBMCOS ibmcos; @JsonProperty("managementState") private String managementState; + @JsonProperty("oss") + private ImageRegistryConfigStorageAlibabaOSS oss; @JsonProperty("pvc") private ImageRegistryConfigStoragePVC pvc; @JsonProperty("s3") @@ -96,17 +99,19 @@ public ImageRegistryConfigStorage() { * @param emptyDir * @param ibmcos * @param pvc + * @param oss * @param azure * @param managementState * @param swift */ - public ImageRegistryConfigStorage(ImageRegistryConfigStorageAzure azure, ImageRegistryConfigStorageEmptyDir emptyDir, ImageRegistryConfigStorageGCS gcs, ImageRegistryConfigStorageIBMCOS ibmcos, String managementState, ImageRegistryConfigStoragePVC pvc, ImageRegistryConfigStorageS3 s3, ImageRegistryConfigStorageSwift swift) { + public ImageRegistryConfigStorage(ImageRegistryConfigStorageAzure azure, ImageRegistryConfigStorageEmptyDir emptyDir, ImageRegistryConfigStorageGCS gcs, ImageRegistryConfigStorageIBMCOS ibmcos, String managementState, ImageRegistryConfigStorageAlibabaOSS oss, ImageRegistryConfigStoragePVC pvc, ImageRegistryConfigStorageS3 s3, ImageRegistryConfigStorageSwift swift) { super(); this.azure = azure; this.emptyDir = emptyDir; this.gcs = gcs; this.ibmcos = ibmcos; this.managementState = managementState; + this.oss = oss; this.pvc = pvc; this.s3 = s3; this.swift = swift; @@ -162,6 +167,16 @@ public void setManagementState(String managementState) { this.managementState = managementState; } + @JsonProperty("oss") + public ImageRegistryConfigStorageAlibabaOSS getOss() { + return oss; + } + + @JsonProperty("oss") + public void setOss(ImageRegistryConfigStorageAlibabaOSS oss) { + this.oss = oss; + } + @JsonProperty("pvc") public ImageRegistryConfigStoragePVC getPvc() { return pvc; diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageAlibabaOSS.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageAlibabaOSS.java new file mode 100644 index 00000000000..1bb8e33323b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageAlibabaOSS.java @@ -0,0 +1,145 @@ + +package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.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", + "bucket", + "encryption", + "endpointAccessibility", + "region" +}) +@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 ImageRegistryConfigStorageAlibabaOSS implements KubernetesResource +{ + + @JsonProperty("bucket") + private String bucket; + @JsonProperty("encryption") + private EncryptionAlibaba encryption; + @JsonProperty("endpointAccessibility") + private String endpointAccessibility; + @JsonProperty("region") + private String region; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ImageRegistryConfigStorageAlibabaOSS() { + } + + /** + * + * @param bucket + * @param encryption + * @param endpointAccessibility + * @param region + */ + public ImageRegistryConfigStorageAlibabaOSS(String bucket, EncryptionAlibaba encryption, String endpointAccessibility, String region) { + super(); + this.bucket = bucket; + this.encryption = encryption; + this.endpointAccessibility = endpointAccessibility; + this.region = region; + } + + @JsonProperty("bucket") + public String getBucket() { + return bucket; + } + + @JsonProperty("bucket") + public void setBucket(String bucket) { + this.bucket = bucket; + } + + @JsonProperty("encryption") + public EncryptionAlibaba getEncryption() { + return encryption; + } + + @JsonProperty("encryption") + public void setEncryption(EncryptionAlibaba encryption) { + this.encryption = encryption; + } + + @JsonProperty("endpointAccessibility") + public String getEndpointAccessibility() { + return endpointAccessibility; + } + + @JsonProperty("endpointAccessibility") + public void setEndpointAccessibility(String endpointAccessibility) { + this.endpointAccessibility = endpointAccessibility; + } + + @JsonProperty("region") + public String getRegion() { + return region; + } + + @JsonProperty("region") + public void setRegion(String region) { + this.region = region; + } + + @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/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageS3.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageS3.java index e10ccd5c1b2..3637eb92eda 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageS3.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistryConfigStorageS3.java @@ -39,6 +39,7 @@ "keyID", "region", "regionEndpoint", + "trustedCA", "virtualHostedStyle" }) @ToString @@ -74,6 +75,8 @@ public class ImageRegistryConfigStorageS3 implements KubernetesResource private String region; @JsonProperty("regionEndpoint") private String regionEndpoint; + @JsonProperty("trustedCA") + private S3TrustedCASource trustedCA; @JsonProperty("virtualHostedStyle") private Boolean virtualHostedStyle; @JsonIgnore @@ -91,12 +94,13 @@ public ImageRegistryConfigStorageS3() { * @param bucket * @param cloudFront * @param regionEndpoint + * @param trustedCA * @param encrypt * @param keyID * @param region * @param virtualHostedStyle */ - public ImageRegistryConfigStorageS3(String bucket, ImageRegistryConfigStorageS3CloudFront cloudFront, Boolean encrypt, String keyID, String region, String regionEndpoint, Boolean virtualHostedStyle) { + public ImageRegistryConfigStorageS3(String bucket, ImageRegistryConfigStorageS3CloudFront cloudFront, Boolean encrypt, String keyID, String region, String regionEndpoint, S3TrustedCASource trustedCA, Boolean virtualHostedStyle) { super(); this.bucket = bucket; this.cloudFront = cloudFront; @@ -104,6 +108,7 @@ public ImageRegistryConfigStorageS3(String bucket, ImageRegistryConfigStorageS3C this.keyID = keyID; this.region = region; this.regionEndpoint = regionEndpoint; + this.trustedCA = trustedCA; this.virtualHostedStyle = virtualHostedStyle; } @@ -167,6 +172,16 @@ public void setRegionEndpoint(String regionEndpoint) { this.regionEndpoint = regionEndpoint; } + @JsonProperty("trustedCA") + public S3TrustedCASource getTrustedCA() { + return trustedCA; + } + + @JsonProperty("trustedCA") + public void setTrustedCA(S3TrustedCASource trustedCA) { + this.trustedCA = trustedCA; + } + @JsonProperty("virtualHostedStyle") public Boolean getVirtualHostedStyle() { return virtualHostedStyle; diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistrySpec.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistrySpec.java index da52d14b632..fd80b6b9a30 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistrySpec.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/ImageRegistrySpec.java @@ -24,6 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.Toleration; +import io.fabric8.kubernetes.api.model.TopologySpreadConstraint; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -56,6 +57,7 @@ "routes", "storage", "tolerations", + "topologySpreadConstraints", "unsupportedConfigOverrides" }) @ToString @@ -121,6 +123,9 @@ public class ImageRegistrySpec implements KubernetesResource @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List tolerations = new ArrayList(); + @JsonProperty("topologySpreadConstraints") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List topologySpreadConstraints = new ArrayList(); @JsonProperty("unsupportedConfigOverrides") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map unsupportedConfigOverrides = new LinkedHashMap(); @@ -138,6 +143,7 @@ public ImageRegistrySpec() { * * @param httpSecret * @param replicas + * @param topologySpreadConstraints * @param resources * @param readOnly * @param requests @@ -157,7 +163,7 @@ public ImageRegistrySpec() { * @param affinity * @param managementState */ - public ImageRegistrySpec(Affinity affinity, Boolean defaultRoute, Boolean disableRedirect, java.lang.String httpSecret, java.lang.String logLevel, Long logging, java.lang.String managementState, Map nodeSelector, Map observedConfig, java.lang.String operatorLogLevel, ImageRegistryConfigProxy proxy, Boolean readOnly, Integer replicas, ImageRegistryConfigRequests requests, io.fabric8.kubernetes.api.model.ResourceRequirements resources, java.lang.String rolloutStrategy, List routes, ImageRegistryConfigStorage storage, List tolerations, Map unsupportedConfigOverrides) { + public ImageRegistrySpec(Affinity affinity, Boolean defaultRoute, Boolean disableRedirect, java.lang.String httpSecret, java.lang.String logLevel, Long logging, java.lang.String managementState, Map nodeSelector, Map observedConfig, java.lang.String operatorLogLevel, ImageRegistryConfigProxy proxy, Boolean readOnly, Integer replicas, ImageRegistryConfigRequests requests, io.fabric8.kubernetes.api.model.ResourceRequirements resources, java.lang.String rolloutStrategy, List routes, ImageRegistryConfigStorage storage, List tolerations, List topologySpreadConstraints, Map unsupportedConfigOverrides) { super(); this.affinity = affinity; this.defaultRoute = defaultRoute; @@ -178,6 +184,7 @@ public ImageRegistrySpec(Affinity affinity, Boolean defaultRoute, Boolean disabl this.routes = routes; this.storage = storage; this.tolerations = tolerations; + this.topologySpreadConstraints = topologySpreadConstraints; this.unsupportedConfigOverrides = unsupportedConfigOverrides; } @@ -371,6 +378,16 @@ public void setTolerations(List tolerations) { this.tolerations = tolerations; } + @JsonProperty("topologySpreadConstraints") + public List getTopologySpreadConstraints() { + return topologySpreadConstraints; + } + + @JsonProperty("topologySpreadConstraints") + public void setTopologySpreadConstraints(List topologySpreadConstraints) { + this.topologySpreadConstraints = topologySpreadConstraints; + } + @JsonProperty("unsupportedConfigOverrides") public Map getUnsupportedConfigOverrides() { return unsupportedConfigOverrides; diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/KMSEncryptionAlibaba.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/KMSEncryptionAlibaba.java new file mode 100644 index 00000000000..9ccbea8a654 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/KMSEncryptionAlibaba.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.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", + "keyID" +}) +@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 KMSEncryptionAlibaba implements KubernetesResource +{ + + @JsonProperty("keyID") + private String keyID; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public KMSEncryptionAlibaba() { + } + + /** + * + * @param keyID + */ + public KMSEncryptionAlibaba(String keyID) { + super(); + this.keyID = keyID; + } + + @JsonProperty("keyID") + public String getKeyID() { + return keyID; + } + + @JsonProperty("keyID") + public void setKeyID(String keyID) { + this.keyID = keyID; + } + + @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/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/S3TrustedCASource.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/S3TrustedCASource.java new file mode 100644 index 00000000000..b8f76a32059 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/S3TrustedCASource.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.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", + "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 S3TrustedCASource implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public S3TrustedCASource() { + } + + /** + * + * @param name + */ + public S3TrustedCASource(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/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareRAIDVolume.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareRAIDVolume.java index ab4d3ba98dd..efa68a9e797 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareRAIDVolume.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/HardwareRAIDVolume.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.miscellaneous.metal3.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; @@ -33,9 +35,11 @@ "apiVersion", "kind", "metadata", + "controller", "level", "name", "numberOfPhysicalDisks", + "physicalDisks", "rotational", "sizeGibibytes" }) @@ -60,12 +64,17 @@ public class HardwareRAIDVolume implements KubernetesResource { + @JsonProperty("controller") + private String controller; @JsonProperty("level") private String level; @JsonProperty("name") private String name; @JsonProperty("numberOfPhysicalDisks") private Integer numberOfPhysicalDisks; + @JsonProperty("physicalDisks") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List physicalDisks = new ArrayList(); @JsonProperty("rotational") private Boolean rotational; @JsonProperty("sizeGibibytes") @@ -82,21 +91,35 @@ public HardwareRAIDVolume() { /** * + * @param controller * @param sizeGibibytes * @param level * @param name * @param rotational * @param numberOfPhysicalDisks + * @param physicalDisks */ - public HardwareRAIDVolume(String level, String name, Integer numberOfPhysicalDisks, Boolean rotational, Integer sizeGibibytes) { + public HardwareRAIDVolume(String controller, String level, String name, Integer numberOfPhysicalDisks, List physicalDisks, Boolean rotational, Integer sizeGibibytes) { super(); + this.controller = controller; this.level = level; this.name = name; this.numberOfPhysicalDisks = numberOfPhysicalDisks; + this.physicalDisks = physicalDisks; this.rotational = rotational; this.sizeGibibytes = sizeGibibytes; } + @JsonProperty("controller") + public String getController() { + return controller; + } + + @JsonProperty("controller") + public void setController(String controller) { + this.controller = controller; + } + @JsonProperty("level") public String getLevel() { return level; @@ -127,6 +150,16 @@ public void setNumberOfPhysicalDisks(Integer numberOfPhysicalDisks) { this.numberOfPhysicalDisks = numberOfPhysicalDisks; } + @JsonProperty("physicalDisks") + public List getPhysicalDisks() { + return physicalDisks; + } + + @JsonProperty("physicalDisks") + public void setPhysicalDisks(List physicalDisks) { + this.physicalDisks = physicalDisks; + } + @JsonProperty("rotational") public Boolean getRotational() { return rotational; 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 d59d5fa5fb1..d45877433c2 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 @@ -1077,6 +1077,45 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_TopologySpreadConstraint": { + "type": "object", + "properties": { + "labelSelector": { + "$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" + }, + "whenUnsatisfiable": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.TopologySpreadConstraint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_WeightedPodAffinityTerm": { "type": "object", "properties": { @@ -1603,6 +1642,23 @@ "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.Config\u003e" ] }, + "os_imageregistry_v1_EncryptionAlibaba": { + "type": "object", + "properties": { + "kms": { + "$ref": "#/definitions/os_imageregistry_v1_KMSEncryptionAlibaba", + "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.KMSEncryptionAlibaba" + }, + "method": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.EncryptionAlibaba", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_imageregistry_v1_ImageRegistryConfigProxy": { "type": "object", "properties": { @@ -1701,6 +1757,10 @@ "managementState": { "type": "string" }, + "oss": { + "$ref": "#/definitions/os_imageregistry_v1_ImageRegistryConfigStorageAlibabaOSS", + "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ImageRegistryConfigStorageAlibabaOSS" + }, "pvc": { "$ref": "#/definitions/os_imageregistry_v1_ImageRegistryConfigStoragePVC", "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ImageRegistryConfigStoragePVC" @@ -1720,6 +1780,29 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_imageregistry_v1_ImageRegistryConfigStorageAlibabaOSS": { + "type": "object", + "properties": { + "bucket": { + "type": "string" + }, + "encryption": { + "$ref": "#/definitions/os_imageregistry_v1_EncryptionAlibaba", + "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.EncryptionAlibaba" + }, + "endpointAccessibility": { + "type": "string" + }, + "region": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ImageRegistryConfigStorageAlibabaOSS", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_imageregistry_v1_ImageRegistryConfigStorageAzure": { "type": "object", "properties": { @@ -1829,6 +1912,10 @@ "regionEndpoint": { "type": "string" }, + "trustedCA": { + "$ref": "#/definitions/os_imageregistry_v1_S3TrustedCASource", + "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.S3TrustedCASource" + }, "virtualHostedStyle": { "type": "boolean" } @@ -1978,6 +2065,14 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Toleration" } }, + "topologySpreadConstraints": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_TopologySpreadConstraint", + "existingJavaType": "io.fabric8.kubernetes.api.model.TopologySpreadConstraint" + } + }, "unsupportedConfigOverrides": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_runtime_RawExtension", "existingJavaType": "java.util.Map\u003cString, Object\u003e" @@ -2032,6 +2127,32 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_imageregistry_v1_KMSEncryptionAlibaba": { + "type": "object", + "properties": { + "keyID": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.KMSEncryptionAlibaba", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_imageregistry_v1_S3TrustedCASource": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.S3TrustedCASource", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_metal3_v1alpha1_BIOS": { "type": "object", "properties": { @@ -2408,6 +2529,9 @@ "os_metal3_v1alpha1_HardwareRAIDVolume": { "type": "object", "properties": { + "controller": { + "type": "string" + }, "level": { "type": "string" }, @@ -2417,6 +2541,13 @@ "numberOfPhysicalDisks": { "type": "integer" }, + "physicalDisks": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "rotational": { "type": "boolean" }, 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 692ec37209d..a00474aa6d1 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 @@ -1077,6 +1077,45 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_TopologySpreadConstraint": { + "type": "object", + "properties": { + "labelSelector": { + "$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" + }, + "whenUnsatisfiable": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.TopologySpreadConstraint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_WeightedPodAffinityTerm": { "type": "object", "properties": { @@ -1603,6 +1642,23 @@ "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.Config\u003e" ] }, + "os_imageregistry_v1_EncryptionAlibaba": { + "type": "object", + "properties": { + "kms": { + "$ref": "#/definitions/os_imageregistry_v1_KMSEncryptionAlibaba", + "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.KMSEncryptionAlibaba" + }, + "method": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.EncryptionAlibaba", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_imageregistry_v1_ImageRegistryConfigProxy": { "type": "object", "properties": { @@ -1701,6 +1757,10 @@ "managementState": { "type": "string" }, + "oss": { + "$ref": "#/definitions/os_imageregistry_v1_ImageRegistryConfigStorageAlibabaOSS", + "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ImageRegistryConfigStorageAlibabaOSS" + }, "pvc": { "$ref": "#/definitions/os_imageregistry_v1_ImageRegistryConfigStoragePVC", "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ImageRegistryConfigStoragePVC" @@ -1720,6 +1780,29 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_imageregistry_v1_ImageRegistryConfigStorageAlibabaOSS": { + "type": "object", + "properties": { + "bucket": { + "type": "string" + }, + "encryption": { + "$ref": "#/definitions/os_imageregistry_v1_EncryptionAlibaba", + "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.EncryptionAlibaba" + }, + "endpointAccessibility": { + "type": "string" + }, + "region": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ImageRegistryConfigStorageAlibabaOSS", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_imageregistry_v1_ImageRegistryConfigStorageAzure": { "type": "object", "properties": { @@ -1829,6 +1912,10 @@ "regionEndpoint": { "type": "string" }, + "trustedCA": { + "$ref": "#/definitions/os_imageregistry_v1_S3TrustedCASource", + "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.S3TrustedCASource" + }, "virtualHostedStyle": { "type": "boolean" } @@ -1978,6 +2065,14 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Toleration" } }, + "topologySpreadConstraints": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_TopologySpreadConstraint", + "existingJavaType": "io.fabric8.kubernetes.api.model.TopologySpreadConstraint" + } + }, "unsupportedConfigOverrides": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_runtime_RawExtension", "existingJavaType": "java.util.Map\u003cString, Object\u003e" @@ -2032,6 +2127,32 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_imageregistry_v1_KMSEncryptionAlibaba": { + "type": "object", + "properties": { + "keyID": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.KMSEncryptionAlibaba", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_imageregistry_v1_S3TrustedCASource": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.S3TrustedCASource", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_metal3_v1alpha1_BIOS": { "type": "object", "properties": { @@ -2408,6 +2529,9 @@ "os_metal3_v1alpha1_HardwareRAIDVolume": { "type": "object", "properties": { + "controller": { + "type": "string" + }, "level": { "type": "string" }, @@ -2417,6 +2541,13 @@ "numberOfPhysicalDisks": { "type": "integer" }, + "physicalDisks": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "rotational": { "type": "boolean" }, @@ -3936,6 +4067,18 @@ }, "additionalProperties": true }, + "encryptionalibaba": { + "properties": { + "kms": { + "$ref": "#/definitions/os_imageregistry_v1_KMSEncryptionAlibaba", + "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.KMSEncryptionAlibaba" + }, + "method": { + "type": "string" + } + }, + "additionalProperties": true + }, "fieldsv1": { "additionalProperties": true }, @@ -4038,6 +4181,9 @@ }, "hardwareraidvolume": { "properties": { + "controller": { + "type": "string" + }, "level": { "type": "string" }, @@ -4047,6 +4193,13 @@ "numberOfPhysicalDisks": { "type": "integer" }, + "physicalDisks": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "rotational": { "type": "boolean" }, @@ -4164,6 +4317,10 @@ "managementState": { "type": "string" }, + "oss": { + "$ref": "#/definitions/os_imageregistry_v1_ImageRegistryConfigStorageAlibabaOSS", + "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ImageRegistryConfigStorageAlibabaOSS" + }, "pvc": { "$ref": "#/definitions/os_imageregistry_v1_ImageRegistryConfigStoragePVC", "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.ImageRegistryConfigStoragePVC" @@ -4179,6 +4336,24 @@ }, "additionalProperties": true }, + "imageregistryconfigstoragealibabaoss": { + "properties": { + "bucket": { + "type": "string" + }, + "encryption": { + "$ref": "#/definitions/os_imageregistry_v1_EncryptionAlibaba", + "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.EncryptionAlibaba" + }, + "endpointAccessibility": { + "type": "string" + }, + "region": { + "type": "string" + } + }, + "additionalProperties": true + }, "imageregistryconfigstorageazure": { "properties": { "accountName": { @@ -4262,6 +4437,10 @@ "regionEndpoint": { "type": "string" }, + "trustedCA": { + "$ref": "#/definitions/os_imageregistry_v1_S3TrustedCASource", + "existingJavaType": "io.fabric8.openshift.api.model.miscellaneous.imageregistry.operator.v1.S3TrustedCASource" + }, "virtualHostedStyle": { "type": "boolean" } @@ -4396,6 +4575,14 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Toleration" } }, + "topologySpreadConstraints": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_TopologySpreadConstraint", + "existingJavaType": "io.fabric8.kubernetes.api.model.TopologySpreadConstraint" + } + }, "unsupportedConfigOverrides": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_runtime_RawExtension", "existingJavaType": "java.util.Map\u003cString, Object\u003e" @@ -4473,6 +4660,14 @@ }, "additionalProperties": true }, + "kmsencryptionalibaba": { + "properties": { + "keyID": { + "type": "string" + } + }, + "additionalProperties": true + }, "l4redirectrule": { "properties": { "destinationIP": { @@ -5379,6 +5574,14 @@ }, "additionalProperties": true }, + "s3trustedcasource": { + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true + }, "secretkeyselector": { "properties": { "key": { @@ -5597,6 +5800,40 @@ }, "additionalProperties": true }, + "topologyspreadconstraint": { + "properties": { + "labelSelector": { + "$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" + }, + "whenUnsatisfiable": { + "type": "string" + } + }, + "additionalProperties": true + }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerConfiguration.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerConfiguration.java new file mode 100644 index 00000000000..69374d3a330 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerConfiguration.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.monitoring.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", + "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 AlertmanagerConfiguration implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AlertmanagerConfiguration() { + } + + /** + * + * @param name + */ + public AlertmanagerConfiguration(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/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerSpec.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerSpec.java index 5a8e03ae220..15c546245d3 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerSpec.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AlertmanagerSpec.java @@ -42,6 +42,7 @@ "affinity", "alertmanagerConfigNamespaceSelector", "alertmanagerConfigSelector", + "alertmanagerConfiguration", "baseImage", "clusterAdvertiseAddress", "clusterGossipInterval", @@ -52,6 +53,7 @@ "containers", "externalUrl", "forceEnableClusterMode", + "hostAliases", "image", "imagePullSecrets", "initContainers", @@ -110,6 +112,8 @@ public class AlertmanagerSpec implements KubernetesResource private io.fabric8.kubernetes.api.model.LabelSelector alertmanagerConfigNamespaceSelector; @JsonProperty("alertmanagerConfigSelector") private io.fabric8.kubernetes.api.model.LabelSelector alertmanagerConfigSelector; + @JsonProperty("alertmanagerConfiguration") + private AlertmanagerConfiguration alertmanagerConfiguration; @JsonProperty("baseImage") private java.lang.String baseImage; @JsonProperty("clusterAdvertiseAddress") @@ -132,6 +136,9 @@ public class AlertmanagerSpec implements KubernetesResource private java.lang.String externalUrl; @JsonProperty("forceEnableClusterMode") private Boolean forceEnableClusterMode; + @JsonProperty("hostAliases") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List hostAliases = new ArrayList(); @JsonProperty("image") private java.lang.String image; @JsonProperty("imagePullSecrets") @@ -211,6 +218,7 @@ public AlertmanagerSpec() { * @param imagePullSecrets * @param baseImage * @param priorityClassName + * @param hostAliases * @param portName * @param securityContext * @param storage @@ -221,6 +229,7 @@ public AlertmanagerSpec() { * @param alertmanagerConfigSelector * @param forceEnableClusterMode * @param clusterPushpullInterval + * @param alertmanagerConfiguration * @param tag * @param configSecret * @param retention @@ -248,12 +257,13 @@ public AlertmanagerSpec() { * @param affinity * @param clusterPeerTimeout */ - public AlertmanagerSpec(List additionalPeers, Affinity affinity, io.fabric8.kubernetes.api.model.LabelSelector alertmanagerConfigNamespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector alertmanagerConfigSelector, java.lang.String baseImage, java.lang.String clusterAdvertiseAddress, java.lang.String clusterGossipInterval, java.lang.String clusterPeerTimeout, java.lang.String clusterPushpullInterval, List configMaps, java.lang.String configSecret, List containers, java.lang.String externalUrl, Boolean forceEnableClusterMode, java.lang.String image, List imagePullSecrets, List initContainers, Boolean listenLocal, java.lang.String logFormat, java.lang.String logLevel, Integer minReadySeconds, Map nodeSelector, Boolean paused, EmbeddedObjectMetadata podMetadata, java.lang.String portName, java.lang.String priorityClassName, Integer replicas, io.fabric8.kubernetes.api.model.ResourceRequirements resources, java.lang.String retention, java.lang.String routePrefix, List secrets, PodSecurityContext securityContext, java.lang.String serviceAccountName, java.lang.String sha, StorageSpec storage, java.lang.String tag, List tolerations, List topologySpreadConstraints, java.lang.String version, List volumeMounts, List volumes) { + public AlertmanagerSpec(List additionalPeers, Affinity affinity, io.fabric8.kubernetes.api.model.LabelSelector alertmanagerConfigNamespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector alertmanagerConfigSelector, AlertmanagerConfiguration alertmanagerConfiguration, java.lang.String baseImage, java.lang.String clusterAdvertiseAddress, java.lang.String clusterGossipInterval, java.lang.String clusterPeerTimeout, java.lang.String clusterPushpullInterval, List configMaps, java.lang.String configSecret, List containers, java.lang.String externalUrl, Boolean forceEnableClusterMode, List hostAliases, java.lang.String image, List imagePullSecrets, List initContainers, Boolean listenLocal, java.lang.String logFormat, java.lang.String logLevel, Integer minReadySeconds, Map nodeSelector, Boolean paused, EmbeddedObjectMetadata podMetadata, java.lang.String portName, java.lang.String priorityClassName, Integer replicas, io.fabric8.kubernetes.api.model.ResourceRequirements resources, java.lang.String retention, java.lang.String routePrefix, List secrets, PodSecurityContext securityContext, java.lang.String serviceAccountName, java.lang.String sha, StorageSpec storage, java.lang.String tag, List tolerations, List topologySpreadConstraints, java.lang.String version, List volumeMounts, List volumes) { super(); this.additionalPeers = additionalPeers; this.affinity = affinity; this.alertmanagerConfigNamespaceSelector = alertmanagerConfigNamespaceSelector; this.alertmanagerConfigSelector = alertmanagerConfigSelector; + this.alertmanagerConfiguration = alertmanagerConfiguration; this.baseImage = baseImage; this.clusterAdvertiseAddress = clusterAdvertiseAddress; this.clusterGossipInterval = clusterGossipInterval; @@ -264,6 +274,7 @@ public AlertmanagerSpec(List additionalPeers, Affinity affinit this.containers = containers; this.externalUrl = externalUrl; this.forceEnableClusterMode = forceEnableClusterMode; + this.hostAliases = hostAliases; this.image = image; this.imagePullSecrets = imagePullSecrets; this.initContainers = initContainers; @@ -333,6 +344,16 @@ public void setAlertmanagerConfigSelector(io.fabric8.kubernetes.api.model.LabelS this.alertmanagerConfigSelector = alertmanagerConfigSelector; } + @JsonProperty("alertmanagerConfiguration") + public AlertmanagerConfiguration getAlertmanagerConfiguration() { + return alertmanagerConfiguration; + } + + @JsonProperty("alertmanagerConfiguration") + public void setAlertmanagerConfiguration(AlertmanagerConfiguration alertmanagerConfiguration) { + this.alertmanagerConfiguration = alertmanagerConfiguration; + } + @JsonProperty("baseImage") public java.lang.String getBaseImage() { return baseImage; @@ -433,6 +454,16 @@ public void setForceEnableClusterMode(Boolean forceEnableClusterMode) { this.forceEnableClusterMode = forceEnableClusterMode; } + @JsonProperty("hostAliases") + public List getHostAliases() { + return hostAliases; + } + + @JsonProperty("hostAliases") + public void setHostAliases(List hostAliases) { + this.hostAliases = hostAliases; + } + @JsonProperty("image") public java.lang.String getImage() { return image; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AttachMetadata.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AttachMetadata.java new file mode 100644 index 00000000000..db784f4be18 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/AttachMetadata.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.monitoring.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", + "node" +}) +@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 AttachMetadata implements KubernetesResource +{ + + @JsonProperty("node") + private Boolean node; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AttachMetadata() { + } + + /** + * + * @param node + */ + public AttachMetadata(Boolean node) { + super(); + this.node = node; + } + + @JsonProperty("node") + public Boolean getNode() { + return node; + } + + @JsonProperty("node") + public void setNode(Boolean node) { + this.node = node; + } + + @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/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Endpoint.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Endpoint.java index 4fa353e8676..b8f84b5611b 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Endpoint.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Endpoint.java @@ -40,6 +40,7 @@ "basicAuth", "bearerTokenFile", "bearerTokenSecret", + "followRedirects", "honorLabels", "honorTimestamps", "interval", @@ -84,6 +85,8 @@ public class Endpoint implements KubernetesResource private java.lang.String bearerTokenFile; @JsonProperty("bearerTokenSecret") private SecretKeySelector bearerTokenSecret; + @JsonProperty("followRedirects") + private Boolean followRedirects; @JsonProperty("honorLabels") private Boolean honorLabels; @JsonProperty("honorTimestamps") @@ -143,15 +146,17 @@ public Endpoint() { * @param path * @param relabelings * @param port + * @param followRedirects * @param interval * @param bearerTokenFile */ - public Endpoint(SafeAuthorization authorization, BasicAuth basicAuth, java.lang.String bearerTokenFile, SecretKeySelector bearerTokenSecret, Boolean honorLabels, Boolean honorTimestamps, java.lang.String interval, List metricRelabelings, OAuth2 oauth2, Map> params, java.lang.String path, java.lang.String port, java.lang.String proxyUrl, List relabelings, java.lang.String scheme, java.lang.String scrapeTimeout, io.fabric8.kubernetes.api.model.IntOrString targetPort, TLSConfig tlsConfig) { + public Endpoint(SafeAuthorization authorization, BasicAuth basicAuth, java.lang.String bearerTokenFile, SecretKeySelector bearerTokenSecret, Boolean followRedirects, Boolean honorLabels, Boolean honorTimestamps, java.lang.String interval, List metricRelabelings, OAuth2 oauth2, Map> params, java.lang.String path, java.lang.String port, java.lang.String proxyUrl, List relabelings, java.lang.String scheme, java.lang.String scrapeTimeout, io.fabric8.kubernetes.api.model.IntOrString targetPort, TLSConfig tlsConfig) { super(); this.authorization = authorization; this.basicAuth = basicAuth; this.bearerTokenFile = bearerTokenFile; this.bearerTokenSecret = bearerTokenSecret; + this.followRedirects = followRedirects; this.honorLabels = honorLabels; this.honorTimestamps = honorTimestamps; this.interval = interval; @@ -208,6 +213,16 @@ public void setBearerTokenSecret(SecretKeySelector bearerTokenSecret) { this.bearerTokenSecret = bearerTokenSecret; } + @JsonProperty("followRedirects") + public Boolean getFollowRedirects() { + return followRedirects; + } + + @JsonProperty("followRedirects") + public void setFollowRedirects(Boolean followRedirects) { + this.followRedirects = followRedirects; + } + @JsonProperty("honorLabels") public Boolean getHonorLabels() { return honorLabels; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/HostAlias.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/HostAlias.java new file mode 100644 index 00000000000..d5cbbd74a8e --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/HostAlias.java @@ -0,0 +1,117 @@ + +package io.fabric8.openshift.api.model.monitoring.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", + "hostnames", + "ip" +}) +@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 HostAlias implements KubernetesResource +{ + + @JsonProperty("hostnames") + private List hostnames = new ArrayList(); + @JsonProperty("ip") + private String ip; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostAlias() { + } + + /** + * + * @param ip + * @param hostnames + */ + public HostAlias(List hostnames, String ip) { + super(); + this.hostnames = hostnames; + this.ip = ip; + } + + @JsonProperty("hostnames") + public List getHostnames() { + return hostnames; + } + + @JsonProperty("hostnames") + public void setHostnames(List hostnames) { + this.hostnames = hostnames; + } + + @JsonProperty("ip") + public String getIp() { + return ip; + } + + @JsonProperty("ip") + public void setIp(String ip) { + this.ip = ip; + } + + @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/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ObjectReference.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ObjectReference.java new file mode 100644 index 00000000000..876587857fe --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ObjectReference.java @@ -0,0 +1,144 @@ + +package io.fabric8.openshift.api.model.monitoring.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.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", + "name", + "namespace", + "resource" +}) +@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(io.fabric8.kubernetes.api.model.ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +public class ObjectReference implements KubernetesResource +{ + + @JsonProperty("group") + private String group; + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("resource") + private String resource; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ObjectReference() { + } + + /** + * + * @param resource + * @param name + * @param namespace + * @param group + */ + public ObjectReference(String group, String name, String namespace, String resource) { + super(); + this.group = group; + this.name = name; + this.namespace = namespace; + this.resource = resource; + } + + @JsonProperty("group") + public String getGroup() { + return group; + } + + @JsonProperty("group") + public void setGroup(String group) { + this.group = group; + } + + @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; + } + + @JsonProperty("resource") + public String getResource() { + return resource; + } + + @JsonProperty("resource") + public void setResource(String resource) { + this.resource = resource; + } + + @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/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMetricsEndpoint.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMetricsEndpoint.java index 72d8973f185..9b654799ff1 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMetricsEndpoint.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMetricsEndpoint.java @@ -39,6 +39,7 @@ "authorization", "basicAuth", "bearerTokenSecret", + "followRedirects", "honorLabels", "honorTimestamps", "interval", @@ -81,6 +82,8 @@ public class PodMetricsEndpoint implements KubernetesResource private BasicAuth basicAuth; @JsonProperty("bearerTokenSecret") private SecretKeySelector bearerTokenSecret; + @JsonProperty("followRedirects") + private Boolean followRedirects; @JsonProperty("honorLabels") private Boolean honorLabels; @JsonProperty("honorTimestamps") @@ -140,13 +143,15 @@ public PodMetricsEndpoint() { * @param path * @param relabelings * @param port + * @param followRedirects * @param interval */ - public PodMetricsEndpoint(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, Boolean honorLabels, Boolean honorTimestamps, java.lang.String interval, List metricRelabelings, OAuth2 oauth2, Map> params, java.lang.String path, java.lang.String port, java.lang.String proxyUrl, List relabelings, java.lang.String scheme, java.lang.String scrapeTimeout, io.fabric8.kubernetes.api.model.IntOrString targetPort, PodMetricsEndpointTLSConfig tlsConfig) { + public PodMetricsEndpoint(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, Boolean followRedirects, Boolean honorLabels, Boolean honorTimestamps, java.lang.String interval, List metricRelabelings, OAuth2 oauth2, Map> params, java.lang.String path, java.lang.String port, java.lang.String proxyUrl, List relabelings, java.lang.String scheme, java.lang.String scrapeTimeout, io.fabric8.kubernetes.api.model.IntOrString targetPort, PodMetricsEndpointTLSConfig tlsConfig) { super(); this.authorization = authorization; this.basicAuth = basicAuth; this.bearerTokenSecret = bearerTokenSecret; + this.followRedirects = followRedirects; this.honorLabels = honorLabels; this.honorTimestamps = honorTimestamps; this.interval = interval; @@ -193,6 +198,16 @@ public void setBearerTokenSecret(SecretKeySelector bearerTokenSecret) { this.bearerTokenSecret = bearerTokenSecret; } + @JsonProperty("followRedirects") + public Boolean getFollowRedirects() { + return followRedirects; + } + + @JsonProperty("followRedirects") + public void setFollowRedirects(Boolean followRedirects) { + this.followRedirects = followRedirects; + } + @JsonProperty("honorLabels") public Boolean getHonorLabels() { return honorLabels; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitorSpec.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitorSpec.java index f12a9331b60..6219827f88e 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitorSpec.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitorSpec.java @@ -34,6 +34,7 @@ "apiVersion", "kind", "metadata", + "attachMetadata", "jobLabel", "labelLimit", "labelNameLengthLimit", @@ -66,6 +67,8 @@ public class PodMonitorSpec implements KubernetesResource { + @JsonProperty("attachMetadata") + private AttachMetadata attachMetadata; @JsonProperty("jobLabel") private String jobLabel; @JsonProperty("labelLimit") @@ -109,9 +112,11 @@ public PodMonitorSpec() { * @param labelValueLengthLimit * @param selector * @param labelNameLengthLimit + * @param attachMetadata */ - public PodMonitorSpec(String jobLabel, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, NamespaceSelector namespaceSelector, List podMetricsEndpoints, List podTargetLabels, Long sampleLimit, io.fabric8.kubernetes.api.model.LabelSelector selector, Long targetLimit) { + public PodMonitorSpec(AttachMetadata attachMetadata, String jobLabel, Long labelLimit, Long labelNameLengthLimit, Long labelValueLengthLimit, NamespaceSelector namespaceSelector, List podMetricsEndpoints, List podTargetLabels, Long sampleLimit, io.fabric8.kubernetes.api.model.LabelSelector selector, Long targetLimit) { super(); + this.attachMetadata = attachMetadata; this.jobLabel = jobLabel; this.labelLimit = labelLimit; this.labelNameLengthLimit = labelNameLengthLimit; @@ -124,6 +129,16 @@ public PodMonitorSpec(String jobLabel, Long labelLimit, Long labelNameLengthLimi this.targetLimit = targetLimit; } + @JsonProperty("attachMetadata") + public AttachMetadata getAttachMetadata() { + return attachMetadata; + } + + @JsonProperty("attachMetadata") + public void setAttachMetadata(AttachMetadata attachMetadata) { + this.attachMetadata = attachMetadata; + } + @JsonProperty("jobLabel") public String getJobLabel() { return jobLabel; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusCondition.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusCondition.java new file mode 100644 index 00000000000..7538950958a --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusCondition.java @@ -0,0 +1,160 @@ + +package io.fabric8.openshift.api.model.monitoring.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", + "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 PrometheusCondition 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 PrometheusCondition() { + } + + /** + * + * @param reason + * @param lastTransitionTime + * @param message + * @param type + * @param status + */ + public PrometheusCondition(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/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusSpec.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusSpec.java index d22009503e6..aba7e769176 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusSpec.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusSpec.java @@ -17,7 +17,6 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; 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.PodSecurityContext; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -53,6 +52,7 @@ "disableCompaction", "enableAdminAPI", "enableFeatures", + "enableRemoteWriteReceiver", "enforcedBodySizeLimit", "enforcedLabelLimit", "enforcedLabelNameLengthLimit", @@ -61,8 +61,10 @@ "enforcedSampleLimit", "enforcedTargetLimit", "evaluationInterval", + "excludedFromEnforcement", "externalLabels", "externalUrl", + "hostAliases", "ignoreNamespaceSelectors", "image", "imagePullSecrets", @@ -131,7 +133,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(io.fabric8.kubernetes.api.model.ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), + @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -169,6 +171,8 @@ public class PrometheusSpec implements KubernetesResource @JsonProperty("enableFeatures") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List enableFeatures = new ArrayList(); + @JsonProperty("enableRemoteWriteReceiver") + private Boolean enableRemoteWriteReceiver; @JsonProperty("enforcedBodySizeLimit") private java.lang.String enforcedBodySizeLimit; @JsonProperty("enforcedLabelLimit") @@ -185,11 +189,17 @@ public class PrometheusSpec implements KubernetesResource private Long enforcedTargetLimit; @JsonProperty("evaluationInterval") private java.lang.String evaluationInterval; + @JsonProperty("excludedFromEnforcement") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List excludedFromEnforcement = new ArrayList(); @JsonProperty("externalLabels") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map externalLabels = new LinkedHashMap(); @JsonProperty("externalUrl") private java.lang.String externalUrl; + @JsonProperty("hostAliases") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List hostAliases = new ArrayList(); @JsonProperty("ignoreNamespaceSelectors") private Boolean ignoreNamespaceSelectors; @JsonProperty("image") @@ -326,6 +336,7 @@ public PrometheusSpec() { * @param baseImage * @param priorityClassName * @param prometheusRulesExcludedFromEnforce + * @param hostAliases * @param rules * @param securityContext * @param nodeSelector @@ -336,6 +347,7 @@ public PrometheusSpec() { * @param queryLogFile * @param enforcedLabelValueLengthLimit * @param tag + * @param excludedFromEnforcement * @param thanos * @param image * @param query @@ -370,6 +382,7 @@ public PrometheusSpec() { * @param podMonitorSelector * @param alerting * @param prometheusExternalLabelName + * @param enableRemoteWriteReceiver * @param logLevel * @param enableAdminAPI * @param web @@ -397,7 +410,7 @@ public PrometheusSpec() { * @param remoteWrite * @param initContainers */ - public PrometheusSpec(SecretKeySelector additionalAlertManagerConfigs, SecretKeySelector additionalAlertRelabelConfigs, SecretKeySelector additionalScrapeConfigs, Affinity affinity, AlertingSpec alerting, Boolean allowOverlappingBlocks, APIServerConfig apiserverConfig, ArbitraryFSAccessThroughSMsConfig arbitraryFSAccessThroughSMs, java.lang.String baseImage, List configMaps, List containers, Boolean disableCompaction, Boolean enableAdminAPI, List enableFeatures, java.lang.String enforcedBodySizeLimit, Long enforcedLabelLimit, Long enforcedLabelNameLengthLimit, Long enforcedLabelValueLengthLimit, java.lang.String enforcedNamespaceLabel, Long enforcedSampleLimit, Long enforcedTargetLimit, java.lang.String evaluationInterval, Map externalLabels, java.lang.String externalUrl, Boolean ignoreNamespaceSelectors, java.lang.String image, List imagePullSecrets, List initContainers, Boolean listenLocal, java.lang.String logFormat, java.lang.String logLevel, Integer minReadySeconds, Map nodeSelector, Boolean overrideHonorLabels, Boolean overrideHonorTimestamps, Boolean paused, EmbeddedObjectMetadata podMetadata, io.fabric8.kubernetes.api.model.LabelSelector podMonitorNamespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector podMonitorSelector, java.lang.String portName, java.lang.String priorityClassName, io.fabric8.kubernetes.api.model.LabelSelector probeNamespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector probeSelector, java.lang.String prometheusExternalLabelName, List prometheusRulesExcludedFromEnforce, QuerySpec query, java.lang.String queryLogFile, List remoteRead, List remoteWrite, java.lang.String replicaExternalLabelName, Integer replicas, io.fabric8.kubernetes.api.model.ResourceRequirements resources, java.lang.String retention, java.lang.String retentionSize, java.lang.String routePrefix, io.fabric8.kubernetes.api.model.LabelSelector ruleNamespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector ruleSelector, Rules rules, java.lang.String scrapeInterval, java.lang.String scrapeTimeout, List secrets, PodSecurityContext securityContext, java.lang.String serviceAccountName, io.fabric8.kubernetes.api.model.LabelSelector serviceMonitorNamespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector serviceMonitorSelector, java.lang.String sha, Integer shards, StorageSpec storage, java.lang.String tag, ThanosSpec thanos, List tolerations, List topologySpreadConstraints, java.lang.String version, List volumeMounts, List volumes, Boolean walCompression, WebSpec web) { + public PrometheusSpec(SecretKeySelector additionalAlertManagerConfigs, SecretKeySelector additionalAlertRelabelConfigs, SecretKeySelector additionalScrapeConfigs, Affinity affinity, AlertingSpec alerting, Boolean allowOverlappingBlocks, APIServerConfig apiserverConfig, ArbitraryFSAccessThroughSMsConfig arbitraryFSAccessThroughSMs, java.lang.String baseImage, List configMaps, List containers, Boolean disableCompaction, Boolean enableAdminAPI, List enableFeatures, Boolean enableRemoteWriteReceiver, java.lang.String enforcedBodySizeLimit, Long enforcedLabelLimit, Long enforcedLabelNameLengthLimit, Long enforcedLabelValueLengthLimit, java.lang.String enforcedNamespaceLabel, Long enforcedSampleLimit, Long enforcedTargetLimit, java.lang.String evaluationInterval, List excludedFromEnforcement, Map externalLabels, java.lang.String externalUrl, List hostAliases, Boolean ignoreNamespaceSelectors, java.lang.String image, List imagePullSecrets, List initContainers, Boolean listenLocal, java.lang.String logFormat, java.lang.String logLevel, Integer minReadySeconds, Map nodeSelector, Boolean overrideHonorLabels, Boolean overrideHonorTimestamps, Boolean paused, EmbeddedObjectMetadata podMetadata, io.fabric8.kubernetes.api.model.LabelSelector podMonitorNamespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector podMonitorSelector, java.lang.String portName, java.lang.String priorityClassName, io.fabric8.kubernetes.api.model.LabelSelector probeNamespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector probeSelector, java.lang.String prometheusExternalLabelName, List prometheusRulesExcludedFromEnforce, QuerySpec query, java.lang.String queryLogFile, List remoteRead, List remoteWrite, java.lang.String replicaExternalLabelName, Integer replicas, io.fabric8.kubernetes.api.model.ResourceRequirements resources, java.lang.String retention, java.lang.String retentionSize, java.lang.String routePrefix, io.fabric8.kubernetes.api.model.LabelSelector ruleNamespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector ruleSelector, Rules rules, java.lang.String scrapeInterval, java.lang.String scrapeTimeout, List secrets, PodSecurityContext securityContext, java.lang.String serviceAccountName, io.fabric8.kubernetes.api.model.LabelSelector serviceMonitorNamespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector serviceMonitorSelector, java.lang.String sha, Integer shards, StorageSpec storage, java.lang.String tag, ThanosSpec thanos, List tolerations, List topologySpreadConstraints, java.lang.String version, List volumeMounts, List volumes, Boolean walCompression, WebSpec web) { super(); this.additionalAlertManagerConfigs = additionalAlertManagerConfigs; this.additionalAlertRelabelConfigs = additionalAlertRelabelConfigs; @@ -413,6 +426,7 @@ public PrometheusSpec(SecretKeySelector additionalAlertManagerConfigs, SecretKey this.disableCompaction = disableCompaction; this.enableAdminAPI = enableAdminAPI; this.enableFeatures = enableFeatures; + this.enableRemoteWriteReceiver = enableRemoteWriteReceiver; this.enforcedBodySizeLimit = enforcedBodySizeLimit; this.enforcedLabelLimit = enforcedLabelLimit; this.enforcedLabelNameLengthLimit = enforcedLabelNameLengthLimit; @@ -421,8 +435,10 @@ public PrometheusSpec(SecretKeySelector additionalAlertManagerConfigs, SecretKey this.enforcedSampleLimit = enforcedSampleLimit; this.enforcedTargetLimit = enforcedTargetLimit; this.evaluationInterval = evaluationInterval; + this.excludedFromEnforcement = excludedFromEnforcement; this.externalLabels = externalLabels; this.externalUrl = externalUrl; + this.hostAliases = hostAliases; this.ignoreNamespaceSelectors = ignoreNamespaceSelectors; this.image = image; this.imagePullSecrets = imagePullSecrets; @@ -618,6 +634,16 @@ public void setEnableFeatures(List enableFeatures) { this.enableFeatures = enableFeatures; } + @JsonProperty("enableRemoteWriteReceiver") + public Boolean getEnableRemoteWriteReceiver() { + return enableRemoteWriteReceiver; + } + + @JsonProperty("enableRemoteWriteReceiver") + public void setEnableRemoteWriteReceiver(Boolean enableRemoteWriteReceiver) { + this.enableRemoteWriteReceiver = enableRemoteWriteReceiver; + } + @JsonProperty("enforcedBodySizeLimit") public java.lang.String getEnforcedBodySizeLimit() { return enforcedBodySizeLimit; @@ -698,6 +724,16 @@ public void setEvaluationInterval(java.lang.String evaluationInterval) { this.evaluationInterval = evaluationInterval; } + @JsonProperty("excludedFromEnforcement") + public List getExcludedFromEnforcement() { + return excludedFromEnforcement; + } + + @JsonProperty("excludedFromEnforcement") + public void setExcludedFromEnforcement(List excludedFromEnforcement) { + this.excludedFromEnforcement = excludedFromEnforcement; + } + @JsonProperty("externalLabels") public Map getExternalLabels() { return externalLabels; @@ -718,6 +754,16 @@ public void setExternalUrl(java.lang.String externalUrl) { this.externalUrl = externalUrl; } + @JsonProperty("hostAliases") + public List getHostAliases() { + return hostAliases; + } + + @JsonProperty("hostAliases") + public void setHostAliases(List hostAliases) { + this.hostAliases = hostAliases; + } + @JsonProperty("ignoreNamespaceSelectors") public Boolean getIgnoreNamespaceSelectors() { return ignoreNamespaceSelectors; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusStatus.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusStatus.java index bb782b54696..fee82b2d117 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusStatus.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusStatus.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.monitoring.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; @@ -34,8 +36,10 @@ "kind", "metadata", "availableReplicas", + "conditions", "paused", "replicas", + "shardStatuses", "unavailableReplicas", "updatedReplicas" }) @@ -62,10 +66,16 @@ public class PrometheusStatus implements KubernetesResource @JsonProperty("availableReplicas") private Integer availableReplicas; + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList(); @JsonProperty("paused") private Boolean paused; @JsonProperty("replicas") private Integer replicas; + @JsonProperty("shardStatuses") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List shardStatuses = new ArrayList(); @JsonProperty("unavailableReplicas") private Integer unavailableReplicas; @JsonProperty("updatedReplicas") @@ -85,14 +95,18 @@ public PrometheusStatus() { * @param paused * @param unavailableReplicas * @param replicas + * @param conditions + * @param shardStatuses * @param updatedReplicas * @param availableReplicas */ - public PrometheusStatus(Integer availableReplicas, Boolean paused, Integer replicas, Integer unavailableReplicas, Integer updatedReplicas) { + public PrometheusStatus(Integer availableReplicas, List conditions, Boolean paused, Integer replicas, List shardStatuses, Integer unavailableReplicas, Integer updatedReplicas) { super(); this.availableReplicas = availableReplicas; + this.conditions = conditions; this.paused = paused; this.replicas = replicas; + this.shardStatuses = shardStatuses; this.unavailableReplicas = unavailableReplicas; this.updatedReplicas = updatedReplicas; } @@ -107,6 +121,16 @@ public void setAvailableReplicas(Integer availableReplicas) { this.availableReplicas = availableReplicas; } + @JsonProperty("conditions") + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + @JsonProperty("paused") public Boolean getPaused() { return paused; @@ -127,6 +151,16 @@ public void setReplicas(Integer replicas) { this.replicas = replicas; } + @JsonProperty("shardStatuses") + public List getShardStatuses() { + return shardStatuses; + } + + @JsonProperty("shardStatuses") + public void setShardStatuses(List shardStatuses) { + this.shardStatuses = shardStatuses; + } + @JsonProperty("unavailableReplicas") public Integer getUnavailableReplicas() { return unavailableReplicas; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/QueueConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/QueueConfig.java index ee5b20dc763..d9048481ae7 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/QueueConfig.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/QueueConfig.java @@ -40,7 +40,8 @@ "maxSamplesPerSend", "maxShards", "minBackoff", - "minShards" + "minShards", + "retryOnRateLimit" }) @ToString @EqualsAndHashCode @@ -79,6 +80,8 @@ public class QueueConfig implements KubernetesResource private String minBackoff; @JsonProperty("minShards") private Integer minShards; + @JsonProperty("retryOnRateLimit") + private Boolean retryOnRateLimit; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -95,12 +98,13 @@ public QueueConfig() { * @param minShards * @param maxBackoff * @param maxShards + * @param retryOnRateLimit * @param minBackoff * @param batchSendDeadline * @param maxSamplesPerSend * @param capacity */ - public QueueConfig(String batchSendDeadline, Integer capacity, String maxBackoff, Integer maxRetries, Integer maxSamplesPerSend, Integer maxShards, String minBackoff, Integer minShards) { + public QueueConfig(String batchSendDeadline, Integer capacity, String maxBackoff, Integer maxRetries, Integer maxSamplesPerSend, Integer maxShards, String minBackoff, Integer minShards, Boolean retryOnRateLimit) { super(); this.batchSendDeadline = batchSendDeadline; this.capacity = capacity; @@ -110,6 +114,7 @@ public QueueConfig(String batchSendDeadline, Integer capacity, String maxBackoff this.maxShards = maxShards; this.minBackoff = minBackoff; this.minShards = minShards; + this.retryOnRateLimit = retryOnRateLimit; } @JsonProperty("batchSendDeadline") @@ -192,6 +197,16 @@ public void setMinShards(Integer minShards) { this.minShards = minShards; } + @JsonProperty("retryOnRateLimit") + public Boolean getRetryOnRateLimit() { + return retryOnRateLimit; + } + + @JsonProperty("retryOnRateLimit") + public void setRetryOnRateLimit(Boolean retryOnRateLimit) { + this.retryOnRateLimit = retryOnRateLimit; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/RemoteReadSpec.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/RemoteReadSpec.java index e90b0f42e31..88fbc536947 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/RemoteReadSpec.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/RemoteReadSpec.java @@ -38,6 +38,7 @@ "basicAuth", "bearerToken", "bearerTokenFile", + "headers", "name", "oauth2", "proxyUrl", @@ -76,6 +77,9 @@ public class RemoteReadSpec implements KubernetesResource private java.lang.String bearerToken; @JsonProperty("bearerTokenFile") private java.lang.String bearerTokenFile; + @JsonProperty("headers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map headers = new LinkedHashMap(); @JsonProperty("name") private java.lang.String name; @JsonProperty("oauth2") @@ -105,25 +109,27 @@ public RemoteReadSpec() { /** * - * @param authorization - * @param readRecent - * @param bearerToken - * @param remoteTimeout + * @param headers * @param requiredMatchers * @param basicAuth * @param proxyUrl - * @param name * @param oauth2 - * @param bearerTokenFile * @param url * @param tlsConfig + * @param authorization + * @param readRecent + * @param bearerToken + * @param remoteTimeout + * @param name + * @param bearerTokenFile */ - public RemoteReadSpec(Authorization authorization, BasicAuth basicAuth, java.lang.String bearerToken, java.lang.String bearerTokenFile, java.lang.String name, OAuth2 oauth2, java.lang.String proxyUrl, Boolean readRecent, java.lang.String remoteTimeout, Map requiredMatchers, TLSConfig tlsConfig, java.lang.String url) { + public RemoteReadSpec(Authorization authorization, BasicAuth basicAuth, java.lang.String bearerToken, java.lang.String bearerTokenFile, Map headers, java.lang.String name, OAuth2 oauth2, java.lang.String proxyUrl, Boolean readRecent, java.lang.String remoteTimeout, Map requiredMatchers, TLSConfig tlsConfig, java.lang.String url) { super(); this.authorization = authorization; this.basicAuth = basicAuth; this.bearerToken = bearerToken; this.bearerTokenFile = bearerTokenFile; + this.headers = headers; this.name = name; this.oauth2 = oauth2; this.proxyUrl = proxyUrl; @@ -174,6 +180,16 @@ public void setBearerTokenFile(java.lang.String bearerTokenFile) { this.bearerTokenFile = bearerTokenFile; } + @JsonProperty("headers") + public Map getHeaders() { + return headers; + } + + @JsonProperty("headers") + public void setHeaders(Map headers) { + this.headers = headers; + } + @JsonProperty("name") public java.lang.String getName() { return name; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ShardStatus.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ShardStatus.java new file mode 100644 index 00000000000..217de9ee8fa --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ShardStatus.java @@ -0,0 +1,160 @@ + +package io.fabric8.openshift.api.model.monitoring.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", + "availableReplicas", + "replicas", + "shardID", + "unavailableReplicas", + "updatedReplicas" +}) +@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 ShardStatus implements KubernetesResource +{ + + @JsonProperty("availableReplicas") + private Integer availableReplicas; + @JsonProperty("replicas") + private Integer replicas; + @JsonProperty("shardID") + private String shardID; + @JsonProperty("unavailableReplicas") + private Integer unavailableReplicas; + @JsonProperty("updatedReplicas") + private Integer updatedReplicas; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ShardStatus() { + } + + /** + * + * @param unavailableReplicas + * @param replicas + * @param shardID + * @param updatedReplicas + * @param availableReplicas + */ + public ShardStatus(Integer availableReplicas, Integer replicas, String shardID, Integer unavailableReplicas, Integer updatedReplicas) { + super(); + this.availableReplicas = availableReplicas; + this.replicas = replicas; + this.shardID = shardID; + this.unavailableReplicas = unavailableReplicas; + this.updatedReplicas = updatedReplicas; + } + + @JsonProperty("availableReplicas") + public Integer getAvailableReplicas() { + return availableReplicas; + } + + @JsonProperty("availableReplicas") + public void setAvailableReplicas(Integer availableReplicas) { + this.availableReplicas = availableReplicas; + } + + @JsonProperty("replicas") + public Integer getReplicas() { + return replicas; + } + + @JsonProperty("replicas") + public void setReplicas(Integer replicas) { + this.replicas = replicas; + } + + @JsonProperty("shardID") + public String getShardID() { + return shardID; + } + + @JsonProperty("shardID") + public void setShardID(String shardID) { + this.shardID = shardID; + } + + @JsonProperty("unavailableReplicas") + public Integer getUnavailableReplicas() { + return unavailableReplicas; + } + + @JsonProperty("unavailableReplicas") + public void setUnavailableReplicas(Integer unavailableReplicas) { + this.unavailableReplicas = unavailableReplicas; + } + + @JsonProperty("updatedReplicas") + public Integer getUpdatedReplicas() { + return updatedReplicas; + } + + @JsonProperty("updatedReplicas") + public void setUpdatedReplicas(Integer updatedReplicas) { + this.updatedReplicas = updatedReplicas; + } + + @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/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ThanosRulerSpec.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ThanosRulerSpec.java index b6fe792dbf5..10656634248 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ThanosRulerSpec.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ThanosRulerSpec.java @@ -17,7 +17,6 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; 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.PodSecurityContext; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,8 +47,10 @@ "containers", "enforcedNamespaceLabel", "evaluationInterval", + "excludedFromEnforcement", "externalPrefix", "grpcServerTlsConfig", + "hostAliases", "image", "imagePullSecrets", "initContainers", @@ -96,7 +97,7 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(io.fabric8.kubernetes.api.model.ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), + @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @@ -126,10 +127,16 @@ public class ThanosRulerSpec implements KubernetesResource private java.lang.String enforcedNamespaceLabel; @JsonProperty("evaluationInterval") private java.lang.String evaluationInterval; + @JsonProperty("excludedFromEnforcement") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List excludedFromEnforcement = new ArrayList(); @JsonProperty("externalPrefix") private java.lang.String externalPrefix; @JsonProperty("grpcServerTlsConfig") private TLSConfig grpcServerTlsConfig; + @JsonProperty("hostAliases") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List hostAliases = new ArrayList(); @JsonProperty("image") private java.lang.String image; @JsonProperty("imagePullSecrets") @@ -221,6 +228,7 @@ public ThanosRulerSpec() { * @param imagePullSecrets * @param priorityClassName * @param prometheusRulesExcludedFromEnforce + * @param hostAliases * @param portName * @param securityContext * @param storage @@ -235,6 +243,7 @@ public ThanosRulerSpec() { * @param queryConfig * @param alertRelabelConfigs * @param alertQueryUrl + * @param excludedFromEnforcement * @param objectStorageConfigFile * @param alertmanagersUrl * @param retention @@ -257,7 +266,7 @@ public ThanosRulerSpec() { * @param initContainers * @param affinity */ - public ThanosRulerSpec(Affinity affinity, List alertDropLabels, java.lang.String alertQueryUrl, java.lang.String alertRelabelConfigFile, SecretKeySelector alertRelabelConfigs, SecretKeySelector alertmanagersConfig, List alertmanagersUrl, List containers, java.lang.String enforcedNamespaceLabel, java.lang.String evaluationInterval, java.lang.String externalPrefix, TLSConfig grpcServerTlsConfig, java.lang.String image, List imagePullSecrets, List initContainers, Map labels, Boolean listenLocal, java.lang.String logFormat, java.lang.String logLevel, Integer minReadySeconds, Map nodeSelector, SecretKeySelector objectStorageConfig, java.lang.String objectStorageConfigFile, Boolean paused, EmbeddedObjectMetadata podMetadata, java.lang.String portName, java.lang.String priorityClassName, List prometheusRulesExcludedFromEnforce, SecretKeySelector queryConfig, List queryEndpoints, Integer replicas, io.fabric8.kubernetes.api.model.ResourceRequirements resources, java.lang.String retention, java.lang.String routePrefix, io.fabric8.kubernetes.api.model.LabelSelector ruleNamespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector ruleSelector, PodSecurityContext securityContext, java.lang.String serviceAccountName, StorageSpec storage, List tolerations, List topologySpreadConstraints, SecretKeySelector tracingConfig, List volumes) { + public ThanosRulerSpec(Affinity affinity, List alertDropLabels, java.lang.String alertQueryUrl, java.lang.String alertRelabelConfigFile, SecretKeySelector alertRelabelConfigs, SecretKeySelector alertmanagersConfig, List alertmanagersUrl, List containers, java.lang.String enforcedNamespaceLabel, java.lang.String evaluationInterval, List excludedFromEnforcement, java.lang.String externalPrefix, TLSConfig grpcServerTlsConfig, List hostAliases, java.lang.String image, List imagePullSecrets, List initContainers, Map labels, Boolean listenLocal, java.lang.String logFormat, java.lang.String logLevel, Integer minReadySeconds, Map nodeSelector, SecretKeySelector objectStorageConfig, java.lang.String objectStorageConfigFile, Boolean paused, EmbeddedObjectMetadata podMetadata, java.lang.String portName, java.lang.String priorityClassName, List prometheusRulesExcludedFromEnforce, SecretKeySelector queryConfig, List queryEndpoints, Integer replicas, io.fabric8.kubernetes.api.model.ResourceRequirements resources, java.lang.String retention, java.lang.String routePrefix, io.fabric8.kubernetes.api.model.LabelSelector ruleNamespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector ruleSelector, PodSecurityContext securityContext, java.lang.String serviceAccountName, StorageSpec storage, List tolerations, List topologySpreadConstraints, SecretKeySelector tracingConfig, List volumes) { super(); this.affinity = affinity; this.alertDropLabels = alertDropLabels; @@ -269,8 +278,10 @@ public ThanosRulerSpec(Affinity affinity, List alertDropLabels this.containers = containers; this.enforcedNamespaceLabel = enforcedNamespaceLabel; this.evaluationInterval = evaluationInterval; + this.excludedFromEnforcement = excludedFromEnforcement; this.externalPrefix = externalPrefix; this.grpcServerTlsConfig = grpcServerTlsConfig; + this.hostAliases = hostAliases; this.image = image; this.imagePullSecrets = imagePullSecrets; this.initContainers = initContainers; @@ -404,6 +415,16 @@ public void setEvaluationInterval(java.lang.String evaluationInterval) { this.evaluationInterval = evaluationInterval; } + @JsonProperty("excludedFromEnforcement") + public List getExcludedFromEnforcement() { + return excludedFromEnforcement; + } + + @JsonProperty("excludedFromEnforcement") + public void setExcludedFromEnforcement(List excludedFromEnforcement) { + this.excludedFromEnforcement = excludedFromEnforcement; + } + @JsonProperty("externalPrefix") public java.lang.String getExternalPrefix() { return externalPrefix; @@ -424,6 +445,16 @@ public void setGrpcServerTlsConfig(TLSConfig grpcServerTlsConfig) { this.grpcServerTlsConfig = grpcServerTlsConfig; } + @JsonProperty("hostAliases") + public List getHostAliases() { + return hostAliases; + } + + @JsonProperty("hostAliases") + public void setHostAliases(List hostAliases) { + this.hostAliases = hostAliases; + } + @JsonProperty("image") public java.lang.String getImage() { return image; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/AlertmanagerConfigSpec.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/AlertmanagerConfigSpec.java index 15aed9f6380..7a4eb71bc3a 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/AlertmanagerConfigSpec.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/AlertmanagerConfigSpec.java @@ -36,6 +36,7 @@ "kind", "metadata", "inhibitRules", + "muteTimeIntervals", "receivers", "route" }) @@ -63,6 +64,9 @@ public class AlertmanagerConfigSpec implements KubernetesResource @JsonProperty("inhibitRules") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List inhibitRules = new ArrayList(); + @JsonProperty("muteTimeIntervals") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List muteTimeIntervals = new ArrayList(); @JsonProperty("receivers") private List receivers = new ArrayList(); @JsonProperty("route") @@ -81,11 +85,13 @@ public AlertmanagerConfigSpec() { * * @param route * @param receivers + * @param muteTimeIntervals * @param inhibitRules */ - public AlertmanagerConfigSpec(List inhibitRules, List receivers, Route route) { + public AlertmanagerConfigSpec(List inhibitRules, List muteTimeIntervals, List receivers, Route route) { super(); this.inhibitRules = inhibitRules; + this.muteTimeIntervals = muteTimeIntervals; this.receivers = receivers; this.route = route; } @@ -100,6 +106,16 @@ public void setInhibitRules(List inhibitRules) { this.inhibitRules = inhibitRules; } + @JsonProperty("muteTimeIntervals") + public List getMuteTimeIntervals() { + return muteTimeIntervals; + } + + @JsonProperty("muteTimeIntervals") + public void setMuteTimeIntervals(List muteTimeIntervals) { + this.muteTimeIntervals = muteTimeIntervals; + } + @JsonProperty("receivers") public List getReceivers() { return receivers; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/DayOfMonthRange.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/DayOfMonthRange.java new file mode 100644 index 00000000000..e7f953ef6c1 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/DayOfMonthRange.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.monitoring.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.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", + "end", + "start" +}) +@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 DayOfMonthRange implements KubernetesResource +{ + + @JsonProperty("end") + private Integer end; + @JsonProperty("start") + private Integer start; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DayOfMonthRange() { + } + + /** + * + * @param start + * @param end + */ + public DayOfMonthRange(Integer end, Integer start) { + super(); + this.end = end; + this.start = start; + } + + @JsonProperty("end") + public Integer getEnd() { + return end; + } + + @JsonProperty("end") + public void setEnd(Integer end) { + this.end = end; + } + + @JsonProperty("start") + public Integer getStart() { + return start; + } + + @JsonProperty("start") + public void setStart(Integer start) { + this.start = start; + } + + @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/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/HTTPConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/HTTPConfig.java index 421827ba5db..5fea84b539b 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/HTTPConfig.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/HTTPConfig.java @@ -22,6 +22,7 @@ import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.SecretKeySelector; import io.fabric8.openshift.api.model.monitoring.v1.BasicAuth; +import io.fabric8.openshift.api.model.monitoring.v1.OAuth2; import io.fabric8.openshift.api.model.monitoring.v1.SafeAuthorization; import io.fabric8.openshift.api.model.monitoring.v1.SafeTLSConfig; import io.sundr.builder.annotations.Buildable; @@ -40,6 +41,8 @@ "authorization", "basicAuth", "bearerTokenSecret", + "followRedirects", + "oauth2", "proxyURL", "tlsConfig" }) @@ -70,6 +73,10 @@ public class HTTPConfig implements KubernetesResource private BasicAuth basicAuth; @JsonProperty("bearerTokenSecret") private SecretKeySelector bearerTokenSecret; + @JsonProperty("followRedirects") + private Boolean followRedirects; + @JsonProperty("oauth2") + private OAuth2 oauth2; @JsonProperty("proxyURL") private String proxyURL; @JsonProperty("tlsConfig") @@ -89,14 +96,18 @@ public HTTPConfig() { * @param authorization * @param bearerTokenSecret * @param basicAuth + * @param followRedirects * @param proxyURL + * @param oauth2 * @param tlsConfig */ - public HTTPConfig(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, String proxyURL, SafeTLSConfig tlsConfig) { + public HTTPConfig(SafeAuthorization authorization, BasicAuth basicAuth, SecretKeySelector bearerTokenSecret, Boolean followRedirects, OAuth2 oauth2, String proxyURL, SafeTLSConfig tlsConfig) { super(); this.authorization = authorization; this.basicAuth = basicAuth; this.bearerTokenSecret = bearerTokenSecret; + this.followRedirects = followRedirects; + this.oauth2 = oauth2; this.proxyURL = proxyURL; this.tlsConfig = tlsConfig; } @@ -131,6 +142,26 @@ public void setBearerTokenSecret(SecretKeySelector bearerTokenSecret) { this.bearerTokenSecret = bearerTokenSecret; } + @JsonProperty("followRedirects") + public Boolean getFollowRedirects() { + return followRedirects; + } + + @JsonProperty("followRedirects") + public void setFollowRedirects(Boolean followRedirects) { + this.followRedirects = followRedirects; + } + + @JsonProperty("oauth2") + public OAuth2 getOauth2() { + return oauth2; + } + + @JsonProperty("oauth2") + public void setOauth2(OAuth2 oauth2) { + this.oauth2 = oauth2; + } + @JsonProperty("proxyURL") public String getProxyURL() { return proxyURL; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/Matcher.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/Matcher.java index 9c32a6f6828..563a92f9e65 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/Matcher.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/Matcher.java @@ -33,6 +33,7 @@ "apiVersion", "kind", "metadata", + "matchType", "name", "regex", "value" @@ -58,6 +59,8 @@ public class Matcher implements KubernetesResource { + @JsonProperty("matchType") + private String matchType; @JsonProperty("name") private String name; @JsonProperty("regex") @@ -77,16 +80,28 @@ public Matcher() { /** * * @param regex + * @param matchType * @param name * @param value */ - public Matcher(String name, Boolean regex, String value) { + public Matcher(String matchType, String name, Boolean regex, String value) { super(); + this.matchType = matchType; this.name = name; this.regex = regex; this.value = value; } + @JsonProperty("matchType") + public String getMatchType() { + return matchType; + } + + @JsonProperty("matchType") + public void setMatchType(String matchType) { + this.matchType = matchType; + } + @JsonProperty("name") public String getName() { return name; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/MuteTimeInterval.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/MuteTimeInterval.java new file mode 100644 index 00000000000..6abb3f356e7 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/MuteTimeInterval.java @@ -0,0 +1,118 @@ + +package io.fabric8.openshift.api.model.monitoring.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.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", + "timeIntervals" +}) +@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 MuteTimeInterval implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("timeIntervals") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List timeIntervals = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MuteTimeInterval() { + } + + /** + * + * @param timeIntervals + * @param name + */ + public MuteTimeInterval(String name, List timeIntervals) { + super(); + this.name = name; + this.timeIntervals = timeIntervals; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("timeIntervals") + public List getTimeIntervals() { + return timeIntervals; + } + + @JsonProperty("timeIntervals") + public void setTimeIntervals(List timeIntervals) { + this.timeIntervals = timeIntervals; + } + + @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/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/OpsGenieConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/OpsGenieConfig.java index 3d8ee0e1c6d..5e774c49ff2 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/OpsGenieConfig.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/OpsGenieConfig.java @@ -36,10 +36,12 @@ "apiVersion", "kind", "metadata", + "actions", "apiKey", "apiURL", "description", "details", + "entity", "httpConfig", "message", "note", @@ -47,7 +49,8 @@ "responders", "sendResolved", "source", - "tags" + "tags", + "updateAlerts" }) @ToString @EqualsAndHashCode @@ -70,6 +73,8 @@ public class OpsGenieConfig implements KubernetesResource { + @JsonProperty("actions") + private String actions; @JsonProperty("apiKey") private SecretKeySelector apiKey; @JsonProperty("apiURL") @@ -79,6 +84,8 @@ public class OpsGenieConfig implements KubernetesResource @JsonProperty("details") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List details = new ArrayList(); + @JsonProperty("entity") + private String entity; @JsonProperty("httpConfig") private HTTPConfig httpConfig; @JsonProperty("message") @@ -96,6 +103,8 @@ public class OpsGenieConfig implements KubernetesResource private String source; @JsonProperty("tags") private String tags; + @JsonProperty("updateAlerts") + private Boolean updateAlerts; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -109,24 +118,29 @@ public OpsGenieConfig() { /** * * @param note - * @param sendResolved * @param apiKey - * @param apiURL - * @param httpConfig + * @param updateAlerts * @param description - * @param details * @param source * @param message * @param priority * @param responders * @param tags + * @param sendResolved + * @param apiURL + * @param httpConfig + * @param details + * @param actions + * @param entity */ - public OpsGenieConfig(SecretKeySelector apiKey, String apiURL, String description, List details, HTTPConfig httpConfig, String message, String note, String priority, List responders, Boolean sendResolved, String source, String tags) { + public OpsGenieConfig(String actions, SecretKeySelector apiKey, String apiURL, String description, List details, String entity, HTTPConfig httpConfig, String message, String note, String priority, List responders, Boolean sendResolved, String source, String tags, Boolean updateAlerts) { super(); + this.actions = actions; this.apiKey = apiKey; this.apiURL = apiURL; this.description = description; this.details = details; + this.entity = entity; this.httpConfig = httpConfig; this.message = message; this.note = note; @@ -135,6 +149,17 @@ public OpsGenieConfig(SecretKeySelector apiKey, String apiURL, String descriptio this.sendResolved = sendResolved; this.source = source; this.tags = tags; + this.updateAlerts = updateAlerts; + } + + @JsonProperty("actions") + public String getActions() { + return actions; + } + + @JsonProperty("actions") + public void setActions(String actions) { + this.actions = actions; } @JsonProperty("apiKey") @@ -177,6 +202,16 @@ public void setDetails(List details) { this.details = details; } + @JsonProperty("entity") + public String getEntity() { + return entity; + } + + @JsonProperty("entity") + public void setEntity(String entity) { + this.entity = entity; + } + @JsonProperty("httpConfig") public HTTPConfig getHttpConfig() { return httpConfig; @@ -257,6 +292,16 @@ public void setTags(String tags) { this.tags = tags; } + @JsonProperty("updateAlerts") + public Boolean getUpdateAlerts() { + return updateAlerts; + } + + @JsonProperty("updateAlerts") + public void setUpdateAlerts(Boolean updateAlerts) { + this.updateAlerts = updateAlerts; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PagerDutyConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PagerDutyConfig.java index 187b154172b..aa706e138fe 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PagerDutyConfig.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PagerDutyConfig.java @@ -44,6 +44,8 @@ "details", "group", "httpConfig", + "pagerDutyImageConfigs", + "pagerDutyLinkConfigs", "routingKey", "sendResolved", "serviceKey", @@ -88,6 +90,12 @@ public class PagerDutyConfig implements KubernetesResource private String group; @JsonProperty("httpConfig") private HTTPConfig httpConfig; + @JsonProperty("pagerDutyImageConfigs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List pagerDutyImageConfigs = new ArrayList(); + @JsonProperty("pagerDutyLinkConfigs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List pagerDutyLinkConfigs = new ArrayList(); @JsonProperty("routingKey") private SecretKeySelector routingKey; @JsonProperty("sendResolved") @@ -113,18 +121,20 @@ public PagerDutyConfig() { * @param severity * @param clientURL * @param description + * @param pagerDutyLinkConfigs * @param className * @param url * @param component * @param sendResolved * @param httpConfig * @param client + * @param pagerDutyImageConfigs * @param details * @param serviceKey * @param routingKey * @param group */ - public PagerDutyConfig(String className, String client, String clientURL, String component, String description, List details, String group, HTTPConfig httpConfig, SecretKeySelector routingKey, Boolean sendResolved, SecretKeySelector serviceKey, String severity, String url) { + public PagerDutyConfig(String className, String client, String clientURL, String component, String description, List details, String group, HTTPConfig httpConfig, List pagerDutyImageConfigs, List pagerDutyLinkConfigs, SecretKeySelector routingKey, Boolean sendResolved, SecretKeySelector serviceKey, String severity, String url) { super(); this.className = className; this.client = client; @@ -134,6 +144,8 @@ public PagerDutyConfig(String className, String client, String clientURL, String this.details = details; this.group = group; this.httpConfig = httpConfig; + this.pagerDutyImageConfigs = pagerDutyImageConfigs; + this.pagerDutyLinkConfigs = pagerDutyLinkConfigs; this.routingKey = routingKey; this.sendResolved = sendResolved; this.serviceKey = serviceKey; @@ -221,6 +233,26 @@ public void setHttpConfig(HTTPConfig httpConfig) { this.httpConfig = httpConfig; } + @JsonProperty("pagerDutyImageConfigs") + public List getPagerDutyImageConfigs() { + return pagerDutyImageConfigs; + } + + @JsonProperty("pagerDutyImageConfigs") + public void setPagerDutyImageConfigs(List pagerDutyImageConfigs) { + this.pagerDutyImageConfigs = pagerDutyImageConfigs; + } + + @JsonProperty("pagerDutyLinkConfigs") + public List getPagerDutyLinkConfigs() { + return pagerDutyLinkConfigs; + } + + @JsonProperty("pagerDutyLinkConfigs") + public void setPagerDutyLinkConfigs(List pagerDutyLinkConfigs) { + this.pagerDutyLinkConfigs = pagerDutyLinkConfigs; + } + @JsonProperty("routingKey") public SecretKeySelector getRoutingKey() { return routingKey; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PagerDutyImageConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PagerDutyImageConfig.java new file mode 100644 index 00000000000..c754003dcae --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PagerDutyImageConfig.java @@ -0,0 +1,130 @@ + +package io.fabric8.openshift.api.model.monitoring.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.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", + "alt", + "href", + "src" +}) +@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 PagerDutyImageConfig implements KubernetesResource +{ + + @JsonProperty("alt") + private String alt; + @JsonProperty("href") + private String href; + @JsonProperty("src") + private String src; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PagerDutyImageConfig() { + } + + /** + * + * @param src + * @param alt + * @param href + */ + public PagerDutyImageConfig(String alt, String href, String src) { + super(); + this.alt = alt; + this.href = href; + this.src = src; + } + + @JsonProperty("alt") + public String getAlt() { + return alt; + } + + @JsonProperty("alt") + public void setAlt(String alt) { + this.alt = alt; + } + + @JsonProperty("href") + public String getHref() { + return href; + } + + @JsonProperty("href") + public void setHref(String href) { + this.href = href; + } + + @JsonProperty("src") + public String getSrc() { + return src; + } + + @JsonProperty("src") + public void setSrc(String src) { + this.src = src; + } + + @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/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PagerDutyLinkConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PagerDutyLinkConfig.java new file mode 100644 index 00000000000..7ce6900e597 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/PagerDutyLinkConfig.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.monitoring.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.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", + "alt", + "href" +}) +@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 PagerDutyLinkConfig implements KubernetesResource +{ + + @JsonProperty("alt") + private String alt; + @JsonProperty("href") + private String href; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PagerDutyLinkConfig() { + } + + /** + * + * @param alt + * @param href + */ + public PagerDutyLinkConfig(String alt, String href) { + super(); + this.alt = alt; + this.href = href; + } + + @JsonProperty("alt") + public String getAlt() { + return alt; + } + + @JsonProperty("alt") + public void setAlt(String alt) { + this.alt = alt; + } + + @JsonProperty("href") + public String getHref() { + return href; + } + + @JsonProperty("href") + public void setHref(String href) { + this.href = href; + } + + @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/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/Receiver.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/Receiver.java index af05952d246..cc60dcf6568 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/Receiver.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/Receiver.java @@ -41,6 +41,8 @@ "pagerdutyConfigs", "pushoverConfigs", "slackConfigs", + "snsConfigs", + "telegramConfigs", "victoropsConfigs", "webhookConfigs", "wechatConfigs" @@ -83,6 +85,12 @@ public class Receiver implements KubernetesResource @JsonProperty("slackConfigs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List slackConfigs = new ArrayList(); + @JsonProperty("snsConfigs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List snsConfigs = new ArrayList(); + @JsonProperty("telegramConfigs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List telegramConfigs = new ArrayList(); @JsonProperty("victoropsConfigs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List victoropsConfigs = new ArrayList(); @@ -110,11 +118,13 @@ public Receiver() { * @param pagerdutyConfigs * @param pushoverConfigs * @param name + * @param telegramConfigs * @param slackConfigs * @param opsgenieConfigs * @param wechatConfigs + * @param snsConfigs */ - public Receiver(List emailConfigs, String name, List opsgenieConfigs, List pagerdutyConfigs, List pushoverConfigs, List slackConfigs, List victoropsConfigs, List webhookConfigs, List wechatConfigs) { + public Receiver(List emailConfigs, String name, List opsgenieConfigs, List pagerdutyConfigs, List pushoverConfigs, List slackConfigs, List snsConfigs, List telegramConfigs, List victoropsConfigs, List webhookConfigs, List wechatConfigs) { super(); this.emailConfigs = emailConfigs; this.name = name; @@ -122,6 +132,8 @@ public Receiver(List emailConfigs, String name, List slackConfigs) { this.slackConfigs = slackConfigs; } + @JsonProperty("snsConfigs") + public List getSnsConfigs() { + return snsConfigs; + } + + @JsonProperty("snsConfigs") + public void setSnsConfigs(List snsConfigs) { + this.snsConfigs = snsConfigs; + } + + @JsonProperty("telegramConfigs") + public List getTelegramConfigs() { + return telegramConfigs; + } + + @JsonProperty("telegramConfigs") + public void setTelegramConfigs(List telegramConfigs) { + this.telegramConfigs = telegramConfigs; + } + @JsonProperty("victoropsConfigs") public List getVictoropsConfigs() { return victoropsConfigs; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/Route.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/Route.java index 3f8ffc74713..126604cc8ed 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/Route.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/Route.java @@ -41,6 +41,7 @@ "groupInterval", "groupWait", "matchers", + "muteTimeIntervals", "receiver", "repeatInterval", "routes" @@ -78,6 +79,9 @@ public class Route implements KubernetesResource @JsonProperty("matchers") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List matchers = new ArrayList(); + @JsonProperty("muteTimeIntervals") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List muteTimeIntervals = new ArrayList(); @JsonProperty("receiver") private String receiver; @JsonProperty("repeatInterval") @@ -101,18 +105,20 @@ public Route() { * @param routes * @param matchers * @param receiver + * @param muteTimeIntervals * @param groupWait * @param repeatInterval * @param groupBy * @param groupInterval */ - public Route(Boolean _continue, List groupBy, String groupInterval, String groupWait, List matchers, String receiver, String repeatInterval, List routes) { + public Route(Boolean _continue, List groupBy, String groupInterval, String groupWait, List matchers, List muteTimeIntervals, String receiver, String repeatInterval, List routes) { super(); this._continue = _continue; this.groupBy = groupBy; this.groupInterval = groupInterval; this.groupWait = groupWait; this.matchers = matchers; + this.muteTimeIntervals = muteTimeIntervals; this.receiver = receiver; this.repeatInterval = repeatInterval; this.routes = routes; @@ -168,6 +174,16 @@ public void setMatchers(List matchers) { this.matchers = matchers; } + @JsonProperty("muteTimeIntervals") + public List getMuteTimeIntervals() { + return muteTimeIntervals; + } + + @JsonProperty("muteTimeIntervals") + public void setMuteTimeIntervals(List muteTimeIntervals) { + this.muteTimeIntervals = muteTimeIntervals; + } + @JsonProperty("receiver") public String getReceiver() { return receiver; diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/SNSConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/SNSConfig.java new file mode 100644 index 00000000000..70b9854c5db --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/SNSConfig.java @@ -0,0 +1,238 @@ + +package io.fabric8.openshift.api.model.monitoring.v1alpha1; + +import java.util.HashMap; +import java.util.LinkedHashMap; +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.fabric8.openshift.api.model.monitoring.v1.Sigv4; +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", + "apiURL", + "attributes", + "httpConfig", + "message", + "phoneNumber", + "sendResolved", + "sigv4", + "subject", + "targetARN", + "topicARN" +}) +@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 SNSConfig implements KubernetesResource +{ + + @JsonProperty("apiURL") + private java.lang.String apiURL; + @JsonProperty("attributes") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map attributes = new LinkedHashMap(); + @JsonProperty("httpConfig") + private HTTPConfig httpConfig; + @JsonProperty("message") + private java.lang.String message; + @JsonProperty("phoneNumber") + private java.lang.String phoneNumber; + @JsonProperty("sendResolved") + private Boolean sendResolved; + @JsonProperty("sigv4") + private Sigv4 sigv4; + @JsonProperty("subject") + private java.lang.String subject; + @JsonProperty("targetARN") + private java.lang.String targetARN; + @JsonProperty("topicARN") + private java.lang.String topicARN; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public SNSConfig() { + } + + /** + * + * @param phoneNumber + * @param sendResolved + * @param apiURL + * @param httpConfig + * @param subject + * @param attributes + * @param sigv4 + * @param message + * @param targetARN + * @param topicARN + */ + public SNSConfig(java.lang.String apiURL, Map attributes, HTTPConfig httpConfig, java.lang.String message, java.lang.String phoneNumber, Boolean sendResolved, Sigv4 sigv4, java.lang.String subject, java.lang.String targetARN, java.lang.String topicARN) { + super(); + this.apiURL = apiURL; + this.attributes = attributes; + this.httpConfig = httpConfig; + this.message = message; + this.phoneNumber = phoneNumber; + this.sendResolved = sendResolved; + this.sigv4 = sigv4; + this.subject = subject; + this.targetARN = targetARN; + this.topicARN = topicARN; + } + + @JsonProperty("apiURL") + public java.lang.String getApiURL() { + return apiURL; + } + + @JsonProperty("apiURL") + public void setApiURL(java.lang.String apiURL) { + this.apiURL = apiURL; + } + + @JsonProperty("attributes") + public Map getAttributes() { + return attributes; + } + + @JsonProperty("attributes") + public void setAttributes(Map attributes) { + this.attributes = attributes; + } + + @JsonProperty("httpConfig") + public HTTPConfig getHttpConfig() { + return httpConfig; + } + + @JsonProperty("httpConfig") + public void setHttpConfig(HTTPConfig httpConfig) { + this.httpConfig = httpConfig; + } + + @JsonProperty("message") + public java.lang.String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(java.lang.String message) { + this.message = message; + } + + @JsonProperty("phoneNumber") + public java.lang.String getPhoneNumber() { + return phoneNumber; + } + + @JsonProperty("phoneNumber") + public void setPhoneNumber(java.lang.String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + @JsonProperty("sendResolved") + public Boolean getSendResolved() { + return sendResolved; + } + + @JsonProperty("sendResolved") + public void setSendResolved(Boolean sendResolved) { + this.sendResolved = sendResolved; + } + + @JsonProperty("sigv4") + public Sigv4 getSigv4() { + return sigv4; + } + + @JsonProperty("sigv4") + public void setSigv4(Sigv4 sigv4) { + this.sigv4 = sigv4; + } + + @JsonProperty("subject") + public java.lang.String getSubject() { + return subject; + } + + @JsonProperty("subject") + public void setSubject(java.lang.String subject) { + this.subject = subject; + } + + @JsonProperty("targetARN") + public java.lang.String getTargetARN() { + return targetARN; + } + + @JsonProperty("targetARN") + public void setTargetARN(java.lang.String targetARN) { + this.targetARN = targetARN; + } + + @JsonProperty("topicARN") + public java.lang.String getTopicARN() { + return topicARN; + } + + @JsonProperty("topicARN") + public void setTopicARN(java.lang.String topicARN) { + this.topicARN = topicARN; + } + + @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/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TelegramConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TelegramConfig.java new file mode 100644 index 00000000000..84d7c3f4a30 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TelegramConfig.java @@ -0,0 +1,206 @@ + +package io.fabric8.openshift.api.model.monitoring.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.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.api.model.SecretKeySelector; +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", + "apiURL", + "botToken", + "chatID", + "disableNotifications", + "httpConfig", + "message", + "parseMode", + "sendResolved" +}) +@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 TelegramConfig implements KubernetesResource +{ + + @JsonProperty("apiURL") + private String apiURL; + @JsonProperty("botToken") + private SecretKeySelector botToken; + @JsonProperty("chatID") + private Long chatID; + @JsonProperty("disableNotifications") + private Boolean disableNotifications; + @JsonProperty("httpConfig") + private HTTPConfig httpConfig; + @JsonProperty("message") + private String message; + @JsonProperty("parseMode") + private String parseMode; + @JsonProperty("sendResolved") + private Boolean sendResolved; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public TelegramConfig() { + } + + /** + * + * @param sendResolved + * @param apiURL + * @param chatID + * @param httpConfig + * @param message + * @param parseMode + * @param disableNotifications + * @param botToken + */ + public TelegramConfig(String apiURL, SecretKeySelector botToken, Long chatID, Boolean disableNotifications, HTTPConfig httpConfig, String message, String parseMode, Boolean sendResolved) { + super(); + this.apiURL = apiURL; + this.botToken = botToken; + this.chatID = chatID; + this.disableNotifications = disableNotifications; + this.httpConfig = httpConfig; + this.message = message; + this.parseMode = parseMode; + this.sendResolved = sendResolved; + } + + @JsonProperty("apiURL") + public String getApiURL() { + return apiURL; + } + + @JsonProperty("apiURL") + public void setApiURL(String apiURL) { + this.apiURL = apiURL; + } + + @JsonProperty("botToken") + public SecretKeySelector getBotToken() { + return botToken; + } + + @JsonProperty("botToken") + public void setBotToken(SecretKeySelector botToken) { + this.botToken = botToken; + } + + @JsonProperty("chatID") + public Long getChatID() { + return chatID; + } + + @JsonProperty("chatID") + public void setChatID(Long chatID) { + this.chatID = chatID; + } + + @JsonProperty("disableNotifications") + public Boolean getDisableNotifications() { + return disableNotifications; + } + + @JsonProperty("disableNotifications") + public void setDisableNotifications(Boolean disableNotifications) { + this.disableNotifications = disableNotifications; + } + + @JsonProperty("httpConfig") + public HTTPConfig getHttpConfig() { + return httpConfig; + } + + @JsonProperty("httpConfig") + public void setHttpConfig(HTTPConfig httpConfig) { + this.httpConfig = httpConfig; + } + + @JsonProperty("message") + public String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(String message) { + this.message = message; + } + + @JsonProperty("parseMode") + public String getParseMode() { + return parseMode; + } + + @JsonProperty("parseMode") + public void setParseMode(String parseMode) { + this.parseMode = parseMode; + } + + @JsonProperty("sendResolved") + public Boolean getSendResolved() { + return sendResolved; + } + + @JsonProperty("sendResolved") + public void setSendResolved(Boolean sendResolved) { + this.sendResolved = sendResolved; + } + + @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/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TimeInterval.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TimeInterval.java new file mode 100644 index 00000000000..5fc4167834d --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TimeInterval.java @@ -0,0 +1,167 @@ + +package io.fabric8.openshift.api.model.monitoring.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.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", + "daysOfMonth", + "months", + "times", + "weekdays", + "years" +}) +@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 TimeInterval implements KubernetesResource +{ + + @JsonProperty("daysOfMonth") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List daysOfMonth = new ArrayList(); + @JsonProperty("months") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List months = new ArrayList(); + @JsonProperty("times") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List times = new ArrayList(); + @JsonProperty("weekdays") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List weekdays = new ArrayList(); + @JsonProperty("years") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List years = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public TimeInterval() { + } + + /** + * + * @param times + * @param months + * @param weekdays + * @param daysOfMonth + * @param years + */ + public TimeInterval(List daysOfMonth, List months, List times, List weekdays, List years) { + super(); + this.daysOfMonth = daysOfMonth; + this.months = months; + this.times = times; + this.weekdays = weekdays; + this.years = years; + } + + @JsonProperty("daysOfMonth") + public List getDaysOfMonth() { + return daysOfMonth; + } + + @JsonProperty("daysOfMonth") + public void setDaysOfMonth(List daysOfMonth) { + this.daysOfMonth = daysOfMonth; + } + + @JsonProperty("months") + public List getMonths() { + return months; + } + + @JsonProperty("months") + public void setMonths(List months) { + this.months = months; + } + + @JsonProperty("times") + public List getTimes() { + return times; + } + + @JsonProperty("times") + public void setTimes(List times) { + this.times = times; + } + + @JsonProperty("weekdays") + public List getWeekdays() { + return weekdays; + } + + @JsonProperty("weekdays") + public void setWeekdays(List weekdays) { + this.weekdays = weekdays; + } + + @JsonProperty("years") + public List getYears() { + return years; + } + + @JsonProperty("years") + public void setYears(List years) { + this.years = years; + } + + @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/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TimeRange.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TimeRange.java new file mode 100644 index 00000000000..17f56a168a4 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/TimeRange.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.monitoring.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.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", + "endTime", + "startTime" +}) +@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 TimeRange implements KubernetesResource +{ + + @JsonProperty("endTime") + private String endTime; + @JsonProperty("startTime") + private String startTime; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public TimeRange() { + } + + /** + * + * @param startTime + * @param endTime + */ + public TimeRange(String endTime, String startTime) { + super(); + this.endTime = endTime; + this.startTime = startTime; + } + + @JsonProperty("endTime") + public String getEndTime() { + return endTime; + } + + @JsonProperty("endTime") + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + @JsonProperty("startTime") + public String getStartTime() { + return startTime; + } + + @JsonProperty("startTime") + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + @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/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 06c20c1392a..196a7da25db 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 @@ -5,11 +5,6 @@ "definitions": { "k8s_io_apiextensions_apiserver_pkg_apis_apiextensions_v1_JSON": { "type": "object", - "properties": { - "Raw": { - "type": "string" - } - }, "additionalProperties": true, "existingJavaType": "com.fasterxml.jackson.databind.JsonNode", "javaInterfaces": [ @@ -916,6 +911,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -996,6 +999,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_DownwardAPIProjection": { "type": "object", "properties": { @@ -3082,6 +3101,19 @@ "io.fabric8.kubernetes.api.model.Namespaced" ] }, + "os_monitoring_v1_AlertmanagerConfiguration": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.AlertmanagerConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1_AlertmanagerEndpoints": { "type": "object", "properties": { @@ -3179,6 +3211,10 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "alertmanagerConfiguration": { + "$ref": "#/definitions/os_monitoring_v1_AlertmanagerConfiguration", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.AlertmanagerConfiguration" + }, "baseImage": { "type": "string" }, @@ -3218,6 +3254,14 @@ "forceEnableClusterMode": { "type": "boolean" }, + "hostAliases": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_HostAlias", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias" + } + }, "image": { "type": "string" }, @@ -3386,6 +3430,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1_AttachMetadata": { + "type": "object", + "properties": { + "node": { + "type": "boolean" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.AttachMetadata", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1_Authorization": { "type": "object", "properties": { @@ -3424,160 +3481,466 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_monitoring_v1_EmbeddedObjectMetadata": { + "os_monitoring_v1_CommonPrometheusFields": { "type": "object", "properties": { - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "additionalScrapeConfigs": { + "$ref": "#/definitions/kubernetes_core_SecretKeySelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "affinity": { + "$ref": "#/definitions/kubernetes_core_Affinity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Affinity" }, - "name": { + "apiserverConfig": { + "$ref": "#/definitions/os_monitoring_v1_APIServerConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.APIServerConfig" + }, + "arbitraryFSAccessThroughSMs": { + "$ref": "#/definitions/os_monitoring_v1_ArbitraryFSAccessThroughSMsConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ArbitraryFSAccessThroughSMsConfig" + }, + "baseImage": { "type": "string" - } - }, - "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedObjectMetadata", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, - "os_monitoring_v1_EmbeddedPersistentVolumeClaim": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "monitoring.coreos.com/v1", - "required": true }, - "kind": { - "type": "string", - "default": "EmbeddedPersistentVolumeClaim", - "required": true + "configMaps": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "metadata": { - "$ref": "#/definitions/os_monitoring_v1_EmbeddedObjectMetadata", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedObjectMetadata" + "containers": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_Container", + "existingJavaType": "io.fabric8.kubernetes.api.model.Container" + } }, - "spec": { - "$ref": "#/definitions/kubernetes_core_PersistentVolumeClaimSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.PersistentVolumeClaimSpec" + "enableAdminAPI": { + "type": "boolean" }, - "status": { - "$ref": "#/definitions/kubernetes_core_PersistentVolumeClaimStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.PersistentVolumeClaimStatus" - } - }, - "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedPersistentVolumeClaim", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, - "os_monitoring_v1_Endpoint": { - "type": "object", - "properties": { - "authorization": { - "$ref": "#/definitions/os_monitoring_v1_SafeAuthorization", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.SafeAuthorization" + "enableFeatures": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "basicAuth": { - "$ref": "#/definitions/os_monitoring_v1_BasicAuth", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.BasicAuth" + "enableRemoteWriteReceiver": { + "type": "boolean" }, - "bearerTokenFile": { + "enforcedBodySizeLimit": { "type": "string" }, - "bearerTokenSecret": { - "$ref": "#/definitions/kubernetes_core_SecretKeySelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + "enforcedLabelLimit": { + "type": "integer", + "existingJavaType": "Long" }, - "honorLabels": { - "type": "boolean" + "enforcedLabelNameLengthLimit": { + "type": "integer", + "existingJavaType": "Long" }, - "honorTimestamps": { - "type": "boolean" + "enforcedLabelValueLengthLimit": { + "type": "integer", + "existingJavaType": "Long" }, - "interval": { + "enforcedNamespaceLabel": { "type": "string" }, - "metricRelabelings": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/os_monitoring_v1_RelabelConfig", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.RelabelConfig" - } + "enforcedSampleLimit": { + "type": "integer", + "existingJavaType": "Long" }, - "oauth2": { - "$ref": "#/definitions/os_monitoring_v1_OAuth2", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.OAuth2" + "enforcedTargetLimit": { + "type": "integer", + "existingJavaType": "Long" }, - "params": { + "evaluationInterval": { + "type": "string" + }, + "externalLabels": { "type": "object", "additionalProperties": { - "type": "array", - "items": { - "type": "string" - } + "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "path": { + "externalUrl": { "type": "string" }, - "port": { - "type": "string" + "hostAliases": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_HostAlias", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias" + } }, - "proxyUrl": { + "ignoreNamespaceSelectors": { + "type": "boolean" + }, + "image": { "type": "string" }, - "relabelings": { + "imagePullSecrets": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/os_monitoring_v1_RelabelConfig", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.RelabelConfig" + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" } }, - "scheme": { + "initContainers": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_Container", + "existingJavaType": "io.fabric8.kubernetes.api.model.Container" + } + }, + "listenLocal": { + "type": "boolean" + }, + "logFormat": { "type": "string" }, - "scrapeTimeout": { + "logLevel": { "type": "string" }, - "targetPort": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_util_intstr_IntOrString", - "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" + "minReadySeconds": { + "type": "integer" }, - "tlsConfig": { - "$ref": "#/definitions/os_monitoring_v1_TLSConfig", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.TLSConfig" - } - }, - "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.monitoring.v1.Endpoint", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, - "os_monitoring_v1_MetadataConfig": { - "type": "object", - "properties": { - "send": { + "nodeSelector": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "overrideHonorLabels": { "type": "boolean" }, - "sendInterval": { - "type": "string" + "overrideHonorTimestamps": { + "type": "boolean" + }, + "paused": { + "type": "boolean" + }, + "podMetadata": { + "$ref": "#/definitions/os_monitoring_v1_EmbeddedObjectMetadata", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedObjectMetadata" + }, + "podMonitorNamespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "podMonitorSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "portName": { + "type": "string" + }, + "priorityClassName": { + "type": "string" + }, + "probeNamespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "probeSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "prometheusExternalLabelName": { + "type": "string" + }, + "remoteWrite": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_RemoteWriteSpec", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.RemoteWriteSpec" + } + }, + "replicaExternalLabelName": { + "type": "string" + }, + "replicas": { + "type": "integer" + }, + "resources": { + "$ref": "#/definitions/kubernetes_core_ResourceRequirements", + "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" + }, + "routePrefix": { + "type": "string" + }, + "scrapeInterval": { + "type": "string" + }, + "scrapeTimeout": { + "type": "string" + }, + "secrets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "securityContext": { + "$ref": "#/definitions/kubernetes_core_PodSecurityContext", + "existingJavaType": "io.fabric8.kubernetes.api.model.PodSecurityContext" + }, + "serviceAccountName": { + "type": "string" + }, + "serviceMonitorNamespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "serviceMonitorSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "sha": { + "type": "string" + }, + "shards": { + "type": "integer" + }, + "storage": { + "$ref": "#/definitions/os_monitoring_v1_StorageSpec", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.StorageSpec" + }, + "tag": { + "type": "string" + }, + "tolerations": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_Toleration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Toleration" + } + }, + "topologySpreadConstraints": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_TopologySpreadConstraint", + "existingJavaType": "io.fabric8.kubernetes.api.model.TopologySpreadConstraint" + } + }, + "version": { + "type": "string" + }, + "volumeMounts": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_VolumeMount", + "existingJavaType": "io.fabric8.kubernetes.api.model.VolumeMount" + } + }, + "volumes": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_Volume", + "existingJavaType": "io.fabric8.kubernetes.api.model.Volume" + } + }, + "web": { + "$ref": "#/definitions/os_monitoring_v1_WebSpec", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.WebSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.CommonPrometheusFields", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1_EmbeddedObjectMetadata": { + "type": "object", + "properties": { + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedObjectMetadata", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1_EmbeddedPersistentVolumeClaim": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "monitoring.coreos.com/v1", + "required": true + }, + "kind": { + "type": "string", + "default": "EmbeddedPersistentVolumeClaim", + "required": true + }, + "metadata": { + "$ref": "#/definitions/os_monitoring_v1_EmbeddedObjectMetadata", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedObjectMetadata" + }, + "spec": { + "$ref": "#/definitions/kubernetes_core_PersistentVolumeClaimSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.PersistentVolumeClaimSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_core_PersistentVolumeClaimStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.PersistentVolumeClaimStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedPersistentVolumeClaim", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1_Endpoint": { + "type": "object", + "properties": { + "authorization": { + "$ref": "#/definitions/os_monitoring_v1_SafeAuthorization", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.SafeAuthorization" + }, + "basicAuth": { + "$ref": "#/definitions/os_monitoring_v1_BasicAuth", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.BasicAuth" + }, + "bearerTokenFile": { + "type": "string" + }, + "bearerTokenSecret": { + "$ref": "#/definitions/kubernetes_core_SecretKeySelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + }, + "followRedirects": { + "type": "boolean" + }, + "honorLabels": { + "type": "boolean" + }, + "honorTimestamps": { + "type": "boolean" + }, + "interval": { + "type": "string" + }, + "metricRelabelings": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_RelabelConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.RelabelConfig" + } + }, + "oauth2": { + "$ref": "#/definitions/os_monitoring_v1_OAuth2", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.OAuth2" + }, + "params": { + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "string" + } + }, + "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + }, + "path": { + "type": "string" + }, + "port": { + "type": "string" + }, + "proxyUrl": { + "type": "string" + }, + "relabelings": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_RelabelConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.RelabelConfig" + } + }, + "scheme": { + "type": "string" + }, + "scrapeTimeout": { + "type": "string" + }, + "targetPort": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_util_intstr_IntOrString", + "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" + }, + "tlsConfig": { + "$ref": "#/definitions/os_monitoring_v1_TLSConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.TLSConfig" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.Endpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1_HostAlias": { + "type": "object", + "properties": { + "hostnames": { + "type": "array", + "items": { + "type": "string" + } + }, + "ip": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1_MetadataConfig": { + "type": "object", + "properties": { + "send": { + "type": "boolean" + }, + "sendInterval": { + "type": "string" } }, "additionalProperties": true, @@ -3641,6 +4004,28 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1_ObjectReference": { + "type": "object", + "properties": { + "group": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + }, + "resource": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.ObjectReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1_PodMetricsEndpoint": { "type": "object", "properties": { @@ -3656,6 +4041,9 @@ "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" }, + "followRedirects": { + "type": "boolean" + }, "honorLabels": { "type": "boolean" }, @@ -3817,6 +4205,10 @@ "os_monitoring_v1_PodMonitorSpec": { "type": "object", "properties": { + "attachMetadata": { + "$ref": "#/definitions/os_monitoring_v1_AttachMetadata", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.AttachMetadata" + }, "jobLabel": { "type": "string" }, @@ -4167,6 +4559,32 @@ "io.fabric8.kubernetes.api.model.Namespaced" ] }, + "os_monitoring_v1_PrometheusCondition": { + "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.openshift.api.model.monitoring.v1.PrometheusCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1_PrometheusList": { "type": "object", "properties": { @@ -4359,6 +4777,9 @@ "type": "string" } }, + "enableRemoteWriteReceiver": { + "type": "boolean" + }, "enforcedBodySizeLimit": { "type": "string" }, @@ -4388,6 +4809,14 @@ "evaluationInterval": { "type": "string" }, + "excludedFromEnforcement": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_ObjectReference", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ObjectReference" + } + }, "externalLabels": { "type": "object", "additionalProperties": { @@ -4398,6 +4827,14 @@ "externalUrl": { "type": "string" }, + "hostAliases": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_HostAlias", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias" + } + }, "ignoreNamespaceSelectors": { "type": "boolean" }, @@ -4639,12 +5076,28 @@ "availableReplicas": { "type": "integer" }, + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_PrometheusCondition", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.PrometheusCondition" + } + }, "paused": { "type": "boolean" }, "replicas": { "type": "integer" }, + "shardStatuses": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_ShardStatus", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ShardStatus" + } + }, "unavailableReplicas": { "type": "integer" }, @@ -4706,6 +5159,9 @@ }, "minShards": { "type": "integer" + }, + "retryOnRateLimit": { + "type": "boolean" } }, "additionalProperties": true, @@ -4767,6 +5223,13 @@ "bearerTokenFile": { "type": "string" }, + "headers": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "name": { "type": "string" }, @@ -5160,6 +5623,31 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1_ShardStatus": { + "type": "object", + "properties": { + "availableReplicas": { + "type": "integer" + }, + "replicas": { + "type": "integer" + }, + "shardID": { + "type": "string" + }, + "unavailableReplicas": { + "type": "integer" + }, + "updatedReplicas": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.ShardStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1_Sigv4": { "type": "object", "properties": { @@ -5363,6 +5851,14 @@ "evaluationInterval": { "type": "string" }, + "excludedFromEnforcement": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_ObjectReference", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ObjectReference" + } + }, "externalPrefix": { "type": "string" }, @@ -5370,6 +5866,14 @@ "$ref": "#/definitions/os_monitoring_v1_TLSConfig", "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.TLSConfig" }, + "hostAliases": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_HostAlias", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias" + } + }, "image": { "type": "string" }, @@ -5753,6 +6257,14 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.InhibitRule" } }, + "muteTimeIntervals": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_MuteTimeInterval", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.MuteTimeInterval" + } + }, "receivers": { "type": "array", "items": { @@ -5771,6 +6283,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1alpha1_DayOfMonthRange": { + "type": "object", + "properties": { + "end": { + "type": "integer" + }, + "start": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.DayOfMonthRange", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1alpha1_EmailConfig": { "type": "object", "properties": { @@ -5846,6 +6374,13 @@ "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" }, + "followRedirects": { + "type": "boolean" + }, + "oauth2": { + "$ref": "#/definitions/os_monitoring_v1_OAuth2", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.OAuth2" + }, "proxyURL": { "type": "string" }, @@ -5912,6 +6447,9 @@ "os_monitoring_v1alpha1_Matcher": { "type": "object", "properties": { + "matchType": { + "type": "string" + }, "name": { "type": "string" }, @@ -5928,9 +6466,33 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1alpha1_MuteTimeInterval": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "timeIntervals": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_TimeInterval", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TimeInterval" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.MuteTimeInterval", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1alpha1_OpsGenieConfig": { "type": "object", "properties": { + "actions": { + "type": "string" + }, "apiKey": { "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" @@ -5949,6 +6511,9 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.KeyValue" } }, + "entity": { + "type": "string" + }, "httpConfig": { "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" @@ -5978,6 +6543,9 @@ }, "tags": { "type": "string" + }, + "updateAlerts": { + "type": "boolean" } }, "additionalProperties": true, @@ -6041,6 +6609,22 @@ "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" }, + "pagerDutyImageConfigs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_PagerDutyImageConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.PagerDutyImageConfig" + } + }, + "pagerDutyLinkConfigs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_PagerDutyLinkConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.PagerDutyLinkConfig" + } + }, "routingKey": { "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" @@ -6065,6 +6649,41 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1alpha1_PagerDutyImageConfig": { + "type": "object", + "properties": { + "alt": { + "type": "string" + }, + "href": { + "type": "string" + }, + "src": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.PagerDutyImageConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1alpha1_PagerDutyLinkConfig": { + "type": "object", + "properties": { + "alt": { + "type": "string" + }, + "href": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.PagerDutyLinkConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1alpha1_PushoverConfig": { "type": "object", "properties": { @@ -6163,6 +6782,22 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.SlackConfig" } }, + "snsConfigs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_SNSConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.SNSConfig" + } + }, + "telegramConfigs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_TelegramConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TelegramConfig" + } + }, "victoropsConfigs": { "type": "array", "javaOmitEmpty": true, @@ -6221,6 +6856,13 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.Matcher" } }, + "muteTimeIntervals": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "receiver": { "type": "string" }, @@ -6242,6 +6884,52 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1alpha1_SNSConfig": { + "type": "object", + "properties": { + "apiURL": { + "type": "string" + }, + "attributes": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "httpConfig": { + "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" + }, + "message": { + "type": "string" + }, + "phoneNumber": { + "type": "string" + }, + "sendResolved": { + "type": "boolean" + }, + "sigv4": { + "$ref": "#/definitions/os_monitoring_v1_Sigv4", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.Sigv4" + }, + "subject": { + "type": "string" + }, + "targetARN": { + "type": "string" + }, + "topicARN": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.SNSConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1alpha1_SlackAction": { "type": "object", "properties": { @@ -6407,6 +7095,106 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1alpha1_TelegramConfig": { + "type": "object", + "properties": { + "apiURL": { + "type": "string" + }, + "botToken": { + "$ref": "#/definitions/kubernetes_core_SecretKeySelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + }, + "chatID": { + "type": "integer", + "existingJavaType": "Long" + }, + "disableNotifications": { + "type": "boolean" + }, + "httpConfig": { + "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" + }, + "message": { + "type": "string" + }, + "parseMode": { + "type": "string" + }, + "sendResolved": { + "type": "boolean" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TelegramConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1alpha1_TimeInterval": { + "type": "object", + "properties": { + "daysOfMonth": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_DayOfMonthRange", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.DayOfMonthRange" + } + }, + "months": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "times": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_TimeRange", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TimeRange" + } + }, + "weekdays": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "years": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TimeInterval", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1alpha1_TimeRange": { + "type": "object", + "properties": { + "endTime": { + "type": "string" + }, + "startTime": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TimeRange", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1alpha1_VictorOpsConfig": { "type": "object", "properties": { 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 bd7c46fa161..7a602a11019 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 @@ -5,11 +5,6 @@ "definitions": { "k8s_io_apiextensions_apiserver_pkg_apis_apiextensions_v1_JSON": { "type": "object", - "properties": { - "Raw": { - "type": "string" - } - }, "additionalProperties": true, "existingJavaType": "com.fasterxml.jackson.databind.JsonNode", "javaInterfaces": [ @@ -916,6 +911,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -996,6 +999,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_DownwardAPIProjection": { "type": "object", "properties": { @@ -3082,6 +3101,19 @@ "io.fabric8.kubernetes.api.model.Namespaced" ] }, + "os_monitoring_v1_AlertmanagerConfiguration": { + "type": "object", + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.AlertmanagerConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1_AlertmanagerEndpoints": { "type": "object", "properties": { @@ -3179,6 +3211,10 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "alertmanagerConfiguration": { + "$ref": "#/definitions/os_monitoring_v1_AlertmanagerConfiguration", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.AlertmanagerConfiguration" + }, "baseImage": { "type": "string" }, @@ -3218,6 +3254,14 @@ "forceEnableClusterMode": { "type": "boolean" }, + "hostAliases": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_HostAlias", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias" + } + }, "image": { "type": "string" }, @@ -3386,6 +3430,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1_AttachMetadata": { + "type": "object", + "properties": { + "node": { + "type": "boolean" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.AttachMetadata", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1_Authorization": { "type": "object", "properties": { @@ -3424,224 +3481,350 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_monitoring_v1_EmbeddedObjectMetadata": { + "os_monitoring_v1_CommonPrometheusFields": { "type": "object", "properties": { - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "additionalScrapeConfigs": { + "$ref": "#/definitions/kubernetes_core_SecretKeySelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "affinity": { + "$ref": "#/definitions/kubernetes_core_Affinity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Affinity" }, - "name": { + "apiserverConfig": { + "$ref": "#/definitions/os_monitoring_v1_APIServerConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.APIServerConfig" + }, + "arbitraryFSAccessThroughSMs": { + "$ref": "#/definitions/os_monitoring_v1_ArbitraryFSAccessThroughSMsConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ArbitraryFSAccessThroughSMsConfig" + }, + "baseImage": { "type": "string" - } - }, - "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedObjectMetadata", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, - "os_monitoring_v1_EmbeddedPersistentVolumeClaim": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "monitoring.coreos.com/v1", - "required": true }, - "kind": { - "type": "string", - "default": "EmbeddedPersistentVolumeClaim", - "required": true + "configMaps": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "metadata": { - "$ref": "#/definitions/os_monitoring_v1_EmbeddedObjectMetadata", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedObjectMetadata" + "containers": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_Container", + "existingJavaType": "io.fabric8.kubernetes.api.model.Container" + } }, - "spec": { - "$ref": "#/definitions/kubernetes_core_PersistentVolumeClaimSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.PersistentVolumeClaimSpec" + "enableAdminAPI": { + "type": "boolean" }, - "status": { - "$ref": "#/definitions/kubernetes_core_PersistentVolumeClaimStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.PersistentVolumeClaimStatus" - } - }, - "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedPersistentVolumeClaim", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, - "os_monitoring_v1_Endpoint": { - "type": "object", - "properties": { - "authorization": { - "$ref": "#/definitions/os_monitoring_v1_SafeAuthorization", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.SafeAuthorization" + "enableFeatures": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "basicAuth": { - "$ref": "#/definitions/os_monitoring_v1_BasicAuth", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.BasicAuth" + "enableRemoteWriteReceiver": { + "type": "boolean" }, - "bearerTokenFile": { + "enforcedBodySizeLimit": { "type": "string" }, - "bearerTokenSecret": { - "$ref": "#/definitions/kubernetes_core_SecretKeySelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + "enforcedLabelLimit": { + "type": "integer", + "existingJavaType": "Long" }, - "honorLabels": { - "type": "boolean" + "enforcedLabelNameLengthLimit": { + "type": "integer", + "existingJavaType": "Long" }, - "honorTimestamps": { - "type": "boolean" + "enforcedLabelValueLengthLimit": { + "type": "integer", + "existingJavaType": "Long" }, - "interval": { + "enforcedNamespaceLabel": { "type": "string" }, - "metricRelabelings": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/os_monitoring_v1_RelabelConfig", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.RelabelConfig" - } + "enforcedSampleLimit": { + "type": "integer", + "existingJavaType": "Long" }, - "oauth2": { - "$ref": "#/definitions/os_monitoring_v1_OAuth2", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.OAuth2" + "enforcedTargetLimit": { + "type": "integer", + "existingJavaType": "Long" }, - "params": { + "evaluationInterval": { + "type": "string" + }, + "externalLabels": { "type": "object", "additionalProperties": { - "type": "array", - "items": { - "type": "string" - } + "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "path": { + "externalUrl": { "type": "string" }, - "port": { - "type": "string" + "hostAliases": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_HostAlias", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias" + } }, - "proxyUrl": { + "ignoreNamespaceSelectors": { + "type": "boolean" + }, + "image": { "type": "string" }, - "relabelings": { + "imagePullSecrets": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/os_monitoring_v1_RelabelConfig", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.RelabelConfig" + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" } }, - "scheme": { + "initContainers": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_Container", + "existingJavaType": "io.fabric8.kubernetes.api.model.Container" + } + }, + "listenLocal": { + "type": "boolean" + }, + "logFormat": { "type": "string" }, - "scrapeTimeout": { + "logLevel": { "type": "string" }, - "targetPort": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_util_intstr_IntOrString", - "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" + "minReadySeconds": { + "type": "integer" }, - "tlsConfig": { - "$ref": "#/definitions/os_monitoring_v1_TLSConfig", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.TLSConfig" - } - }, - "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.monitoring.v1.Endpoint", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, - "os_monitoring_v1_MetadataConfig": { - "type": "object", - "properties": { - "send": { + "nodeSelector": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "overrideHonorLabels": { "type": "boolean" }, - "sendInterval": { - "type": "string" - } - }, - "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.monitoring.v1.MetadataConfig", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, - "os_monitoring_v1_NamespaceSelector": { - "type": "object", - "properties": { - "any": { + "overrideHonorTimestamps": { "type": "boolean" }, - "matchNames": { + "paused": { + "type": "boolean" + }, + "podMetadata": { + "$ref": "#/definitions/os_monitoring_v1_EmbeddedObjectMetadata", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedObjectMetadata" + }, + "podMonitorNamespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "podMonitorSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "portName": { + "type": "string" + }, + "priorityClassName": { + "type": "string" + }, + "probeNamespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "probeSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "prometheusExternalLabelName": { + "type": "string" + }, + "remoteWrite": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_RemoteWriteSpec", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.RemoteWriteSpec" + } + }, + "replicaExternalLabelName": { + "type": "string" + }, + "replicas": { + "type": "integer" + }, + "resources": { + "$ref": "#/definitions/kubernetes_core_ResourceRequirements", + "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" + }, + "routePrefix": { + "type": "string" + }, + "scrapeInterval": { + "type": "string" + }, + "scrapeTimeout": { + "type": "string" + }, + "secrets": { "type": "array", "javaOmitEmpty": true, "items": { "type": "string" } + }, + "securityContext": { + "$ref": "#/definitions/kubernetes_core_PodSecurityContext", + "existingJavaType": "io.fabric8.kubernetes.api.model.PodSecurityContext" + }, + "serviceAccountName": { + "type": "string" + }, + "serviceMonitorNamespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "serviceMonitorSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "sha": { + "type": "string" + }, + "shards": { + "type": "integer" + }, + "storage": { + "$ref": "#/definitions/os_monitoring_v1_StorageSpec", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.StorageSpec" + }, + "tag": { + "type": "string" + }, + "tolerations": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_Toleration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Toleration" + } + }, + "topologySpreadConstraints": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_TopologySpreadConstraint", + "existingJavaType": "io.fabric8.kubernetes.api.model.TopologySpreadConstraint" + } + }, + "version": { + "type": "string" + }, + "volumeMounts": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_VolumeMount", + "existingJavaType": "io.fabric8.kubernetes.api.model.VolumeMount" + } + }, + "volumes": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_Volume", + "existingJavaType": "io.fabric8.kubernetes.api.model.Volume" + } + }, + "web": { + "$ref": "#/definitions/os_monitoring_v1_WebSpec", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.WebSpec" } }, "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.monitoring.v1.NamespaceSelector", + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.CommonPrometheusFields", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_monitoring_v1_OAuth2": { + "os_monitoring_v1_EmbeddedObjectMetadata": { "type": "object", "properties": { - "clientId": { - "$ref": "#/definitions/os_monitoring_v1_SecretOrConfigMap", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.SecretOrConfigMap" - }, - "clientSecret": { - "$ref": "#/definitions/kubernetes_core_SecretKeySelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" - }, - "endpointParams": { + "annotations": { "type": "object", "additionalProperties": { "type": "string" }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "scopes": { - "type": "array", - "javaOmitEmpty": true, - "items": { + "labels": { + "type": "object", + "additionalProperties": { "type": "string" - } + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "tokenUrl": { + "name": { "type": "string" } }, "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.monitoring.v1.OAuth2", + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedObjectMetadata", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_monitoring_v1_PodMetricsEndpoint": { + "os_monitoring_v1_EmbeddedPersistentVolumeClaim": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "monitoring.coreos.com/v1", + "required": true + }, + "kind": { + "type": "string", + "default": "EmbeddedPersistentVolumeClaim", + "required": true + }, + "metadata": { + "$ref": "#/definitions/os_monitoring_v1_EmbeddedObjectMetadata", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedObjectMetadata" + }, + "spec": { + "$ref": "#/definitions/kubernetes_core_PersistentVolumeClaimSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.PersistentVolumeClaimSpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_core_PersistentVolumeClaimStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.PersistentVolumeClaimStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedPersistentVolumeClaim", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1_Endpoint": { "type": "object", "properties": { "authorization": { @@ -3652,10 +3835,16 @@ "$ref": "#/definitions/os_monitoring_v1_BasicAuth", "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.BasicAuth" }, + "bearerTokenFile": { + "type": "string" + }, "bearerTokenSecret": { "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" }, + "followRedirects": { + "type": "boolean" + }, "honorLabels": { "type": "boolean" }, @@ -3715,64 +3904,263 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" }, "tlsConfig": { - "$ref": "#/definitions/os_monitoring_v1_PodMetricsEndpointTLSConfig", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.PodMetricsEndpointTLSConfig" + "$ref": "#/definitions/os_monitoring_v1_TLSConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.TLSConfig" } }, "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.monitoring.v1.PodMetricsEndpoint", + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.Endpoint", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_monitoring_v1_PodMetricsEndpointTLSConfig": { + "os_monitoring_v1_HostAlias": { "type": "object", "properties": { - "ca": { - "$ref": "#/definitions/os_monitoring_v1_SecretOrConfigMap", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.SecretOrConfigMap" - }, - "cert": { - "$ref": "#/definitions/os_monitoring_v1_SecretOrConfigMap", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.SecretOrConfigMap" - }, - "insecureSkipVerify": { - "type": "boolean" - }, - "keySecret": { - "$ref": "#/definitions/kubernetes_core_SecretKeySelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + "hostnames": { + "type": "array", + "items": { + "type": "string" + } }, - "serverName": { + "ip": { "type": "string" } }, "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.monitoring.v1.PodMetricsEndpointTLSConfig", + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_monitoring_v1_PodMonitor": { + "os_monitoring_v1_MetadataConfig": { "type": "object", "properties": { - "apiVersion": { - "type": "string", - "default": "monitoring.coreos.com/v1", - "required": true - }, - "kind": { - "type": "string", - "default": "PodMonitor", - "required": true - }, - "metadata": { - "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", - "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + "send": { + "type": "boolean" }, - "spec": { - "$ref": "#/definitions/os_monitoring_v1_PodMonitorSpec", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.PodMonitorSpec" + "sendInterval": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.MetadataConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1_NamespaceSelector": { + "type": "object", + "properties": { + "any": { + "type": "boolean" + }, + "matchNames": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.NamespaceSelector", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1_OAuth2": { + "type": "object", + "properties": { + "clientId": { + "$ref": "#/definitions/os_monitoring_v1_SecretOrConfigMap", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.SecretOrConfigMap" + }, + "clientSecret": { + "$ref": "#/definitions/kubernetes_core_SecretKeySelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + }, + "endpointParams": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "scopes": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "tokenUrl": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.OAuth2", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1_ObjectReference": { + "type": "object", + "properties": { + "group": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + }, + "resource": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.ObjectReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1_PodMetricsEndpoint": { + "type": "object", + "properties": { + "authorization": { + "$ref": "#/definitions/os_monitoring_v1_SafeAuthorization", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.SafeAuthorization" + }, + "basicAuth": { + "$ref": "#/definitions/os_monitoring_v1_BasicAuth", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.BasicAuth" + }, + "bearerTokenSecret": { + "$ref": "#/definitions/kubernetes_core_SecretKeySelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + }, + "followRedirects": { + "type": "boolean" + }, + "honorLabels": { + "type": "boolean" + }, + "honorTimestamps": { + "type": "boolean" + }, + "interval": { + "type": "string" + }, + "metricRelabelings": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_RelabelConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.RelabelConfig" + } + }, + "oauth2": { + "$ref": "#/definitions/os_monitoring_v1_OAuth2", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.OAuth2" + }, + "params": { + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "string" + } + }, + "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + }, + "path": { + "type": "string" + }, + "port": { + "type": "string" + }, + "proxyUrl": { + "type": "string" + }, + "relabelings": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_RelabelConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.RelabelConfig" + } + }, + "scheme": { + "type": "string" + }, + "scrapeTimeout": { + "type": "string" + }, + "targetPort": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_util_intstr_IntOrString", + "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" + }, + "tlsConfig": { + "$ref": "#/definitions/os_monitoring_v1_PodMetricsEndpointTLSConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.PodMetricsEndpointTLSConfig" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.PodMetricsEndpoint", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1_PodMetricsEndpointTLSConfig": { + "type": "object", + "properties": { + "ca": { + "$ref": "#/definitions/os_monitoring_v1_SecretOrConfigMap", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.SecretOrConfigMap" + }, + "cert": { + "$ref": "#/definitions/os_monitoring_v1_SecretOrConfigMap", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.SecretOrConfigMap" + }, + "insecureSkipVerify": { + "type": "boolean" + }, + "keySecret": { + "$ref": "#/definitions/kubernetes_core_SecretKeySelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + }, + "serverName": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.PodMetricsEndpointTLSConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1_PodMonitor": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "monitoring.coreos.com/v1", + "required": true + }, + "kind": { + "type": "string", + "default": "PodMonitor", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/os_monitoring_v1_PodMonitorSpec", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.PodMonitorSpec" } }, "additionalProperties": true, @@ -3817,6 +4205,10 @@ "os_monitoring_v1_PodMonitorSpec": { "type": "object", "properties": { + "attachMetadata": { + "$ref": "#/definitions/os_monitoring_v1_AttachMetadata", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.AttachMetadata" + }, "jobLabel": { "type": "string" }, @@ -4167,6 +4559,32 @@ "io.fabric8.kubernetes.api.model.Namespaced" ] }, + "os_monitoring_v1_PrometheusCondition": { + "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.openshift.api.model.monitoring.v1.PrometheusCondition", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1_PrometheusList": { "type": "object", "properties": { @@ -4359,6 +4777,9 @@ "type": "string" } }, + "enableRemoteWriteReceiver": { + "type": "boolean" + }, "enforcedBodySizeLimit": { "type": "string" }, @@ -4388,6 +4809,14 @@ "evaluationInterval": { "type": "string" }, + "excludedFromEnforcement": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_ObjectReference", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ObjectReference" + } + }, "externalLabels": { "type": "object", "additionalProperties": { @@ -4398,6 +4827,14 @@ "externalUrl": { "type": "string" }, + "hostAliases": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_HostAlias", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias" + } + }, "ignoreNamespaceSelectors": { "type": "boolean" }, @@ -4639,12 +5076,28 @@ "availableReplicas": { "type": "integer" }, - "paused": { - "type": "boolean" + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_PrometheusCondition", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.PrometheusCondition" + } + }, + "paused": { + "type": "boolean" }, "replicas": { "type": "integer" }, + "shardStatuses": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_ShardStatus", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ShardStatus" + } + }, "unavailableReplicas": { "type": "integer" }, @@ -4706,6 +5159,9 @@ }, "minShards": { "type": "integer" + }, + "retryOnRateLimit": { + "type": "boolean" } }, "additionalProperties": true, @@ -4767,6 +5223,13 @@ "bearerTokenFile": { "type": "string" }, + "headers": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "name": { "type": "string" }, @@ -5160,6 +5623,31 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1_ShardStatus": { + "type": "object", + "properties": { + "availableReplicas": { + "type": "integer" + }, + "replicas": { + "type": "integer" + }, + "shardID": { + "type": "string" + }, + "unavailableReplicas": { + "type": "integer" + }, + "updatedReplicas": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1.ShardStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1_Sigv4": { "type": "object", "properties": { @@ -5363,6 +5851,14 @@ "evaluationInterval": { "type": "string" }, + "excludedFromEnforcement": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_ObjectReference", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ObjectReference" + } + }, "externalPrefix": { "type": "string" }, @@ -5370,6 +5866,14 @@ "$ref": "#/definitions/os_monitoring_v1_TLSConfig", "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.TLSConfig" }, + "hostAliases": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_HostAlias", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias" + } + }, "image": { "type": "string" }, @@ -5753,6 +6257,14 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.InhibitRule" } }, + "muteTimeIntervals": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_MuteTimeInterval", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.MuteTimeInterval" + } + }, "receivers": { "type": "array", "items": { @@ -5771,6 +6283,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1alpha1_DayOfMonthRange": { + "type": "object", + "properties": { + "end": { + "type": "integer" + }, + "start": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.DayOfMonthRange", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1alpha1_EmailConfig": { "type": "object", "properties": { @@ -5846,6 +6374,13 @@ "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" }, + "followRedirects": { + "type": "boolean" + }, + "oauth2": { + "$ref": "#/definitions/os_monitoring_v1_OAuth2", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.OAuth2" + }, "proxyURL": { "type": "string" }, @@ -5912,6 +6447,9 @@ "os_monitoring_v1alpha1_Matcher": { "type": "object", "properties": { + "matchType": { + "type": "string" + }, "name": { "type": "string" }, @@ -5928,9 +6466,33 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1alpha1_MuteTimeInterval": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "timeIntervals": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_TimeInterval", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TimeInterval" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.MuteTimeInterval", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1alpha1_OpsGenieConfig": { "type": "object", "properties": { + "actions": { + "type": "string" + }, "apiKey": { "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" @@ -5949,6 +6511,9 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.KeyValue" } }, + "entity": { + "type": "string" + }, "httpConfig": { "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" @@ -5978,6 +6543,9 @@ }, "tags": { "type": "string" + }, + "updateAlerts": { + "type": "boolean" } }, "additionalProperties": true, @@ -6041,6 +6609,22 @@ "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" }, + "pagerDutyImageConfigs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_PagerDutyImageConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.PagerDutyImageConfig" + } + }, + "pagerDutyLinkConfigs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_PagerDutyLinkConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.PagerDutyLinkConfig" + } + }, "routingKey": { "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" @@ -6065,6 +6649,41 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1alpha1_PagerDutyImageConfig": { + "type": "object", + "properties": { + "alt": { + "type": "string" + }, + "href": { + "type": "string" + }, + "src": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.PagerDutyImageConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1alpha1_PagerDutyLinkConfig": { + "type": "object", + "properties": { + "alt": { + "type": "string" + }, + "href": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.PagerDutyLinkConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1alpha1_PushoverConfig": { "type": "object", "properties": { @@ -6163,6 +6782,22 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.SlackConfig" } }, + "snsConfigs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_SNSConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.SNSConfig" + } + }, + "telegramConfigs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_TelegramConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TelegramConfig" + } + }, "victoropsConfigs": { "type": "array", "javaOmitEmpty": true, @@ -6221,6 +6856,13 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.Matcher" } }, + "muteTimeIntervals": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "receiver": { "type": "string" }, @@ -6242,6 +6884,52 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_monitoring_v1alpha1_SNSConfig": { + "type": "object", + "properties": { + "apiURL": { + "type": "string" + }, + "attributes": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "httpConfig": { + "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" + }, + "message": { + "type": "string" + }, + "phoneNumber": { + "type": "string" + }, + "sendResolved": { + "type": "boolean" + }, + "sigv4": { + "$ref": "#/definitions/os_monitoring_v1_Sigv4", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.Sigv4" + }, + "subject": { + "type": "string" + }, + "targetARN": { + "type": "string" + }, + "topicARN": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.SNSConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_monitoring_v1alpha1_SlackAction": { "type": "object", "properties": { @@ -6407,74 +7095,174 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_monitoring_v1alpha1_VictorOpsConfig": { + "os_monitoring_v1alpha1_TelegramConfig": { "type": "object", "properties": { - "apiKey": { + "apiURL": { + "type": "string" + }, + "botToken": { "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" }, - "apiUrl": { - "type": "string" - }, - "customFields": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/os_monitoring_v1alpha1_KeyValue", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.KeyValue" - } + "chatID": { + "type": "integer", + "existingJavaType": "Long" }, - "entityDisplayName": { - "type": "string" + "disableNotifications": { + "type": "boolean" }, "httpConfig": { "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" }, - "messageType": { - "type": "string" - }, - "monitoringTool": { + "message": { "type": "string" }, - "routingKey": { + "parseMode": { "type": "string" }, "sendResolved": { "type": "boolean" - }, - "stateMessage": { - "type": "string" } }, "additionalProperties": true, - "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.VictorOpsConfig", + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TelegramConfig", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "os_monitoring_v1alpha1_WeChatConfig": { + "os_monitoring_v1alpha1_TimeInterval": { "type": "object", "properties": { - "agentID": { - "type": "string" - }, - "apiSecret": { - "$ref": "#/definitions/kubernetes_core_SecretKeySelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + "daysOfMonth": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_DayOfMonthRange", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.DayOfMonthRange" + } }, - "apiURL": { - "type": "string" + "months": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "corpID": { - "type": "string" + "times": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_TimeRange", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TimeRange" + } }, - "httpConfig": { - "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" + "weekdays": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "message": { + "years": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TimeInterval", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1alpha1_TimeRange": { + "type": "object", + "properties": { + "endTime": { + "type": "string" + }, + "startTime": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TimeRange", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1alpha1_VictorOpsConfig": { + "type": "object", + "properties": { + "apiKey": { + "$ref": "#/definitions/kubernetes_core_SecretKeySelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + }, + "apiUrl": { + "type": "string" + }, + "customFields": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_KeyValue", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.KeyValue" + } + }, + "entityDisplayName": { + "type": "string" + }, + "httpConfig": { + "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" + }, + "messageType": { + "type": "string" + }, + "monitoringTool": { + "type": "string" + }, + "routingKey": { + "type": "string" + }, + "sendResolved": { + "type": "boolean" + }, + "stateMessage": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.VictorOpsConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_monitoring_v1alpha1_WeChatConfig": { + "type": "object", + "properties": { + "agentID": { + "type": "string" + }, + "apiSecret": { + "$ref": "#/definitions/kubernetes_core_SecretKeySelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + }, + "apiURL": { + "type": "string" + }, + "corpID": { + "type": "string" + }, + "httpConfig": { + "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" + }, + "message": { "type": "string" }, "messageType": { @@ -6747,6 +7535,14 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.InhibitRule" } }, + "muteTimeIntervals": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_MuteTimeInterval", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.MuteTimeInterval" + } + }, "receivers": { "type": "array", "items": { @@ -6761,6 +7557,14 @@ }, "additionalProperties": true }, + "alertmanagerconfiguration": { + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": true + }, "alertmanagerendpoints": { "properties": { "apiVersion": { @@ -6846,6 +7650,10 @@ "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, + "alertmanagerConfiguration": { + "$ref": "#/definitions/os_monitoring_v1_AlertmanagerConfiguration", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.AlertmanagerConfiguration" + }, "baseImage": { "type": "string" }, @@ -6885,6 +7693,14 @@ "forceEnableClusterMode": { "type": "boolean" }, + "hostAliases": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_HostAlias", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias" + } + }, "image": { "type": "string" }, @@ -7124,6 +7940,14 @@ }, "additionalProperties": true }, + "attachmetadata": { + "properties": { + "node": { + "type": "boolean" + } + }, + "additionalProperties": true + }, "authorization": { "properties": { "credentials": { @@ -7144,128 +7968,407 @@ "fsType": { "type": "string" }, - "partition": { + "partition": { + "type": "integer" + }, + "readOnly": { + "type": "boolean" + }, + "volumeID": { + "type": "string" + } + }, + "additionalProperties": true + }, + "azurediskvolumesource": { + "properties": { + "cachingMode": { + "type": "string" + }, + "diskName": { + "type": "string" + }, + "diskURI": { + "type": "string" + }, + "fsType": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "readOnly": { + "type": "boolean" + } + }, + "additionalProperties": true + }, + "azurefilevolumesource": { + "properties": { + "readOnly": { + "type": "boolean" + }, + "secretName": { + "type": "string" + }, + "shareName": { + "type": "string" + } + }, + "additionalProperties": true + }, + "basicauth": { + "properties": { + "password": { + "$ref": "#/definitions/kubernetes_core_SecretKeySelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + }, + "username": { + "$ref": "#/definitions/kubernetes_core_SecretKeySelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + } + }, + "additionalProperties": true + }, + "capabilities": { + "properties": { + "add": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "drop": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true + }, + "cephfsvolumesource": { + "properties": { + "monitors": { + "type": "array", + "items": { + "type": "string" + } + }, + "path": { + "type": "string" + }, + "readOnly": { + "type": "boolean" + }, + "secretFile": { + "type": "string" + }, + "secretRef": { + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" + }, + "user": { + "type": "string" + } + }, + "additionalProperties": true + }, + "cindervolumesource": { + "properties": { + "fsType": { + "type": "string" + }, + "readOnly": { + "type": "boolean" + }, + "secretRef": { + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" + }, + "volumeID": { + "type": "string" + } + }, + "additionalProperties": true + }, + "commonprometheusfields": { + "properties": { + "additionalScrapeConfigs": { + "$ref": "#/definitions/kubernetes_core_SecretKeySelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + }, + "affinity": { + "$ref": "#/definitions/kubernetes_core_Affinity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Affinity" + }, + "apiserverConfig": { + "$ref": "#/definitions/os_monitoring_v1_APIServerConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.APIServerConfig" + }, + "arbitraryFSAccessThroughSMs": { + "$ref": "#/definitions/os_monitoring_v1_ArbitraryFSAccessThroughSMsConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ArbitraryFSAccessThroughSMsConfig" + }, + "baseImage": { + "type": "string" + }, + "configMaps": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "containers": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_Container", + "existingJavaType": "io.fabric8.kubernetes.api.model.Container" + } + }, + "enableAdminAPI": { + "type": "boolean" + }, + "enableFeatures": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "enableRemoteWriteReceiver": { + "type": "boolean" + }, + "enforcedBodySizeLimit": { + "type": "string" + }, + "enforcedLabelLimit": { + "type": "integer", + "existingJavaType": "Long" + }, + "enforcedLabelNameLengthLimit": { + "type": "integer", + "existingJavaType": "Long" + }, + "enforcedLabelValueLengthLimit": { + "type": "integer", + "existingJavaType": "Long" + }, + "enforcedNamespaceLabel": { + "type": "string" + }, + "enforcedSampleLimit": { + "type": "integer", + "existingJavaType": "Long" + }, + "enforcedTargetLimit": { + "type": "integer", + "existingJavaType": "Long" + }, + "evaluationInterval": { + "type": "string" + }, + "externalLabels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "externalUrl": { + "type": "string" + }, + "hostAliases": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_HostAlias", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias" + } + }, + "ignoreNamespaceSelectors": { + "type": "boolean" + }, + "image": { + "type": "string" + }, + "imagePullSecrets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" + } + }, + "initContainers": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_Container", + "existingJavaType": "io.fabric8.kubernetes.api.model.Container" + } + }, + "listenLocal": { + "type": "boolean" + }, + "logFormat": { + "type": "string" + }, + "logLevel": { + "type": "string" + }, + "minReadySeconds": { + "type": "integer" + }, + "nodeSelector": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "overrideHonorLabels": { + "type": "boolean" + }, + "overrideHonorTimestamps": { + "type": "boolean" + }, + "paused": { + "type": "boolean" + }, + "podMetadata": { + "$ref": "#/definitions/os_monitoring_v1_EmbeddedObjectMetadata", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.EmbeddedObjectMetadata" + }, + "podMonitorNamespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "podMonitorSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "portName": { + "type": "string" + }, + "priorityClassName": { + "type": "string" + }, + "probeNamespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "probeSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "prometheusExternalLabelName": { + "type": "string" + }, + "remoteWrite": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_RemoteWriteSpec", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.RemoteWriteSpec" + } + }, + "replicaExternalLabelName": { + "type": "string" + }, + "replicas": { "type": "integer" }, - "readOnly": { - "type": "boolean" + "resources": { + "$ref": "#/definitions/kubernetes_core_ResourceRequirements", + "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, - "volumeID": { - "type": "string" - } - }, - "additionalProperties": true - }, - "azurediskvolumesource": { - "properties": { - "cachingMode": { + "routePrefix": { "type": "string" }, - "diskName": { + "scrapeInterval": { "type": "string" }, - "diskURI": { + "scrapeTimeout": { "type": "string" }, - "fsType": { - "type": "string" + "secrets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "kind": { + "securityContext": { + "$ref": "#/definitions/kubernetes_core_PodSecurityContext", + "existingJavaType": "io.fabric8.kubernetes.api.model.PodSecurityContext" + }, + "serviceAccountName": { "type": "string" }, - "readOnly": { - "type": "boolean" - } - }, - "additionalProperties": true - }, - "azurefilevolumesource": { - "properties": { - "readOnly": { - "type": "boolean" + "serviceMonitorNamespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, - "secretName": { + "serviceMonitorSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "sha": { "type": "string" }, - "shareName": { + "shards": { + "type": "integer" + }, + "storage": { + "$ref": "#/definitions/os_monitoring_v1_StorageSpec", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.StorageSpec" + }, + "tag": { "type": "string" - } - }, - "additionalProperties": true - }, - "basicauth": { - "properties": { - "password": { - "$ref": "#/definitions/kubernetes_core_SecretKeySelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" }, - "username": { - "$ref": "#/definitions/kubernetes_core_SecretKeySelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" - } - }, - "additionalProperties": true - }, - "capabilities": { - "properties": { - "add": { + "tolerations": { "type": "array", "javaOmitEmpty": true, "items": { - "type": "string" + "$ref": "#/definitions/kubernetes_core_Toleration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Toleration" } }, - "drop": { + "topologySpreadConstraints": { "type": "array", "javaOmitEmpty": true, "items": { - "type": "string" - } - } - }, - "additionalProperties": true - }, - "cephfsvolumesource": { - "properties": { - "monitors": { - "type": "array", - "items": { - "type": "string" + "$ref": "#/definitions/kubernetes_core_TopologySpreadConstraint", + "existingJavaType": "io.fabric8.kubernetes.api.model.TopologySpreadConstraint" } }, - "path": { - "type": "string" - }, - "readOnly": { - "type": "boolean" - }, - "secretFile": { - "type": "string" - }, - "secretRef": { - "$ref": "#/definitions/kubernetes_core_LocalObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" - }, - "user": { - "type": "string" - } - }, - "additionalProperties": true - }, - "cindervolumesource": { - "properties": { - "fsType": { + "version": { "type": "string" }, - "readOnly": { - "type": "boolean" + "volumeMounts": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_VolumeMount", + "existingJavaType": "io.fabric8.kubernetes.api.model.VolumeMount" + } }, - "secretRef": { - "$ref": "#/definitions/kubernetes_core_LocalObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" + "volumes": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_Volume", + "existingJavaType": "io.fabric8.kubernetes.api.model.Volume" + } }, - "volumeID": { - "type": "string" + "web": { + "$ref": "#/definitions/os_monitoring_v1_WebSpec", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.WebSpec" } }, "additionalProperties": true @@ -7399,6 +8502,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -7470,6 +8581,17 @@ }, "additionalProperties": true }, + "containerresizepolicy": { + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true + }, "csivolumesource": { "properties": { "driver": { @@ -7495,6 +8617,17 @@ }, "additionalProperties": true }, + "dayofmonthrange": { + "properties": { + "end": { + "type": "integer" + }, + "start": { + "type": "integer" + } + }, + "additionalProperties": true + }, "downwardapiprojection": { "properties": { "items": { @@ -7676,6 +8809,9 @@ "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" }, + "followRedirects": { + "type": "boolean" + }, "honorLabels": { "type": "boolean" }, @@ -7949,6 +9085,20 @@ }, "additionalProperties": true }, + "hostalias": { + "properties": { + "hostnames": { + "type": "array", + "items": { + "type": "string" + } + }, + "ip": { + "type": "string" + } + }, + "additionalProperties": true + }, "hostpathvolumesource": { "properties": { "path": { @@ -7974,6 +9124,13 @@ "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" }, + "followRedirects": { + "type": "boolean" + }, + "oauth2": { + "$ref": "#/definitions/os_monitoring_v1_OAuth2", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.OAuth2" + }, "proxyURL": { "type": "string" }, @@ -8140,11 +9297,6 @@ "additionalProperties": true }, "json": { - "properties": { - "Raw": { - "type": "string" - } - }, "additionalProperties": true }, "keytopath": { @@ -8322,6 +9474,9 @@ }, "matcher": { "properties": { + "matchType": { + "type": "string" + }, "name": { "type": "string" }, @@ -8345,6 +9500,22 @@ }, "additionalProperties": true }, + "mutetimeinterval": { + "properties": { + "name": { + "type": "string" + }, + "timeIntervals": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_TimeInterval", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TimeInterval" + } + } + }, + "additionalProperties": true + }, "namespaceselector": { "properties": { "any": { @@ -8561,8 +9732,28 @@ }, "additionalProperties": true }, + "objectreference": { + "properties": { + "group": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + }, + "resource": { + "type": "string" + } + }, + "additionalProperties": true + }, "opsgenieconfig": { "properties": { + "actions": { + "type": "string" + }, "apiKey": { "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" @@ -8581,6 +9772,9 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.KeyValue" } }, + "entity": { + "type": "string" + }, "httpConfig": { "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" @@ -8610,6 +9804,9 @@ }, "tags": { "type": "string" + }, + "updateAlerts": { + "type": "boolean" } }, "additionalProperties": true @@ -8686,6 +9883,22 @@ "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" }, + "pagerDutyImageConfigs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_PagerDutyImageConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.PagerDutyImageConfig" + } + }, + "pagerDutyLinkConfigs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_PagerDutyLinkConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.PagerDutyLinkConfig" + } + }, "routingKey": { "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" @@ -8697,10 +9910,35 @@ "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" }, - "severity": { + "severity": { + "type": "string" + }, + "url": { + "type": "string" + } + }, + "additionalProperties": true + }, + "pagerdutyimageconfig": { + "properties": { + "alt": { + "type": "string" + }, + "href": { "type": "string" }, - "url": { + "src": { + "type": "string" + } + }, + "additionalProperties": true + }, + "pagerdutylinkconfig": { + "properties": { + "alt": { + "type": "string" + }, + "href": { "type": "string" } }, @@ -8927,6 +10165,9 @@ "$ref": "#/definitions/kubernetes_core_SecretKeySelector", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" }, + "followRedirects": { + "type": "boolean" + }, "honorLabels": { "type": "boolean" }, @@ -9066,6 +10307,10 @@ }, "podmonitorspec": { "properties": { + "attachMetadata": { + "$ref": "#/definitions/os_monitoring_v1_AttachMetadata", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.AttachMetadata" + }, "jobLabel": { "type": "string" }, @@ -9193,40 +10438,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 @@ -9494,6 +10722,27 @@ }, "additionalProperties": true }, + "prometheuscondition": { + "properties": { + "lastTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "message": { + "type": "string" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "string" + }, + "type": { + "type": "string" + } + }, + "additionalProperties": true + }, "prometheuslist": { "properties": { "apiVersion": { @@ -9657,6 +10906,9 @@ "type": "string" } }, + "enableRemoteWriteReceiver": { + "type": "boolean" + }, "enforcedBodySizeLimit": { "type": "string" }, @@ -9686,6 +10938,14 @@ "evaluationInterval": { "type": "string" }, + "excludedFromEnforcement": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_ObjectReference", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ObjectReference" + } + }, "externalLabels": { "type": "object", "additionalProperties": { @@ -9696,6 +10956,14 @@ "externalUrl": { "type": "string" }, + "hostAliases": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_HostAlias", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias" + } + }, "ignoreNamespaceSelectors": { "type": "boolean" }, @@ -9932,12 +11200,28 @@ "availableReplicas": { "type": "integer" }, + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_PrometheusCondition", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.PrometheusCondition" + } + }, "paused": { "type": "boolean" }, "replicas": { "type": "integer" }, + "shardStatuses": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_ShardStatus", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ShardStatus" + } + }, "unavailableReplicas": { "type": "integer" }, @@ -10044,6 +11328,9 @@ }, "minShards": { "type": "integer" + }, + "retryOnRateLimit": { + "type": "boolean" } }, "additionalProperties": true @@ -10152,6 +11439,22 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.SlackConfig" } }, + "snsConfigs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_SNSConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.SNSConfig" + } + }, + "telegramConfigs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_TelegramConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TelegramConfig" + } + }, "victoropsConfigs": { "type": "array", "javaOmitEmpty": true, @@ -10226,6 +11529,13 @@ "bearerTokenFile": { "type": "string" }, + "headers": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "name": { "type": "string" }, @@ -10406,6 +11716,13 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.Matcher" } }, + "muteTimeIntervals": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "receiver": { "type": "string" }, @@ -10853,6 +12170,26 @@ }, "additionalProperties": true }, + "shardstatus": { + "properties": { + "availableReplicas": { + "type": "integer" + }, + "replicas": { + "type": "integer" + }, + "shardID": { + "type": "string" + }, + "unavailableReplicas": { + "type": "integer" + }, + "updatedReplicas": { + "type": "integer" + } + }, + "additionalProperties": true + }, "sigv4": { "properties": { "accessKey": { @@ -11020,6 +12357,47 @@ }, "additionalProperties": true }, + "snsconfig": { + "properties": { + "apiURL": { + "type": "string" + }, + "attributes": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "httpConfig": { + "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" + }, + "message": { + "type": "string" + }, + "phoneNumber": { + "type": "string" + }, + "sendResolved": { + "type": "boolean" + }, + "sigv4": { + "$ref": "#/definitions/os_monitoring_v1_Sigv4", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.Sigv4" + }, + "subject": { + "type": "string" + }, + "targetARN": { + "type": "string" + }, + "topicARN": { + "type": "string" + } + }, + "additionalProperties": true + }, "status": { "properties": { "apiVersion": { @@ -11161,6 +12539,38 @@ }, "additionalProperties": true }, + "telegramconfig": { + "properties": { + "apiURL": { + "type": "string" + }, + "botToken": { + "$ref": "#/definitions/kubernetes_core_SecretKeySelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.SecretKeySelector" + }, + "chatID": { + "type": "integer", + "existingJavaType": "Long" + }, + "disableNotifications": { + "type": "boolean" + }, + "httpConfig": { + "$ref": "#/definitions/os_monitoring_v1alpha1_HTTPConfig", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.HTTPConfig" + }, + "message": { + "type": "string" + }, + "parseMode": { + "type": "string" + }, + "sendResolved": { + "type": "boolean" + } + }, + "additionalProperties": true + }, "thanosruler": { "properties": { "apiVersion": { @@ -11262,6 +12672,14 @@ "evaluationInterval": { "type": "string" }, + "excludedFromEnforcement": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_ObjectReference", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ObjectReference" + } + }, "externalPrefix": { "type": "string" }, @@ -11269,6 +12687,14 @@ "$ref": "#/definitions/os_monitoring_v1_TLSConfig", "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.TLSConfig" }, + "hostAliases": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1_HostAlias", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.HostAlias" + } + }, "image": { "type": "string" }, @@ -11509,6 +12935,59 @@ }, "additionalProperties": true }, + "timeinterval": { + "properties": { + "daysOfMonth": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_DayOfMonthRange", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.DayOfMonthRange" + } + }, + "months": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "times": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_monitoring_v1alpha1_TimeRange", + "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1alpha1.TimeRange" + } + }, + "weekdays": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "years": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true + }, + "timerange": { + "properties": { + "endTime": { + "type": "string" + }, + "startTime": { + "type": "string" + } + }, + "additionalProperties": true + }, "tlsconfig": { "properties": { "ca": { diff --git a/kubernetes-model-generator/openshift-model-operator/cmd/generate/generate.go b/kubernetes-model-generator/openshift-model-operator/cmd/generate/generate.go index 577bd472dc6..b567e91724c 100644 --- a/kubernetes-model-generator/openshift-model-operator/cmd/generate/generate.go +++ b/kubernetes-model-generator/openshift-model-operator/cmd/generate/generate.go @@ -32,6 +32,7 @@ import ( operatorv1alpha1 "github.com/openshift/api/operator/v1alpha1" operatoringressv1 "github.com/openshift/api/operatoringress/v1" operatorcontrolpanev1alpha1 "github.com/openshift/api/operatorcontrolplane/v1alpha1" + authorizationv1 "k8s.io/api/authorization/v1" "os" @@ -124,7 +125,10 @@ func main() { reflect.TypeOf(time.Time{}): reflect.TypeOf(""), reflect.TypeOf(struct{}{}): reflect.TypeOf(""), } - schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, map[reflect.Type]string{},"operator") + manualTypeMap := map[reflect.Type]string { + reflect.TypeOf(authorizationv1.ResourceAttributes{}): "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes", + } + schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, manualTypeMap,"operator") if err != nil { fmt.Fprintf(os.Stderr, "An error occurred: %v", err) return diff --git a/kubernetes-model-generator/openshift-model-operator/pom.xml b/kubernetes-model-generator/openshift-model-operator/pom.xml index ef6d38a9e9f..b095b5a82da 100644 --- a/kubernetes-model-generator/openshift-model-operator/pom.xml +++ b/kubernetes-model-generator/openshift-model-operator/pom.xml @@ -49,6 +49,10 @@ io.fabric8 kubernetes-model-common + + io.fabric8 + kubernetes-model-admissionregistration + io.fabric8 openshift-model-config diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSCSIDriverConfigSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSCSIDriverConfigSpec.java new file mode 100644 index 00000000000..af2555eb3d2 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSCSIDriverConfigSpec.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.operator.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", + "kmsKeyARN" +}) +@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 AWSCSIDriverConfigSpec implements KubernetesResource +{ + + @JsonProperty("kmsKeyARN") + private String kmsKeyARN; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AWSCSIDriverConfigSpec() { + } + + /** + * + * @param kmsKeyARN + */ + public AWSCSIDriverConfigSpec(String kmsKeyARN) { + super(); + this.kmsKeyARN = kmsKeyARN; + } + + @JsonProperty("kmsKeyARN") + public String getKmsKeyARN() { + return kmsKeyARN; + } + + @JsonProperty("kmsKeyARN") + public void setKmsKeyARN(String kmsKeyARN) { + this.kmsKeyARN = kmsKeyARN; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSClassicLoadBalancerParameters.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSClassicLoadBalancerParameters.java index 6eb22a9ec56..d67b5c84308 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSClassicLoadBalancerParameters.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AWSClassicLoadBalancerParameters.java @@ -7,9 +7,11 @@ 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.Duration; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; import io.fabric8.kubernetes.api.model.LabelSelector; @@ -31,7 +33,8 @@ @JsonPropertyOrder({ "apiVersion", "kind", - "metadata" + "metadata", + "connectionIdleTimeout" }) @ToString @EqualsAndHashCode @@ -54,9 +57,37 @@ public class AWSClassicLoadBalancerParameters implements KubernetesResource { + @JsonProperty("connectionIdleTimeout") + private Duration connectionIdleTimeout; @JsonIgnore private Map additionalProperties = new HashMap(); + /** + * No args constructor for use in serialization + * + */ + public AWSClassicLoadBalancerParameters() { + } + + /** + * + * @param connectionIdleTimeout + */ + public AWSClassicLoadBalancerParameters(Duration connectionIdleTimeout) { + super(); + this.connectionIdleTimeout = connectionIdleTimeout; + } + + @JsonProperty("connectionIdleTimeout") + public Duration getConnectionIdleTimeout() { + return connectionIdleTimeout; + } + + @JsonProperty("connectionIdleTimeout") + public void setConnectionIdleTimeout(Duration connectionIdleTimeout) { + this.connectionIdleTimeout = connectionIdleTimeout; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AzureCSIDriverConfigSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AzureCSIDriverConfigSpec.java new file mode 100644 index 00000000000..1e7b8c9eff9 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AzureCSIDriverConfigSpec.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.operator.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", + "diskEncryptionSet" +}) +@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 AzureCSIDriverConfigSpec implements KubernetesResource +{ + + @JsonProperty("diskEncryptionSet") + private AzureDiskEncryptionSet diskEncryptionSet; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AzureCSIDriverConfigSpec() { + } + + /** + * + * @param diskEncryptionSet + */ + public AzureCSIDriverConfigSpec(AzureDiskEncryptionSet diskEncryptionSet) { + super(); + this.diskEncryptionSet = diskEncryptionSet; + } + + @JsonProperty("diskEncryptionSet") + public AzureDiskEncryptionSet getDiskEncryptionSet() { + return diskEncryptionSet; + } + + @JsonProperty("diskEncryptionSet") + public void setDiskEncryptionSet(AzureDiskEncryptionSet diskEncryptionSet) { + this.diskEncryptionSet = diskEncryptionSet; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AzureDiskEncryptionSet.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AzureDiskEncryptionSet.java new file mode 100644 index 00000000000..6a96a9025d1 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/AzureDiskEncryptionSet.java @@ -0,0 +1,130 @@ + +package io.fabric8.openshift.api.model.operator.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", + "name", + "resourceGroup", + "subscriptionID" +}) +@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 AzureDiskEncryptionSet implements KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("resourceGroup") + private String resourceGroup; + @JsonProperty("subscriptionID") + private String subscriptionID; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AzureDiskEncryptionSet() { + } + + /** + * + * @param resourceGroup + * @param name + * @param subscriptionID + */ + public AzureDiskEncryptionSet(String name, String resourceGroup, String subscriptionID) { + super(); + this.name = name; + this.resourceGroup = resourceGroup; + this.subscriptionID = subscriptionID; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("resourceGroup") + public String getResourceGroup() { + return resourceGroup; + } + + @JsonProperty("resourceGroup") + public void setResourceGroup(String resourceGroup) { + this.resourceGroup = resourceGroup; + } + + @JsonProperty("subscriptionID") + public String getSubscriptionID() { + return subscriptionID; + } + + @JsonProperty("subscriptionID") + public void setSubscriptionID(String subscriptionID) { + this.subscriptionID = subscriptionID; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSIDriverConfigSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSIDriverConfigSpec.java new file mode 100644 index 00000000000..ce4a84c130c --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSIDriverConfigSpec.java @@ -0,0 +1,160 @@ + +package io.fabric8.openshift.api.model.operator.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", + "aws", + "azure", + "driverType", + "gcp", + "vSphere" +}) +@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 CSIDriverConfigSpec implements KubernetesResource +{ + + @JsonProperty("aws") + private AWSCSIDriverConfigSpec aws; + @JsonProperty("azure") + private AzureCSIDriverConfigSpec azure; + @JsonProperty("driverType") + private String driverType; + @JsonProperty("gcp") + private GCPCSIDriverConfigSpec gcp; + @JsonProperty("vSphere") + private VSphereCSIDriverConfigSpec vSphere; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CSIDriverConfigSpec() { + } + + /** + * + * @param gcp + * @param aws + * @param driverType + * @param azure + * @param vSphere + */ + public CSIDriverConfigSpec(AWSCSIDriverConfigSpec aws, AzureCSIDriverConfigSpec azure, String driverType, GCPCSIDriverConfigSpec gcp, VSphereCSIDriverConfigSpec vSphere) { + super(); + this.aws = aws; + this.azure = azure; + this.driverType = driverType; + this.gcp = gcp; + this.vSphere = vSphere; + } + + @JsonProperty("aws") + public AWSCSIDriverConfigSpec getAws() { + return aws; + } + + @JsonProperty("aws") + public void setAws(AWSCSIDriverConfigSpec aws) { + this.aws = aws; + } + + @JsonProperty("azure") + public AzureCSIDriverConfigSpec getAzure() { + return azure; + } + + @JsonProperty("azure") + public void setAzure(AzureCSIDriverConfigSpec azure) { + this.azure = azure; + } + + @JsonProperty("driverType") + public String getDriverType() { + return driverType; + } + + @JsonProperty("driverType") + public void setDriverType(String driverType) { + this.driverType = driverType; + } + + @JsonProperty("gcp") + public GCPCSIDriverConfigSpec getGcp() { + return gcp; + } + + @JsonProperty("gcp") + public void setGcp(GCPCSIDriverConfigSpec gcp) { + this.gcp = gcp; + } + + @JsonProperty("vSphere") + public VSphereCSIDriverConfigSpec getVSphere() { + return vSphere; + } + + @JsonProperty("vSphere") + public void setVSphere(VSphereCSIDriverConfigSpec vSphere) { + this.vSphere = vSphere; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpec.java index 0c28d69e4c6..61013119418 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpec.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriverSpec.java @@ -35,10 +35,12 @@ "apiVersion", "kind", "metadata", + "driverConfig", "logLevel", "managementState", "observedConfig", "operatorLogLevel", + "storageClassState", "unsupportedConfigOverrides" }) @ToString @@ -64,6 +66,8 @@ public class ClusterCSIDriverSpec implements KubernetesResource { + @JsonProperty("driverConfig") + private CSIDriverConfigSpec driverConfig; @JsonProperty("logLevel") private String logLevel; @JsonProperty("managementState") @@ -72,6 +76,8 @@ public class ClusterCSIDriverSpec implements KubernetesResource private KubernetesResource observedConfig; @JsonProperty("operatorLogLevel") private String operatorLogLevel; + @JsonProperty("storageClassState") + private String storageClassState; @JsonProperty("unsupportedConfigOverrides") private KubernetesResource unsupportedConfigOverrides; @JsonIgnore @@ -86,21 +92,35 @@ public ClusterCSIDriverSpec() { /** * + * @param driverConfig * @param logLevel + * @param storageClassState * @param unsupportedConfigOverrides * @param operatorLogLevel * @param observedConfig * @param managementState */ - public ClusterCSIDriverSpec(String logLevel, String managementState, KubernetesResource observedConfig, String operatorLogLevel, KubernetesResource unsupportedConfigOverrides) { + public ClusterCSIDriverSpec(CSIDriverConfigSpec driverConfig, String logLevel, String managementState, KubernetesResource observedConfig, String operatorLogLevel, String storageClassState, KubernetesResource unsupportedConfigOverrides) { super(); + this.driverConfig = driverConfig; this.logLevel = logLevel; this.managementState = managementState; this.observedConfig = observedConfig; this.operatorLogLevel = operatorLogLevel; + this.storageClassState = storageClassState; this.unsupportedConfigOverrides = unsupportedConfigOverrides; } + @JsonProperty("driverConfig") + public CSIDriverConfigSpec getDriverConfig() { + return driverConfig; + } + + @JsonProperty("driverConfig") + public void setDriverConfig(CSIDriverConfigSpec driverConfig) { + this.driverConfig = driverConfig; + } + @JsonProperty("logLevel") public String getLogLevel() { return logLevel; @@ -141,6 +161,16 @@ public void setOperatorLogLevel(String operatorLogLevel) { this.operatorLogLevel = operatorLogLevel; } + @JsonProperty("storageClassState") + public String getStorageClassState() { + return storageClassState; + } + + @JsonProperty("storageClassState") + public void setStorageClassState(String storageClassState) { + this.storageClassState = storageClassState; + } + @JsonProperty("unsupportedConfigOverrides") public KubernetesResource getUnsupportedConfigOverrides() { return unsupportedConfigOverrides; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleCustomization.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleCustomization.java index df6288f0c4f..e8dbd40f1c1 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleCustomization.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ConsoleCustomization.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.operator.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; @@ -40,6 +42,7 @@ "customProductName", "developerCatalog", "documentationBaseURL", + "perspectives", "projectAccess", "quickStarts" }) @@ -76,6 +79,8 @@ public class ConsoleCustomization implements KubernetesResource private DeveloperConsoleCatalogCustomization developerCatalog; @JsonProperty("documentationBaseURL") private String documentationBaseURL; + @JsonProperty("perspectives") + private List perspectives = new ArrayList(); @JsonProperty("projectAccess") private ProjectAccess projectAccess; @JsonProperty("quickStarts") @@ -93,6 +98,7 @@ public ConsoleCustomization() { /** * * @param customProductName + * @param perspectives * @param customLogoFile * @param addPage * @param quickStarts @@ -101,7 +107,7 @@ public ConsoleCustomization() { * @param brand * @param developerCatalog */ - public ConsoleCustomization(AddPage addPage, String brand, ConfigMapFileReference customLogoFile, String customProductName, DeveloperConsoleCatalogCustomization developerCatalog, String documentationBaseURL, ProjectAccess projectAccess, QuickStarts quickStarts) { + public ConsoleCustomization(AddPage addPage, String brand, ConfigMapFileReference customLogoFile, String customProductName, DeveloperConsoleCatalogCustomization developerCatalog, String documentationBaseURL, List perspectives, ProjectAccess projectAccess, QuickStarts quickStarts) { super(); this.addPage = addPage; this.brand = brand; @@ -109,6 +115,7 @@ public ConsoleCustomization(AddPage addPage, String brand, ConfigMapFileReferenc this.customProductName = customProductName; this.developerCatalog = developerCatalog; this.documentationBaseURL = documentationBaseURL; + this.perspectives = perspectives; this.projectAccess = projectAccess; this.quickStarts = quickStarts; } @@ -173,6 +180,16 @@ public void setDocumentationBaseURL(String documentationBaseURL) { this.documentationBaseURL = documentationBaseURL; } + @JsonProperty("perspectives") + public List getPerspectives() { + return perspectives; + } + + @JsonProperty("perspectives") + public void setPerspectives(List perspectives) { + this.perspectives = perspectives; + } + @JsonProperty("projectAccess") public ProjectAccess getProjectAccess() { return projectAccess; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ContainerLoggingDestinationParameters.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ContainerLoggingDestinationParameters.java index 2b90743cd53..ca3e6186e82 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ContainerLoggingDestinationParameters.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ContainerLoggingDestinationParameters.java @@ -7,6 +7,7 @@ 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; @@ -31,7 +32,8 @@ @JsonPropertyOrder({ "apiVersion", "kind", - "metadata" + "metadata", + "maxLength" }) @ToString @EqualsAndHashCode @@ -54,9 +56,37 @@ public class ContainerLoggingDestinationParameters implements KubernetesResource { + @JsonProperty("maxLength") + private Integer maxLength; @JsonIgnore private Map additionalProperties = new HashMap(); + /** + * No args constructor for use in serialization + * + */ + public ContainerLoggingDestinationParameters() { + } + + /** + * + * @param maxLength + */ + public ContainerLoggingDestinationParameters(Integer maxLength) { + super(); + this.maxLength = maxLength; + } + + @JsonProperty("maxLength") + public Integer getMaxLength() { + return maxLength; + } + + @JsonProperty("maxLength") + public void setMaxLength(Integer maxLength) { + this.maxLength = maxLength; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSCache.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSCache.java new file mode 100644 index 00000000000..972203d98f9 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSCache.java @@ -0,0 +1,116 @@ + +package io.fabric8.openshift.api.model.operator.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.Duration; +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", + "negativeTTL", + "positiveTTL" +}) +@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 DNSCache implements KubernetesResource +{ + + @JsonProperty("negativeTTL") + private Duration negativeTTL; + @JsonProperty("positiveTTL") + private Duration positiveTTL; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DNSCache() { + } + + /** + * + * @param negativeTTL + * @param positiveTTL + */ + public DNSCache(Duration negativeTTL, Duration positiveTTL) { + super(); + this.negativeTTL = negativeTTL; + this.positiveTTL = positiveTTL; + } + + @JsonProperty("negativeTTL") + public Duration getNegativeTTL() { + return negativeTTL; + } + + @JsonProperty("negativeTTL") + public void setNegativeTTL(Duration negativeTTL) { + this.negativeTTL = negativeTTL; + } + + @JsonProperty("positiveTTL") + public Duration getPositiveTTL() { + return positiveTTL; + } + + @JsonProperty("positiveTTL") + public void setPositiveTTL(Duration positiveTTL) { + this.positiveTTL = positiveTTL; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSOverTLSConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSOverTLSConfig.java new file mode 100644 index 00000000000..61890bbd36d --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSOverTLSConfig.java @@ -0,0 +1,116 @@ + +package io.fabric8.openshift.api.model.operator.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.fabric8.openshift.api.model.config.v1.ConfigMapNameReference; +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", + "caBundle", + "serverName" +}) +@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 DNSOverTLSConfig implements KubernetesResource +{ + + @JsonProperty("caBundle") + private ConfigMapNameReference caBundle; + @JsonProperty("serverName") + private String serverName; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DNSOverTLSConfig() { + } + + /** + * + * @param caBundle + * @param serverName + */ + public DNSOverTLSConfig(ConfigMapNameReference caBundle, String serverName) { + super(); + this.caBundle = caBundle; + this.serverName = serverName; + } + + @JsonProperty("caBundle") + public ConfigMapNameReference getCaBundle() { + return caBundle; + } + + @JsonProperty("caBundle") + public void setCaBundle(ConfigMapNameReference caBundle) { + this.caBundle = caBundle; + } + + @JsonProperty("serverName") + public String getServerName() { + return serverName; + } + + @JsonProperty("serverName") + public void setServerName(String serverName) { + this.serverName = serverName; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSRecordSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSRecordSpec.java index 2ff3bae5e88..ec6e57e920e 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSRecordSpec.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSRecordSpec.java @@ -35,6 +35,7 @@ "apiVersion", "kind", "metadata", + "dnsManagementPolicy", "dnsName", "recordTTL", "recordType", @@ -61,6 +62,8 @@ public class DNSRecordSpec implements KubernetesResource { + @JsonProperty("dnsManagementPolicy") + private String dnsManagementPolicy; @JsonProperty("dnsName") private String dnsName; @JsonProperty("recordTTL") @@ -85,15 +88,27 @@ public DNSRecordSpec() { * @param recordType * @param dnsName * @param targets + * @param dnsManagementPolicy */ - public DNSRecordSpec(String dnsName, Long recordTTL, String recordType, List targets) { + public DNSRecordSpec(String dnsManagementPolicy, String dnsName, Long recordTTL, String recordType, List targets) { super(); + this.dnsManagementPolicy = dnsManagementPolicy; this.dnsName = dnsName; this.recordTTL = recordTTL; this.recordType = recordType; this.targets = targets; } + @JsonProperty("dnsManagementPolicy") + public String getDnsManagementPolicy() { + return dnsManagementPolicy; + } + + @JsonProperty("dnsManagementPolicy") + public void setDnsManagementPolicy(String dnsManagementPolicy) { + this.dnsManagementPolicy = dnsManagementPolicy; + } + @JsonProperty("dnsName") public String getDnsName() { return dnsName; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpec.java index 53e0af44ae8..52707ebaebe 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpec.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSSpec.java @@ -35,6 +35,7 @@ "apiVersion", "kind", "metadata", + "cache", "logLevel", "managementState", "nodePlacement", @@ -63,6 +64,8 @@ public class DNSSpec implements KubernetesResource { + @JsonProperty("cache") + private DNSCache cache; @JsonProperty("logLevel") private String logLevel; @JsonProperty("managementState") @@ -89,14 +92,16 @@ public DNSSpec() { /** * * @param nodePlacement + * @param cache * @param servers * @param upstreamResolvers * @param logLevel * @param operatorLogLevel * @param managementState */ - public DNSSpec(String logLevel, String managementState, DNSNodePlacement nodePlacement, String operatorLogLevel, List servers, UpstreamResolvers upstreamResolvers) { + public DNSSpec(DNSCache cache, String logLevel, String managementState, DNSNodePlacement nodePlacement, String operatorLogLevel, List servers, UpstreamResolvers upstreamResolvers) { super(); + this.cache = cache; this.logLevel = logLevel; this.managementState = managementState; this.nodePlacement = nodePlacement; @@ -105,6 +110,16 @@ public DNSSpec(String logLevel, String managementState, DNSNodePlacement nodePla this.upstreamResolvers = upstreamResolvers; } + @JsonProperty("cache") + public DNSCache getCache() { + return cache; + } + + @JsonProperty("cache") + public void setCache(DNSCache cache) { + this.cache = cache; + } + @JsonProperty("logLevel") public String getLogLevel() { return logLevel; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSTransportConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSTransportConfig.java new file mode 100644 index 00000000000..7895a032ebb --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSTransportConfig.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.operator.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", + "tls", + "transport" +}) +@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 DNSTransportConfig implements KubernetesResource +{ + + @JsonProperty("tls") + private DNSOverTLSConfig tls; + @JsonProperty("transport") + private String transport; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DNSTransportConfig() { + } + + /** + * + * @param tls + * @param transport + */ + public DNSTransportConfig(DNSOverTLSConfig tls, String transport) { + super(); + this.tls = tls; + this.transport = transport; + } + + @JsonProperty("tls") + public DNSOverTLSConfig getTls() { + return tls; + } + + @JsonProperty("tls") + public void setTls(DNSOverTLSConfig tls) { + this.tls = tls; + } + + @JsonProperty("transport") + public String getTransport() { + return transport; + } + + @JsonProperty("transport") + public void setTransport(String transport) { + this.transport = transport; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogCustomization.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogCustomization.java index 4a3163755b3..652f8d98fe4 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogCustomization.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogCustomization.java @@ -35,7 +35,8 @@ "apiVersion", "kind", "metadata", - "categories" + "categories", + "types" }) @ToString @EqualsAndHashCode @@ -61,6 +62,8 @@ public class DeveloperConsoleCatalogCustomization implements KubernetesResource @JsonProperty("categories") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List categories = new ArrayList(); + @JsonProperty("types") + private DeveloperConsoleCatalogTypes types; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -73,11 +76,13 @@ public DeveloperConsoleCatalogCustomization() { /** * + * @param types * @param categories */ - public DeveloperConsoleCatalogCustomization(List categories) { + public DeveloperConsoleCatalogCustomization(List categories, DeveloperConsoleCatalogTypes types) { super(); this.categories = categories; + this.types = types; } @JsonProperty("categories") @@ -90,6 +95,16 @@ public void setCategories(List categories) { this.categories = categories; } + @JsonProperty("types") + public DeveloperConsoleCatalogTypes getTypes() { + return types; + } + + @JsonProperty("types") + public void setTypes(DeveloperConsoleCatalogTypes types) { + this.types = types; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogTypes.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogTypes.java new file mode 100644 index 00000000000..b64a8ab76ec --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DeveloperConsoleCatalogTypes.java @@ -0,0 +1,134 @@ + +package io.fabric8.openshift.api.model.operator.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", + "disabled", + "enabled", + "state" +}) +@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 DeveloperConsoleCatalogTypes implements KubernetesResource +{ + + @JsonProperty("disabled") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List disabled = new ArrayList(); + @JsonProperty("enabled") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List enabled = new ArrayList(); + @JsonProperty("state") + private String state; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DeveloperConsoleCatalogTypes() { + } + + /** + * + * @param disabled + * @param state + * @param enabled + */ + public DeveloperConsoleCatalogTypes(List disabled, List enabled, String state) { + super(); + this.disabled = disabled; + this.enabled = enabled; + this.state = state; + } + + @JsonProperty("disabled") + public List getDisabled() { + return disabled; + } + + @JsonProperty("disabled") + public void setDisabled(List disabled) { + this.disabled = disabled; + } + + @JsonProperty("enabled") + public List getEnabled() { + return enabled; + } + + @JsonProperty("enabled") + public void setEnabled(List enabled) { + this.enabled = enabled; + } + + @JsonProperty("state") + public String getState() { + return state; + } + + @JsonProperty("state") + public void setState(String state) { + this.state = state; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EgressIPConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EgressIPConfig.java new file mode 100644 index 00000000000..06ca0abfbe2 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/EgressIPConfig.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.operator.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", + "reachabilityTotalTimeoutSeconds" +}) +@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 EgressIPConfig implements KubernetesResource +{ + + @JsonProperty("reachabilityTotalTimeoutSeconds") + private Integer reachabilityTotalTimeoutSeconds; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public EgressIPConfig() { + } + + /** + * + * @param reachabilityTotalTimeoutSeconds + */ + public EgressIPConfig(Integer reachabilityTotalTimeoutSeconds) { + super(); + this.reachabilityTotalTimeoutSeconds = reachabilityTotalTimeoutSeconds; + } + + @JsonProperty("reachabilityTotalTimeoutSeconds") + public Integer getReachabilityTotalTimeoutSeconds() { + return reachabilityTotalTimeoutSeconds; + } + + @JsonProperty("reachabilityTotalTimeoutSeconds") + public void setReachabilityTotalTimeoutSeconds(Integer reachabilityTotalTimeoutSeconds) { + this.reachabilityTotalTimeoutSeconds = reachabilityTotalTimeoutSeconds; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/FeaturesMigration.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/FeaturesMigration.java new file mode 100644 index 00000000000..94880c8cf2e --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/FeaturesMigration.java @@ -0,0 +1,130 @@ + +package io.fabric8.openshift.api.model.operator.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", + "egressFirewall", + "egressIP", + "multicast" +}) +@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 FeaturesMigration implements KubernetesResource +{ + + @JsonProperty("egressFirewall") + private Boolean egressFirewall; + @JsonProperty("egressIP") + private Boolean egressIP; + @JsonProperty("multicast") + private Boolean multicast; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FeaturesMigration() { + } + + /** + * + * @param egressIP + * @param egressFirewall + * @param multicast + */ + public FeaturesMigration(Boolean egressFirewall, Boolean egressIP, Boolean multicast) { + super(); + this.egressFirewall = egressFirewall; + this.egressIP = egressIP; + this.multicast = multicast; + } + + @JsonProperty("egressFirewall") + public Boolean getEgressFirewall() { + return egressFirewall; + } + + @JsonProperty("egressFirewall") + public void setEgressFirewall(Boolean egressFirewall) { + this.egressFirewall = egressFirewall; + } + + @JsonProperty("egressIP") + public Boolean getEgressIP() { + return egressIP; + } + + @JsonProperty("egressIP") + public void setEgressIP(Boolean egressIP) { + this.egressIP = egressIP; + } + + @JsonProperty("multicast") + public Boolean getMulticast() { + return multicast; + } + + @JsonProperty("multicast") + public void setMulticast(Boolean multicast) { + this.multicast = multicast; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ForwardPlugin.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ForwardPlugin.java index 00c05ef9c7e..57c5493d302 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ForwardPlugin.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ForwardPlugin.java @@ -36,6 +36,8 @@ "kind", "metadata", "policy", + "protocolStrategy", + "transportConfig", "upstreams" }) @ToString @@ -61,6 +63,10 @@ public class ForwardPlugin implements KubernetesResource @JsonProperty("policy") private String policy; + @JsonProperty("protocolStrategy") + private String protocolStrategy; + @JsonProperty("transportConfig") + private DNSTransportConfig transportConfig; @JsonProperty("upstreams") private List upstreams = new ArrayList(); @JsonIgnore @@ -75,12 +81,16 @@ public ForwardPlugin() { /** * + * @param protocolStrategy * @param upstreams + * @param transportConfig * @param policy */ - public ForwardPlugin(String policy, List upstreams) { + public ForwardPlugin(String policy, String protocolStrategy, DNSTransportConfig transportConfig, List upstreams) { super(); this.policy = policy; + this.protocolStrategy = protocolStrategy; + this.transportConfig = transportConfig; this.upstreams = upstreams; } @@ -94,6 +104,26 @@ public void setPolicy(String policy) { this.policy = policy; } + @JsonProperty("protocolStrategy") + public String getProtocolStrategy() { + return protocolStrategy; + } + + @JsonProperty("protocolStrategy") + public void setProtocolStrategy(String protocolStrategy) { + this.protocolStrategy = protocolStrategy; + } + + @JsonProperty("transportConfig") + public DNSTransportConfig getTransportConfig() { + return transportConfig; + } + + @JsonProperty("transportConfig") + public void setTransportConfig(DNSTransportConfig transportConfig) { + this.transportConfig = transportConfig; + } + @JsonProperty("upstreams") public List getUpstreams() { return upstreams; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GCPCSIDriverConfigSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GCPCSIDriverConfigSpec.java new file mode 100644 index 00000000000..9cf7d6fe702 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GCPCSIDriverConfigSpec.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.operator.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", + "kmsKey" +}) +@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 GCPCSIDriverConfigSpec implements KubernetesResource +{ + + @JsonProperty("kmsKey") + private GCPKMSKeyReference kmsKey; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public GCPCSIDriverConfigSpec() { + } + + /** + * + * @param kmsKey + */ + public GCPCSIDriverConfigSpec(GCPKMSKeyReference kmsKey) { + super(); + this.kmsKey = kmsKey; + } + + @JsonProperty("kmsKey") + public GCPKMSKeyReference getKmsKey() { + return kmsKey; + } + + @JsonProperty("kmsKey") + public void setKmsKey(GCPKMSKeyReference kmsKey) { + this.kmsKey = kmsKey; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GCPKMSKeyReference.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GCPKMSKeyReference.java new file mode 100644 index 00000000000..748943c4cdd --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GCPKMSKeyReference.java @@ -0,0 +1,145 @@ + +package io.fabric8.openshift.api.model.operator.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", + "keyRing", + "location", + "name", + "projectID" +}) +@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 GCPKMSKeyReference implements KubernetesResource +{ + + @JsonProperty("keyRing") + private String keyRing; + @JsonProperty("location") + private String location; + @JsonProperty("name") + private String name; + @JsonProperty("projectID") + private String projectID; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public GCPKMSKeyReference() { + } + + /** + * + * @param name + * @param location + * @param keyRing + * @param projectID + */ + public GCPKMSKeyReference(String keyRing, String location, String name, String projectID) { + super(); + this.keyRing = keyRing; + this.location = location; + this.name = name; + this.projectID = projectID; + } + + @JsonProperty("keyRing") + public String getKeyRing() { + return keyRing; + } + + @JsonProperty("keyRing") + public void setKeyRing(String keyRing) { + this.keyRing = keyRing; + } + + @JsonProperty("location") + public String getLocation() { + return location; + } + + @JsonProperty("location") + public void setLocation(String location) { + this.location = location; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("projectID") + public String getProjectID() { + return projectID; + } + + @JsonProperty("projectID") + public void setProjectID(String projectID) { + this.projectID = projectID; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GatewayConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GatewayConfig.java new file mode 100644 index 00000000000..70e809403f4 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/GatewayConfig.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.operator.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", + "ipForwarding", + "routingViaHost" +}) +@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 GatewayConfig implements KubernetesResource +{ + + @JsonProperty("ipForwarding") + private String ipForwarding; + @JsonProperty("routingViaHost") + private Boolean routingViaHost; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public GatewayConfig() { + } + + /** + * + * @param routingViaHost + * @param ipForwarding + */ + public GatewayConfig(String ipForwarding, Boolean routingViaHost) { + super(); + this.ipForwarding = ipForwarding; + this.routingViaHost = routingViaHost; + } + + @JsonProperty("ipForwarding") + public String getIpForwarding() { + return ipForwarding; + } + + @JsonProperty("ipForwarding") + public void setIpForwarding(String ipForwarding) { + this.ipForwarding = ipForwarding; + } + + @JsonProperty("routingViaHost") + public Boolean getRoutingViaHost() { + return routingViaHost; + } + + @JsonProperty("routingViaHost") + public void setRoutingViaHost(Boolean routingViaHost) { + this.routingViaHost = routingViaHost; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/HostNetworkStrategy.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/HostNetworkStrategy.java index 3552cbe4789..f128b9dbf38 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/HostNetworkStrategy.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/HostNetworkStrategy.java @@ -33,7 +33,10 @@ "apiVersion", "kind", "metadata", - "protocol" + "httpPort", + "httpsPort", + "protocol", + "statsPort" }) @ToString @EqualsAndHashCode @@ -56,8 +59,14 @@ public class HostNetworkStrategy implements KubernetesResource { + @JsonProperty("httpPort") + private Integer httpPort; + @JsonProperty("httpsPort") + private Integer httpsPort; @JsonProperty("protocol") private String protocol; + @JsonProperty("statsPort") + private Integer statsPort; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -71,10 +80,36 @@ public HostNetworkStrategy() { /** * * @param protocol + * @param httpPort + * @param httpsPort + * @param statsPort */ - public HostNetworkStrategy(String protocol) { + public HostNetworkStrategy(Integer httpPort, Integer httpsPort, String protocol, Integer statsPort) { super(); + this.httpPort = httpPort; + this.httpsPort = httpsPort; this.protocol = protocol; + this.statsPort = statsPort; + } + + @JsonProperty("httpPort") + public Integer getHttpPort() { + return httpPort; + } + + @JsonProperty("httpPort") + public void setHttpPort(Integer httpPort) { + this.httpPort = httpPort; + } + + @JsonProperty("httpsPort") + public Integer getHttpsPort() { + return httpsPort; + } + + @JsonProperty("httpsPort") + public void setHttpsPort(Integer httpsPort) { + this.httpsPort = httpsPort; } @JsonProperty("protocol") @@ -87,6 +122,16 @@ public void setProtocol(String protocol) { this.protocol = protocol; } + @JsonProperty("statsPort") + public Integer getStatsPort() { + return statsPort; + } + + @JsonProperty("statsPort") + public void setStatsPort(Integer statsPort) { + this.statsPort = statsPort; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IBMLoadBalancerParameters.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IBMLoadBalancerParameters.java new file mode 100644 index 00000000000..2fe0d20f814 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IBMLoadBalancerParameters.java @@ -0,0 +1,100 @@ + +package io.fabric8.openshift.api.model.operator.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", + "protocol" +}) +@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 IBMLoadBalancerParameters implements KubernetesResource +{ + + @JsonProperty("protocol") + private String protocol; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public IBMLoadBalancerParameters() { + } + + /** + * + * @param protocol + */ + public IBMLoadBalancerParameters(String protocol) { + super(); + this.protocol = protocol; + } + + @JsonProperty("protocol") + public String getProtocol() { + return protocol; + } + + @JsonProperty("protocol") + public void setProtocol(String protocol) { + this.protocol = protocol; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatus.java index d77fa4a01d6..a14fab6da5c 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerStatus.java @@ -15,7 +15,6 @@ 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; @@ -40,7 +39,9 @@ "conditions", "domain", "endpointPublishingStrategy", + "namespaceSelector", "observedGeneration", + "routeSelector", "selector", "tlsProfile" }) @@ -53,7 +54,7 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), + @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @@ -74,8 +75,12 @@ public class IngressControllerStatus implements KubernetesResource private String domain; @JsonProperty("endpointPublishingStrategy") private EndpointPublishingStrategy endpointPublishingStrategy; + @JsonProperty("namespaceSelector") + private io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector; @JsonProperty("observedGeneration") private Long observedGeneration; + @JsonProperty("routeSelector") + private io.fabric8.kubernetes.api.model.LabelSelector routeSelector; @JsonProperty("selector") private String selector; @JsonProperty("tlsProfile") @@ -92,21 +97,25 @@ public IngressControllerStatus() { /** * + * @param routeSelector * @param domain * @param endpointPublishingStrategy + * @param namespaceSelector * @param selector * @param tlsProfile * @param conditions * @param availableReplicas * @param observedGeneration */ - public IngressControllerStatus(Integer availableReplicas, List conditions, String domain, EndpointPublishingStrategy endpointPublishingStrategy, Long observedGeneration, String selector, TLSProfileSpec tlsProfile) { + public IngressControllerStatus(Integer availableReplicas, List conditions, String domain, EndpointPublishingStrategy endpointPublishingStrategy, io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector, Long observedGeneration, io.fabric8.kubernetes.api.model.LabelSelector routeSelector, String selector, TLSProfileSpec tlsProfile) { super(); this.availableReplicas = availableReplicas; this.conditions = conditions; this.domain = domain; this.endpointPublishingStrategy = endpointPublishingStrategy; + this.namespaceSelector = namespaceSelector; this.observedGeneration = observedGeneration; + this.routeSelector = routeSelector; this.selector = selector; this.tlsProfile = tlsProfile; } @@ -151,6 +160,16 @@ public void setEndpointPublishingStrategy(EndpointPublishingStrategy endpointPub this.endpointPublishingStrategy = endpointPublishingStrategy; } + @JsonProperty("namespaceSelector") + public io.fabric8.kubernetes.api.model.LabelSelector getNamespaceSelector() { + return namespaceSelector; + } + + @JsonProperty("namespaceSelector") + public void setNamespaceSelector(io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector) { + this.namespaceSelector = namespaceSelector; + } + @JsonProperty("observedGeneration") public Long getObservedGeneration() { return observedGeneration; @@ -161,6 +180,16 @@ public void setObservedGeneration(Long observedGeneration) { this.observedGeneration = observedGeneration; } + @JsonProperty("routeSelector") + public io.fabric8.kubernetes.api.model.LabelSelector getRouteSelector() { + return routeSelector; + } + + @JsonProperty("routeSelector") + public void setRouteSelector(io.fabric8.kubernetes.api.model.LabelSelector routeSelector) { + this.routeSelector = routeSelector; + } + @JsonProperty("selector") public String getSelector() { return selector; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerTuningOptions.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerTuningOptions.java index d4bc823d295..b9c93073251 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerTuningOptions.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressControllerTuningOptions.java @@ -38,6 +38,9 @@ "clientTimeout", "headerBufferBytes", "headerBufferMaxRewriteBytes", + "healthCheckInterval", + "maxConnections", + "reloadInterval", "serverFinTimeout", "serverTimeout", "threadCount", @@ -73,6 +76,12 @@ public class IngressControllerTuningOptions implements KubernetesResource private Integer headerBufferBytes; @JsonProperty("headerBufferMaxRewriteBytes") private Integer headerBufferMaxRewriteBytes; + @JsonProperty("healthCheckInterval") + private Duration healthCheckInterval; + @JsonProperty("maxConnections") + private Integer maxConnections; + @JsonProperty("reloadInterval") + private Duration reloadInterval; @JsonProperty("serverFinTimeout") private Duration serverFinTimeout; @JsonProperty("serverTimeout") @@ -97,20 +106,26 @@ public IngressControllerTuningOptions() { * * @param tunnelTimeout * @param headerBufferBytes + * @param reloadInterval * @param serverFinTimeout * @param clientFinTimeout * @param threadCount * @param clientTimeout * @param headerBufferMaxRewriteBytes * @param tlsInspectDelay + * @param healthCheckInterval + * @param maxConnections * @param serverTimeout */ - public IngressControllerTuningOptions(Duration clientFinTimeout, Duration clientTimeout, Integer headerBufferBytes, Integer headerBufferMaxRewriteBytes, Duration serverFinTimeout, Duration serverTimeout, Integer threadCount, Duration tlsInspectDelay, Duration tunnelTimeout) { + public IngressControllerTuningOptions(Duration clientFinTimeout, Duration clientTimeout, Integer headerBufferBytes, Integer headerBufferMaxRewriteBytes, Duration healthCheckInterval, Integer maxConnections, Duration reloadInterval, Duration serverFinTimeout, Duration serverTimeout, Integer threadCount, Duration tlsInspectDelay, Duration tunnelTimeout) { super(); this.clientFinTimeout = clientFinTimeout; this.clientTimeout = clientTimeout; this.headerBufferBytes = headerBufferBytes; this.headerBufferMaxRewriteBytes = headerBufferMaxRewriteBytes; + this.healthCheckInterval = healthCheckInterval; + this.maxConnections = maxConnections; + this.reloadInterval = reloadInterval; this.serverFinTimeout = serverFinTimeout; this.serverTimeout = serverTimeout; this.threadCount = threadCount; @@ -158,6 +173,36 @@ public void setHeaderBufferMaxRewriteBytes(Integer headerBufferMaxRewriteBytes) this.headerBufferMaxRewriteBytes = headerBufferMaxRewriteBytes; } + @JsonProperty("healthCheckInterval") + public Duration getHealthCheckInterval() { + return healthCheckInterval; + } + + @JsonProperty("healthCheckInterval") + public void setHealthCheckInterval(Duration healthCheckInterval) { + this.healthCheckInterval = healthCheckInterval; + } + + @JsonProperty("maxConnections") + public Integer getMaxConnections() { + return maxConnections; + } + + @JsonProperty("maxConnections") + public void setMaxConnections(Integer maxConnections) { + this.maxConnections = maxConnections; + } + + @JsonProperty("reloadInterval") + public Duration getReloadInterval() { + return reloadInterval; + } + + @JsonProperty("reloadInterval") + public void setReloadInterval(Duration reloadInterval) { + this.reloadInterval = reloadInterval; + } + @JsonProperty("serverFinTimeout") public Duration getServerFinTimeout() { return serverFinTimeout; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatus.java index b8b0da642d5..b01a14cff7a 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServerStatus.java @@ -42,6 +42,7 @@ "nodeStatuses", "observedGeneration", "readyReplicas", + "serviceAccountIssuers", "version" }) @ToString @@ -82,6 +83,9 @@ public class KubeAPIServerStatus implements KubernetesResource private Long observedGeneration; @JsonProperty("readyReplicas") private Integer readyReplicas; + @JsonProperty("serviceAccountIssuers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List serviceAccountIssuers = new ArrayList(); @JsonProperty("version") private String version; @JsonIgnore @@ -101,11 +105,12 @@ public KubeAPIServerStatus() { * @param generations * @param latestAvailableRevisionReason * @param readyReplicas + * @param serviceAccountIssuers * @param conditions * @param version * @param observedGeneration */ - public KubeAPIServerStatus(List conditions, List generations, Integer latestAvailableRevision, String latestAvailableRevisionReason, List nodeStatuses, Long observedGeneration, Integer readyReplicas, String version) { + public KubeAPIServerStatus(List conditions, List generations, Integer latestAvailableRevision, String latestAvailableRevisionReason, List nodeStatuses, Long observedGeneration, Integer readyReplicas, List serviceAccountIssuers, String version) { super(); this.conditions = conditions; this.generations = generations; @@ -114,6 +119,7 @@ public KubeAPIServerStatus(List conditions, List getServiceAccountIssuers() { + return serviceAccountIssuers; + } + + @JsonProperty("serviceAccountIssuers") + public void setServiceAccountIssuers(List serviceAccountIssuers) { + this.serviceAccountIssuers = serviceAccountIssuers; + } + @JsonProperty("version") public String getVersion() { return version; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/LoadBalancerStrategy.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/LoadBalancerStrategy.java index 852869b5fb7..9dc8ab45e28 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/LoadBalancerStrategy.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/LoadBalancerStrategy.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.operator.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; @@ -33,6 +35,8 @@ "apiVersion", "kind", "metadata", + "allowedSourceRanges", + "dnsManagementPolicy", "providerParameters", "scope" }) @@ -57,6 +61,11 @@ public class LoadBalancerStrategy implements KubernetesResource { + @JsonProperty("allowedSourceRanges") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List allowedSourceRanges = new ArrayList(); + @JsonProperty("dnsManagementPolicy") + private String dnsManagementPolicy; @JsonProperty("providerParameters") private ProviderLoadBalancerParameters providerParameters; @JsonProperty("scope") @@ -73,15 +82,39 @@ public LoadBalancerStrategy() { /** * + * @param allowedSourceRanges * @param scope * @param providerParameters + * @param dnsManagementPolicy */ - public LoadBalancerStrategy(ProviderLoadBalancerParameters providerParameters, String scope) { + public LoadBalancerStrategy(List allowedSourceRanges, String dnsManagementPolicy, ProviderLoadBalancerParameters providerParameters, String scope) { super(); + this.allowedSourceRanges = allowedSourceRanges; + this.dnsManagementPolicy = dnsManagementPolicy; this.providerParameters = providerParameters; this.scope = scope; } + @JsonProperty("allowedSourceRanges") + public List getAllowedSourceRanges() { + return allowedSourceRanges; + } + + @JsonProperty("allowedSourceRanges") + public void setAllowedSourceRanges(List allowedSourceRanges) { + this.allowedSourceRanges = allowedSourceRanges; + } + + @JsonProperty("dnsManagementPolicy") + public String getDnsManagementPolicy() { + return dnsManagementPolicy; + } + + @JsonProperty("dnsManagementPolicy") + public void setDnsManagementPolicy(String dnsManagementPolicy) { + this.dnsManagementPolicy = dnsManagementPolicy; + } + @JsonProperty("providerParameters") public ProviderLoadBalancerParameters getProviderParameters() { return providerParameters; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MTUMigration.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MTUMigration.java new file mode 100644 index 00000000000..44aebf4c63b --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MTUMigration.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.operator.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", + "machine", + "network" +}) +@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 MTUMigration implements KubernetesResource +{ + + @JsonProperty("machine") + private MTUMigrationValues machine; + @JsonProperty("network") + private MTUMigrationValues network; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MTUMigration() { + } + + /** + * + * @param machine + * @param network + */ + public MTUMigration(MTUMigrationValues machine, MTUMigrationValues network) { + super(); + this.machine = machine; + this.network = network; + } + + @JsonProperty("machine") + public MTUMigrationValues getMachine() { + return machine; + } + + @JsonProperty("machine") + public void setMachine(MTUMigrationValues machine) { + this.machine = machine; + } + + @JsonProperty("network") + public MTUMigrationValues getNetwork() { + return network; + } + + @JsonProperty("network") + public void setNetwork(MTUMigrationValues network) { + this.network = network; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MTUMigrationValues.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MTUMigrationValues.java new file mode 100644 index 00000000000..457f84009e4 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/MTUMigrationValues.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.operator.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", + "from", + "to" +}) +@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 MTUMigrationValues implements KubernetesResource +{ + + @JsonProperty("from") + private Integer from; + @JsonProperty("to") + private Integer to; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MTUMigrationValues() { + } + + /** + * + * @param from + * @param to + */ + public MTUMigrationValues(Integer from, Integer to) { + super(); + this.from = from; + this.to = to; + } + + @JsonProperty("from") + public Integer getFrom() { + return from; + } + + @JsonProperty("from") + public void setFrom(Integer from) { + this.from = from; + } + + @JsonProperty("to") + public Integer getTo() { + return to; + } + + @JsonProperty("to") + public void setTo(Integer to) { + this.to = to; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkMigration.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkMigration.java index e69902f2d45..cd9f472b11f 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkMigration.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NetworkMigration.java @@ -33,6 +33,8 @@ "apiVersion", "kind", "metadata", + "features", + "mtu", "networkType" }) @ToString @@ -56,6 +58,10 @@ public class NetworkMigration implements KubernetesResource { + @JsonProperty("features") + private FeaturesMigration features; + @JsonProperty("mtu") + private MTUMigration mtu; @JsonProperty("networkType") private String networkType; @JsonIgnore @@ -70,13 +76,37 @@ public NetworkMigration() { /** * + * @param features * @param networkType + * @param mtu */ - public NetworkMigration(String networkType) { + public NetworkMigration(FeaturesMigration features, MTUMigration mtu, String networkType) { super(); + this.features = features; + this.mtu = mtu; this.networkType = networkType; } + @JsonProperty("features") + public FeaturesMigration getFeatures() { + return features; + } + + @JsonProperty("features") + public void setFeatures(FeaturesMigration features) { + this.features = features; + } + + @JsonProperty("mtu") + public MTUMigration getMtu() { + return mtu; + } + + @JsonProperty("mtu") + public void setMtu(MTUMigration mtu) { + this.mtu = mtu; + } + @JsonProperty("networkType") public String getNetworkType() { return networkType; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OVNKubernetesConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OVNKubernetesConfig.java index 71e003518a7..b697b234e9d 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OVNKubernetesConfig.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OVNKubernetesConfig.java @@ -33,11 +33,15 @@ "apiVersion", "kind", "metadata", + "egressIPConfig", + "gatewayConfig", "genevePort", "hybridOverlayConfig", "ipsecConfig", "mtu", - "policyAuditConfig" + "policyAuditConfig", + "v4InternalSubnet", + "v6InternalSubnet" }) @ToString @EqualsAndHashCode @@ -60,6 +64,10 @@ public class OVNKubernetesConfig implements KubernetesResource { + @JsonProperty("egressIPConfig") + private EgressIPConfig egressIPConfig; + @JsonProperty("gatewayConfig") + private GatewayConfig gatewayConfig; @JsonProperty("genevePort") private Integer genevePort; @JsonProperty("hybridOverlayConfig") @@ -70,6 +78,10 @@ public class OVNKubernetesConfig implements KubernetesResource private Integer mtu; @JsonProperty("policyAuditConfig") private PolicyAuditConfig policyAuditConfig; + @JsonProperty("v4InternalSubnet") + private String v4InternalSubnet; + @JsonProperty("v6InternalSubnet") + private String v6InternalSubnet; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -84,17 +96,45 @@ public OVNKubernetesConfig() { * * @param policyAuditConfig * @param genevePort + * @param v6InternalSubnet * @param hybridOverlayConfig + * @param egressIPConfig + * @param v4InternalSubnet * @param ipsecConfig + * @param gatewayConfig * @param mtu */ - public OVNKubernetesConfig(Integer genevePort, HybridOverlayConfig hybridOverlayConfig, IPsecConfig ipsecConfig, Integer mtu, PolicyAuditConfig policyAuditConfig) { + public OVNKubernetesConfig(EgressIPConfig egressIPConfig, GatewayConfig gatewayConfig, Integer genevePort, HybridOverlayConfig hybridOverlayConfig, IPsecConfig ipsecConfig, Integer mtu, PolicyAuditConfig policyAuditConfig, String v4InternalSubnet, String v6InternalSubnet) { super(); + this.egressIPConfig = egressIPConfig; + this.gatewayConfig = gatewayConfig; this.genevePort = genevePort; this.hybridOverlayConfig = hybridOverlayConfig; this.ipsecConfig = ipsecConfig; this.mtu = mtu; this.policyAuditConfig = policyAuditConfig; + this.v4InternalSubnet = v4InternalSubnet; + this.v6InternalSubnet = v6InternalSubnet; + } + + @JsonProperty("egressIPConfig") + public EgressIPConfig getEgressIPConfig() { + return egressIPConfig; + } + + @JsonProperty("egressIPConfig") + public void setEgressIPConfig(EgressIPConfig egressIPConfig) { + this.egressIPConfig = egressIPConfig; + } + + @JsonProperty("gatewayConfig") + public GatewayConfig getGatewayConfig() { + return gatewayConfig; + } + + @JsonProperty("gatewayConfig") + public void setGatewayConfig(GatewayConfig gatewayConfig) { + this.gatewayConfig = gatewayConfig; } @JsonProperty("genevePort") @@ -147,6 +187,26 @@ public void setPolicyAuditConfig(PolicyAuditConfig policyAuditConfig) { this.policyAuditConfig = policyAuditConfig; } + @JsonProperty("v4InternalSubnet") + public String getV4InternalSubnet() { + return v4InternalSubnet; + } + + @JsonProperty("v4InternalSubnet") + public void setV4InternalSubnet(String v4InternalSubnet) { + this.v4InternalSubnet = v4InternalSubnet; + } + + @JsonProperty("v6InternalSubnet") + public String getV6InternalSubnet() { + return v6InternalSubnet; + } + + @JsonProperty("v6InternalSubnet") + public void setV6InternalSubnet(String v6InternalSubnet) { + this.v6InternalSubnet = v6InternalSubnet; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Perspective.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Perspective.java new file mode 100644 index 00000000000..00274739f8a --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Perspective.java @@ -0,0 +1,133 @@ + +package io.fabric8.openshift.api.model.operator.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", + "id", + "pinnedResources", + "visibility" +}) +@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 Perspective implements KubernetesResource +{ + + @JsonProperty("id") + private String id; + @JsonProperty("pinnedResources") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List pinnedResources = new ArrayList(); + @JsonProperty("visibility") + private PerspectiveVisibility visibility; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Perspective() { + } + + /** + * + * @param visibility + * @param id + * @param pinnedResources + */ + public Perspective(String id, List pinnedResources, PerspectiveVisibility visibility) { + super(); + this.id = id; + this.pinnedResources = pinnedResources; + this.visibility = visibility; + } + + @JsonProperty("id") + public String getId() { + return id; + } + + @JsonProperty("id") + public void setId(String id) { + this.id = id; + } + + @JsonProperty("pinnedResources") + public List getPinnedResources() { + return pinnedResources; + } + + @JsonProperty("pinnedResources") + public void setPinnedResources(List pinnedResources) { + this.pinnedResources = pinnedResources; + } + + @JsonProperty("visibility") + public PerspectiveVisibility getVisibility() { + return visibility; + } + + @JsonProperty("visibility") + public void setVisibility(PerspectiveVisibility visibility) { + this.visibility = visibility; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PerspectiveVisibility.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PerspectiveVisibility.java new file mode 100644 index 00000000000..764084e95c6 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PerspectiveVisibility.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.operator.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", + "accessReview", + "state" +}) +@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 PerspectiveVisibility implements KubernetesResource +{ + + @JsonProperty("accessReview") + private ResourceAttributesAccessReview accessReview; + @JsonProperty("state") + private String state; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PerspectiveVisibility() { + } + + /** + * + * @param accessReview + * @param state + */ + public PerspectiveVisibility(ResourceAttributesAccessReview accessReview, String state) { + super(); + this.accessReview = accessReview; + this.state = state; + } + + @JsonProperty("accessReview") + public ResourceAttributesAccessReview getAccessReview() { + return accessReview; + } + + @JsonProperty("accessReview") + public void setAccessReview(ResourceAttributesAccessReview accessReview) { + this.accessReview = accessReview; + } + + @JsonProperty("state") + public String getState() { + return state; + } + + @JsonProperty("state") + public void setState(String state) { + this.state = state; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PinnedResourceReference.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PinnedResourceReference.java new file mode 100644 index 00000000000..68d41094154 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PinnedResourceReference.java @@ -0,0 +1,130 @@ + +package io.fabric8.openshift.api.model.operator.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", + "group", + "resource", + "version" +}) +@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 PinnedResourceReference implements KubernetesResource +{ + + @JsonProperty("group") + private String group; + @JsonProperty("resource") + private String resource; + @JsonProperty("version") + private String version; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PinnedResourceReference() { + } + + /** + * + * @param resource + * @param version + * @param group + */ + public PinnedResourceReference(String group, String resource, String version) { + super(); + this.group = group; + this.resource = resource; + this.version = version; + } + + @JsonProperty("group") + public String getGroup() { + return group; + } + + @JsonProperty("group") + public void setGroup(String group) { + this.group = group; + } + + @JsonProperty("resource") + public String getResource() { + return resource; + } + + @JsonProperty("resource") + public void setResource(String resource) { + this.resource = resource; + } + + @JsonProperty("version") + public String getVersion() { + return version; + } + + @JsonProperty("version") + public void setVersion(String version) { + this.version = version; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PolicyAuditConfig.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PolicyAuditConfig.java index 18a51ad1a86..6f9b7e0acef 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PolicyAuditConfig.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PolicyAuditConfig.java @@ -35,6 +35,7 @@ "metadata", "destination", "maxFileSize", + "maxLogFiles", "rateLimit", "syslogFacility" }) @@ -63,6 +64,8 @@ public class PolicyAuditConfig implements KubernetesResource private String destination; @JsonProperty("maxFileSize") private Integer maxFileSize; + @JsonProperty("maxLogFiles") + private Integer maxLogFiles; @JsonProperty("rateLimit") private Integer rateLimit; @JsonProperty("syslogFacility") @@ -80,14 +83,16 @@ public PolicyAuditConfig() { /** * * @param rateLimit + * @param maxLogFiles * @param destination * @param maxFileSize * @param syslogFacility */ - public PolicyAuditConfig(String destination, Integer maxFileSize, Integer rateLimit, String syslogFacility) { + public PolicyAuditConfig(String destination, Integer maxFileSize, Integer maxLogFiles, Integer rateLimit, String syslogFacility) { super(); this.destination = destination; this.maxFileSize = maxFileSize; + this.maxLogFiles = maxLogFiles; this.rateLimit = rateLimit; this.syslogFacility = syslogFacility; } @@ -112,6 +117,16 @@ public void setMaxFileSize(Integer maxFileSize) { this.maxFileSize = maxFileSize; } + @JsonProperty("maxLogFiles") + public Integer getMaxLogFiles() { + return maxLogFiles; + } + + @JsonProperty("maxLogFiles") + public void setMaxLogFiles(Integer maxLogFiles) { + this.maxLogFiles = maxLogFiles; + } + @JsonProperty("rateLimit") public Integer getRateLimit() { return rateLimit; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PrivateStrategy.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PrivateStrategy.java index cebe31f3b02..ed0a29b94c7 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PrivateStrategy.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/PrivateStrategy.java @@ -7,6 +7,7 @@ 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; @@ -31,7 +32,8 @@ @JsonPropertyOrder({ "apiVersion", "kind", - "metadata" + "metadata", + "protocol" }) @ToString @EqualsAndHashCode @@ -54,9 +56,37 @@ public class PrivateStrategy implements KubernetesResource { + @JsonProperty("protocol") + private String protocol; @JsonIgnore private Map additionalProperties = new HashMap(); + /** + * No args constructor for use in serialization + * + */ + public PrivateStrategy() { + } + + /** + * + * @param protocol + */ + public PrivateStrategy(String protocol) { + super(); + this.protocol = protocol; + } + + @JsonProperty("protocol") + public String getProtocol() { + return protocol; + } + + @JsonProperty("protocol") + public void setProtocol(String protocol) { + this.protocol = protocol; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ProviderLoadBalancerParameters.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ProviderLoadBalancerParameters.java index 2a0f60cbb8d..bfad19a678a 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ProviderLoadBalancerParameters.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ProviderLoadBalancerParameters.java @@ -35,6 +35,7 @@ "metadata", "aws", "gcp", + "ibm", "type" }) @ToString @@ -62,6 +63,8 @@ public class ProviderLoadBalancerParameters implements KubernetesResource private AWSLoadBalancerParameters aws; @JsonProperty("gcp") private GCPLoadBalancerParameters gcp; + @JsonProperty("ibm") + private IBMLoadBalancerParameters ibm; @JsonProperty("type") private String type; @JsonIgnore @@ -77,13 +80,15 @@ public ProviderLoadBalancerParameters() { /** * * @param gcp + * @param ibm * @param aws * @param type */ - public ProviderLoadBalancerParameters(AWSLoadBalancerParameters aws, GCPLoadBalancerParameters gcp, String type) { + public ProviderLoadBalancerParameters(AWSLoadBalancerParameters aws, GCPLoadBalancerParameters gcp, IBMLoadBalancerParameters ibm, String type) { super(); this.aws = aws; this.gcp = gcp; + this.ibm = ibm; this.type = type; } @@ -107,6 +112,16 @@ public void setGcp(GCPLoadBalancerParameters gcp) { this.gcp = gcp; } + @JsonProperty("ibm") + public IBMLoadBalancerParameters getIbm() { + return ibm; + } + + @JsonProperty("ibm") + public void setIbm(IBMLoadBalancerParameters ibm) { + this.ibm = ibm; + } + @JsonProperty("type") public String getType() { return type; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ResourceAttributesAccessReview.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ResourceAttributesAccessReview.java new file mode 100644 index 00000000000..7eef64a28b7 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ResourceAttributesAccessReview.java @@ -0,0 +1,118 @@ + +package io.fabric8.openshift.api.model.operator.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.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes; +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", + "missing", + "required" +}) +@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 ResourceAttributesAccessReview implements KubernetesResource +{ + + @JsonProperty("missing") + private List missing = new ArrayList(); + @JsonProperty("required") + private List required = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ResourceAttributesAccessReview() { + } + + /** + * + * @param missing + * @param required + */ + public ResourceAttributesAccessReview(List missing, List required) { + super(); + this.missing = missing; + this.required = required; + } + + @JsonProperty("missing") + public List getMissing() { + return missing; + } + + @JsonProperty("missing") + public void setMissing(List missing) { + this.missing = missing; + } + + @JsonProperty("required") + public List getRequired() { + return required; + } + + @JsonProperty("required") + public void setRequired(List required) { + this.required = required; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceAccountIssuerStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceAccountIssuerStatus.java new file mode 100644 index 00000000000..1edb65d542f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceAccountIssuerStatus.java @@ -0,0 +1,115 @@ + +package io.fabric8.openshift.api.model.operator.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", + "expirationTime", + "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 ServiceAccountIssuerStatus implements KubernetesResource +{ + + @JsonProperty("expirationTime") + private String expirationTime; + @JsonProperty("name") + private java.lang.String name; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ServiceAccountIssuerStatus() { + } + + /** + * + * @param expirationTime + * @param name + */ + public ServiceAccountIssuerStatus(String expirationTime, java.lang.String name) { + super(); + this.expirationTime = expirationTime; + this.name = name; + } + + @JsonProperty("expirationTime") + public String getExpirationTime() { + return expirationTime; + } + + @JsonProperty("expirationTime") + public void setExpirationTime(String expirationTime) { + this.expirationTime = expirationTime; + } + + @JsonProperty("name") + public java.lang.String getName() { + return name; + } + + @JsonProperty("name") + public void setName(java.lang.String name) { + this.name = name; + } + + @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/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StorageSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StorageSpec.java index 1ccf60a8273..e8e96d64620 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StorageSpec.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/StorageSpec.java @@ -39,7 +39,8 @@ "managementState", "observedConfig", "operatorLogLevel", - "unsupportedConfigOverrides" + "unsupportedConfigOverrides", + "vsphereStorageDriver" }) @ToString @EqualsAndHashCode @@ -74,6 +75,8 @@ public class StorageSpec implements KubernetesResource private String operatorLogLevel; @JsonProperty("unsupportedConfigOverrides") private KubernetesResource unsupportedConfigOverrides; + @JsonProperty("vsphereStorageDriver") + private String vsphereStorageDriver; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -86,19 +89,21 @@ public StorageSpec() { /** * + * @param vsphereStorageDriver * @param logLevel * @param unsupportedConfigOverrides * @param operatorLogLevel * @param observedConfig * @param managementState */ - public StorageSpec(String logLevel, String managementState, KubernetesResource observedConfig, String operatorLogLevel, KubernetesResource unsupportedConfigOverrides) { + public StorageSpec(String logLevel, String managementState, KubernetesResource observedConfig, String operatorLogLevel, KubernetesResource unsupportedConfigOverrides, String vsphereStorageDriver) { super(); this.logLevel = logLevel; this.managementState = managementState; this.observedConfig = observedConfig; this.operatorLogLevel = operatorLogLevel; this.unsupportedConfigOverrides = unsupportedConfigOverrides; + this.vsphereStorageDriver = vsphereStorageDriver; } @JsonProperty("logLevel") @@ -151,6 +156,16 @@ public void setUnsupportedConfigOverrides(KubernetesResource unsupportedConfigOv this.unsupportedConfigOverrides = unsupportedConfigOverrides; } + @JsonProperty("vsphereStorageDriver") + public String getVsphereStorageDriver() { + return vsphereStorageDriver; + } + + @JsonProperty("vsphereStorageDriver") + public void setVsphereStorageDriver(String vsphereStorageDriver) { + this.vsphereStorageDriver = vsphereStorageDriver; + } + @JsonAnyGetter public Map getAdditionalProperties() { return this.additionalProperties; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/UpstreamResolvers.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/UpstreamResolvers.java index 378c7616a2a..fb36c6eb899 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/UpstreamResolvers.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/UpstreamResolvers.java @@ -36,6 +36,8 @@ "kind", "metadata", "policy", + "protocolStrategy", + "transportConfig", "upstreams" }) @ToString @@ -61,6 +63,10 @@ public class UpstreamResolvers implements KubernetesResource @JsonProperty("policy") private String policy; + @JsonProperty("protocolStrategy") + private String protocolStrategy; + @JsonProperty("transportConfig") + private DNSTransportConfig transportConfig; @JsonProperty("upstreams") private List upstreams = new ArrayList(); @JsonIgnore @@ -75,12 +81,16 @@ public UpstreamResolvers() { /** * + * @param protocolStrategy * @param upstreams + * @param transportConfig * @param policy */ - public UpstreamResolvers(String policy, List upstreams) { + public UpstreamResolvers(String policy, String protocolStrategy, DNSTransportConfig transportConfig, List upstreams) { super(); this.policy = policy; + this.protocolStrategy = protocolStrategy; + this.transportConfig = transportConfig; this.upstreams = upstreams; } @@ -94,6 +104,26 @@ public void setPolicy(String policy) { this.policy = policy; } + @JsonProperty("protocolStrategy") + public String getProtocolStrategy() { + return protocolStrategy; + } + + @JsonProperty("protocolStrategy") + public void setProtocolStrategy(String protocolStrategy) { + this.protocolStrategy = protocolStrategy; + } + + @JsonProperty("transportConfig") + public DNSTransportConfig getTransportConfig() { + return transportConfig; + } + + @JsonProperty("transportConfig") + public void setTransportConfig(DNSTransportConfig transportConfig) { + this.transportConfig = transportConfig; + } + @JsonProperty("upstreams") public List getUpstreams() { return upstreams; diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/VSphereCSIDriverConfigSpec.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/VSphereCSIDriverConfigSpec.java new file mode 100644 index 00000000000..ee7f6f29920 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/VSphereCSIDriverConfigSpec.java @@ -0,0 +1,103 @@ + +package io.fabric8.openshift.api.model.operator.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", + "topologyCategories" +}) +@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 VSphereCSIDriverConfigSpec implements KubernetesResource +{ + + @JsonProperty("topologyCategories") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List topologyCategories = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public VSphereCSIDriverConfigSpec() { + } + + /** + * + * @param topologyCategories + */ + public VSphereCSIDriverConfigSpec(List topologyCategories) { + super(); + this.topologyCategories = topologyCategories; + } + + @JsonProperty("topologyCategories") + public List getTopologyCategories() { + return topologyCategories; + } + + @JsonProperty("topologyCategories") + public void setTopologyCategories(List topologyCategories) { + this.topologyCategories = topologyCategories; + } + + @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/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 870255649da..35a2be4ba01 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 @@ -3,6 +3,37 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$module": "operator", "definitions": { + "k8s_io_api_authorization_v1_ResourceAttributes": { + "type": "object", + "properties": { + "group": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + }, + "resource": { + "type": "string" + }, + "subresource": { + "type": "string" + }, + "verb": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_apimachinery_APIGroup": { "type": "object", "properties": { @@ -1388,8 +1419,27 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_AWSCSIDriverConfigSpec": { + "type": "object", + "properties": { + "kmsKeyARN": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.AWSCSIDriverConfigSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_AWSClassicLoadBalancerParameters": { "type": "object", + "properties": { + "connectionIdleTimeout": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + } + }, "additionalProperties": true, "javaType": "io.fabric8.openshift.api.model.operator.v1.AWSClassicLoadBalancerParameters", "javaInterfaces": [ @@ -1631,6 +1681,68 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_AzureCSIDriverConfigSpec": { + "type": "object", + "properties": { + "diskEncryptionSet": { + "$ref": "#/definitions/os_operator_v1_AzureDiskEncryptionSet", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.AzureDiskEncryptionSet" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.AzureCSIDriverConfigSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_AzureDiskEncryptionSet": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "resourceGroup": { + "type": "string" + }, + "subscriptionID": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.AzureDiskEncryptionSet", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_CSIDriverConfigSpec": { + "type": "object", + "properties": { + "aws": { + "$ref": "#/definitions/os_operator_v1_AWSCSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.AWSCSIDriverConfigSpec" + }, + "azure": { + "$ref": "#/definitions/os_operator_v1_AzureCSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.AzureCSIDriverConfigSpec" + }, + "driverType": { + "type": "string" + }, + "gcp": { + "$ref": "#/definitions/os_operator_v1_GCPCSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.GCPCSIDriverConfigSpec" + }, + "vSphere": { + "$ref": "#/definitions/os_operator_v1_VSphereCSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.VSphereCSIDriverConfigSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.CSIDriverConfigSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_CSISnapshotController": { "type": "object", "properties": { @@ -1979,6 +2091,10 @@ "os_operator_v1_ClusterCSIDriverSpec": { "type": "object", "properties": { + "driverConfig": { + "$ref": "#/definitions/os_operator_v1_CSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.CSIDriverConfigSpec" + }, "logLevel": { "type": "string" }, @@ -1992,6 +2108,9 @@ "operatorLogLevel": { "type": "string" }, + "storageClassState": { + "type": "string" + }, "unsupportedConfigOverrides": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_runtime_RawExtension", "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesResource" @@ -2255,6 +2374,13 @@ "documentationBaseURL": { "type": "string" }, + "perspectives": { + "type": "array", + "items": { + "$ref": "#/definitions/os_operator_v1_Perspective", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.Perspective" + } + }, "projectAccess": { "$ref": "#/definitions/os_operator_v1_ProjectAccess", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.ProjectAccess" @@ -2400,6 +2526,11 @@ }, "os_operator_v1_ContainerLoggingDestinationParameters": { "type": "object", + "properties": { + "maxLength": { + "type": "integer" + } + }, "additionalProperties": true, "javaType": "io.fabric8.openshift.api.model.operator.v1.ContainerLoggingDestinationParameters", "javaInterfaces": [ @@ -2438,6 +2569,24 @@ "io.fabric8.kubernetes.api.model.HasMetadata" ] }, + "os_operator_v1_DNSCache": { + "type": "object", + "properties": { + "negativeTTL": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + }, + "positiveTTL": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.DNSCache", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_DNSList": { "type": "object", "properties": { @@ -2495,6 +2644,23 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_DNSOverTLSConfig": { + "type": "object", + "properties": { + "caBundle": { + "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" + }, + "serverName": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.DNSOverTLSConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_DNSRecord": { "type": "object", "properties": { @@ -2563,6 +2729,9 @@ "os_operator_v1_DNSRecordSpec": { "type": "object", "properties": { + "dnsManagementPolicy": { + "type": "string" + }, "dnsName": { "type": "string" }, @@ -2611,6 +2780,10 @@ "os_operator_v1_DNSSpec": { "type": "object", "properties": { + "cache": { + "$ref": "#/definitions/os_operator_v1_DNSCache", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DNSCache" + }, "logLevel": { "type": "string" }, @@ -2667,6 +2840,23 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_DNSTransportConfig": { + "type": "object", + "properties": { + "tls": { + "$ref": "#/definitions/os_operator_v1_DNSOverTLSConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DNSOverTLSConfig" + }, + "transport": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.DNSTransportConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_DNSZoneCondition": { "type": "object", "properties": { @@ -2804,6 +2994,10 @@ "$ref": "#/definitions/os_operator_v1_DeveloperConsoleCatalogCategory", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DeveloperConsoleCatalogCategory" } + }, + "types": { + "$ref": "#/definitions/os_operator_v1_DeveloperConsoleCatalogTypes", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DeveloperConsoleCatalogTypes" } }, "additionalProperties": true, @@ -2812,6 +3006,46 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_DeveloperConsoleCatalogTypes": { + "type": "object", + "properties": { + "disabled": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "enabled": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "state": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.DeveloperConsoleCatalogTypes", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_EgressIPConfig": { + "type": "object", + "properties": { + "reachabilityTotalTimeoutSeconds": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.EgressIPConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_EndpointPublishingStrategy": { "type": "object", "properties": { @@ -3013,12 +3247,38 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_FeaturesMigration": { + "type": "object", + "properties": { + "egressFirewall": { + "type": "boolean" + }, + "egressIP": { + "type": "boolean" + }, + "multicast": { + "type": "boolean" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.FeaturesMigration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_ForwardPlugin": { "type": "object", "properties": { "policy": { "type": "string" }, + "protocolStrategy": { + "type": "string" + }, + "transportConfig": { + "$ref": "#/definitions/os_operator_v1_DNSTransportConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DNSTransportConfig" + }, "upstreams": { "type": "array", "items": { @@ -3032,6 +3292,42 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_GCPCSIDriverConfigSpec": { + "type": "object", + "properties": { + "kmsKey": { + "$ref": "#/definitions/os_operator_v1_GCPKMSKeyReference", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.GCPKMSKeyReference" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.GCPCSIDriverConfigSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_GCPKMSKeyReference": { + "type": "object", + "properties": { + "keyRing": { + "type": "string" + }, + "location": { + "type": "string" + }, + "name": { + "type": "string" + }, + "projectID": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.GCPKMSKeyReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_GCPLoadBalancerParameters": { "type": "object", "properties": { @@ -3045,6 +3341,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_GatewayConfig": { + "type": "object", + "properties": { + "ipForwarding": { + "type": "string" + }, + "routingViaHost": { + "type": "boolean" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.GatewayConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_GenerationStatus": { "type": "object", "properties": { @@ -3094,8 +3406,17 @@ "os_operator_v1_HostNetworkStrategy": { "type": "object", "properties": { + "httpPort": { + "type": "integer" + }, + "httpsPort": { + "type": "integer" + }, "protocol": { "type": "string" + }, + "statsPort": { + "type": "integer" } }, "additionalProperties": true, @@ -3124,6 +3445,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_IBMLoadBalancerParameters": { + "type": "object", + "properties": { + "protocol": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.IBMLoadBalancerParameters", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_IPAMConfig": { "type": "object", "properties": { @@ -3464,10 +3798,18 @@ "$ref": "#/definitions/os_operator_v1_EndpointPublishingStrategy", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.EndpointPublishingStrategy" }, + "namespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, "observedGeneration": { "type": "integer", "existingJavaType": "Long" }, + "routeSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, "selector": { "type": "string" }, @@ -3499,6 +3841,17 @@ "headerBufferMaxRewriteBytes": { "type": "integer" }, + "healthCheckInterval": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + }, + "maxConnections": { + "type": "integer" + }, + "reloadInterval": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + }, "serverFinTimeout": { "$ref": "#/definitions/kubernetes_apimachinery_Duration", "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" @@ -3665,6 +4018,14 @@ "readyReplicas": { "type": "integer" }, + "serviceAccountIssuers": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_operator_v1_ServiceAccountIssuerStatus", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.ServiceAccountIssuerStatus" + } + }, "version": { "type": "string" } @@ -4142,6 +4503,16 @@ "os_operator_v1_LoadBalancerStrategy": { "type": "object", "properties": { + "allowedSourceRanges": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "dnsManagementPolicy": { + "type": "string" + }, "providerParameters": { "$ref": "#/definitions/os_operator_v1_ProviderLoadBalancerParameters", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.ProviderLoadBalancerParameters" @@ -4177,6 +4548,40 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_MTUMigration": { + "type": "object", + "properties": { + "machine": { + "$ref": "#/definitions/os_operator_v1_MTUMigrationValues", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.MTUMigrationValues" + }, + "network": { + "$ref": "#/definitions/os_operator_v1_MTUMigrationValues", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.MTUMigrationValues" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.MTUMigration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_MTUMigrationValues": { + "type": "object", + "properties": { + "from": { + "type": "integer" + }, + "to": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.MTUMigrationValues", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_NetFlowConfig": { "type": "object", "properties": { @@ -4261,6 +4666,14 @@ "os_operator_v1_NetworkMigration": { "type": "object", "properties": { + "features": { + "$ref": "#/definitions/os_operator_v1_FeaturesMigration", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.FeaturesMigration" + }, + "mtu": { + "$ref": "#/definitions/os_operator_v1_MTUMigration", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.MTUMigration" + }, "networkType": { "type": "string" } @@ -4476,6 +4889,14 @@ "os_operator_v1_OVNKubernetesConfig": { "type": "object", "properties": { + "egressIPConfig": { + "$ref": "#/definitions/os_operator_v1_EgressIPConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.EgressIPConfig" + }, + "gatewayConfig": { + "$ref": "#/definitions/os_operator_v1_GatewayConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.GatewayConfig" + }, "genevePort": { "type": "integer" }, @@ -4493,6 +4914,12 @@ "policyAuditConfig": { "$ref": "#/definitions/os_operator_v1_PolicyAuditConfig", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.PolicyAuditConfig" + }, + "v4InternalSubnet": { + "type": "string" + }, + "v6InternalSubnet": { + "type": "string" } }, "additionalProperties": true, @@ -4872,6 +5299,67 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_Perspective": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "pinnedResources": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_operator_v1_PinnedResourceReference", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.PinnedResourceReference" + } + }, + "visibility": { + "$ref": "#/definitions/os_operator_v1_PerspectiveVisibility", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.PerspectiveVisibility" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.Perspective", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_PerspectiveVisibility": { + "type": "object", + "properties": { + "accessReview": { + "$ref": "#/definitions/os_operator_v1_ResourceAttributesAccessReview", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.ResourceAttributesAccessReview" + }, + "state": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.PerspectiveVisibility", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_PinnedResourceReference": { + "type": "object", + "properties": { + "group": { + "type": "string" + }, + "resource": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.PinnedResourceReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_PolicyAuditConfig": { "type": "object", "properties": { @@ -4881,6 +5369,9 @@ "maxFileSize": { "type": "integer" }, + "maxLogFiles": { + "type": "integer" + }, "rateLimit": { "type": "integer" }, @@ -4896,6 +5387,11 @@ }, "os_operator_v1_PrivateStrategy": { "type": "object", + "properties": { + "protocol": { + "type": "string" + } + }, "additionalProperties": true, "javaType": "io.fabric8.openshift.api.model.operator.v1.PrivateStrategy", "javaInterfaces": [ @@ -4930,6 +5426,10 @@ "$ref": "#/definitions/os_operator_v1_GCPLoadBalancerParameters", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.GCPLoadBalancerParameters" }, + "ibm": { + "$ref": "#/definitions/os_operator_v1_IBMLoadBalancerParameters", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.IBMLoadBalancerParameters" + }, "type": { "type": "string" } @@ -4983,6 +5483,30 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_ResourceAttributesAccessReview": { + "type": "object", + "properties": { + "missing": { + "type": "array", + "items": { + "$ref": "#/definitions/k8s_io_api_authorization_v1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" + } + }, + "required": { + "type": "array", + "items": { + "$ref": "#/definitions/k8s_io_api_authorization_v1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.ResourceAttributesAccessReview", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_RouteAdmissionPolicy": { "type": "object", "properties": { @@ -5039,6 +5563,23 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_ServiceAccountIssuerStatus": { + "type": "object", + "properties": { + "expirationTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.ServiceAccountIssuerStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_ServiceCA": { "type": "object", "properties": { @@ -5714,6 +6255,9 @@ "unsupportedConfigOverrides": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_runtime_RawExtension", "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesResource" + }, + "vsphereStorageDriver": { + "type": "string" } }, "additionalProperties": true, @@ -5805,6 +6349,13 @@ "policy": { "type": "string" }, + "protocolStrategy": { + "type": "string" + }, + "transportConfig": { + "$ref": "#/definitions/os_operator_v1_DNSTransportConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DNSTransportConfig" + }, "upstreams": { "type": "array", "items": { @@ -5819,6 +6370,23 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_VSphereCSIDriverConfigSpec": { + "type": "object", + "properties": { + "topologyCategories": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.VSphereCSIDriverConfigSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1alpha1_ImageContentSourcePolicy": { "type": "object", "properties": { 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 3b88f32aa2e..c8f759d8c0a 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 @@ -3,6 +3,37 @@ "$schema": "http://json-schema.org/draft-07/schema#", "$module": "operator", "definitions": { + "k8s_io_api_authorization_v1_ResourceAttributes": { + "type": "object", + "properties": { + "group": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + }, + "resource": { + "type": "string" + }, + "subresource": { + "type": "string" + }, + "verb": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_apimachinery_APIGroup": { "type": "object", "properties": { @@ -1388,8 +1419,27 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_AWSCSIDriverConfigSpec": { + "type": "object", + "properties": { + "kmsKeyARN": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.AWSCSIDriverConfigSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_AWSClassicLoadBalancerParameters": { "type": "object", + "properties": { + "connectionIdleTimeout": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + } + }, "additionalProperties": true, "javaType": "io.fabric8.openshift.api.model.operator.v1.AWSClassicLoadBalancerParameters", "javaInterfaces": [ @@ -1631,6 +1681,68 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_AzureCSIDriverConfigSpec": { + "type": "object", + "properties": { + "diskEncryptionSet": { + "$ref": "#/definitions/os_operator_v1_AzureDiskEncryptionSet", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.AzureDiskEncryptionSet" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.AzureCSIDriverConfigSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_AzureDiskEncryptionSet": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "resourceGroup": { + "type": "string" + }, + "subscriptionID": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.AzureDiskEncryptionSet", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_CSIDriverConfigSpec": { + "type": "object", + "properties": { + "aws": { + "$ref": "#/definitions/os_operator_v1_AWSCSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.AWSCSIDriverConfigSpec" + }, + "azure": { + "$ref": "#/definitions/os_operator_v1_AzureCSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.AzureCSIDriverConfigSpec" + }, + "driverType": { + "type": "string" + }, + "gcp": { + "$ref": "#/definitions/os_operator_v1_GCPCSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.GCPCSIDriverConfigSpec" + }, + "vSphere": { + "$ref": "#/definitions/os_operator_v1_VSphereCSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.VSphereCSIDriverConfigSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.CSIDriverConfigSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_CSISnapshotController": { "type": "object", "properties": { @@ -1979,6 +2091,10 @@ "os_operator_v1_ClusterCSIDriverSpec": { "type": "object", "properties": { + "driverConfig": { + "$ref": "#/definitions/os_operator_v1_CSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.CSIDriverConfigSpec" + }, "logLevel": { "type": "string" }, @@ -1992,6 +2108,9 @@ "operatorLogLevel": { "type": "string" }, + "storageClassState": { + "type": "string" + }, "unsupportedConfigOverrides": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_runtime_RawExtension", "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesResource" @@ -2255,6 +2374,13 @@ "documentationBaseURL": { "type": "string" }, + "perspectives": { + "type": "array", + "items": { + "$ref": "#/definitions/os_operator_v1_Perspective", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.Perspective" + } + }, "projectAccess": { "$ref": "#/definitions/os_operator_v1_ProjectAccess", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.ProjectAccess" @@ -2400,6 +2526,11 @@ }, "os_operator_v1_ContainerLoggingDestinationParameters": { "type": "object", + "properties": { + "maxLength": { + "type": "integer" + } + }, "additionalProperties": true, "javaType": "io.fabric8.openshift.api.model.operator.v1.ContainerLoggingDestinationParameters", "javaInterfaces": [ @@ -2438,6 +2569,24 @@ "io.fabric8.kubernetes.api.model.HasMetadata" ] }, + "os_operator_v1_DNSCache": { + "type": "object", + "properties": { + "negativeTTL": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + }, + "positiveTTL": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.DNSCache", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_DNSList": { "type": "object", "properties": { @@ -2495,6 +2644,23 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_DNSOverTLSConfig": { + "type": "object", + "properties": { + "caBundle": { + "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" + }, + "serverName": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.DNSOverTLSConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_DNSRecord": { "type": "object", "properties": { @@ -2563,6 +2729,9 @@ "os_operator_v1_DNSRecordSpec": { "type": "object", "properties": { + "dnsManagementPolicy": { + "type": "string" + }, "dnsName": { "type": "string" }, @@ -2611,6 +2780,10 @@ "os_operator_v1_DNSSpec": { "type": "object", "properties": { + "cache": { + "$ref": "#/definitions/os_operator_v1_DNSCache", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DNSCache" + }, "logLevel": { "type": "string" }, @@ -2667,6 +2840,23 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_DNSTransportConfig": { + "type": "object", + "properties": { + "tls": { + "$ref": "#/definitions/os_operator_v1_DNSOverTLSConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DNSOverTLSConfig" + }, + "transport": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.DNSTransportConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_DNSZoneCondition": { "type": "object", "properties": { @@ -2804,6 +2994,10 @@ "$ref": "#/definitions/os_operator_v1_DeveloperConsoleCatalogCategory", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DeveloperConsoleCatalogCategory" } + }, + "types": { + "$ref": "#/definitions/os_operator_v1_DeveloperConsoleCatalogTypes", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DeveloperConsoleCatalogTypes" } }, "additionalProperties": true, @@ -2812,6 +3006,46 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_DeveloperConsoleCatalogTypes": { + "type": "object", + "properties": { + "disabled": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "enabled": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "state": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.DeveloperConsoleCatalogTypes", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_EgressIPConfig": { + "type": "object", + "properties": { + "reachabilityTotalTimeoutSeconds": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.EgressIPConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_EndpointPublishingStrategy": { "type": "object", "properties": { @@ -3013,12 +3247,38 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_FeaturesMigration": { + "type": "object", + "properties": { + "egressFirewall": { + "type": "boolean" + }, + "egressIP": { + "type": "boolean" + }, + "multicast": { + "type": "boolean" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.FeaturesMigration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_ForwardPlugin": { "type": "object", "properties": { "policy": { "type": "string" }, + "protocolStrategy": { + "type": "string" + }, + "transportConfig": { + "$ref": "#/definitions/os_operator_v1_DNSTransportConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DNSTransportConfig" + }, "upstreams": { "type": "array", "items": { @@ -3032,6 +3292,42 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_GCPCSIDriverConfigSpec": { + "type": "object", + "properties": { + "kmsKey": { + "$ref": "#/definitions/os_operator_v1_GCPKMSKeyReference", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.GCPKMSKeyReference" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.GCPCSIDriverConfigSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_GCPKMSKeyReference": { + "type": "object", + "properties": { + "keyRing": { + "type": "string" + }, + "location": { + "type": "string" + }, + "name": { + "type": "string" + }, + "projectID": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.GCPKMSKeyReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_GCPLoadBalancerParameters": { "type": "object", "properties": { @@ -3045,6 +3341,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_GatewayConfig": { + "type": "object", + "properties": { + "ipForwarding": { + "type": "string" + }, + "routingViaHost": { + "type": "boolean" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.GatewayConfig", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_GenerationStatus": { "type": "object", "properties": { @@ -3094,8 +3406,17 @@ "os_operator_v1_HostNetworkStrategy": { "type": "object", "properties": { + "httpPort": { + "type": "integer" + }, + "httpsPort": { + "type": "integer" + }, "protocol": { "type": "string" + }, + "statsPort": { + "type": "integer" } }, "additionalProperties": true, @@ -3124,6 +3445,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_IBMLoadBalancerParameters": { + "type": "object", + "properties": { + "protocol": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.IBMLoadBalancerParameters", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_IPAMConfig": { "type": "object", "properties": { @@ -3464,10 +3798,18 @@ "$ref": "#/definitions/os_operator_v1_EndpointPublishingStrategy", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.EndpointPublishingStrategy" }, + "namespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, "observedGeneration": { "type": "integer", "existingJavaType": "Long" }, + "routeSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, "selector": { "type": "string" }, @@ -3499,6 +3841,17 @@ "headerBufferMaxRewriteBytes": { "type": "integer" }, + "healthCheckInterval": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + }, + "maxConnections": { + "type": "integer" + }, + "reloadInterval": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + }, "serverFinTimeout": { "$ref": "#/definitions/kubernetes_apimachinery_Duration", "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" @@ -3665,6 +4018,14 @@ "readyReplicas": { "type": "integer" }, + "serviceAccountIssuers": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_operator_v1_ServiceAccountIssuerStatus", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.ServiceAccountIssuerStatus" + } + }, "version": { "type": "string" } @@ -4142,6 +4503,16 @@ "os_operator_v1_LoadBalancerStrategy": { "type": "object", "properties": { + "allowedSourceRanges": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "dnsManagementPolicy": { + "type": "string" + }, "providerParameters": { "$ref": "#/definitions/os_operator_v1_ProviderLoadBalancerParameters", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.ProviderLoadBalancerParameters" @@ -4177,6 +4548,40 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_MTUMigration": { + "type": "object", + "properties": { + "machine": { + "$ref": "#/definitions/os_operator_v1_MTUMigrationValues", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.MTUMigrationValues" + }, + "network": { + "$ref": "#/definitions/os_operator_v1_MTUMigrationValues", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.MTUMigrationValues" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.MTUMigration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_MTUMigrationValues": { + "type": "object", + "properties": { + "from": { + "type": "integer" + }, + "to": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.MTUMigrationValues", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_NetFlowConfig": { "type": "object", "properties": { @@ -4261,6 +4666,14 @@ "os_operator_v1_NetworkMigration": { "type": "object", "properties": { + "features": { + "$ref": "#/definitions/os_operator_v1_FeaturesMigration", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.FeaturesMigration" + }, + "mtu": { + "$ref": "#/definitions/os_operator_v1_MTUMigration", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.MTUMigration" + }, "networkType": { "type": "string" } @@ -4476,6 +4889,14 @@ "os_operator_v1_OVNKubernetesConfig": { "type": "object", "properties": { + "egressIPConfig": { + "$ref": "#/definitions/os_operator_v1_EgressIPConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.EgressIPConfig" + }, + "gatewayConfig": { + "$ref": "#/definitions/os_operator_v1_GatewayConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.GatewayConfig" + }, "genevePort": { "type": "integer" }, @@ -4493,6 +4914,12 @@ "policyAuditConfig": { "$ref": "#/definitions/os_operator_v1_PolicyAuditConfig", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.PolicyAuditConfig" + }, + "v4InternalSubnet": { + "type": "string" + }, + "v6InternalSubnet": { + "type": "string" } }, "additionalProperties": true, @@ -4872,6 +5299,67 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_Perspective": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "pinnedResources": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_operator_v1_PinnedResourceReference", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.PinnedResourceReference" + } + }, + "visibility": { + "$ref": "#/definitions/os_operator_v1_PerspectiveVisibility", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.PerspectiveVisibility" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.Perspective", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_PerspectiveVisibility": { + "type": "object", + "properties": { + "accessReview": { + "$ref": "#/definitions/os_operator_v1_ResourceAttributesAccessReview", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.ResourceAttributesAccessReview" + }, + "state": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.PerspectiveVisibility", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "os_operator_v1_PinnedResourceReference": { + "type": "object", + "properties": { + "group": { + "type": "string" + }, + "resource": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.PinnedResourceReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_PolicyAuditConfig": { "type": "object", "properties": { @@ -4881,6 +5369,9 @@ "maxFileSize": { "type": "integer" }, + "maxLogFiles": { + "type": "integer" + }, "rateLimit": { "type": "integer" }, @@ -4896,6 +5387,11 @@ }, "os_operator_v1_PrivateStrategy": { "type": "object", + "properties": { + "protocol": { + "type": "string" + } + }, "additionalProperties": true, "javaType": "io.fabric8.openshift.api.model.operator.v1.PrivateStrategy", "javaInterfaces": [ @@ -4930,6 +5426,10 @@ "$ref": "#/definitions/os_operator_v1_GCPLoadBalancerParameters", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.GCPLoadBalancerParameters" }, + "ibm": { + "$ref": "#/definitions/os_operator_v1_IBMLoadBalancerParameters", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.IBMLoadBalancerParameters" + }, "type": { "type": "string" } @@ -4983,6 +5483,30 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_ResourceAttributesAccessReview": { + "type": "object", + "properties": { + "missing": { + "type": "array", + "items": { + "$ref": "#/definitions/k8s_io_api_authorization_v1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" + } + }, + "required": { + "type": "array", + "items": { + "$ref": "#/definitions/k8s_io_api_authorization_v1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.ResourceAttributesAccessReview", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_RouteAdmissionPolicy": { "type": "object", "properties": { @@ -5039,6 +5563,23 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_ServiceAccountIssuerStatus": { + "type": "object", + "properties": { + "expirationTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.ServiceAccountIssuerStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1_ServiceCA": { "type": "object", "properties": { @@ -5714,6 +6255,9 @@ "unsupportedConfigOverrides": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_runtime_RawExtension", "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesResource" + }, + "vsphereStorageDriver": { + "type": "string" } }, "additionalProperties": true, @@ -5805,6 +6349,13 @@ "policy": { "type": "string" }, + "protocolStrategy": { + "type": "string" + }, + "transportConfig": { + "$ref": "#/definitions/os_operator_v1_DNSTransportConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DNSTransportConfig" + }, "upstreams": { "type": "array", "items": { @@ -5819,6 +6370,23 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_operator_v1_VSphereCSIDriverConfigSpec": { + "type": "object", + "properties": { + "topologyCategories": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.operator.v1.VSphereCSIDriverConfigSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_operator_v1alpha1_ImageContentSourcePolicy": { "type": "object", "properties": { @@ -6408,6 +6976,20 @@ "additionalProperties": true }, "awsclassicloadbalancerparameters": { + "properties": { + "connectionIdleTimeout": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + } + }, + "additionalProperties": true + }, + "awscsidriverconfigspec": { + "properties": { + "kmsKeyARN": { + "type": "string" + } + }, "additionalProperties": true }, "awsloadbalancerparameters": { @@ -6429,6 +7011,29 @@ "awsnetworkloadbalancerparameters": { "additionalProperties": true }, + "azurecsidriverconfigspec": { + "properties": { + "diskEncryptionSet": { + "$ref": "#/definitions/os_operator_v1_AzureDiskEncryptionSet", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.AzureDiskEncryptionSet" + } + }, + "additionalProperties": true + }, + "azurediskencryptionset": { + "properties": { + "name": { + "type": "string" + }, + "resourceGroup": { + "type": "string" + }, + "subscriptionID": { + "type": "string" + } + }, + "additionalProperties": true + }, "clienttls": { "properties": { "allowedSubjectPatterns": { @@ -6612,6 +7217,10 @@ }, "clustercsidriverspec": { "properties": { + "driverConfig": { + "$ref": "#/definitions/os_operator_v1_CSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.CSIDriverConfigSpec" + }, "logLevel": { "type": "string" }, @@ -6625,6 +7234,9 @@ "operatorLogLevel": { "type": "string" }, + "storageClassState": { + "type": "string" + }, "unsupportedConfigOverrides": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_runtime_RawExtension", "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesResource" @@ -6861,6 +7473,13 @@ "documentationBaseURL": { "type": "string" }, + "perspectives": { + "type": "array", + "items": { + "$ref": "#/definitions/os_operator_v1_Perspective", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.Perspective" + } + }, "projectAccess": { "$ref": "#/definitions/os_operator_v1_ProjectAccess", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.ProjectAccess" @@ -6980,6 +7599,35 @@ "additionalProperties": true }, "containerloggingdestinationparameters": { + "properties": { + "maxLength": { + "type": "integer" + } + }, + "additionalProperties": true + }, + "csidriverconfigspec": { + "properties": { + "aws": { + "$ref": "#/definitions/os_operator_v1_AWSCSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.AWSCSIDriverConfigSpec" + }, + "azure": { + "$ref": "#/definitions/os_operator_v1_AzureCSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.AzureCSIDriverConfigSpec" + }, + "driverType": { + "type": "string" + }, + "gcp": { + "$ref": "#/definitions/os_operator_v1_GCPCSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.GCPCSIDriverConfigSpec" + }, + "vSphere": { + "$ref": "#/definitions/os_operator_v1_VSphereCSIDriverConfigSpec", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.VSphereCSIDriverConfigSpec" + } + }, "additionalProperties": true }, "csisnapshotcontroller": { @@ -7166,15 +7814,41 @@ }, "additionalProperties": true }, - "developerconsolecatalogcustomization": { + "developerconsolecatalogcustomization": { + "properties": { + "categories": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_operator_v1_DeveloperConsoleCatalogCategory", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DeveloperConsoleCatalogCategory" + } + }, + "types": { + "$ref": "#/definitions/os_operator_v1_DeveloperConsoleCatalogTypes", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DeveloperConsoleCatalogTypes" + } + }, + "additionalProperties": true + }, + "developerconsolecatalogtypes": { "properties": { - "categories": { + "disabled": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/os_operator_v1_DeveloperConsoleCatalogCategory", - "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DeveloperConsoleCatalogCategory" + "type": "string" + } + }, + "enabled": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" } + }, + "state": { + "type": "string" } }, "additionalProperties": true @@ -7206,6 +7880,19 @@ }, "additionalProperties": true }, + "dnscache": { + "properties": { + "negativeTTL": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + }, + "positiveTTL": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + } + }, + "additionalProperties": true + }, "dnslist": { "properties": { "apiVersion": { @@ -7252,6 +7939,18 @@ }, "additionalProperties": true }, + "dnsovertlsconfig": { + "properties": { + "caBundle": { + "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" + }, + "serverName": { + "type": "string" + } + }, + "additionalProperties": true + }, "dnsrecord": { "properties": { "apiVersion": { @@ -7307,6 +8006,9 @@ }, "dnsrecordspec": { "properties": { + "dnsManagementPolicy": { + "type": "string" + }, "dnsName": { "type": "string" }, @@ -7345,6 +8047,10 @@ }, "dnsspec": { "properties": { + "cache": { + "$ref": "#/definitions/os_operator_v1_DNSCache", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DNSCache" + }, "logLevel": { "type": "string" }, @@ -7392,6 +8098,18 @@ }, "additionalProperties": true }, + "dnstransportconfig": { + "properties": { + "tls": { + "$ref": "#/definitions/os_operator_v1_DNSOverTLSConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DNSOverTLSConfig" + }, + "transport": { + "type": "string" + } + }, + "additionalProperties": true + }, "dnszone": { "properties": { "id": { @@ -7454,6 +8172,14 @@ }, "additionalProperties": true }, + "egressipconfig": { + "properties": { + "reachabilityTotalTimeoutSeconds": { + "type": "integer" + } + }, + "additionalProperties": true + }, "endpointpublishingstrategy": { "properties": { "hostNetwork": { @@ -7624,6 +8350,20 @@ }, "additionalProperties": true }, + "featuresmigration": { + "properties": { + "egressFirewall": { + "type": "boolean" + }, + "egressIP": { + "type": "boolean" + }, + "multicast": { + "type": "boolean" + } + }, + "additionalProperties": true + }, "fieldsv1": { "additionalProperties": true }, @@ -7632,6 +8372,13 @@ "policy": { "type": "string" }, + "protocolStrategy": { + "type": "string" + }, + "transportConfig": { + "$ref": "#/definitions/os_operator_v1_DNSTransportConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DNSTransportConfig" + }, "upstreams": { "type": "array", "items": { @@ -7641,6 +8388,43 @@ }, "additionalProperties": true }, + "gatewayconfig": { + "properties": { + "ipForwarding": { + "type": "string" + }, + "routingViaHost": { + "type": "boolean" + } + }, + "additionalProperties": true + }, + "gcpcsidriverconfigspec": { + "properties": { + "kmsKey": { + "$ref": "#/definitions/os_operator_v1_GCPKMSKeyReference", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.GCPKMSKeyReference" + } + }, + "additionalProperties": true + }, + "gcpkmskeyreference": { + "properties": { + "keyRing": { + "type": "string" + }, + "location": { + "type": "string" + }, + "name": { + "type": "string" + }, + "projectID": { + "type": "string" + } + }, + "additionalProperties": true + }, "gcploadbalancerparameters": { "properties": { "clientAccess": { @@ -7686,8 +8470,17 @@ }, "hostnetworkstrategy": { "properties": { + "httpPort": { + "type": "integer" + }, + "httpsPort": { + "type": "integer" + }, "protocol": { "type": "string" + }, + "statsPort": { + "type": "integer" } }, "additionalProperties": true @@ -7719,6 +8512,14 @@ }, "additionalProperties": true }, + "ibmloadbalancerparameters": { + "properties": { + "protocol": { + "type": "string" + } + }, + "additionalProperties": true + }, "imagecontentsourcepolicy": { "properties": { "apiVersion": { @@ -8184,10 +8985,18 @@ "$ref": "#/definitions/os_operator_v1_EndpointPublishingStrategy", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.EndpointPublishingStrategy" }, + "namespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, "observedGeneration": { "type": "integer", "existingJavaType": "Long" }, + "routeSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, "selector": { "type": "string" }, @@ -8214,6 +9023,17 @@ "headerBufferMaxRewriteBytes": { "type": "integer" }, + "healthCheckInterval": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + }, + "maxConnections": { + "type": "integer" + }, + "reloadInterval": { + "$ref": "#/definitions/kubernetes_apimachinery_Duration", + "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" + }, "serverFinTimeout": { "$ref": "#/definitions/kubernetes_apimachinery_Duration", "existingJavaType": "io.fabric8.kubernetes.api.model.Duration" @@ -8389,6 +9209,14 @@ "readyReplicas": { "type": "integer" }, + "serviceAccountIssuers": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_operator_v1_ServiceAccountIssuerStatus", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.ServiceAccountIssuerStatus" + } + }, "version": { "type": "string" } @@ -8875,6 +9703,16 @@ }, "loadbalancerstrategy": { "properties": { + "allowedSourceRanges": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "dnsManagementPolicy": { + "type": "string" + }, "providerParameters": { "$ref": "#/definitions/os_operator_v1_ProviderLoadBalancerParameters", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.ProviderLoadBalancerParameters" @@ -8962,6 +9800,30 @@ "moderntlsprofile": { "additionalProperties": true }, + "mtumigration": { + "properties": { + "machine": { + "$ref": "#/definitions/os_operator_v1_MTUMigrationValues", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.MTUMigrationValues" + }, + "network": { + "$ref": "#/definitions/os_operator_v1_MTUMigrationValues", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.MTUMigrationValues" + } + }, + "additionalProperties": true + }, + "mtumigrationvalues": { + "properties": { + "from": { + "type": "integer" + }, + "to": { + "type": "integer" + } + }, + "additionalProperties": true + }, "netflowconfig": { "properties": { "collectors": { @@ -9029,6 +9891,14 @@ }, "networkmigration": { "properties": { + "features": { + "$ref": "#/definitions/os_operator_v1_FeaturesMigration", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.FeaturesMigration" + }, + "mtu": { + "$ref": "#/definitions/os_operator_v1_MTUMigration", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.MTUMigration" + }, "networkType": { "type": "string" } @@ -9699,6 +10569,14 @@ }, "ovnkubernetesconfig": { "properties": { + "egressIPConfig": { + "$ref": "#/definitions/os_operator_v1_EgressIPConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.EgressIPConfig" + }, + "gatewayConfig": { + "$ref": "#/definitions/os_operator_v1_GatewayConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.GatewayConfig" + }, "genevePort": { "type": "integer" }, @@ -9716,6 +10594,12 @@ "policyAuditConfig": { "$ref": "#/definitions/os_operator_v1_PolicyAuditConfig", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.PolicyAuditConfig" + }, + "v4InternalSubnet": { + "type": "string" + }, + "v6InternalSubnet": { + "type": "string" } }, "additionalProperties": true @@ -9746,6 +10630,52 @@ "patch": { "additionalProperties": true }, + "perspective": { + "properties": { + "id": { + "type": "string" + }, + "pinnedResources": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_operator_v1_PinnedResourceReference", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.PinnedResourceReference" + } + }, + "visibility": { + "$ref": "#/definitions/os_operator_v1_PerspectiveVisibility", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.PerspectiveVisibility" + } + }, + "additionalProperties": true + }, + "perspectivevisibility": { + "properties": { + "accessReview": { + "$ref": "#/definitions/os_operator_v1_ResourceAttributesAccessReview", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.ResourceAttributesAccessReview" + }, + "state": { + "type": "string" + } + }, + "additionalProperties": true + }, + "pinnedresourcereference": { + "properties": { + "group": { + "type": "string" + }, + "resource": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": true + }, "podaffinity": { "properties": { "preferredDuringSchedulingIgnoredDuringExecution": { @@ -9945,6 +10875,9 @@ "maxFileSize": { "type": "integer" }, + "maxLogFiles": { + "type": "integer" + }, "rateLimit": { "type": "integer" }, @@ -9967,6 +10900,11 @@ "additionalProperties": true }, "privatestrategy": { + "properties": { + "protocol": { + "type": "string" + } + }, "additionalProperties": true }, "projectaccess": { @@ -9991,6 +10929,10 @@ "$ref": "#/definitions/os_operator_v1_GCPLoadBalancerParameters", "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.GCPLoadBalancerParameters" }, + "ibm": { + "$ref": "#/definitions/os_operator_v1_IBMLoadBalancerParameters", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.IBMLoadBalancerParameters" + }, "type": { "type": "string" } @@ -10055,6 +10997,51 @@ }, "additionalProperties": true }, + "resourceattributes": { + "properties": { + "group": { + "type": "string" + }, + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + }, + "resource": { + "type": "string" + }, + "subresource": { + "type": "string" + }, + "verb": { + "type": "string" + }, + "version": { + "type": "string" + } + }, + "additionalProperties": true + }, + "resourceattributesaccessreview": { + "properties": { + "missing": { + "type": "array", + "items": { + "$ref": "#/definitions/k8s_io_api_authorization_v1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" + } + }, + "required": { + "type": "array", + "items": { + "$ref": "#/definitions/k8s_io_api_authorization_v1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" + } + } + }, + "additionalProperties": true + }, "resourceclaim": { "properties": { "name": { @@ -10140,6 +11127,18 @@ }, "additionalProperties": true }, + "serviceaccountissuerstatus": { + "properties": { + "expirationTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true + }, "serviceca": { "properties": { "apiVersion": { @@ -10789,6 +11788,9 @@ "unsupportedConfigOverrides": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_runtime_RawExtension", "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesResource" + }, + "vsphereStorageDriver": { + "type": "string" } }, "additionalProperties": true @@ -10938,6 +11940,13 @@ "policy": { "type": "string" }, + "protocolStrategy": { + "type": "string" + }, + "transportConfig": { + "$ref": "#/definitions/os_operator_v1_DNSTransportConfig", + "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.DNSTransportConfig" + }, "upstreams": { "type": "array", "items": { @@ -10948,6 +11957,18 @@ }, "additionalProperties": true }, + "vspherecsidriverconfigspec": { + "properties": { + "topologyCategories": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true + }, "weightedpodaffinityterm": { "properties": { "podAffinityTerm": { 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 f944251010f..231a7c9d1d8 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 @@ -1232,6 +1232,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1312,6 +1320,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_DownwardAPIProjection": { "type": "object", "properties": { @@ -1522,6 +1546,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1640,6 +1672,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" 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 b2eb1c28c06..6ee259df444 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 @@ -1232,6 +1232,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1312,6 +1320,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_DownwardAPIProjection": { "type": "object", "properties": { @@ -1522,6 +1546,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1640,6 +1672,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -7293,13 +7333,13 @@ "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" }, - "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" - }, "message": { "type": "string" }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, "reason": { "type": "string" }, @@ -7462,6 +7502,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -7533,6 +7581,17 @@ }, "additionalProperties": true }, + "containerresizepolicy": { + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true + }, "crddescription": { "properties": { "actionDescriptors": { @@ -8061,6 +8120,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -8174,6 +8241,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildVolumeSource.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildVolumeSource.java index e00c1b4b26a..751c42c6d59 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildVolumeSource.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildVolumeSource.java @@ -10,6 +10,7 @@ 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.CSIVolumeSource; import io.fabric8.kubernetes.api.model.ConfigMapVolumeSource; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; @@ -36,6 +37,7 @@ "kind", "metadata", "configMap", + "csi", "secret", "type" }) @@ -62,6 +64,8 @@ public class BuildVolumeSource implements KubernetesResource @JsonProperty("configMap") private ConfigMapVolumeSource configMap; + @JsonProperty("csi") + private CSIVolumeSource csi; @JsonProperty("secret") private SecretVolumeSource secret; @JsonProperty("type") @@ -79,12 +83,14 @@ public BuildVolumeSource() { /** * * @param configMap + * @param csi * @param secret * @param type */ - public BuildVolumeSource(ConfigMapVolumeSource configMap, SecretVolumeSource secret, String type) { + public BuildVolumeSource(ConfigMapVolumeSource configMap, CSIVolumeSource csi, SecretVolumeSource secret, String type) { super(); this.configMap = configMap; + this.csi = csi; this.secret = secret; this.type = type; } @@ -99,6 +105,16 @@ public void setConfigMap(ConfigMapVolumeSource configMap) { this.configMap = configMap; } + @JsonProperty("csi") + public CSIVolumeSource getCsi() { + return csi; + } + + @JsonProperty("csi") + public void setCsi(CSIVolumeSource csi) { + this.csi = csi; + } + @JsonProperty("secret") public SecretVolumeSource getSecret() { return secret; diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Image.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Image.java index 2de63dc7f6e..b55703a97cc 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Image.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Image.java @@ -43,6 +43,7 @@ "dockerImageLayers", "dockerImageManifest", "dockerImageManifestMediaType", + "dockerImageManifests", "dockerImageMetadata", "dockerImageMetadataVersion", "dockerImageReference", @@ -85,11 +86,15 @@ public class Image implements HasMetadata @JsonProperty("dockerImageConfig") private String dockerImageConfig; @JsonProperty("dockerImageLayers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) private List dockerImageLayers = new ArrayList(); @JsonProperty("dockerImageManifest") private String dockerImageManifest; @JsonProperty("dockerImageManifestMediaType") private String dockerImageManifestMediaType; + @JsonProperty("dockerImageManifests") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List dockerImageManifests = new ArrayList(); @JsonProperty("dockerImageMetadata") private RawExtension dockerImageMetadata; @JsonProperty("dockerImageMetadataVersion") @@ -123,26 +128,28 @@ public Image() { /** * - * @param dockerImageLayers + * @param dockerImageManifests * @param dockerImageMetadata * @param metadata - * @param apiVersion - * @param dockerImageSignatures * @param kind - * @param dockerImageReference * @param dockerImageManifestMediaType * @param dockerImageConfig * @param dockerImageMetadataVersion * @param dockerImageManifest * @param signatures + * @param dockerImageLayers + * @param apiVersion + * @param dockerImageSignatures + * @param dockerImageReference */ - public Image(String apiVersion, String dockerImageConfig, List dockerImageLayers, String dockerImageManifest, String dockerImageManifestMediaType, RawExtension dockerImageMetadata, String dockerImageMetadataVersion, String dockerImageReference, List dockerImageSignatures, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, List signatures) { + public Image(String apiVersion, String dockerImageConfig, List dockerImageLayers, String dockerImageManifest, String dockerImageManifestMediaType, List dockerImageManifests, RawExtension dockerImageMetadata, String dockerImageMetadataVersion, String dockerImageReference, List dockerImageSignatures, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, List signatures) { super(); this.apiVersion = apiVersion; this.dockerImageConfig = dockerImageConfig; this.dockerImageLayers = dockerImageLayers; this.dockerImageManifest = dockerImageManifest; this.dockerImageManifestMediaType = dockerImageManifestMediaType; + this.dockerImageManifests = dockerImageManifests; this.dockerImageMetadata = dockerImageMetadata; this.dockerImageMetadataVersion = dockerImageMetadataVersion; this.dockerImageReference = dockerImageReference; @@ -212,6 +219,16 @@ public void setDockerImageManifestMediaType(String dockerImageManifestMediaType) this.dockerImageManifestMediaType = dockerImageManifestMediaType; } + @JsonProperty("dockerImageManifests") + public List getDockerImageManifests() { + return dockerImageManifests; + } + + @JsonProperty("dockerImageManifests") + public void setDockerImageManifests(List dockerImageManifests) { + this.dockerImageManifests = dockerImageManifests; + } + @JsonProperty("dockerImageMetadata") public RawExtension getDockerImageMetadata() { return dockerImageMetadata; diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageImportStatus.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageImportStatus.java index b9960986cea..2644ea8cbb7 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageImportStatus.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageImportStatus.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.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; @@ -35,6 +37,7 @@ "kind", "metadata", "image", + "manifests", "status", "tag" }) @@ -61,6 +64,9 @@ public class ImageImportStatus implements KubernetesResource @JsonProperty("image") private Image image; + @JsonProperty("manifests") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List manifests = new ArrayList(); @JsonProperty("status") private Status status; @JsonProperty("tag") @@ -78,12 +84,14 @@ public ImageImportStatus() { /** * * @param image + * @param manifests * @param tag * @param status */ - public ImageImportStatus(Image image, Status status, String tag) { + public ImageImportStatus(Image image, List manifests, Status status, String tag) { super(); this.image = image; + this.manifests = manifests; this.status = status; this.tag = tag; } @@ -98,6 +106,16 @@ public void setImage(Image image) { this.image = image; } + @JsonProperty("manifests") + public List getManifests() { + return manifests; + } + + @JsonProperty("manifests") + public void setManifests(List manifests) { + this.manifests = manifests; + } + @JsonProperty("status") public Status getStatus() { return status; diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageManifest.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageManifest.java new file mode 100644 index 00000000000..9f76c866c8c --- /dev/null +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageManifest.java @@ -0,0 +1,175 @@ + +package io.fabric8.openshift.api.model; + +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", + "architecture", + "digest", + "manifestSize", + "mediaType", + "os", + "variant" +}) +@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 ImageManifest implements KubernetesResource +{ + + @JsonProperty("architecture") + private String architecture; + @JsonProperty("digest") + private String digest; + @JsonProperty("manifestSize") + private Long manifestSize; + @JsonProperty("mediaType") + private String mediaType; + @JsonProperty("os") + private String os; + @JsonProperty("variant") + private String variant; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ImageManifest() { + } + + /** + * + * @param os + * @param digest + * @param variant + * @param mediaType + * @param architecture + * @param manifestSize + */ + public ImageManifest(String architecture, String digest, Long manifestSize, String mediaType, String os, String variant) { + super(); + this.architecture = architecture; + this.digest = digest; + this.manifestSize = manifestSize; + this.mediaType = mediaType; + this.os = os; + this.variant = variant; + } + + @JsonProperty("architecture") + public String getArchitecture() { + return architecture; + } + + @JsonProperty("architecture") + public void setArchitecture(String architecture) { + this.architecture = architecture; + } + + @JsonProperty("digest") + public String getDigest() { + return digest; + } + + @JsonProperty("digest") + public void setDigest(String digest) { + this.digest = digest; + } + + @JsonProperty("manifestSize") + public Long getManifestSize() { + return manifestSize; + } + + @JsonProperty("manifestSize") + public void setManifestSize(Long manifestSize) { + this.manifestSize = manifestSize; + } + + @JsonProperty("mediaType") + public String getMediaType() { + return mediaType; + } + + @JsonProperty("mediaType") + public void setMediaType(String mediaType) { + this.mediaType = mediaType; + } + + @JsonProperty("os") + public String getOs() { + return os; + } + + @JsonProperty("os") + public void setOs(String os) { + this.os = os; + } + + @JsonProperty("variant") + public String getVariant() { + return variant; + } + + @JsonProperty("variant") + public void setVariant(String variant) { + this.variant = variant; + } + + @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/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagImportPolicy.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagImportPolicy.java index bd8f6fa949b..194f484de44 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagImportPolicy.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagImportPolicy.java @@ -33,6 +33,7 @@ "apiVersion", "kind", "metadata", + "importMode", "insecure", "scheduled" }) @@ -57,6 +58,8 @@ public class TagImportPolicy implements KubernetesResource { + @JsonProperty("importMode") + private String importMode; @JsonProperty("insecure") private Boolean insecure; @JsonProperty("scheduled") @@ -73,15 +76,27 @@ public TagImportPolicy() { /** * + * @param importMode * @param scheduled * @param insecure */ - public TagImportPolicy(Boolean insecure, Boolean scheduled) { + public TagImportPolicy(String importMode, Boolean insecure, Boolean scheduled) { super(); + this.importMode = importMode; this.insecure = insecure; this.scheduled = scheduled; } + @JsonProperty("importMode") + public String getImportMode() { + return importMode; + } + + @JsonProperty("importMode") + public void setImportMode(String importMode) { + this.importMode = importMode; + } + @JsonProperty("insecure") public Boolean getInsecure() { return insecure; 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 2d9b29e70fc..d95b7d09e15 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 @@ -361,6 +361,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1662,6 +1665,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1742,6 +1753,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_DownwardAPIProjection": { "type": "object", "properties": { @@ -1952,6 +1979,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -2070,6 +2105,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -6120,6 +6163,10 @@ "$ref": "#/definitions/kubernetes_core_ConfigMapVolumeSource", "existingJavaType": "io.fabric8.kubernetes.api.model.ConfigMapVolumeSource" }, + "csi": { + "$ref": "#/definitions/kubernetes_core_CSIVolumeSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.CSIVolumeSource" + }, "secret": { "$ref": "#/definitions/kubernetes_core_SecretVolumeSource", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretVolumeSource" @@ -7487,6 +7534,7 @@ }, "dockerImageLayers": { "type": "array", + "javaOmitEmpty": true, "items": { "$ref": "#/definitions/os_image_ImageLayer", "existingJavaType": "io.fabric8.openshift.api.model.ImageLayer" @@ -7498,6 +7546,14 @@ "dockerImageManifestMediaType": { "type": "string" }, + "dockerImageManifests": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_image_ImageManifest", + "existingJavaType": "io.fabric8.openshift.api.model.ImageManifest" + } + }, "dockerImageMetadata": { "existingJavaType": "io.fabric8.openshift.api.model.runtime.RawExtension" }, @@ -7574,6 +7630,14 @@ "$ref": "#/definitions/os_image_Image", "existingJavaType": "io.fabric8.openshift.api.model.Image" }, + "manifests": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_image_Image", + "existingJavaType": "io.fabric8.openshift.api.model.Image" + } + }, "status": { "$ref": "#/definitions/kubernetes_apimachinery_Status", "existingJavaType": "io.fabric8.kubernetes.api.model.Status" @@ -7653,6 +7717,35 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_image_ImageManifest": { + "type": "object", + "properties": { + "architecture": { + "type": "string" + }, + "digest": { + "type": "string" + }, + "manifestSize": { + "type": "integer", + "existingJavaType": "Long" + }, + "mediaType": { + "type": "string" + }, + "os": { + "type": "string" + }, + "variant": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.ImageManifest", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_image_ImageSignature": { "type": "object", "properties": { @@ -8342,6 +8435,9 @@ "os_image_TagImportPolicy": { "type": "object", "properties": { + "importMode": { + "type": "string" + }, "insecure": { "type": "boolean" }, 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 b2c1cf47f7a..8907d59f294 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 @@ -361,6 +361,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -1662,6 +1665,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -1742,6 +1753,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_ContainerResizePolicy": { + "type": "object", + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_DownwardAPIProjection": { "type": "object", "properties": { @@ -1952,6 +1979,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -2070,6 +2105,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -6120,6 +6163,10 @@ "$ref": "#/definitions/kubernetes_core_ConfigMapVolumeSource", "existingJavaType": "io.fabric8.kubernetes.api.model.ConfigMapVolumeSource" }, + "csi": { + "$ref": "#/definitions/kubernetes_core_CSIVolumeSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.CSIVolumeSource" + }, "secret": { "$ref": "#/definitions/kubernetes_core_SecretVolumeSource", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretVolumeSource" @@ -7487,6 +7534,7 @@ }, "dockerImageLayers": { "type": "array", + "javaOmitEmpty": true, "items": { "$ref": "#/definitions/os_image_ImageLayer", "existingJavaType": "io.fabric8.openshift.api.model.ImageLayer" @@ -7498,6 +7546,14 @@ "dockerImageManifestMediaType": { "type": "string" }, + "dockerImageManifests": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_image_ImageManifest", + "existingJavaType": "io.fabric8.openshift.api.model.ImageManifest" + } + }, "dockerImageMetadata": { "existingJavaType": "io.fabric8.openshift.api.model.runtime.RawExtension" }, @@ -7574,6 +7630,14 @@ "$ref": "#/definitions/os_image_Image", "existingJavaType": "io.fabric8.openshift.api.model.Image" }, + "manifests": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_image_Image", + "existingJavaType": "io.fabric8.openshift.api.model.Image" + } + }, "status": { "$ref": "#/definitions/kubernetes_apimachinery_Status", "existingJavaType": "io.fabric8.kubernetes.api.model.Status" @@ -7653,6 +7717,35 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "os_image_ImageManifest": { + "type": "object", + "properties": { + "architecture": { + "type": "string" + }, + "digest": { + "type": "string" + }, + "manifestSize": { + "type": "integer", + "existingJavaType": "Long" + }, + "mediaType": { + "type": "string" + }, + "os": { + "type": "string" + }, + "variant": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.openshift.api.model.ImageManifest", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "os_image_ImageSignature": { "type": "object", "properties": { @@ -8342,6 +8435,9 @@ "os_image_TagImportPolicy": { "type": "object", "properties": { + "importMode": { + "type": "string" + }, "insecure": { "type": "boolean" }, @@ -12431,6 +12527,10 @@ "$ref": "#/definitions/kubernetes_core_ConfigMapVolumeSource", "existingJavaType": "io.fabric8.kubernetes.api.model.ConfigMapVolumeSource" }, + "csi": { + "$ref": "#/definitions/kubernetes_core_CSIVolumeSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.CSIVolumeSource" + }, "secret": { "$ref": "#/definitions/kubernetes_core_SecretVolumeSource", "existingJavaType": "io.fabric8.kubernetes.api.model.SecretVolumeSource" @@ -13168,6 +13268,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -13239,6 +13347,17 @@ }, "additionalProperties": true }, + "containerresizepolicy": { + "properties": { + "resourceName": { + "type": "string" + }, + "restartPolicy": { + "type": "string" + } + }, + "additionalProperties": true + }, "context": { "properties": { "cluster": { @@ -14006,6 +14125,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -14119,6 +14246,14 @@ "$ref": "#/definitions/kubernetes_core_Probe", "existingJavaType": "io.fabric8.kubernetes.api.model.Probe" }, + "resizePolicy": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_ContainerResizePolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.ContainerResizePolicy" + } + }, "resources": { "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" @@ -14876,6 +15011,7 @@ }, "dockerImageLayers": { "type": "array", + "javaOmitEmpty": true, "items": { "$ref": "#/definitions/os_image_ImageLayer", "existingJavaType": "io.fabric8.openshift.api.model.ImageLayer" @@ -14887,6 +15023,14 @@ "dockerImageManifestMediaType": { "type": "string" }, + "dockerImageManifests": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_image_ImageManifest", + "existingJavaType": "io.fabric8.openshift.api.model.ImageManifest" + } + }, "dockerImageMetadata": { "existingJavaType": "io.fabric8.openshift.api.model.runtime.RawExtension" }, @@ -14996,6 +15140,14 @@ "$ref": "#/definitions/os_image_Image", "existingJavaType": "io.fabric8.openshift.api.model.Image" }, + "manifests": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_image_Image", + "existingJavaType": "io.fabric8.openshift.api.model.Image" + } + }, "status": { "$ref": "#/definitions/kubernetes_apimachinery_Status", "existingJavaType": "io.fabric8.kubernetes.api.model.Status" @@ -15066,6 +15218,30 @@ }, "additionalProperties": true }, + "imagemanifest": { + "properties": { + "architecture": { + "type": "string" + }, + "digest": { + "type": "string" + }, + "manifestSize": { + "type": "integer", + "existingJavaType": "Long" + }, + "mediaType": { + "type": "string" + }, + "os": { + "type": "string" + }, + "variant": { + "type": "string" + } + }, + "additionalProperties": true + }, "imagesignature": { "properties": { "apiVersion": { @@ -15795,6 +15971,9 @@ "resourceVersionMatch": { "type": "string" }, + "sendInitialEvents": { + "type": "boolean" + }, "timeoutSeconds": { "type": "integer", "existingJavaType": "Long" @@ -19390,6 +19569,9 @@ }, "tagimportpolicy": { "properties": { + "importMode": { + "type": "string" + }, "insecure": { "type": "boolean" }, diff --git a/kubernetes-model-generator/pkg/schemagen/generate.go b/kubernetes-model-generator/pkg/schemagen/generate.go index 58d608feab3..f3acac0b66a 100644 --- a/kubernetes-model-generator/pkg/schemagen/generate.go +++ b/kubernetes-model-generator/pkg/schemagen/generate.go @@ -577,6 +577,7 @@ func (g *schemaGenerator) isClusterScopedResource(t reflect.Type) bool { "k8s.io/api/core/v1/PersistentVolume", "k8s.io/api/authentication/v1/TokenReview", "k8s.io/api/authentication/v1alpha1/SelfSubjectReview", + "k8s.io/api/authentication/v1beta1/SelfSubjectReview", "k8s.io/api/admissionregistration/v1beta1/MutatingWebhookConfiguration", "k8s.io/api/admissionregistration/v1alpha1/ValidatingAdmissionPolicy", "k8s.io/api/admissionregistration/v1alpha1/ValidatingAdmissionPolicyBinding", @@ -596,6 +597,7 @@ func (g *schemaGenerator) isClusterScopedResource(t reflect.Type) bool { "k8s.io/api/rbac/v1/ClusterRoleBinding", "k8s.io/api/scheduling/v1/PriorityClass", "k8s.io/api/scheduling/v1beta1/PriorityClass", + "k8s.io/api/certificates/v1alpha1/ClusterTrustBundle", "k8s.io/api/certificates/v1beta1/CertificateSigningRequest", "k8s.io/api/certificates/v1/CertificateSigningRequest", "k8s.io/api/storage/v1beta1/CSIDriver", @@ -607,6 +609,8 @@ func (g *schemaGenerator) isClusterScopedResource(t reflect.Type) bool { "k8s.io/api/node/v1beta1/RuntimeClass", "k8s.io/api/node/v1/RuntimeClass", "k8s.io/api/node/v1alpha1/RuntimeClass", + "k8s.io/api/networking/v1alpha1/ClusterCIDR", + "k8s.io/api/networking/v1alpha1/IPAddress", "k8s.io/api/networking/v1beta1/IngressClass", "k8s.io/api/networking/v1/IngressClass", "k8s.io/api/storage/v1/StorageClass", @@ -617,7 +621,8 @@ func (g *schemaGenerator) isClusterScopedResource(t reflect.Type) bool { "k8s.io/api/flowcontrol/v1beta2/PriorityLevelConfiguration", "k8s.io/api/flowcontrol/v1beta3/FlowSchema", "k8s.io/api/flowcontrol/v1beta3/PriorityLevelConfiguration", - "k8s.io/api/resource/v1alpha1/ResourceClass", + "k8s.io/api/apiserverinternal/v1alpha1/StorageVersion", + "k8s.io/api/resource/v1alpha2/ResourceClass", "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/PodSchedulingTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSchedulingContextTest.java similarity index 61% rename from kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSchedulingTest.java rename to kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSchedulingContextTest.java index b0df7679753..3d93fc6e4f2 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSchedulingTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSchedulingContextTest.java @@ -15,10 +15,10 @@ */ package io.fabric8.kubernetes.client.mock; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodScheduling; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingBuilder; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.PodSchedulingListBuilder; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContext; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextBuilder; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.PodSchedulingContextListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; @@ -29,23 +29,24 @@ import static org.assertj.core.api.Assertions.assertThat; @EnableKubernetesMockClient -class PodSchedulingTest { +class PodSchedulingContextTest { private KubernetesClient client; private KubernetesMockServer server; @Test void get() { // Given - server.expect().get().withPath("/apis/resource.k8s.io/v1alpha1/namespaces/test/podschedulings/test-get") - .andReturn(HttpURLConnection.HTTP_OK, createNewPodScheduling("test-get")) + server.expect().get().withPath("/apis/resource.k8s.io/v1alpha2/namespaces/test/podschedulingcontexts/test-get") + .andReturn(HttpURLConnection.HTTP_OK, createNewPodSchedulingContext("test-get")) .once(); // When - PodScheduling podScheduling = client.dynamicResourceAllocation().v1alpha1().podSchedulings().inNamespace("test") + PodSchedulingContext podSchedulingContext = client.dynamicResourceAllocation().v1alpha2().podSchedulings() + .inNamespace("test") .withName("test-get").get(); // Then - assertThat(podScheduling) + assertThat(podSchedulingContext) .isNotNull() .hasFieldOrPropertyWithValue("metadata.name", "test-get"); } @@ -53,40 +54,41 @@ void get() { @Test void list() { // Given - server.expect().get().withPath("/apis/resource.k8s.io/v1alpha1/namespaces/test/podschedulings") - .andReturn(HttpURLConnection.HTTP_OK, new PodSchedulingListBuilder() - .addToItems(createNewPodScheduling("test-list")) + server.expect().get().withPath("/apis/resource.k8s.io/v1alpha2/namespaces/test/podschedulingcontexts") + .andReturn(HttpURLConnection.HTTP_OK, new PodSchedulingContextListBuilder() + .addToItems(createNewPodSchedulingContext("test-list")) .build()) .once(); // When - PodSchedulingList podSchedulingList = client.dynamicResourceAllocation().v1alpha1().podSchedulings().inNamespace("test") + PodSchedulingContextList podSchedulingContextList = client.dynamicResourceAllocation().v1alpha2().podSchedulings() + .inNamespace("test") .list(); // Then - assertThat(podSchedulingList).isNotNull(); - assertThat(podSchedulingList.getItems()).hasSize(1); - assertThat(podSchedulingList.getItems().get(0)) + assertThat(podSchedulingContextList).isNotNull(); + assertThat(podSchedulingContextList.getItems()).hasSize(1); + assertThat(podSchedulingContextList.getItems().get(0)) .hasFieldOrPropertyWithValue("metadata.name", "test-list"); } @Test void delete() { // Given - server.expect().delete().withPath("/apis/resource.k8s.io/v1alpha1/namespaces/test/podschedulings/cluster") - .andReturn(HttpURLConnection.HTTP_OK, createNewPodScheduling("cluster")) + server.expect().delete().withPath("/apis/resource.k8s.io/v1alpha2/namespaces/test/podschedulingcontexts/cluster") + .andReturn(HttpURLConnection.HTTP_OK, createNewPodSchedulingContext("cluster")) .once(); // When - boolean isDeleted = client.dynamicResourceAllocation().v1alpha1().podSchedulings().inNamespace("test").withName("cluster") + boolean isDeleted = client.dynamicResourceAllocation().v1alpha2().podSchedulings().inNamespace("test").withName("cluster") .delete().size() == 1; // Then assertThat(isDeleted).isTrue(); } - private PodScheduling createNewPodScheduling(String name) { - return new PodSchedulingBuilder() + private PodSchedulingContext createNewPodSchedulingContext(String name) { + return new PodSchedulingContextBuilder() .withNewMetadata() .withName(name) .endMetadata() diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTemplateTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTemplateTest.java index 437b644d52e..796afedb43f 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTemplateTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTemplateTest.java @@ -15,10 +15,10 @@ */ package io.fabric8.kubernetes.client.mock; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplate; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateBuilder; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimTemplateListBuilder; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplate; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateBuilder; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimTemplateListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; @@ -36,12 +36,12 @@ class ResourceClaimTemplateTest { @Test void get() { // Given - server.expect().get().withPath("/apis/resource.k8s.io/v1alpha1/namespaces/test/resourceclaimtemplates/test-get") + server.expect().get().withPath("/apis/resource.k8s.io/v1alpha2/namespaces/test/resourceclaimtemplates/test-get") .andReturn(HttpURLConnection.HTTP_OK, createNewResourceClaimTemplate("test-get")) .once(); // When - ResourceClaimTemplate resourceClaimTemplate = client.dynamicResourceAllocation().v1alpha1().resourceClaimTemplates() + ResourceClaimTemplate resourceClaimTemplate = client.dynamicResourceAllocation().v1alpha2().resourceClaimTemplates() .inNamespace("test").withName("test-get").get(); // Then @@ -53,14 +53,14 @@ void get() { @Test void list() { // Given - server.expect().get().withPath("/apis/resource.k8s.io/v1alpha1/namespaces/test/resourceclaimtemplates") + server.expect().get().withPath("/apis/resource.k8s.io/v1alpha2/namespaces/test/resourceclaimtemplates") .andReturn(HttpURLConnection.HTTP_OK, new ResourceClaimTemplateListBuilder() .addToItems(createNewResourceClaimTemplate("test-list")) .build()) .once(); // When - ResourceClaimTemplateList resourceClaimList = client.dynamicResourceAllocation().v1alpha1().resourceClaimTemplates() + ResourceClaimTemplateList resourceClaimList = client.dynamicResourceAllocation().v1alpha2().resourceClaimTemplates() .inNamespace("test").list(); // Then @@ -73,12 +73,12 @@ void list() { @Test void delete() { // Given - server.expect().delete().withPath("/apis/resource.k8s.io/v1alpha1/namespaces/test/resourceclaimtemplates/cluster") + server.expect().delete().withPath("/apis/resource.k8s.io/v1alpha2/namespaces/test/resourceclaimtemplates/cluster") .andReturn(HttpURLConnection.HTTP_OK, createNewResourceClaimTemplate("cluster")) .once(); // When - boolean isDeleted = client.dynamicResourceAllocation().v1alpha1().resourceClaimTemplates().inNamespace("test") + boolean isDeleted = client.dynamicResourceAllocation().v1alpha2().resourceClaimTemplates().inNamespace("test") .withName("cluster").delete().size() == 1; // Then diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTest.java index 298bed2eae5..122e200f495 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTest.java @@ -15,10 +15,10 @@ */ package io.fabric8.kubernetes.client.mock; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaim; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimBuilder; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClaimListBuilder; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaim; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimBuilder; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClaimListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; @@ -36,12 +36,12 @@ class ResourceClaimTest { @Test void get() { // Given - server.expect().get().withPath("/apis/resource.k8s.io/v1alpha1/namespaces/test/resourceclaims/test-get") + server.expect().get().withPath("/apis/resource.k8s.io/v1alpha2/namespaces/test/resourceclaims/test-get") .andReturn(HttpURLConnection.HTTP_OK, createNewResourceClaim("test-get")) .once(); // When - ResourceClaim resourceClaim = client.dynamicResourceAllocation().v1alpha1().resourceClaims().inNamespace("test") + ResourceClaim resourceClaim = client.dynamicResourceAllocation().v1alpha2().resourceClaims().inNamespace("test") .withName("test-get").get(); // Then @@ -53,14 +53,14 @@ void get() { @Test void list() { // Given - server.expect().get().withPath("/apis/resource.k8s.io/v1alpha1/namespaces/test/resourceclaims") + server.expect().get().withPath("/apis/resource.k8s.io/v1alpha2/namespaces/test/resourceclaims") .andReturn(HttpURLConnection.HTTP_OK, new ResourceClaimListBuilder() .addToItems(createNewResourceClaim("test-list")) .build()) .once(); // When - ResourceClaimList resourceClaimList = client.dynamicResourceAllocation().v1alpha1().resourceClaims().inNamespace("test") + ResourceClaimList resourceClaimList = client.dynamicResourceAllocation().v1alpha2().resourceClaims().inNamespace("test") .list(); // Then @@ -73,12 +73,12 @@ void list() { @Test void delete() { // Given - server.expect().delete().withPath("/apis/resource.k8s.io/v1alpha1/namespaces/test/resourceclaims/cluster") + server.expect().delete().withPath("/apis/resource.k8s.io/v1alpha2/namespaces/test/resourceclaims/cluster") .andReturn(HttpURLConnection.HTTP_OK, createNewResourceClaim("cluster")) .once(); // When - boolean isDeleted = client.dynamicResourceAllocation().v1alpha1().resourceClaims().inNamespace("test").withName("cluster") + boolean isDeleted = client.dynamicResourceAllocation().v1alpha2().resourceClaims().inNamespace("test").withName("cluster") .delete().size() == 1; // Then diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClassTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClassTest.java index 1e2377e8faf..afeb792f17b 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClassTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClassTest.java @@ -17,10 +17,10 @@ import io.fabric8.kubernetes.api.model.NodeSelectorBuilder; import io.fabric8.kubernetes.api.model.NodeSelectorRequirementBuilder; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClass; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassBuilder; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassList; -import io.fabric8.kubernetes.api.model.resource.v1alpha1.ResourceClassListBuilder; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClass; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassBuilder; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassList; +import io.fabric8.kubernetes.api.model.resource.v1alpha2.ResourceClassListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; @@ -38,12 +38,12 @@ class ResourceClassTest { @Test void get() { // Given - server.expect().get().withPath("/apis/resource.k8s.io/v1alpha1/resourceclasses/test-get") + server.expect().get().withPath("/apis/resource.k8s.io/v1alpha2/resourceclasses/test-get") .andReturn(HttpURLConnection.HTTP_OK, createNewResourceClass("test-get")) .once(); // When - ResourceClass resourceClass = client.dynamicResourceAllocation().v1alpha1().resourceClasses().withName("test-get").get(); + ResourceClass resourceClass = client.dynamicResourceAllocation().v1alpha2().resourceClasses().withName("test-get").get(); // Then assertThat(resourceClass) @@ -54,14 +54,14 @@ void get() { @Test void list() { // Given - server.expect().get().withPath("/apis/resource.k8s.io/v1alpha1/resourceclasses") + server.expect().get().withPath("/apis/resource.k8s.io/v1alpha2/resourceclasses") .andReturn(HttpURLConnection.HTTP_OK, new ResourceClassListBuilder() .addToItems(createNewResourceClass("test-list")) .build()) .once(); // When - ResourceClassList resourceClassList = client.dynamicResourceAllocation().v1alpha1().resourceClasses().list(); + ResourceClassList resourceClassList = client.dynamicResourceAllocation().v1alpha2().resourceClasses().list(); // Then assertThat(resourceClassList).isNotNull(); @@ -73,12 +73,12 @@ void list() { @Test void delete() { // Given - server.expect().delete().withPath("/apis/resource.k8s.io/v1alpha1/resourceclasses/cluster") + server.expect().delete().withPath("/apis/resource.k8s.io/v1alpha2/resourceclasses/cluster") .andReturn(HttpURLConnection.HTTP_OK, createNewResourceClass("cluster")) .once(); // When - boolean isDeleted = client.dynamicResourceAllocation().v1alpha1().resourceClasses().withName("cluster").delete() + boolean isDeleted = client.dynamicResourceAllocation().v1alpha2().resourceClasses().withName("cluster").delete() .size() == 1; // Then